fixes for FreeBSD: update paths, do not try to install unavailable libs and desktop entries.

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

3 files changed, 40 insertions, 32 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 63d38d75ef3a..41becc8d938d 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.336 2012/04/15 16:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.337 2012/04/24 14:04:07 aballier Exp $
+
+  24 Apr 2012; Alexis Ballier <aballier@gentoo.org>
+  nvidia-drivers-295.40.ebuild:
+  fixes for FreeBSD: update paths, do not try to install unavailable libs and
+  desktop entries.
 
   15 Apr 2012; Markus Meier <maekke@gentoo.org> nvidia-drivers-295.40.ebuild:
   x86 stable, bug #411617
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 465aea334794..87da34ea3fc9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -41,14 +41,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.33.ebuild 18349 RMD160 f6ec5e8ae1f5ccde10739852de05eaa9811e45bb SHA1 9bf8ed98100c4de86a7f31a60d170c62167bf1be SHA256 36a2b0e6542a50125de88d5417e55d8e1a7e61acfd3859b3b77499f12d9b6eb3
-EBUILD nvidia-drivers-295.40.ebuild 18347 RMD160 a1733ed1bc25c10691ee706ad64744de13e12914 SHA1 a46f8c6698850b5f3839dc20fafab57091305ff7 SHA256 d43eb08dc20499665addbddf31ca328d6a6702d80ea8d49c5a19a56c53dcb73f
+EBUILD nvidia-drivers-295.40.ebuild 18448 RMD160 5519b4779cdaedeae967e4a23a8f1cf3af4c44ee SHA1 ecbf72fe2e73aae4b1b14e73e06bc7b00f88e748 SHA256 b7adad353ae3cdce981f6575c157474c9e19bb195c3753ae6948cee9957ac77d
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 71871 RMD160 a7a05969a89874de8d45affcc54c3f453ece3274 SHA1 022f574783cb9962f663fd05a3afe23dd043119f SHA256 b929a40be9e8d941cc4af0e824d0634a9b4b61e207356eba54dc45812728dd16
+MISC ChangeLog 72055 RMD160 42a37ce89d31f5ea010778f738a369a76dd68069 SHA1 3640f098ded2ba81554de1462efbedf8a377024e SHA256 60c934e183aff9dbf37b8e7ea702017d22da76b8188fbc6ae2ecedc605246e16
 MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+K/f0ACgkQkKaRLQcq0GKpuwCgtJbhjQGlF3iQUHVDZN0nn9dO
-4AoAn0D93UkEtpMGP5ol6LcKQFvgXSM7
-=eqmr
+iEYEARECAAYFAk+Wst0ACgkQvFcC4BYPU0oSbACeKq5Z9TLrrXDbnEleW6fZDpqG
+zewAnjLanID38dFMEl9FYLBUEfaKEJI4
+=3Ae7
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
index 6a364f197f97..8389521a53f0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-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/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.3 2012/04/15 16:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.4 2012/04/24 14:04:07 aballier Exp $
 
 EAPI="2"
 
@@ -54,8 +54,8 @@ QA_TEXTRELS_x86="
 QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
 	usr/lib/opengl/nvidia/lib/libGL.so.1
 	usr/lib/libnvidia-glcore.so.1
+	usr/lib/libvdpau_nvidia.so.1
 	usr/lib/libnvidia-cfg.so.1
-	usr/lib/libnvidia-ml.so.1
 	usr/lib/opengl/nvidia/extensions/libglx.so.1
 	usr/lib/xorg/modules/drivers/nvidia_drv.so"
 
@@ -235,6 +235,7 @@ pkg_setup() {
 
 	# set variables to where files are in the package structure
 	if use kernel_FreeBSD; then
+		S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
 		NV_DOC="${S}/doc"
 		NV_EXEC="${S}/obj"
 		NV_LIB="${S}/obj"
@@ -344,10 +345,10 @@ src_install() {
 		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
 	elif use x86-fbsd; then
 		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+		doins "${S}/src/nvidia.kld" || die
 
 		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+		doexe "${S}/src/nvidia.ko" || die
 	fi
 
 	# NVIDIA kernel <-> userspace driver config lib
@@ -360,25 +361,27 @@ src_install() {
 		/usr/$(get_libdir)/libnvidia-cfg.so || \
 		die "failed to create libnvidia-cfg.so symlink"
 
-	# NVIDIA monitoring library
-	dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
-		die "failed to install libnvidia-ml"
-	dosym libnvidia-ml.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvidia-ml.so.1 || \
-		die "failed to create libnvidia-ml.so symlink"
-	dosym libnvidia-ml.so.1 \
-		/usr/$(get_libdir)/libnvidia-ml.so || \
-		die "failed to create libnvidia-ml.so symlink"
-
-	# NVIDIA video decode <-> CUDA
-	dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
-		die "failed to install libnvcuvid.so"
-	dosym libnvcuvid.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvcuvid.so.1 || \
-		die "failed to create libnvcuvid.so symlink"
-	dosym libnvcuvid.so.1 \
-		/usr/$(get_libdir)/libnvcuvid.so || \
-		die "failed to create libnvcuvid.so symlink"
+	if use kernel_linux; then
+		# NVIDIA monitoring library
+		dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
+			die "failed to install libnvidia-ml"
+		dosym libnvidia-ml.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libnvidia-ml.so.1 || \
+			die "failed to create libnvidia-ml.so symlink"
+		dosym libnvidia-ml.so.1 \
+			/usr/$(get_libdir)/libnvidia-ml.so || \
+			die "failed to create libnvidia-ml.so symlink"
+
+		# NVIDIA video decode <-> CUDA
+		dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
+			die "failed to install libnvcuvid.so"
+		dosym libnvcuvid.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libnvcuvid.so.1 || \
+			die "failed to create libnvcuvid.so symlink"
+		dosym libnvcuvid.so.1 \
+			/usr/$(get_libdir)/libnvcuvid.so || \
+			die "failed to create libnvcuvid.so symlink"
+	fi
 
 	# Xorg DDX driver
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
@@ -430,7 +433,7 @@ src_install() {
 	# Helper Apps
 	exeinto /opt/bin/
 	doexe ${NV_EXEC}/nvidia-xconfig || die
-	doexe ${NV_EXEC}/nvidia-debugdump || die
+	use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; }
 	if use gtk; then
 		doexe ${NV_EXEC}/nvidia-settings || die
 	fi
@@ -440,7 +443,7 @@ src_install() {
 	fi
 
 	# Desktop entries for nvidia-settings
-	if use gtk; then
+	if use gtk && use kernel_linux ; then
 		sed -e 's:__UTILS_PATH__:/opt/bin:' \
 			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
 			-i "${NV_EXEC}/nvidia-settings.desktop"