Version Bump

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 86 insertions, 18 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 928f478dd632..f81017596a29 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.102 2011/05/11 23:49:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.103 2011/12/04 13:54:48 jlec Exp $
+
+*nvidia-settings-290.10 (04 Dec 2011)
+
+  04 Dec 2011; Justin Lecher <jlec@gentoo.org> +nvidia-settings-290.10.ebuild,
+  metadata.xml:
+  Version Bump
 
 *nvidia-settings-270.41.06 (11 May 2011)
 *nvidia-settings-173.14.30 (11 May 2011)
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index cde9ffb65128..29578860a6c6 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
 AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
@@ -20,6 +17,7 @@ DIST nvidia-settings-260.19.36.tar.bz2 1536035 RMD160 ea21ff3e3744ea8f774f62bada
 DIST nvidia-settings-260.19.44.tar.bz2 1535853 RMD160 a7457ad8e6723d1da41670922160b1d5a7c8d9f2 SHA1 3b464fde7467e7693dc5b957c0fec8894450147a SHA256 124b748b83267c5a50f58cd653fdccaf1238eb3861c717cc24561aa988469114
 DIST nvidia-settings-270.41.03.tar.bz2 1541983 RMD160 a03552e4ab80089875df7659a42255f9e21ef12b SHA1 a1f611b4d5945e6df90658e172efd541923dc7c0 SHA256 97571aecdd37387336ec51eaf7553b82ea084068ca95cb7a3117e624dafff956
 DIST nvidia-settings-270.41.06.tar.bz2 1542669 RMD160 005bcff4bbaa7897af764a8fc883effdfd1995d6 SHA1 6ac463a00383daa39a48b4e4e42855d0ef58783f SHA256 54787e3f91521c930c1969524ed5d4ee7f9b55e97903f3ba9c91dbdc4a8d3e99
+DIST nvidia-settings-290.10.tar.bz2 1544400 RMD160 d114a1441dac0b178922ac3b7736e32af1d55f94 SHA1 92acce8ed9816b55edc5a8ffc3090c258ce58f38 SHA256 c20dac225e5c67135d0d3f784ee058ce6337687a4232e20335997061f1ec5e26
 EBUILD nvidia-settings-173.14.25.ebuild 1928 RMD160 9dec24d603a6042142ba5669169eb7023d24e292 SHA1 d3aea444ee654be0c03a6a341bdcf7c1ded82d5a SHA256 7384d8bd6bd69d8e02db120f64312407339a2ff9799bba3c3240e9eb63d45633
 EBUILD nvidia-settings-173.14.27.ebuild 1928 RMD160 52ca73f7d5c0664596fbc3a263be037a9488bc72 SHA1 7829113bc78d88cf777bccc4d4dc3e16a1dde8ee SHA256 bacd77fa4d994574fb594e5cf1a8376e0a80b3d8e0c988425f3905d15d5533a0
 EBUILD nvidia-settings-173.14.30.ebuild 1923 RMD160 cc355c3bc90b009e1605b919fcf7201456e70b5d SHA1 8e34fbe918868f2b8c6ef1a88ba753f2ed885104 SHA256 da4dd758eb8cc27d0b842cefc3599b36535c35d5c946558b40644cc0b7097599
@@ -34,14 +32,6 @@ EBUILD nvidia-settings-260.19.36.ebuild 1946 RMD160 7f6cccae92577a5307482924f14f
 EBUILD nvidia-settings-260.19.44.ebuild 1946 RMD160 250f2b38b0df4543e4e20bd1aa711bf42dc3f80e SHA1 63c808c49ec8086626b90c58f7f27f99464bb526 SHA256 51543afdfb97e098a5781bbddbfdb0d9a8a7266aceeb26ea90ed7fc705522b03
 EBUILD nvidia-settings-270.41.03.ebuild 1946 RMD160 8d605a1c38a5ac35cfdcbc553af41c6de94c30ed SHA1 113ff214499680f0c2ced331f2eaa913509d7e43 SHA256 dc0010679134b881e11ce528b7a0a011657481cdf689b33d7959e872779d4e41
 EBUILD nvidia-settings-270.41.06.ebuild 1946 RMD160 f78bd687c5b4b50c15560f4e445b3be256c8c60e SHA1 225cd75f286305ba188a8f6d84266a7381d2d5aa SHA256 8b2897892cba68a82dd6fe520f9298be7d98dca8dbed7b4a65510682f10302c7
