Fix nvidia-drivers dependency and more FreeBSD build fixes

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 31 insertions, 22 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 79eb43b1a528..79b8f9c64afd 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.110 2012/04/24 13:45:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.111 2012/04/25 02:43:16 idl0r Exp $
+
+  25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  nvidia-settings-275.43.ebuild, nvidia-settings-290.10.ebuild,
+  nvidia-settings-295.20.ebuild, nvidia-settings-295.40.ebuild:
+  Fix nvidia-drivers dependency and more FreeBSD build fixes
 
   24 Apr 2012; Alexis Ballier <aballier@gentoo.org>
   nvidia-settings-295.40.ebuild:
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 8a7f8488df75..e841fb56c038 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-Makefile-improvements.patch 5269 RMD160 c80118b3aa18f3f1d90f7aff0974b7f9df08939c SHA1 8b24d0307eecd84382b3009e9ba2ce115176234f SHA256 c7dddefa196f4b06a96592e27a903bc969580ed74291f76faf213f1f3276d4b7
 AUX 0002-Build-libNVCtrl-with-PIC.patch 578 RMD160 168a9b38d1c743798eb0e2b7e8de2efd60cf7c32 SHA1 49d6d4847621034de6624d388f71703abc6e42a4 SHA256 1492edfdbfd682b16e5f26be41bc61ab7320478c37f92730ff2b1ef1c520ceb2
@@ -22,16 +22,20 @@ EBUILD nvidia-settings-190.53.ebuild 2015 RMD160 b750992206e9841154200d0780fade6
 EBUILD nvidia-settings-195.36.24.ebuild 2024 RMD160 d07c4c9e3925db8d9397defd80873799ad2e2072 SHA1 67bfe6c7584eba1d686285eef03eef7d9d8483d9 SHA256 ff03cac6dc25fd9adbb9a40236d4e1b01dfea1ca04739b9b2d97641f7a080263
 EBUILD nvidia-settings-195.36.31.ebuild 2026 RMD160 41095f50c603f7a631095bf5519cf0a31a689e17 SHA1 de98c156bbefd6c8c9e2392282257168fa084ba7 SHA256 bbf92cdb9b1464930be89c689e89286611d0e18fdaabe3e0bdabd60186e39470
 EBUILD nvidia-settings-260.19.29.ebuild 1944 RMD160 5e0142afc4893181fe9994d3b295020d3b0e2c76 SHA1 242864e8da517bc467f5ab4d37c0b43fbf41dbc5 SHA256 cce97fc9d2e4cc079a7d68945dbdbf162b3250e4c52b8d9dc7bda936972ae97a
