Add FreeBSD drivers and ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre10

4 files changed, 34 insertions, 27 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/Manifest b/media-video/nvidia-glx/Manifest
index bdc442ffe772..69a3b8544f45 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -35,6 +35,7 @@ RMD160 55658c04bed5ab85b36a1849d0619820306e273d files/libGL.la-r2 751
 SHA256 e5147149f3f35f0f34fd9ac077b132f0fa6a201d56cac9bcc2e65b5e0dd39680 files/libGL.la-r2 751
 DIST NVIDIA-FreeBSD-x86-1.0-7676.tar.gz 8455397 RMD160 06ef57f35026e89777a9478247a7170e5b5c4f0c SHA256 c92a2c021c31853cd739a1b915d9d86f21ccc8a46ef87e009d10820f4ca52088 size 8455397
 DIST NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056 RMD160 75d3ef8bab67868056f540f580aa907c8a32d0b6 SHA256 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280 size 9067056
+DIST NVIDIA-FreeBSD-x86-1.0-8756.tar.gz 9427746 RMD160 ae604948fb939dd3331e7d8aa4fc1667eedf5aab SHA256 3c5e095c62cb5e57dc932a626d75e64cdd4c3c62ab9b1bab1bc0478f987b64b1 size 9427746
 DIST NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999 RMD160 d107299f9e6c287ab2409522c8b4c71cffa0b432 SHA256 e2b2ee4b70a310760e97c23df7c3b17a4ee78872fcae55868ad99266ab1f94e5 size 8167999
 DIST NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221 RMD160 c6d17cd1b0e101acbd31cd991595c1b52f294c1c SHA256 63b735881a05462e8e9e8ef0863cdfec038c0419c728bd7fad1fdb84d9792c0b size 8725221
 DIST NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444 RMD160 8a8073a50fe688868224211a15edbe1a1d974285 SHA256 e870472b71e58bcd2c0d251bbb14de7498a3000d73fb649627b68aaaee96f15a size 9427444
@@ -85,14 +86,14 @@ EBUILD nvidia-glx-1.0.8178-r1.ebuild 8419 RMD160 8a0241a6c730d066fb3882d275a1d0e
 MD5 a540aaeee08deb7d51548e228f33c91e nvidia-glx-1.0.8178-r1.ebuild 8419
 RMD160 8a0241a6c730d066fb3882d275a1d0ef90e0ec1b nvidia-glx-1.0.8178-r1.ebuild 8419
 SHA256 cd278ced300b238ad019094b18886d9fe7494e9484d9e0b79f708877b251d707 nvidia-glx-1.0.8178-r1.ebuild 8419
