Style touchups and create relative symlinks in /usr/lib.

(Portage version: 2.1.2_rc4-r1)

2 files changed, 18 insertions, 14 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 83d4f5411ad0..6c0acb56eb64 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.35 2006/12/12 14:46:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.36 2006/12/26 05:06:14 vapier Exp $
+
+  26 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  nvidia-drivers-1.0.9742.ebuild:
+  Style touchups and create relative symlinks in /usr/lib.
 
   12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild:
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
index 0ce6077b21bb..469981166c7d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.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/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.4 2006/12/12 14:46:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.5 2006/12/26 05:06:14 vapier Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic
 
@@ -139,7 +139,7 @@ src_unpack() {
 	fi
 
 	if ! use x86-fbsd; then
-		cd ${WORKDIR}
+		cd "${WORKDIR}"
 		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
 	else
 		unpack ${A}
@@ -150,22 +150,22 @@ src_unpack() {
 		&& cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
 	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/NVIDIA_glx-defines.patch
+	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/NVIDIA_glx-glheader.patch
+	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
 	if ! use x86-fbsd; then
 		# Quiet down warnings the user do not need to see
 		sed -i \
 			-e 's:-Wpointer-arith::g' \
 			-e 's:-Wsign-compare::g' \
-			${S}/Makefile.kbuild
+			"${S}"/Makefile.kbuild
 
 		# If you set this then it's your own fault when stuff breaks :)
 		[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
 
 		# If greater than 2.6.5 use M= instead of SUBDIR=
-		cd ${S}; convert_to_m Makefile.kbuild
+		cd "${S}"; convert_to_m Makefile.kbuild
 	fi
 }
 
@@ -185,15 +185,15 @@ src_compile() {
 src_install() {
 	local MLTEST=$(type dyn_unpack)
 
-	cd ${WORKDIR}/${NV_PACKAGE}${PKG_V}
+	cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V}
 
 	if ! use x86-fbsd; then
 		linux-mod_src_install
 
 		# Add the aliases
-		sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
+		sed -e 's:\${PACKAGE}:'${PF}':g' "${FILESDIR}"/nvidia > "${WORKDIR}"/nvidia
 		insinto /etc/modules.d
-		newins ${WORKDIR}/nvidia nvidia
+		newins "${WORKDIR}"/nvidia nvidia || die
 	else
 		insinto /boot/modules
 		doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld"
@@ -213,8 +213,8 @@ src_install() {
 		src_install-libs lib32 $(get_multilibdir)
 		src_install-libs lib $(get_libdir)
 
-		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
-		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+		rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/extensions
 	else
 		src_install-libs
 	fi
@@ -325,7 +325,7 @@ src_install-libs() {
 			-e "s:\${ver2}:${ver2}:" \
 			-e "s:\${ver3}:${ver3}:" \
 			-e "s:\${libdir}:${inslibdir}:" \
-			${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
 	fi
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
@@ -346,7 +346,7 @@ src_install-libs() {
 	# fix Bug 131315
 	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
 		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \
+		dosym libXvMCNVIDIA.so.${PV} \
 			/usr/${inslibdir}/libXvMCNVIDIA.so
 
 	exeinto ${NV_ROOT}/extensions