-EBUILD nvidia-settings-275.43.ebuild 1943 RMD160 91ab8008bd1f56d421c0756557677ba1d8019497 SHA1 74c76a1e42cd9797b97487eb0d178a956ff14cbc SHA256 581cc65e5a69cddd80f2073ca4cc0e239154997e8b89d0b25336dbf3f336187c
-EBUILD nvidia-settings-290.10.ebuild 1943 RMD160 dc2e547664e700feac6b9c6c624c9dd3100d1181 SHA1 6a67a099cf1fb395efed0d93e44cf8f308fd090e SHA256 f64de75120f93b644bca598b31eb80e0ac6384de0eafc97b63f7740cf0703524
-EBUILD nvidia-settings-295.20.ebuild 1943 RMD160 8d19afc8d8498abf61a3e124deeae3fe88826dbd SHA1 2f6c62fee1967830978736fda9ad19e4777af26f SHA256 0cdbc20fcb119a9167dbdae3f6c5d3e993f6727d10f591c2c113afe17f455500
-EBUILD nvidia-settings-295.40.ebuild 1967 RMD160 2dd36e59fdfa79cd43016551948145fc612bbfc9 SHA1 5fbb3fa6c86d9045845c6a3771c3b3cfae4c91bb SHA256 62a34f2b655cb5f7132942462d272909aa62bd522fd36d364a4d455eccc20aa1
-MISC ChangeLog 21851 RMD160 ac7abc7df9aff4a6d84093e27c17b9e92b02b6b0 SHA1 0b2a0484b2e3a29869292710b76f4ad083ee26dd SHA256 c4fc5860f899d10915693f25e3bcf37b2005dd336e2a752a0a565de1802137ea
+EBUILD nvidia-settings-275.43.ebuild 1968 RMD160 507432a898efb1de4071f1e227b8ad0277186734 SHA1 656148e588dd252e33e9e6f0208e44e3b317d0b8 SHA256 0d7a8945f69362396037d8e66eccca80c1af6ef51a6e62af568604d5a698e403
+EBUILD nvidia-settings-290.10.ebuild 1968 RMD160 6be453228aa610899060c9e230fe7b877363f835 SHA1 148c21e8d04de043912ddfdb1437e16506cc8a70 SHA256 d1c13cd7196670035717cb8ddb6ee9e9553840ed331a551cf823119d6f643188
+EBUILD nvidia-settings-295.20.ebuild 1968 RMD160 b4ceffb30de58864e168653ac6bc42355b6ebe49 SHA1 43c619100d4c206a141b51a1357cc200da834584 SHA256 469bf3d2205703d453a24396c840bab89a556b2b34cdde1388b1e28daf1d6e17
+EBUILD nvidia-settings-295.40.ebuild 1968 RMD160 3d283794ea8cdf54cbec1c1288de3948ee4fb1b4 SHA1 4ed87afcedf72d3d2a3e0a1d27a5a0393ff04992 SHA256 cd2e7d1cf0d2c8626afd1ed75cc122516d1466677f817f05eebcabf8a36b0b22
+MISC ChangeLog 22090 RMD160 5941dd39c1b127910d790854ff60e7417e0ad651 SHA1 d775ad4c37f1a02d2c6cfbada75c05f48afef304 SHA256 646337ddbaf7f5816384b2154e0f158c19a290f341dc7ec001f620d22592db71
 MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+WrpMACgkQvFcC4BYPU0qXjACfThJtTM+Otxb/ibzQYkCKc5nz
-V/cAoLVxu69C6bhjly44dNZ8j4R7Blvv
-=nv0p
+iQEcBAEBCAAGBQJPl2TNAAoJEMOx0zmdw4Z13PsH/1fEqkpesqXTGQWhW+svR52W
++ZngyR8Rd7A/I6ZVMATuC2glyjC6gSHQX7DzeIs4AuPi+HFUVUfYxWhNo2VaJSIe
+HfXNsP79MxkgpX3eqQ9sCbsmkbvaAflTYuNhmgO2Wh03dEQ4Njqf/XktNKuFyxbs
+/itiN58lzE+P38xFLclqWLJClerSNwXvwjrhujuY6aJ7Ln/psnSzn/XIeKowQNSN
+Azuspvd7BRq/sMQudlGT8cJgOPieO0qnPxnLXE3Eft8BSbuiWlolJPryqUUx0SDX
+1TJRDa7zgMfhSUt9rNycJDEjFvmIW4yMTMbUeg5wy9+cI+Qip+WCyEDBd8rb7nE=
+=0sfa
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
index 4773a0fb2fa3..c20c46dd34b2 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.5 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.6 2012/04/25 02:43:16 idl0r Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
 	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
 }
 
 src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index e68f5a7caed4..056e1a2365dc 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.6 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.7 2012/04/25 02:43:16 idl0r Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
 	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
 }
 
 src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index e0796aca1a62..bbba30b5b268 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.5 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.6 2012/04/25 02:43:16 idl0r Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
 	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
 }
 
 src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
index 57776f1f96af..6ec38e8dcc3e 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.4 2012/04/24 13:45:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.5 2012/04/25 02:43:16 idl0r Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig