Fixes #177231, #182622, #184432, #184795

Package-Manager: portage-2.1.3_rc6

3 files changed, 56 insertions, 44 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index ca1a4aabd236..ae31a6a7fe48 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.49 2007/07/07 16:47:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.50 2007/07/12 16:46:30 cardoe Exp $
+
+  12 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-100.14.11.ebuild:
+  Fixes #177231, #182622, #184432, #184795
 
   07 Jul 2007; Doug Goldstein <cardoe@gentoo.org> +files/nvidia-2,
   +files/NVIDIA_i2c-hwmon.patch, +files/nvidia-settings.desktop,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 032fd3a8ffb9..f4ecf680c031 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -84,14 +84,14 @@ EBUILD nvidia-drivers-100.14.09.ebuild 14407 RMD160 4ff5c2fded86ccc4b753ea16726d
 MD5 ff6cfb08ecc905d0b6687533f914a727 nvidia-drivers-100.14.09.ebuild 14407
 RMD160 4ff5c2fded86ccc4b753ea16726d9f9d861bb216 nvidia-drivers-100.14.09.ebuild 14407
 SHA256 57384e35cdce92bebbff272244f78d0f2fa3b633569cef64e61dffdcb4a6334d nvidia-drivers-100.14.09.ebuild 14407
-EBUILD nvidia-drivers-100.14.11.ebuild 15263 RMD160 9080383779560e2ecd2a4c49dd63823beae3bf20 SHA1 780a5b23d5a736b76556c7d87c21ba4d997d0ddf SHA256 f6c2a2db729da45af32670d4f35e76880e66cb0e4500bb436f09b85d21564dad
-MD5 fa8f183fae6749295e651199cf436198 nvidia-drivers-100.14.11.ebuild 15263
-RMD160 9080383779560e2ecd2a4c49dd63823beae3bf20 nvidia-drivers-100.14.11.ebuild 15263
-SHA256 f6c2a2db729da45af32670d4f35e76880e66cb0e4500bb436f09b85d21564dad nvidia-drivers-100.14.11.ebuild 15263
-MISC ChangeLog 11488 RMD160 740b30cbe25e40972f45830b555f9993831df077 SHA1 ca85e47a22e622b3545f8cafc792040de1c7dedb SHA256 c9ce9bf7ae356aaaca5e13792f460debfa84dd17679537554f8848e5ba494639
-MD5 f42e3c62ac9bd863ff41eb513b58b719 ChangeLog 11488
-RMD160 740b30cbe25e40972f45830b555f9993831df077 ChangeLog 11488
-SHA256 c9ce9bf7ae356aaaca5e13792f460debfa84dd17679537554f8848e5ba494639 ChangeLog 11488
+EBUILD nvidia-drivers-100.14.11.ebuild 15456 RMD160 5d6d78f9b5856523da4274b2b61b0d1ff5c27b6a SHA1 bdee92fa0e0a3106e1916568b49b30d02fa57e55 SHA256 16e60290f92965204f9641e9ca5008821fbec4cf27b00114bfcaec7542cfa784
+MD5 fe0119b7d365ddbf76a58ec6a8944049 nvidia-drivers-100.14.11.ebuild 15456
+RMD160 5d6d78f9b5856523da4274b2b61b0d1ff5c27b6a nvidia-drivers-100.14.11.ebuild 15456
+SHA256 16e60290f92965204f9641e9ca5008821fbec4cf27b00114bfcaec7542cfa784 nvidia-drivers-100.14.11.ebuild 15456
+MISC ChangeLog 11617 RMD160 415880143720d02adcf7c3b0110896cf1a67e5a0 SHA1 2e85bbc2a7ba42e716c03ac01b88c268f2a636cb SHA256 d10ae07d343a0cdf53deaf217cc989c2cf333487ebc0d2ed097b6032f369447e
+MD5 90bbdb219d6209e93d2de623fdfc6ab3 ChangeLog 11617
+RMD160 415880143720d02adcf7c3b0110896cf1a67e5a0 ChangeLog 11617
+SHA256 d10ae07d343a0cdf53deaf217cc989c2cf333487ebc0d2ed097b6032f369447e ChangeLog 11617
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -117,7 +117,7 @@ SHA256 fcec2f6d7426226e77134009ac806252546baed3c5a99ba5b31ee730e8efcfe0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGj8OSoeSe8B0zEfwRAkTdAJ9sWPwqwAj5hXaT3eNAFSvpZAZpAgCdFo/A
-FVROk+38acjy0zNOjL3FnEI=
-=AI0v
+iD8DBQFGllryoeSe8B0zEfwRAk0WAJ9eFF1TmTIca55B3v4az4Np7cSbXACfenfg
+qj6U3IFXIpDqvfXEvEmac08=
+=lXn0
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
index 94f0eeb3ae40..e42ed4646724 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.3 2007/07/07 16:47:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.4 2007/07/12 16:46:30 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -15,17 +15,18 @@ HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
 	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run )
 	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz"
