fix patch to nvidia-xconfig on FreeBSD. bug #199761

Package-Manager: portage-2.1.4_rc11

4 files changed, 32 insertions, 20 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 8f5039b03a4f..c5ef1e55847d 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.76 2007/12/21 20:34:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.77 2007/12/26 19:47:24 cardoe Exp $
+
+  26 Dec 2007; Doug Klima <cardoe@gentoo.org>
+  nvidia-drivers-100.14.19.ebuild, nvidia-drivers-100.14.23.ebuild:
+  fix patch to nvidia-xconfig on FreeBSD. bug #199761
 
   21 Dec 2007; Doug Klima <cardoe@gentoo.org>
   -nvidia-drivers-1.0.7185.ebuild, -nvidia-drivers-1.0.9639.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 51dfeb35962b..93214fab0170 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -55,14 +55,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 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-100.14.19.ebuild 14653 RMD160 145205d4eaffb4dbebb88498855de8d6dcf1693a SHA1 221335dc95b42b61cc33ae70b99869dda90eacc6 SHA256 ddebf7aabf55061e275db905787898dc5c70ad800bfa4082a30de07e1cf54f17
+MD5 cca6f85970511d8a0d4f52689a8bfd7f nvidia-drivers-100.14.19.ebuild 14653
+RMD160 145205d4eaffb4dbebb88498855de8d6dcf1693a nvidia-drivers-100.14.19.ebuild 14653
+SHA256 ddebf7aabf55061e275db905787898dc5c70ad800bfa4082a30de07e1cf54f17 nvidia-drivers-100.14.19.ebuild 14653
+EBUILD nvidia-drivers-100.14.23.ebuild 14658 RMD160 a43fab1e59d9f01e381ea864b717192522f420cd SHA1 1ee1666dcfd13bd51495c6a445be9808120b3eaa SHA256 9dba80ac97d614bb39940ceb3c66f592a4fffc3945447033b279f5b653eb1f53
+MD5 caba33d46cfb63c2c439ecc318baac82 nvidia-drivers-100.14.23.ebuild 14658
+RMD160 a43fab1e59d9f01e381ea864b717192522f420cd nvidia-drivers-100.14.23.ebuild 14658
+SHA256 9dba80ac97d614bb39940ceb3c66f592a4fffc3945447033b279f5b653eb1f53 nvidia-drivers-100.14.23.ebuild 14658
 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
@@ -71,10 +71,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 16848 RMD160 a95eae4146c063101fcc8d2a57a4ce7a8267ecd2 SHA1 128ec82da1e3531307d092cd852c2249eef7e3a3 SHA256 c150b8f9251d073f9529069afd556dc915501a037ce70c9432b11df2c4021cd7
-MD5 214943fbfecb40d5424df9e719721480 ChangeLog 16848
-RMD160 a95eae4146c063101fcc8d2a57a4ce7a8267ecd2 ChangeLog 16848
-SHA256 c150b8f9251d073f9529069afd556dc915501a037ce70c9432b11df2c4021cd7 ChangeLog 16848
+MISC ChangeLog 17017 RMD160 016d33d6979cf1e05826f1120411bc28a51a5958 SHA1 a0f9db318e0c0df5d135197c3173b985ddad041e SHA256 7d6ae137fa02a05722df5e4f070d282d6102311eafb7d17fcd0f57e6a2f9a150
+MD5 e4cf53a8cbe319a0e9c1f25ee40925d7 ChangeLog 17017
+RMD160 016d33d6979cf1e05826f1120411bc28a51a5958 ChangeLog 17017
+SHA256 7d6ae137fa02a05722df5e4f070d282d6102311eafb7d17fcd0f57e6a2f9a150 ChangeLog 17017
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -100,7 +100,7 @@ SHA256 4b9abf636b49388ef5e27292dfb96376eedb02636f3ab0a9de97043d2e7de168 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkdsI0gACgkQoeSe8B0zEfwU4ACfUCQD96cF2VZ0rBIlWcs668r2
-Q7sAoIAKDNE6Dn6vbWzGmHYt/wgbvL/u
-=8szE
+iEYEARECAAYFAkdysAAACgkQoeSe8B0zEfxvBACaAx/ZpIMPHcWqmZTbYDR/LZwa
+obsAnjNeDVpuZFhXhcnxc8y7gHBgYOFK
+=goWS
 -----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 4f7b4d79cdb9..cb4f764937c4 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.9 2007/12/21 20:14:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19.ebuild,v 1.10 2007/12/26 19:47:24 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -278,7 +278,11 @@ src_install() {
 	fi
 
 	# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
-	dobin usr/bin/nvidia-xconfig || die
+	if use xf86-fbsd; then
+		dobin obj/nvidia-xconfig || die
+	else
+		dobin usr/bin/nvidia-xconfig || die
+	fi
 }
 
 # Install nvidia library:
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 628c65028c5f..8ff2dc542398 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.2 2007/12/21 20:14:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.23.ebuild,v 1.3 2007/12/26 19:47:24 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -278,7 +278,11 @@ src_install() {
 	fi
 
 	# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
-	dobin usr/bin/nvidia-xconfig || die
+	if use xf86-fbsd; then
+		dobin obj/nvidia-xconfig || die
+	else
+		dobin usr/bin/nvidia-xconfig || die
+	fi
 }
 
 # Install nvidia library: