Added new version of nvidia-settings.

Package-Manager: portage-2.1.1-r1

4 files changed, 120 insertions, 15 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 8c478f891809..e8a1a5e8c8c5 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.29 2006/10/30 15:22:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.30 2006/11/10 15:34:19 augustus Exp $
+
+*nvidia-settings-1.0.20061102 (10 Nov 2006)
+
+  10 Nov 2006; Kristopher Kersey <augustus@gentoo.org>
+  +nvidia-settings-1.0.20061102.ebuild:
+  Added new version of nvidia-settings.  Bug #154402.  This should be marked
+  stable once nvidia-drivers-1.0.9629 is marked stable.
 
   30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-settings-1.0.20051122-r3.ebuild,
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 25db6cf2848c..95427df30f4f 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 MD5 596d93feba5f2012ed21d3b44bfd0b10 files/icon/nvidia-settings.desktop 194
 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 files/icon/nvidia-settings.desktop 194
@@ -12,6 +9,7 @@ SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 files/ic
 DIST nvidia-settings-1.0.20051122.tar.gz 1091361 RMD160 742998d4de33217bbb07f99d2af9480548aeaa07 SHA1 a1a374bb57cd611d26e841d277e7cb7df824ee5f SHA256 d9df3d743f39a5e6961a4f42f77fcf10e57e61b2af68cec03630a1edf5a0a8b1
 DIST nvidia-settings-1.0.20060516.tar.gz 1119552 RMD160 784cb63001dae40bcd0c2298f3fbc519438a7266 SHA1 713f6ca7c3d21f8c21e1004becc2b9d305ddc3c9 SHA256 884a1152899ffccfa3180dfc1af9d1e5c7f3bb7367882f1971bd601aa715fada
 DIST nvidia-settings-1.0.20060919.tar.gz 1298171 RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 SHA1 315e1ec3626b60ab4e9ef290ff7e95f3d6a28ed7 SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477
+DIST nvidia-settings-1.0.20061102.tar.gz 1098727 RMD160 9d182e66ed40799046f213ef4685278f9b4ebf3a SHA1 218560127f9ec9cd34817d7f3cefd86d6421fac3 SHA256 c9cd5f33a8a60c91b6a64915967456289c13ebfee6d83b82fa1b02cd2652b84c
 EBUILD nvidia-settings-1.0.20051122-r3.ebuild 3022 RMD160 0fd576e32d58e842454e534229479b881299f23a SHA1 8fe37c8dda894950c3862b4a8d3cf83ff149ec60 SHA256 7220f21e02854aac8c56f6f176b48c085e119360c6f45e542696d3f008c0378e
 MD5 e61d5fc045c8c3e230e70f9404aea663 nvidia-settings-1.0.20051122-r3.ebuild 3022
 RMD160 0fd576e32d58e842454e534229479b881299f23a nvidia-settings-1.0.20051122-r3.ebuild 3022
@@ -24,10 +22,14 @@ EBUILD nvidia-settings-1.0.20060919.ebuild 2957 RMD160 216e7df33729d1cff387b1f2c
 MD5 69c290d9ae83c4fd677f5efea9eb3e48 nvidia-settings-1.0.20060919.ebuild 2957
 RMD160 216e7df33729d1cff387b1f2c27cd4ff3245445b nvidia-settings-1.0.20060919.ebuild 2957
 SHA256 e471cdf18e0a2ff162e0b5f15389f32b643637f7c0248f7baa2d0d5be8d90ea3 nvidia-settings-1.0.20060919.ebuild 2957
-MISC ChangeLog 5793 RMD160 b546e459b24b9efd97610c19f62b3c574e4ccbaf SHA1 fd2372effadad498257105cf3acf0b4d696df89d SHA256 95f7d56071e4ba0cfd020a9f08324ae9f5d6d74a966b7d6ac5f37ebcfc5a9572
-MD5 6c18028de2f5a4c94fdaaca2573fd874 ChangeLog 5793
-RMD160 b546e459b24b9efd97610c19f62b3c574e4ccbaf ChangeLog 5793
-SHA256 95f7d56071e4ba0cfd020a9f08324ae9f5d6d74a966b7d6ac5f37ebcfc5a9572 ChangeLog 5793
+EBUILD nvidia-settings-1.0.20061102.ebuild 2959 RMD160 fea3d0aeae8c22fc5fc8e34407daf31ba249dadb SHA1 3f38fc9f23dea164d75e6a7eb302d8ad0adf280a SHA256 1dbdf4aa5c48752fceeb66c058e9844bfd8f402b2c0fc577363865e5c97df187
+MD5 0e03bcdcbcc934da4caff5e02a76e010 nvidia-settings-1.0.20061102.ebuild 2959
+RMD160 fea3d0aeae8c22fc5fc8e34407daf31ba249dadb nvidia-settings-1.0.20061102.ebuild 2959
+SHA256 1dbdf4aa5c48752fceeb66c058e9844bfd8f402b2c0fc577363865e5c97df187 nvidia-settings-1.0.20061102.ebuild 2959
+MISC ChangeLog 6067 RMD160 3c7b148890994042aa805b99271adfd324767293 SHA1 1e405b5e81a1be42ecc5a8565390997d65841a15 SHA256 2f8095853f86243ae794493ce6a9c5b1ad5e5b1db5c019bf1f104a2828573540
+MD5 d018213eea361ee275b90fbcf19b71da ChangeLog 6067
+RMD160 3c7b148890994042aa805b99271adfd324767293 ChangeLog 6067
+SHA256 2f8095853f86243ae794493ce6a9c5b1ad5e5b1db5c019bf1f104a2828573540 ChangeLog 6067
 MISC metadata.xml 300 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf SHA1 c09bb78e0f50c4c1baf741d6fc7abda39fdf338b SHA256 8e7d769dbca123b81bed99b71048e93a8f860219e894c8abc7569d0cc3e948e8
 MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf metadata.xml 300
