Add FreeBSD drivers and ~x86-fbsd keyword.

(Portage version: 2.1_pre10)

3 files changed, 19 insertions, 13 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 535487f2312c..85a2dc3b7798 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.118 2006/04/27 23:53:26 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.119 2006/04/30 07:09:10 flameeyes Exp $
+
+  30 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  nvidia-glx-1.0.8756.ebuild:
+  Add FreeBSD drivers and ~x86-fbsd keyword.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-nvidia-glx-1.0.6111-r3, files/digest-nvidia-glx-1.0.6629-r7,
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8756 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8756
index 465afe6064b7..0e9724d378e8 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8756
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8756
@@ -1,3 +1,6 @@
+MD5 fa80b5400d66b292870e1d641041666e NVIDIA-FreeBSD-x86-1.0-8756.tar.gz 9427746
+RMD160 ae604948fb939dd3331e7d8aa4fc1667eedf5aab NVIDIA-FreeBSD-x86-1.0-8756.tar.gz 9427746
+SHA256 3c5e095c62cb5e57dc932a626d75e64cdd4c3c62ab9b1bab1bc0478f987b64b1 NVIDIA-FreeBSD-x86-1.0-8756.tar.gz 9427746
 MD5 67293549b90f549ca9210743eaa5b09c NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
 RMD160 e33aad0b2cf948e54b9bd245f5ad865dd2c46abe NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
 SHA256 eb8cdd5acc14044e35f8462e00a6626dbf498804aca4ec8e4cd421a8e0898dd6 NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild
index 8362426bb67c..e9eec6936f5f 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild,v 1.1 2006/04/08 03:46:10 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8756.ebuild,v 1.2 2006/04/30 07:09:11 flameeyes Exp $
 
 inherit eutils multilib versionator
 
@@ -9,17 +9,17 @@ AMD64_PKG_V="pkg2"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-#X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-#	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
+	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
 IUSE="dlloader"
 RESTRICT="nostrip multilib-pkg-force"
 
@@ -27,10 +27,8 @@ RDEPEND="|| ( >=x11-base/xorg-server-0.99.1-r7 virtual/x11 )
 	 || ( media-libs/mesa virtual/x11 )
 	 app-admin/eselect-opengl
 	 kernel_linux? ( ~media-video/nvidia-kernel-${PV} )
-	 !app-emulation/emul-linux-x86-nvidia"
-# This should be added to have full dependencies for Gentoo FreeBSD
-# but can't be added until the profiles are in main portage (for repoman)
-# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )
+	 !app-emulation/emul-linux-x86-nvidia
+	kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -41,9 +39,9 @@ if use x86; then
 elif use amd64; then
 	PKG_V="-${AMD64_PKG_V}"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-#elif use x86-fbsd; then
-#	PKG_V=""
-#	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
+elif use x86-fbsd; then
+	PKG_V=""
+	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
 fi
 
 S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
@@ -70,6 +68,7 @@ src_unpack() {
 
 	# Patchs go below here, add breif description
 	cd ${S}
+	use x86-fbsd && cd "${S}/doc"
 	# Use the correct defines to make gtkglext build work
 	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h