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.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

2 files changed, 26 insertions, 14 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/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}