@@ -41,10 +43,6 @@ SHA256 175d7bc1eb49f717f571325404133184bf1fd48abb7de5f235146fdeae0412b4 files/di
 MD5 bd3b3edb6b41da666a9d87b1c57f2c37 files/digest-nvidia-settings-1.0.20060919 289
 RMD160 5ad2acbe32b6ff573a10a90a793eec8ea8bf7aac files/digest-nvidia-settings-1.0.20060919 289
 SHA256 c3816b195b5c9ffe7cd8a990df6f01bc41a364c54ccb1f8a75e30152b2aea0e6 files/digest-nvidia-settings-1.0.20060919 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRhjbkT4lNIS36YERAmgbAJwJa2e4P7SEauSZN9G6upZRbXA+kQCgm9QH
-QAqypgh8mjQftMQNFvVYnMY=
-=r1qo
------END PGP SIGNATURE-----
+MD5 d3b3cbc5d5e06bae9c84e70e8c05ade3 files/digest-nvidia-settings-1.0.20061102 289
+RMD160 daa3471f169de0adfeaef2204ad267d1ef410eee files/digest-nvidia-settings-1.0.20061102 289
+SHA256 51b4ef9efb1c18bfa936a205c3fa23f7b4d41dcc9fdd6269f6a46a97f24b9b16 files/digest-nvidia-settings-1.0.20061102 289
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20061102 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20061102
new file mode 100644
index 000000000000..26f7f2affb2e
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20061102
@@ -0,0 +1,3 @@
+MD5 f985d60446aff0bb7fd0f9f8f5ec144d nvidia-settings-1.0.20061102.tar.gz 1098727
+RMD160 9d182e66ed40799046f213ef4685278f9b4ebf3a nvidia-settings-1.0.20061102.tar.gz 1098727
+SHA256 c9cd5f33a8a60c91b6a64915967456289c13ebfee6d83b82fa1b02cd2652b84c nvidia-settings-1.0.20061102.tar.gz 1098727
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild
new file mode 100644
index 000000000000..d8cdc3fe5bba
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild,v 1.1 2006/11/10 15:34:19 augustus Exp $
+
+inherit eutils toolchain-funcs multilib
+
+# The following were added to work with the new nvidia-drivers and
+# nvidia-legacy-drivers ebuilds.
+NVIDIA_NEW_VERSION="1.0.9625"
+NVIDIA_LEGACY_VERSION="1.0.7182"
+S="${WORKDIR}/${PN}-1.0"
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		http://dev.gentoo.org/~augustus/nvidia/${P}.tar.gz"
+#SRC_URI="ftp://download.nvidia.com/XFree86/nvidia-settings/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+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="virtual/libc
+		>=x11-libs/gtk+-2
+		dev-util/pkgconfig
+		x11-base/xorg-server
+		x11-libs/libXt
+		x11-libs/libXv
+		x11-proto/xf86driproto
+		x11-misc/imake
+		x11-misc/gccmakedep"
+RDEPEND="|| (
+			>=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION}
+			>=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )
+		>=x11-libs/gtk+-2
+		x11-base/xorg-server
+		x11-libs/libXt"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/libXNVCtrl
+	einfo "Tweaking libXNVCtrl for build..."
+	# This next voodoo is just to work around xmkmf's broken behaviour
+	# after the Xorg move to /usr (or I think, as I have not messed
+	# with it in ages).
+	ln -snf ${ROOT}/usr/include/X11 include
+
+	# Ensure that libNVCtrl.a is actually built
+	# Regardless of how NormalLibXrandr was built
+	# (NormalLibXrandr indicates if Xrandr was built as static or not)
+	# NormalLibXrandr was 'YES' in Xorg-6.8, but is 'NO' in 7.0.
+	sed -i.orig \
+		-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
+		Imakefile
+
+	# for a rainy day, when we need a shared libXNVCtrl.so
+	#-e 'a#define DoSharedLib YES\n' \
+}
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	cd ${S}/src/libXNVCtrl
+	xmkmf -a || die "Running xmkmf failed!"
+	make clean || die "Cleaning old libXNVCtrl failed"
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!"
+
+	cd ${S}
+	einfo "Building nVidia-Settings..."
+	emake  CC="$(tc-getCC)" || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	# Install the executable
+	exeinto /usr/bin
+	doexe nvidia-settings
+
+	# 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"
+
+	# Install manpage
+	doman doc/nvidia-settings.1
+
+	# Now install documentation
+	dodoc doc/*.txt
+}