tweak some more directory usage

Package-Manager: portage-2.1.4

2 files changed, 44 insertions, 44 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5a55f6d0f03b..7e907d87cc86 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -63,10 +63,10 @@ EBUILD nvidia-drivers-100.14.23.ebuild 14658 RMD160 a43fab1e59d9f01e381ea864b717
 MD5 caba33d46cfb63c2c439ecc318baac82 nvidia-drivers-100.14.23.ebuild 14658
 RMD160 a43fab1e59d9f01e381ea864b717192522f420cd nvidia-drivers-100.14.23.ebuild 14658
 SHA256 9dba80ac97d614bb39940ceb3c66f592a4fffc3945447033b279f5b653eb1f53 nvidia-drivers-100.14.23.ebuild 14658
-EBUILD nvidia-drivers-169.07.ebuild 13652 RMD160 504cc7e3f7ac2c050ca8bf44089ce2d7433f5da9 SHA1 80dddd4d5d9942e47318d7f04ce40f7d56ee87dc SHA256 4489627f5a89ce7302247ff7bf83ac45c4ec22904aade5fbe746b6c6d6fe578e
-MD5 6d047d6ab6062e10e8c8387dc172dfdf nvidia-drivers-169.07.ebuild 13652
-RMD160 504cc7e3f7ac2c050ca8bf44089ce2d7433f5da9 nvidia-drivers-169.07.ebuild 13652
-SHA256 4489627f5a89ce7302247ff7bf83ac45c4ec22904aade5fbe746b6c6d6fe578e nvidia-drivers-169.07.ebuild 13652
+EBUILD nvidia-drivers-169.07.ebuild 13502 RMD160 91a25a9052c4f554284cc75e00f107acd2c4b6bc SHA1 9854863998b91475961ba01b80cd8dadc57f6951 SHA256 8bf591b346b28c9fa9c685696fd4ef56960ad4fff8714ed68a74b9db40a37cd2
+MD5 549ab686f07d50d5b5b4ec4128046566 nvidia-drivers-169.07.ebuild 13502
+RMD160 91a25a9052c4f554284cc75e00f107acd2c4b6bc nvidia-drivers-169.07.ebuild 13502
+SHA256 8bf591b346b28c9fa9c685696fd4ef56960ad4fff8714ed68a74b9db40a37cd2 nvidia-drivers-169.07.ebuild 13502
 EBUILD nvidia-drivers-71.86.01.ebuild 14218 RMD160 44a3cbc6c1c1aad593dfac08ce8070d3ba5e2c54 SHA1 875154af5015448fc238e34c6b9bf95211b8460d SHA256 0db0dc634b5d4cfb06bd50b6cd2ff97844786bc5e9bc5af20ce9b4983da0b3f1
 MD5 672d17e8cd6e9bbde81fb5ec5c43d45c nvidia-drivers-71.86.01.ebuild 14218
 RMD160 44a3cbc6c1c1aad593dfac08ce8070d3ba5e2c54 nvidia-drivers-71.86.01.ebuild 14218
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
index 6fd34d3b2c3b..7738c452dcba 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.2 2008/01/16 19:21:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-169.07.ebuild,v 1.3 2008/01/16 20:39:59 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_P
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi gtk multilib"
+IUSE="acpi custom-cflags gtk multilib"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
@@ -53,21 +53,21 @@ QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
 	usr/lib/opengl/nvidia/extensions/libglx.so
 	usr/lib/xorg/modules/drivers/nvidia_drv.so"
 
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}"
+#QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+#	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+#	usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+#	usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+#	usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}"
 
 QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/extensions/libglx.so"
 
-QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}"
+#QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+#	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+#	usr/lib64/opengl/nvidia/extensions/libglx.so
+#	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+#	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}"
 
 QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -76,13 +76,13 @@ QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/libXvMCNVIDIA.so.${PV}
 	usr/bin/nvidia-xconfig"
 
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/bin/nvidia-xconfig"
+#QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
+#	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+#	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+#	usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
+#	usr/lib64/opengl/nvidia/extensions/libglx.so
+#	usr/lib64/libXvMCNVIDIA.so.${PV}
+#	usr/bin/nvidia-xconfig"
 
 if use x86; then
 	PKG_V="-pkg0"
@@ -95,7 +95,7 @@ elif use x86-fbsd; then
 	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
 fi
 
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
 
 mtrr_check() {
 	ebegin "Checking for MTRR support"
@@ -119,9 +119,9 @@ pkg_setup() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if kernel_linux; then
+	if use kernel_linux; then
 		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S})"
+		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
 		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
 		mtrr_check
 	fi
@@ -141,17 +141,17 @@ pkg_setup() {
 	if use kernel_FreeBSD; then
 		NV_DOC="${S}/doc"
 		NV_EXEC="${S}/obj"
+		NV_SRC="${S}/src"
 	elif use kernel_linux; then
 		NV_DOC="${S}/usr/share/doc"
 		NV_EXEC="${S}/usr/bin"
+		NV_SRC="${S}/usr/src/nv"
 	else
 		die "Could not determine proper NVIDIA package"
 	fi
 }
 
 src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
-
 	if kernel_linux && kernel_is lt 2 6 7; then
 		echo
 		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
@@ -170,9 +170,9 @@ src_unpack() {
 	fi
 
 	# Patches go below here, add brief description
-	use x86-fbsd \
-		&& cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \
-		|| cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+	cd "${S}"
+	use x86-fbsd && cd doc
+
 	# Use the correct defines to make gtkglext build work
 	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
@@ -188,13 +188,13 @@ src_unpack() {
 		sed -i \
 			-e 's:-Wpointer-arith::g' \
 			-e 's:-Wsign-compare::g' \
-			"${S}"/Makefile.kbuild
+			"${NV_SRC}"/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.*
+		use custom-cflags && sed -i "s:-O:${CFLAGS}:" Makefile.*
 
 		# If greater than 2.6.5 use M= instead of SUBDIR=
-		cd "${S}"; convert_to_m Makefile.kbuild
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
 }
 
@@ -202,9 +202,9 @@ src_compile() {
 	# This is already the default on Linux, as there's no toplevel Makefile, but
 	# on FreeBSD there's one and triggers the kernel module build, as we install
 	# it by itself, pass this.
+
+	cd "${NV_SRC}"
 	if use x86-fbsd; then
-		cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src"
-		echo LDFLAGS="$(raw-ldflags)"
 		MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
 	elif kernel_linux; then
 		linux-mod_src_compile
@@ -214,7 +214,7 @@ src_compile() {
 src_install() {
 	local MLTEST=$(type dyn_unpack)
 
-	cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V}
+	cd "${S}"
 
 	if use kernel_linux; then
 		linux-mod_src_install
@@ -234,10 +234,10 @@ src_install() {
 		doins "${WORKDIR}"/nvidia || die
 	elif use x86-fbsd; then
 		insinto /boot/modules
-		doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld" || die
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
 
 		exeinto /boot/modules
-		doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko" || die
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
 	fi
 
 	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
@@ -260,14 +260,14 @@ src_install() {
 	is_final_abi || return 0
 
 	# Documentation
-	dodoc ${NV_DOC}/{XF86Config.sample,Copyrights}
-	dohtml ${NV_DOC}/html/*
+	dodoc "${NV_DOC}"/{XF86Config.sample,Copyrights}
+	dohtml "${NV_DOC}"/html/*
 	if use x86-fbsd; then
-		dodoc doc/README
+		dodoc "${NV_DOC}/README"
 	else
 		# Docs
-		newdoc usr/share/doc/README.txt README
-		dodoc usr/share/doc/NVIDIA_Changelog
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
 	fi
 
 	# Helper Apps