Document the symlink creation a little bit better. Create some more symlinks that aren't used by quiets Portage's QA notices.

(Portage version: 2.1.10.63/cvs/Linux x86_64)

3 files changed, 25 insertions, 7 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 5e200dd3d269..77cb57b54f99 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.351 2012/05/25 01:50:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.352 2012/06/04 16:22:28 cardoe Exp $
+
+  04 Jun 2012; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-173.14.34.ebuild, nvidia-drivers-295.49.ebuild:
+  Document the symlink creation a little bit better. Create some more symlinks
+  that aren't used by quiets Portage's QA notices.
 
   25 May 2012; Jeff Horelick <jdhore@gentoo.org> nvidia-drivers-295.49.ebuild:
   marked x86 per bug 416993
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
index 1edac41fb782..37e34e32f1d6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.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-173.14.34.ebuild,v 1.4 2012/05/22 21:30:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.5 2012/06/04 16:22:28 cardoe Exp $
 
 EAPI="2"
 
@@ -319,6 +319,12 @@ src_install() {
 	# NVIDIA kernel <-> userspace driver config lib
 	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
 		die "failed to install libnvidia-cfg"
+	dosym libnvidia-cfg.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
+		die "failed to create libnvidia-cfg.so.1 symlink"
+	dosym libnvidia-cfg.so.1 \
+		/usr/$(get_libdir)/libnvidia-cfg.so || \
+		die "failed to create libnvidia-cfg.so symlink"
 
 	# Xorg DDX driver
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
@@ -337,8 +343,15 @@ src_install() {
 		die "failed to install libXvMCNVIDIA.so"
 	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
 		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
+		die "failed to create libXvMCNVIDIA.so.1 symlink"
+	dosym libXvMCNVIDIA.so.1 \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so || \
 		die "failed to create libXvMCNVIDIA.so symlink"
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+		die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
 
 	# CUDA headers (driver to come)
 	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
index 56fd3b589e82..c5eb892a2103 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.8 2012/05/25 01:50:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.9 2012/06/04 16:22:28 cardoe Exp $
 
 EAPI="2"
 
@@ -368,7 +368,7 @@ src_install() {
 		die "failed to install libnvidia-cfg"
 	dosym libnvidia-cfg.so.${NV_SOVER} \
 		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
-		die "failed to create libnvidia-cfg.so symlink"
+		die "failed to create libnvidia-cfg.so.1 symlink"
 	dosym libnvidia-cfg.so.1 \
 		/usr/$(get_libdir)/libnvidia-cfg.so || \
 		die "failed to create libnvidia-cfg.so symlink"
@@ -414,12 +414,12 @@ src_install() {
 		die "failed to install libXvMCNVIDIA.so"
 	dosym libXvMCNVIDIA.so.${NV_SOVER} \
 		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
-		die "failed to create libXvMCNVIDIA.so symlink"
+		die "failed to create libXvMCNVIDIA.so.1 symlink"
 	dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \
 		die "failed to create libXvMCNVIDIA.so symlink"
 	dosym libXvMCNVIDIA.so.${NV_SOVER} \
 		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-		die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+		die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
 
 	# OpenCL ICD for NVIDIA
 	if use kernel_linux; then