-MISC ChangeLog 19497 RMD160 0173455772786c81ba68e444671f81aa61651bd9 SHA1 3c7aa0c5ea3165b034fb183e1523d1903fa30271 SHA256 e7b141a31a6d40cc1cce6c9dc16955d16454ca58f1b7cfbef8f5a246801c2ca4
-MISC metadata.xml 218 RMD160 b8d59202c68b3f015db783c4b800120676c401e3 SHA1 6366b18a091033de638b10002f27fd5e9885720f SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59p58ACgkQfXuS5UK5QB2dzQP/dtsDSqhF5OwHBjxy6lrNxD70
-tsCPv+UkIxH1EmQrS5mUW7MK77yZB5bs2ihw5IB2qfGSTnA+KArnVwXbpjpEIUp1
-LAVRcN1Kg980HlECxfuaDH0iJWsfHB7kis+uik++/e11QKw2z39n/djYPkN9pCOM
-ZyLEbfijivQuHRl6pzY=
-=sJPB
------END PGP SIGNATURE-----
+EBUILD nvidia-settings-290.10.ebuild 1878 RMD160 5fbc8bb2337b428b315dd20add2483d087ff9bd3 SHA1 224629b044563cdfae819baeb83695aa6ddd422c SHA256 7a58d854445a7ce4fc2a988f4e4c84942d63271d54bb74777e8e38e93d778d5b
+MISC ChangeLog 19648 RMD160 28295b3a3083190cab1206814426d7c7b505c244 SHA1 c1259f14ee6757bc51bdaa1fe8a7d3cc6b11fd5e SHA256 c7ca1170850dbbd5812886b246a9444b86f62f31f05c8746f84e2864269c7c47
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
index 1470e032181b..91f4e72fb544 100644
--- a/media-video/nvidia-settings/metadata.xml
+++ b/media-video/nvidia-settings/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
new file mode 100644
index 000000000000..765ce604a562
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.1 2011/12/04 13:54:48 jlec Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+# xorg-server is used in the depends as nvidia-settings builds against some
+# headers in /usr/include/xorg/.
+# This also allows us to optimize out a lot of the other dependancies, as
+# between gtk and xorg-server, almost all libraries and headers are accounted
+# for.
+DEPEND="
+	dev-util/pkgconfig
+	x11-base/xorg-server
+	x11-libs/gtk+:2
+	x11-libs/libXt
+	x11-libs/libXv
+	x11-libs/pango[X]
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto"
+
+RDEPEND="
+	x11-base/xorg-server
+	x11-libs/gtk+:2
+	x11-libs/libXt
+	x11-libs/pango[X]
+	x11-drivers/nvidia-drivers"
+
+src_prepare() {
+	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk || die
+}
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	cd "${S}/src/libXNVCtrl"
+	emake clean
+	append-flags -fPIC
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a
+	filter-flags -fPIC
+
+	# cd "${S}"
+	#einfo "Building nVidia-Settings..."
+	#emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	#emake STRIP_CMD=/bin/true install || die
+
+	# Install libXNVCtrl and headers
+	insinto "/usr/$(get_libdir)"
+	doins src/libXNVCtrl/libXNVCtrl.a
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
+
+	# Install icon and .desktop entry
+	#doicon "${FILESDIR}/icon/${PN}.png"
+	#domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	# Now install documentation
+	dodoc doc/*.txt
+}