-EBUILD nvidia-glx-1.0.8756.ebuild 8359 RMD160 2cb6f9a94d44c79c87e0263385d17d3309b9d0a6 SHA1 d60fb309df6420675b09d6c12a76d44c34e3006e SHA256 e3e61a992636a69c28a13f4f85f34bde1dc19a2033e12e94378e611fc2c2d6dc size 8359
-MD5 323ef641ae50c3cf6a8c262c5cb01217 nvidia-glx-1.0.8756.ebuild 8359
-RMD160 2cb6f9a94d44c79c87e0263385d17d3309b9d0a6 nvidia-glx-1.0.8756.ebuild 8359
-SHA256 e3e61a992636a69c28a13f4f85f34bde1dc19a2033e12e94378e611fc2c2d6dc nvidia-glx-1.0.8756.ebuild 8359
-MISC ChangeLog 25417 RMD160 151a82369f4f9707fc411ca0dacdb087fe7d867a SHA1 0747b226374993498e0ceb7b2cf78f1fb1dfe6d5 SHA256 77f00213a07a2bdb0d6dbe5567ccd168efe517d5f1b35a3ac4199f28d82dd705 size 25417
-MD5 f673b27d95b6baedef8eef04e3a98b57 ChangeLog 25417
-RMD160 151a82369f4f9707fc411ca0dacdb087fe7d867a ChangeLog 25417
-SHA256 77f00213a07a2bdb0d6dbe5567ccd168efe517d5f1b35a3ac4199f28d82dd705 ChangeLog 25417
+EBUILD nvidia-glx-1.0.8756.ebuild 8252 RMD160 41cbda01dcb4f5fc5b7c4662c3adb7134f2ad98e SHA1 a40cfe109e6da7d63e4781745aee13ba714f472f SHA256 dae25c41fcf0eeaa5bbc85d80c4d344533f4bdc92c39cba7ed255593af728270 size 8252
+MD5 7e51623ae2a70990c71482c2a83e7d90 nvidia-glx-1.0.8756.ebuild 8252
+RMD160 41cbda01dcb4f5fc5b7c4662c3adb7134f2ad98e nvidia-glx-1.0.8756.ebuild 8252
+SHA256 dae25c41fcf0eeaa5bbc85d80c4d344533f4bdc92c39cba7ed255593af728270 nvidia-glx-1.0.8756.ebuild 8252
+MISC ChangeLog 25548 RMD160 9aa6513240b5b36d511dffa3ec46c30fe1e2565a SHA1 cb2211f31f5e6d95b29e4d6f6423919e43f9684a SHA256 fb4100fb33a8e9a6147a22afbbab18a1cd6f312b06e51263174ab7c144220d20 size 25548
+MD5 6ce0ba1227090df1cb88ca008925d27b ChangeLog 25548
+RMD160 9aa6513240b5b36d511dffa3ec46c30fe1e2565a ChangeLog 25548
+SHA256 fb4100fb33a8e9a6147a22afbbab18a1cd6f312b06e51263174ab7c144220d20 ChangeLog 25548
 MISC metadata.xml 302 RMD160 416561faac567878c46fabc4777704ce99ffe3d6 SHA1 afdd273baf089019d29158390bcabec58fd8f4cc SHA256 becf8c60b41ea2f1422062c605941b88f70dad1f0362f8023d042cec690d0fe2 size 302
 MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
 RMD160 416561faac567878c46fabc4777704ce99ffe3d6 metadata.xml 302
@@ -121,13 +122,13 @@ SHA256 1c2099ddc5b6106a6b8d0902f4c04d3b225f067b524c05b33e92677b4d57ca2f files/di
 MD5 912d39198d3b3254ec00bf0bdac9c964 files/digest-nvidia-glx-1.0.8178-r1 870
 RMD160 98786a8b1dc700709f538dacb7b2ebc5bb418acc files/digest-nvidia-glx-1.0.8178-r1 870
 SHA256 40ddd0b9152f72be231fb6f701d528ab7e0c586c2f8b6dedfc8512b080f33bed files/digest-nvidia-glx-1.0.8178-r1 870
-MD5 05cf3fdba28c8340826a15e5c61c9fbe files/digest-nvidia-glx-1.0.8756 584
-RMD160 0b03fed142033a300ae218a2f47b910a5b0abef0 files/digest-nvidia-glx-1.0.8756 584
-SHA256 67c9715799691ee3782422f45c95692e97302d73b9b5d4e567387f95a3c838d7 files/digest-nvidia-glx-1.0.8756 584
+MD5 e4345fd826403738299840fc7e628aca files/digest-nvidia-glx-1.0.8756 870
+RMD160 3465647e823f28a5df0728a7668c45b3338f74d2 files/digest-nvidia-glx-1.0.8756 870
+SHA256 0a21c357b2d63bf33852c77e8f2d6077b87f5da5d7e07c02382481a311afa3d2 files/digest-nvidia-glx-1.0.8756 870
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUVmGW78445TWHXcRAhtgAJ91wTZwQeudq3mi4muKgUDXy+wL3gCfe8eX
-mQxx1dZ7UAC7CToTd35EmSU=
-=yrtu
+iD8DBQFEVGKmAiZjviIA2XgRAtZSAKC9+PUkx/LkWmAOWSTKnYRVykzmyQCgu6D1
+U6o4ilPsmPyiwd8Jlb4JxAU=
+=iztK
 -----END PGP SIGNATURE-----
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