From: Martin Schlemmer <azarah@gentoo.org>
Date: Fri, 11 Nov 2005 18:49:45 +0000 (+0000)
Subject: Small tweak to last commit.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34dd6e2e2cdbca5d2c48946addc9c42028a8f33e;p=gentoo.git

Small tweak to last commit.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index c850d90ca126..d77eb774ed11 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -30,11 +30,11 @@ MD5 18ddb38a7595329ad585c74ee979ffaf nvidia-glx-1.0.7167-r3.ebuild 8284
 MD5 630dc45be727342243d06af61e06d6dd nvidia-glx-1.0.7174-r5.ebuild 8446
 MD5 413c2a51514bb61b54b1c9f3ae2e6463 nvidia-glx-1.0.7667-r1.ebuild 8446
 MD5 226c3e5fe5d6e5be93b0a3937e563c06 nvidia-glx-1.0.7676-r1.ebuild 9204
-MD5 7de949c9d842e49384040ef2afdc3df0 nvidia-glx-1.0.7676-r2.ebuild 9269
+MD5 a699cf5ee272cc61bb943c77bbfe75f9 nvidia-glx-1.0.7676-r2.ebuild 9321
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDdObk1ZcsMnZjRyIRAinbAJ9dCW2DSo44vmDtWgX4n25uq2NsFwCgmoIU
-lc2sIUgUkAU//qR8qN9x8NI=
-=CVfr
+iD8DBQFDdOi61ZcsMnZjRyIRAiITAJ9rF1gl8smdr+osDSvcb1Rk7UL44gCfX/pw
+GK5jAfve4KLd7afNMLI4Hl4=
+=l3S/
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
index 5d347a3b5af6..53f3af25c347 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7676-r2.ebuild,v 1.1 2005/11/11 18:41:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.2 2005/11/11 18:49:45 azarah Exp $
 
 inherit eutils multilib versionator
 
@@ -250,13 +250,15 @@ src_install-libs() {
 
 pkg_preinst() {
 	# Can we make up our minds ?!?!?
-	[[ -n ${IMAGE} ]] && D=${IMAGE}
+	[[ -n ${IMAGE} ]] && \
+		NV_D="${IMAGE}" || \
+		NV_D="${D}"
 
 	if ! has_version x11-base/xorg-server ; then
 		for dir in lib lib32 lib64 ; do
-			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
-				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
-				rmdir ${D}/usr/${dir}/xorg
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
 			fi
 		done
 	fi
@@ -265,9 +267,9 @@ pkg_preinst() {
 	# Since we moved away from libs in /usr/X11R6 need to check this
 	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
 	   has_version "x11-base/xfree86" ; then
-		mkdir -p ${D}/usr/X11R6
+		mkdir -p ${NV_D}/usr/X11R6
 		for dir in lib lib32 lib64 ; do
-			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+			[[ -d ${NV_D}/usr/${dir} ]] && mv ${NV_D}/usr/${dir} ${NV_D}/usr/X11R6
 		done
 	fi