+	 gtk? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="gtk multilib"
 RESTRICT="strip"
 
 COMMON="x11-base/xorg-server
 	x11-libs/libXt
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	!media-video/nvidia-settings
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
@@ -194,12 +195,14 @@ src_unpack() {
 		cd "${S}"; convert_to_m Makefile.kbuild
 	fi
 
-	cd "${WORKDIR}"
-	unpack "nvidia-settings-${SETTINGS_V}.tar.gz"
-	cd "${SETTINGS_DIR}" || die
-	sed -i.orig \
-		-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
-		src/libXNVCtrl/Imakefile || die "sed Imakefile"
+	if use gtk; then
+		cd "${WORKDIR}"
+		unpack "nvidia-settings-${SETTINGS_V}.tar.gz"
+		cd "${SETTINGS_DIR}" || die
+		sed -i.orig \
+			-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
+			src/libXNVCtrl/Imakefile || die "sed Imakefile"
+	fi
 }
 
 src_compile() {
@@ -214,16 +217,18 @@ src_compile() {
 		linux-mod_src_compile
 	fi
 
-	# nvidia-settings
-	einfo "Building libXNVCtrl..."
-	cd "${SETTINGS_DIR}/src/libXNVCtrl"
-	xmkmf -a || die "Running xmkmf failed"
-	make clean || die "Cleaning old libXNVCtrl failed"
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl"
-
-	cd "${SETTINGS_DIR}"
-	einfo "Building nVidia-Settings..."
-	emake CC="$(tc-getCC)" || die "emake settings"
+	if use gtk; then
+		# nvidia-settings
+		einfo "Building libXNVCtrl..."
+		cd "${SETTINGS_DIR}/src/libXNVCtrl"
+		xmkmf -a || die "Running xmkmf failed"
+		make clean || die "Cleaning old libXNVCtrl failed"
+		emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl"
+
+		cd "${SETTINGS_DIR}"
+		einfo "Building nVidia-Settings..."
+		emake CC="$(tc-getCC)" || die "emake settings"
+	fi
 }
 
 src_install() {
@@ -287,22 +292,25 @@ src_install() {
 		dohtml doc/html/*
 	fi
 
-	# Taking nvidia-settings from nvidia-drivers - more up-to-date
-	dobin usr/bin/nvidia-{settings,xconfig} || die
+	# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
+	dobin usr/bin/nvidia-xconfig || die
 
-	# nvidia-settings
-	cd "${SETTINGS_DIR}"
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a || die
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die
+	if gtk; then
+		# nvidia-settings
+		dobin usr/bin/nvidia-settings || die
+		cd "${SETTINGS_DIR}"
+		insinto "/usr/$(get_libdir)"
+		doins src/libXNVCtrl/libXNVCtrl.a || die
+		insinto /usr/include/NVCtrl
+		doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die
 
-	# Install icon and .desktop entry
-	doicon "${FILESDIR}/nvidia-settings.png" || die "doicon"
-	domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu"
+		# Install icon and .desktop entry
+		doicon "${FILESDIR}/nvidia-settings.png" || die "doicon"
+		domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu"
 
-	doman doc/nvidia-settings.1 || die
-	dodoc doc/*.txt
+		doman doc/nvidia-settings.1 || die
+		dodoc doc/*.txt
+	fi
 }
 
 # Install nvidia library: