Add support for x86_64 FreeBSD. Do not try to install 32bits libs if multilib is not requested as the FreeBSD x86_64 package does not provide 32bits libs. Merge most of x86-fbsd code under kernel_FreeBSD as the x86 and x86_64 packages are similar. Keyword ~amd64-fbsd.

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

3 files changed, 39 insertions, 16 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 658a81ea9a75..f6b163dc9713 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.342 2012/05/04 14:58:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.343 2012/05/16 15:22:33 aballier Exp $
+
+  16 May 2012; Alexis Ballier <aballier@gentoo.org>
+  nvidia-drivers-295.49.ebuild:
+  Add support for x86_64 FreeBSD. Do not try to install 32bits libs if multilib
+  is not requested as the FreeBSD x86_64 package does not provide 32bits libs.
+  Merge most of x86-fbsd code under kernel_FreeBSD as the x86 and x86_64
+  packages are similar. Keyword ~amd64-fbsd.
 
   04 May 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-295.49.ebuild,
   metadata.xml:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2c95639e647f..dd9da67cef7a 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 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
 AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
@@ -21,6 +24,7 @@ DIST NVIDIA-FreeBSD-x86-295.20.tar.gz 31993959 RMD160 56a123e11f288fe9c0b4a82493
 DIST NVIDIA-FreeBSD-x86-295.40.tar.gz 32029253 RMD160 8bf52080d538eb26e1528a026036e82be2f5e4f4 SHA1 d5cbe7df001690c22653577953c7848ee97aa6da SHA256 f47b603f39dfd2e405949aab6fbc7abd4b24f43c6fb47b4f23d7618f32021364
 DIST NVIDIA-FreeBSD-x86-295.49.tar.gz 32078716 RMD160 faf9557831fdcfebdb9692d77aa23444cabe6e11 SHA1 814074a68cf3ca3476cae27f0011aabc5149d3ac SHA256 aa7c9a13931a55e358c542e1d18feb0aeaa7b18550e9675698b152265134d938
 DIST NVIDIA-FreeBSD-x86-96.43.20.tar.gz 14060884 RMD160 2323ef0e85c4383558ea61ff4906b28f85a5952c SHA1 1d7397eaf1e42866595144af550a1df84369fd80 SHA256 e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf
+DIST NVIDIA-FreeBSD-x86_64-295.49.tar.gz 33035836 RMD160 8eddc5b7b154ebcf706d3fec47fcf263e0911a3b SHA1 6550b77f24e8edb5e97a71023020c1d10de58dfd SHA256 e9baf4be5fa54c4f0d606dca95d21e2d0ec0835377c311df279b10e77b8eb4f2
 DIST NVIDIA-Linux-x86-173.14.31-pkg0.run 13407481 RMD160 87f5bfb9aee83c3edb41894df540840a9eec343d SHA1 470e19fdfa75f18522745de285e256808fe14d48 SHA256 e855a62f16a9d0eff1bf470a8fcedd48cd1b718e969ad5ebe89a557d039d1924
 DIST NVIDIA-Linux-x86-290.10.run 34691272 RMD160 ddcee14e7b474a646a707fd966cc1d223d3177eb SHA1 dfc095db2bdca672e6cfe7878a75c5d25d8c54a9 SHA256 99be8f53aa1f777445e5a4cac27acd7d85990db712b5c29caac865145fc5adaa
 DIST NVIDIA-Linux-x86-295.20.run 34641353 RMD160 9727ee28dab4a5489124e3382d67be8d4b9c2b32 SHA1 67cac5eb191fa8e6661f24e1f37254689e634fe0 SHA256 0f9dc3d493053cffe37f72b6783edc6c14afd31532b43a7cf0bfce763cf2d500
@@ -38,7 +42,14 @@ EBUILD nvidia-drivers-290.10-r2.ebuild 17634 RMD160 b7622700747478a2c2736d85e30d
 EBUILD nvidia-drivers-290.10.ebuild 17229 RMD160 5638271cc9a33df494db4031564b2d6a1acd52c3 SHA1 eea6e6f7d929bbdf7c8da3ce65d022eba71f6992 SHA256 4ae8bcb31a72588a7965dde833597c62386a6f36b1fbb4eb7d781c11304199dc
 EBUILD nvidia-drivers-295.20-r1.ebuild 17817 RMD160 fa86ce3c58e739c0a7f0ebff8d2de1d5b9b79a7f SHA1 14e8fe9a78349840c64d7bacad13c7081fe165fb SHA256 817fb32916ef517d9bd66d86f6f40a2a995783f24f032bdd6b047ad57752523b
 EBUILD nvidia-drivers-295.40.ebuild 18448 RMD160 5519b4779cdaedeae967e4a23a8f1cf3af4c44ee SHA1 ecbf72fe2e73aae4b1b14e73e06bc7b00f88e748 SHA256 b7adad353ae3cdce981f6575c157474c9e19bb195c3753ae6948cee9957ac77d
-EBUILD nvidia-drivers-295.49.ebuild 18326 RMD160 2c3af78860741749928a95f539c3c613b10a755a SHA1 b133c5fcc3e7b96d841421b21b6b066199b40337 SHA256 e67e939d309b045fa03657587c45b72346e853be0246460f4a69708a664a7753
+EBUILD nvidia-drivers-295.49.ebuild 18677 RMD160 da60f2d9dbd35129ab3a2b8c90b3914343f3072f SHA1 f948daa3239425ceae34a71c6cfef19213f469a2 SHA256 88d327d94176a6f470b50642324c6b822889878f64d098c9fb164d3c4a30c519
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 72607 RMD160 370855aef6dad7c5e4bb6bfc893765403ba4e818 SHA1 52a4678e00ac7b6ce98f5c2508d9688b1e878bb9 SHA256 9d97f1409426e748961215658b59babc116995a137c28fb3bc2c864ca6878eed
+MISC ChangeLog 72971 RMD160 9f8e54a5df678de643134ddff5c7335c57eb7825 SHA1 834f800252929eaa2bffc6298cdf5e094ac7f86b SHA256 7c5e4e6b0a129d44711eab3972c1e14da5771c59d3a1b3413c367ca275214cfc
 MISC metadata.xml 805 RMD160 2dba407d1bd596807d7a165b091e2d10838d7a30 SHA1 c3b311bacd6d1c916f70265369ff6263a38c411c SHA256 86490388b274c1b62b659755b80bd96f82625ed8a35c0a0d83992eee3734e4b1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk+zxj4ACgkQvFcC4BYPU0pRQACfVW+tfrDA/KXINcRMe3UwuUmm
+7mMAoINih7qx9uT1d45li7CokMsMpFSH
+=bINl
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
index cd8991980287..ee900c353605 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.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/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.2 2012/05/04 14:58:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.3 2012/05/16 15:22:33 aballier Exp $
 
 EAPI="2"
 
@@ -9,17 +9,19 @@ inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
 X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
 	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	 amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
 	 x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_linux +tools"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi custom-cflags multilib kernel_FreeBSD kernel_linux +tools"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
@@ -234,7 +236,8 @@ pkg_setup() {
 
 	# set variables to where files are in the package structure
 	if use kernel_FreeBSD; then
-		S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
 		NV_DOC="${S}/doc"
 		NV_EXEC="${S}/obj"
 		NV_LIB="${S}/obj"
@@ -270,7 +273,7 @@ src_unpack() {
 		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
 	fi
 
-	if ! use x86-fbsd; then
+	if ! use kernel_FreeBSD; then
 		cd "${S}"
 		unpack_makeself
 	else
@@ -280,7 +283,7 @@ src_unpack() {
 
 src_prepare() {
 	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
+	use kernel_FreeBSD && cd doc
 
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
@@ -310,7 +313,7 @@ src_compile() {
 	# it by itself, pass this.
 
 	cd "${NV_SRC}"
-	if use x86-fbsd; then
+	if use kernel_FreeBSD; then
 		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
 			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
 	elif use kernel_linux; then
@@ -342,9 +345,11 @@ src_install() {
 
 		insinto /lib/udev/rules.d
 		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${S}/src/nvidia.kld" || die
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld" || die
+		fi
 
 		exeinto /boot/modules
 		doexe "${S}/src/nvidia.ko" || die
@@ -416,7 +421,7 @@ src_install() {
 
 	# Documentation
 	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
+	if use kernel_FreeBSD; then
 		dodoc "${NV_DOC}/README"
 		doman "${NV_MAN}/nvidia-xconfig.1"
 		doman "${NV_MAN}/nvidia-settings.1"
@@ -451,7 +456,7 @@ src_install() {
 
 	doicon ${NV_EXEC}/nvidia-settings.png
 
-	if has_multilib_profile ; then
+	if has_multilib_profile && use multilib ; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis) ; do
 			src_install-libs
@@ -502,7 +507,7 @@ src_install-libs() {
 	# The GLX libraries
 	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
 	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
-	if use x86-fbsd; then
+	if use kernel_FreeBSD; then
 		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
 	else
 		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}