Version bump to the new nvidia-settings for bug #148860. This is still masked because there are reports that it requires the masked BETA nvidia-drivers to function properly.

Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 123 insertions, 8 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index edaba629eab1..9be2f1881656 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,14 @@
 # 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.27 2006/10/05 21:45:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.28 2006/10/06 18:39:56 wolf31o2 Exp $
+
+*nvidia-settings-1.0.20060919 (06 Oct 2006)
+
+  06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +nvidia-settings-1.0.20060919.ebuild:
+  Version bump to the new nvidia-settings for bug #148860. This is still
+  masked because there are reports that it requires the masked BETA
+  nvidia-drivers to function properly.
 
   05 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 07f7a1d024bd..0286e2753886 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -11,6 +11,7 @@ RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 files/icon/nvidia-settings.png 3
 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 files/icon/nvidia-settings.png 3790
 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
 EBUILD nvidia-settings-1.0.20051122-r3.ebuild 3001 RMD160 2fa611a390a2bdbda3bdaa4cbadf27f5285ac5e5 SHA1 98531e8b32ffbf4cbdc0fd05b765add3f5154d16 SHA256 6cb84c26f28e6d12e71dc239797470b6c63a9189c2c1b46b07613c09ab028fa9
 MD5 721aa35904b2320678c91af9f8c120a3 nvidia-settings-1.0.20051122-r3.ebuild 3001
 RMD160 2fa611a390a2bdbda3bdaa4cbadf27f5285ac5e5 nvidia-settings-1.0.20051122-r3.ebuild 3001
@@ -19,10 +20,14 @@ EBUILD nvidia-settings-1.0.20060516-r1.ebuild 3003 RMD160 ee84cf484df5fcee5653aa
 MD5 42e2cfd919aba1afcd394de50df51d41 nvidia-settings-1.0.20060516-r1.ebuild 3003
 RMD160 ee84cf484df5fcee5653aaf5bf04717568febe8d nvidia-settings-1.0.20060516-r1.ebuild 3003
 SHA256 acb0fb1256ffe34df60afc0a6682c8cdd013e5d025111515cfb1430b5de11f49 nvidia-settings-1.0.20060516-r1.ebuild 3003
-MISC ChangeLog 5242 RMD160 0a0455b30797f16c2096fcfac41277e84259e824 SHA1 f1421d3888da898f24f2998cccf4e40ccaf93231 SHA256 3e91df8d5ac08f264e6162d5fd6ba1bf165944629314c0d69b4a1d9bd96b47b8
-MD5 572bbc80e36f1c751271811dd9ba6955 ChangeLog 5242
-RMD160 0a0455b30797f16c2096fcfac41277e84259e824 ChangeLog 5242
-SHA256 3e91df8d5ac08f264e6162d5fd6ba1bf165944629314c0d69b4a1d9bd96b47b8 ChangeLog 5242
+EBUILD nvidia-settings-1.0.20060919.ebuild 2936 RMD160 0a8abec589e01eff6ba4de2c28e7bf3e6e9fd8e0 SHA1 ea465275813d02f9d52572119ef124859ff51404 SHA256 d6c41d8019c8dacf19ea8e0cdb816be01e95e54d904c5b3a9110126e44684fc7
+MD5 171c4aed48a65b5d67e6e755efc06026 nvidia-settings-1.0.20060919.ebuild 2936
+RMD160 0a8abec589e01eff6ba4de2c28e7bf3e6e9fd8e0 nvidia-settings-1.0.20060919.ebuild 2936
+SHA256 d6c41d8019c8dacf19ea8e0cdb816be01e95e54d904c5b3a9110126e44684fc7 nvidia-settings-1.0.20060919.ebuild 2936
+MISC ChangeLog 5562 RMD160 de25232514261c0ddd72fed6d8170c44682368f7 SHA1 58b55a124922a67a5a73ac1c43758749e81a0276 SHA256 2bb133197323db9affc8284f8b297e693e5301fdd89bf76b83a9ca9e37bf8730
+MD5 6f9d690c422eda801fa3c0f9b3cb7f20 ChangeLog 5562
+RMD160 de25232514261c0ddd72fed6d8170c44682368f7 ChangeLog 5562
+SHA256 2bb133197323db9affc8284f8b297e693e5301fdd89bf76b83a9ca9e37bf8730 ChangeLog 5562
 MISC metadata.xml 300 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf SHA1 c09bb78e0f50c4c1baf741d6fc7abda39fdf338b SHA256 8e7d769dbca123b81bed99b71048e93a8f860219e894c8abc7569d0cc3e948e8
 MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
 RMD160 bd9f5911138f38787f7559ebfa93ffbeb05babaf metadata.xml 300
@@ -33,10 +38,13 @@ SHA256 e9fe910e1bd16eb80e57cea532819984097376a6287b1f03e9f6cb90938ea009 files/di
 MD5 8f267f01d4240bae508663a667abdeb8 files/digest-nvidia-settings-1.0.20060516-r1 289
 RMD160 1bfae97fa4662223c93eda89b37eac48616a32f7 files/digest-nvidia-settings-1.0.20060516-r1 289
 SHA256 175d7bc1eb49f717f571325404133184bf1fd48abb7de5f235146fdeae0412b4 files/digest-nvidia-settings-1.0.20060516-r1 289
+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)
 
-iD8DBQFFJXzlkT4lNIS36YERAky0AKCGAHkds61Gv+AK4hdvhtLYKZUtEQCgqrcI
-NFV+Y2bvx2v48EYPO+GTw6w=
-=EML4
+iD8DBQFFJqMBkT4lNIS36YERAm1kAKCMmfTANAL3nkMj4Xn5Q6A8+aSpfwCgsf4Z
+yw3/zV95hmpX8VFDhcccIDM=
+=ZnUz
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919
new file mode 100644
index 000000000000..3301a744653e
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919
@@ -0,0 +1,3 @@
+MD5 6b70f0a178573b685f6c76e55067756c nvidia-settings-1.0.20060919.tar.gz 1298171
+RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 nvidia-settings-1.0.20060919.tar.gz 1298171
+SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477 nvidia-settings-1.0.20060919.tar.gz 1298171
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild
new file mode 100644
index 000000000000..ab033035c962
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild
@@ -0,0 +1,96 @@
+# 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.20060919.ebuild,v 1.1 2006/10/06 18:39:56 wolf31o2 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/~azarah/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
+		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
+}