Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it since this is apparently the version I need for my GeForce2 MX 400

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 28 insertions, 9 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 1b3cef9a0a8b..59c1ba683695 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.130 2009/01/30 20:01:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.131 2009/01/31 09:25:11 aballier Exp $
+
+  31 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+  nvidia-drivers-96.43.09.ebuild:
+  Backport the missing bits from the 100. ebuild for x86-fbsd and keyword it
+  since this is apparently the version I need for my GeForce2 MX 400
 
 *nvidia-drivers-180.27 (30 Jan 2009)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5967b522ec22..cdf7bde931c5 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
@@ -20,6 +23,7 @@ DIST NVIDIA-FreeBSD-x86-177.80.tar.gz 16704786 RMD160 88b85e8872338b8b91ff1c5157
 DIST NVIDIA-FreeBSD-x86-177.82.tar.gz 16708972 RMD160 ef85282a05127a7d5c764243deb2448d9045f0ba SHA1 1df52f23e241a847c256f125b3bc73d2d714e344 SHA256 705c2ed339fbe17545b490d6fced7da351624f767b3d710dbeabfc6447079ac1
 DIST NVIDIA-FreeBSD-x86-180.22.tar.gz 17867440 RMD160 9953a2b45134c43eb3b26e3c5181b2660f5c9d9d SHA1 7c61226b62b21c800e2c32a1173f09b2006715f9 SHA256 1c5f5647e36908eca031f45fff2b11d08efdb0de351e161aedd95b2ca2bd196f
 DIST NVIDIA-FreeBSD-x86-180.27.tar.gz 18022650 RMD160 e3ae0ad0f930e87026b81dc64d6a38c76b7d1362 SHA1 1700e6e798e2a493ff768136ec82430cddbc95d8 SHA256 99f71363572f1216f2cff342e2a4820887a140fd26c3f5e6fda4cedf2b087492
+DIST NVIDIA-FreeBSD-x86-96.43.09.tar.gz 10400444 RMD160 9569c9b51d902c214b0225b0aad615627ec944b9 SHA1 21680258aa94a1bff4a59d13de850c31743fac2a SHA256 58c041ce5be40b7837d8126ff1ea6e2932be0d189a046622faef698f1a83b50f
 DIST NVIDIA-Linux-x86-100.14.19-pkg0.run 7592917 RMD160 717c168cbc78c804c540b813ef2bb634834446ec SHA1 d645b21dfd43e0c0640783f2336d51f2e3151353 SHA256 46c8629a0f07eaa3009df835cdeb51db8a24d3d17b114b04ec2eae1b3ab69a2f
 DIST NVIDIA-Linux-x86-173.14.09-pkg0.run 11590266 RMD160 b61f4af4fc51b0f62983a13412b31c4bcb620b8b SHA1 941b4029dd677418a820a5bd90230116d6b6cfb9 SHA256 efa0f96b83c7163ab748321301234256ecc455475fce7d7d7c96a10a9236f874
 DIST NVIDIA-Linux-x86-173.14.12-pkg0.run 11587505 RMD160 97d02d21f94b2c93f27af044a17dd8a990bdc17e SHA1 64e366fe15dabc6db0f452c58285258e6e60440c SHA256 a5d9e087cbe0f34bb9ae11e36fa25ce5b9622b0b50cd4e639aab1181e6379b11
@@ -55,6 +59,13 @@ EBUILD nvidia-drivers-180.27.ebuild 15433 RMD160 322166830a8af1a727509c04ce1fa01
 EBUILD nvidia-drivers-71.86.06.ebuild 14138 RMD160 2f713727f51ed4fdcf8e94fa629b8892fe3266b1 SHA1 9ac9d3ccae0978327e782c1ba52f506326d565dc SHA256 ea06b4cf57144afe3a08d0a266e0beced197aa53b88464e76d2f4cde9d62c123
 EBUILD nvidia-drivers-71.86.07.ebuild 14185 RMD160 23342dddcd0936f4bb095887f14d7f29ffce8d66 SHA1 616ddfd373ff9dc886c3d4ec36f1732161c9daa9 SHA256 8708fb576fbb1d35cbd7b235ec35d0f479115ac195202f033e0b785988b1e6eb
 EBUILD nvidia-drivers-96.43.07.ebuild 14475 RMD160 35dc001755181bdda3e4d0c5be97879d579736a1 SHA1 c5b52dffd298e87c4cd78118bf5ada1f2af770d5 SHA256 07b82b5b503e61212104927ad79e4f75d082e39c0df807800bfaeb9e1874a98d
-EBUILD nvidia-drivers-96.43.09.ebuild 14513 RMD160 7ea137c3a28a529232f3a7c86555b57c075bdbc2 SHA1 1ec49d39454419300451a3fd9ac071bc3d1c0a13 SHA256 45e88194f984e70ac3a56aea04176566fa76c3bef05233193544e989642b0d55
-MISC ChangeLog 29679 RMD160 5ab9a67fa8e6bdf602ca751e431eac9d4f04763f SHA1 e15e5122aa5566fd6e870aebd382ce04a15bf69a SHA256 1ebfe402aa166f8e744c0de03307a18367a08afc4bb8c474e36d14f06c3f2864
+EBUILD nvidia-drivers-96.43.09.ebuild 14639 RMD160 196b0ec412f57feac01ca2dda35c582a380b888a SHA1 f7237f6b8e793eaaffe3115c3ec6f84a8f66bcec SHA256 e21c09a244c86fc97385a7f35d1d535f68c59ceac3503e1b00b923f186ecaabf
+MISC ChangeLog 29916 RMD160 fd9edd0d796fd29654877b62d61760e0e28b5ac0 SHA1 b2f6fb48579370764fbddaed7f90a321658dc56b SHA256 ec0b8e33e10956e7bbbf4993b3fab857d67174459635b3cd14a65bca0cfb6411
 MISC metadata.xml 453 RMD160 4e3149a2f84395713739fb8706ac956a03f581e6 SHA1 7631f2686bf4b40f814aa19e99eb94493659cab2 SHA256 ebf76bf6d7f6494241970099567b3292bb1e10f98ebdb9045ecdf92a44599ae6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmEGQQACgkQvFcC4BYPU0rvcwCgzefrhnCp5W/lPNRn10D8UCyR
+DUYAn11h0C2U/0oN4k3SQqvkDLjz4iUv
+=sir2
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
index 197fc65e7b63..acda3b09b93d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.5 2009/01/20 10:50:30 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.6 2009/01/31 09:25:11 aballier Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -14,11 +14,12 @@ X86_FBSD_NV_PACKAGE="NVIDIA-${X86_FBSD_NV}-${PV}"
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/${X86_NV}/${PV}/${X86_NV_PACKAGE}.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/${AMD64_NV}/${PV}/${AMD64_NV_PACKAGE}.run )"
+	 amd64? ( ftp://download.nvidia.com/XFree86/${AMD64_NV}/${PV}/${AMD64_NV_PACKAGE}.run )
+	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
 IUSE="acpi custom-cflags gtk multilib kernel_FreeBSD kernel_linux userland_BSD"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
@@ -197,7 +198,9 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 	# allow on board sensors to work with lm_sensors
-	epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
+	if ! use x86-fbsd; then
+		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
+	fi
 
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
@@ -221,8 +224,8 @@ src_compile() {
 
 	cd "${NV_SRC}"
 	if use x86-fbsd; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" \
-			CFLAGS="-Wno-sign-compare" || die "Failed to compile"
+		echo LDFLAGS="$(raw-ldflags)"
+		MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
 	else
 		linux-mod_src_compile
 	fi