apply patch only when linux. bug #199759

Package-Manager: portage-2.1.4_rc11

4 files changed, 29 insertions, 21 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index c7e5e0bca60c..0657760a7394 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.74 2007/11/20 12:05:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.75 2007/12/21 20:14:52 cardoe Exp $
+
+  21 Dec 2007; Doug Klima <cardoe@gentoo.org>
+  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
+  apply patch only when linux. bug #199759
 
   20 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
   nvidia-drivers-71.86.01.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ea7c1f7df194..4911498a7a1d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -69,14 +69,14 @@ EBUILD nvidia-drivers-100.14.11.ebuild 14568 RMD160 c62b5610dc3124cd6a9c2d4b158d
 MD5 b56d84456ab08223c79baa4d60297ca6 nvidia-drivers-100.14.11.ebuild 14568
 RMD160 c62b5610dc3124cd6a9c2d4b158d36523a535adf nvidia-drivers-100.14.11.ebuild 14568
 SHA256 a9877a839c5590a97f57a542d493140d859c726ae50553be1b327bff4d920792 nvidia-drivers-100.14.11.ebuild 14568
-EBUILD nvidia-drivers-100.14.19.ebuild 14555 RMD160 b66c476ea92c15994e1ef03e1b0d0938ef42b90a SHA1 b86a31fe1ca0308d1871a6e93c274c00c7930a87 SHA256 a6381b6ab8af10a4fcf47f45cc6454d4f27e9022320e1d8d6d03bec4ebf5206a
-MD5 d878862d8b634f4d8f5dfbdf56867085 nvidia-drivers-100.14.19.ebuild 14555
-RMD160 b66c476ea92c15994e1ef03e1b0d0938ef42b90a nvidia-drivers-100.14.19.ebuild 14555
-SHA256 a6381b6ab8af10a4fcf47f45cc6454d4f27e9022320e1d8d6d03bec4ebf5206a nvidia-drivers-100.14.19.ebuild 14555
-EBUILD nvidia-drivers-100.14.23.ebuild 14559 RMD160 78e4cacd718342d90720e6c17569b6d08b0b91b8 SHA1 862efb6e84c3161bbb42e762e8498b58212ef3e7 SHA256 269bc8cce498fd5ffe86b801412b78878c9161cfea615a04dfc2b562d0985cc7
-MD5 2f004d2ef62f51f99af09d1f0cc2f606 nvidia-drivers-100.14.23.ebuild 14559
-RMD160 78e4cacd718342d90720e6c17569b6d08b0b91b8 nvidia-drivers-100.14.23.ebuild 14559
-SHA256 269bc8cce498fd5ffe86b801412b78878c9161cfea615a04dfc2b562d0985cc7 nvidia-drivers-100.14.23.ebuild 14559
+EBUILD nvidia-drivers-100.14.19.ebuild 14583 RMD160 befe83b619758c520d14a5525bbc746a4528b10e SHA1 8c7d6399b2f70a8b46026a1ece2ab442f0d39a06 SHA256 43215339dcff6b897e789c1f064b3eba8dff78bc883578c866f710b7593a3d56
+MD5 f159918e99fb80a019a1705ae6b58912 nvidia-drivers-100.14.19.ebuild 14583
+RMD160 befe83b619758c520d14a5525bbc746a4528b10e nvidia-drivers-100.14.19.ebuild 14583
+SHA256 43215339dcff6b897e789c1f064b3eba8dff78bc883578c866f710b7593a3d56 nvidia-drivers-100.14.19.ebuild 14583
+EBUILD nvidia-drivers-100.14.23.ebuild 14589 RMD160 19255aca8f2730fae70fcff3e26f53d9be98541d SHA1 26b3a91ff2ff1ae125a4b52d07a65811a049d460 SHA256 3db9a5c79613336f868d4de292229850efa30305817f2a221210caf2ebdcf88a
+MD5 63c004129bcfead7739da0f8a371deb7 nvidia-drivers-100.14.23.ebuild 14589
+RMD160 19255aca8f2730fae70fcff3e26f53d9be98541d nvidia-drivers-100.14.23.ebuild 14589
+SHA256 3db9a5c79613336f868d4de292229850efa30305817f2a221210caf2ebdcf88a nvidia-drivers-100.14.23.ebuild 14589
 EBUILD nvidia-drivers-71.86.01.ebuild 14218 RMD160 44a3cbc6c1c1aad593dfac08ce8070d3ba5e2c54 SHA1 875154af5015448fc238e34c6b9bf95211b8460d SHA256 0db0dc634b5d4cfb06bd50b6cd2ff97844786bc5e9bc5af20ce9b4983da0b3f1
 MD5 672d17e8cd6e9bbde81fb5ec5c43d45c nvidia-drivers-71.86.01.ebuild 14218
 RMD160 44a3cbc6c1c1aad593dfac08ce8070d3ba5e2c54 nvidia-drivers-71.86.01.ebuild 14218
@@ -85,10 +85,10 @@ EBUILD nvidia-drivers-96.43.01.ebuild 14557 RMD160 9ec8f373685cba6402687b7f9fa4f
 MD5 3a8a635bd8eb3d18b288927a1e34872b nvidia-drivers-96.43.01.ebuild 14557
 RMD160 9ec8f373685cba6402687b7f9fa4fbd62ae307f1 nvidia-drivers-96.43.01.ebuild 14557
 SHA256 247dede1b041aff2b08dc8a630c83bddba9ab77f4392ddf76dbefad4860a321b nvidia-drivers-96.43.01.ebuild 14557
-MISC ChangeLog 16552 RMD160 fca690ce936400aa18e31e3dd57e16698515d4cd SHA1 1ba0844ecfce8e8815935e21ab9f84ba98f2e3ad SHA256 fab1cdf78f352bc848569e9b90dc297269dd8d1d7fc0210e19c5a942cb18fa72
-MD5 937abe77cb93645ea4c052d171daab28 ChangeLog 16552
-RMD160 fca690ce936400aa18e31e3dd57e16698515d4cd ChangeLog 16552
-SHA256 fab1cdf78f352bc848569e9b90dc297269dd8d1d7fc0210e19c5a942cb18fa72 ChangeLog 16552
+MISC ChangeLog 16711 RMD160 bcbb2a032fd01ac313491c8775e4259ea8a8b059 SHA1 e9566ce677e5fe53967728b867641acc07884b09 SHA256 4c8c68074e36000a9ad588925d11425b8b07e00d14114307de57bc022539beed
+MD5 5503def6aeb59b53b0d4e15e7e459856 ChangeLog 16711
+RMD160 bcbb2a032fd01ac313491c8775e4259ea8a8b059 ChangeLog 16711
+SHA256 4c8c68074e36000a9ad588925d11425b8b07e00d14114307de57bc022539beed ChangeLog 16711
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -118,9 +118,9 @@ MD5 504e0e052db3db78581ab5fb6b2b94af files/digest-nvidia-drivers-96.43.01 870
 RMD160 ec2a2956768a87999fba5c10b60f46aac5454ad4 files/digest-nvidia-drivers-96.43.01 870
 SHA256 4b9abf636b49388ef5e27292dfb96376eedb02636f3ab0a9de97043d2e7de168 files/digest-nvidia-drivers-96.43.01 870
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHQs23NQqtfCuFneMRAmAhAJ9xHtWBeOVF9QBbFU0NsU33XgtnLwCffbBz
-2xVN9YHHn+mFoIvXvw2plMs=
-=sVzp
+iEYEARECAAYFAkdsHs0ACgkQoeSe8B0zEfwaWQCfc2wBpnekkmLvHQhcXa2dbrCV
+gKEAnRnDPKmlJ/mNmjBs4QgX4R4Xxf/Z
+=9VVQ
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild
index d1f8fca5bf2c..4f7b4d79cdb9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.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.19.ebuild,v 1.8 2007/11/12 16:25:58 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild,v 1.9 2007/12/21 20:14:52 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -183,7 +183,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 ! x86-fbsd; then
+		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
+	fi
 
 	if ! use x86-fbsd; then
 		# Quiet down warnings the user does not need to see
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild
index 6e28daf1d3bb..628c65028c5f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.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.23.ebuild,v 1.1 2007/11/01 05:49:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild,v 1.2 2007/12/21 20:14:52 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -183,7 +183,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 x86-fbsd; then
 		# Quiet down warnings the user does not need to see