add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers. Removed old 100.14.09 drivers. No longer build nvidia-settings part of the drivers but PDEPEND on it via gtk USE flag. Other misc cleanups.

(Portage version: 2.1.3_rc8)

8 files changed, 130 insertions, 205 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index b481fed9dac7..bd1b999bda6d 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.51 2007/07/13 14:39:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.52 2007/07/14 10:52:13 cardoe Exp $
+
+*nvidia-drivers-1.0.9639 (14 Jul 2007)
+
+  14 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
+  -files/nvidia-settings.desktop, -files/nvidia-settings.png,
+  +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild,
+  nvidia-drivers-100.14.11.ebuild:
+  add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers.
+  Removed old 100.14.09 drivers. No longer build nvidia-settings part of the
+  drivers but PDEPEND on it via gtk USE flag. Other misc cleanups.
 
   13 Jul 2007; Doug Goldstein <doug@gentoo.org>
   nvidia-drivers-100.14.11.ebuild:
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639
new file mode 100644
index 000000000000..876e763d4862
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639
@@ -0,0 +1,9 @@
+MD5 2947394ea9f6a7f7dc6e5bcdd1f6e3db NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348
+RMD160 d8712200f67f69e8d98b922d98268152cf6a3ce7 NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348
+SHA256 a661f039bd838605543a460769bd18a4296717878450eec4baecc6215b91a8a6 NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348
+MD5 3d8b8b700a0c5a34eb39c8ca70a57f72 NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405
+RMD160 dc21dc575f03e581a7a3f5d5066038a43f40833f NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405
+SHA256 058acd6678ae9c53c5b8083fcab3dbce1f30b77271e6553632d600acafc0bcaf NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405
+MD5 c84db1dd38a965e9074e14f59ecd2331 NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436
+RMD160 aeb23cfbed6cef57bec4f4e94b897a0cc9fb2f14 NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436
+SHA256 64cb092b05f0865cc176dce5155009958f44d59f57c307de8bcf85834c1d6e3d NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09
deleted file mode 100644
index 3580914f700f..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 979a43c663c29b7bd440558866a90e85 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923
-RMD160 2b53d1254fb2868fac17f34c51d9ecea9c09c601 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923
-SHA256 db448b1c5491995b643bb7009da179ef59315cdea5f2993d0149fe10ebea9906 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923
-MD5 bc3295a0e14feaab41af59b56f12f19e NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581
-RMD160 53f0a664dfb27488943697ffac618574ac388f03 NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581
-SHA256 92ec9b407530018df14c7ccfef9c5e76ad8ba49ee7fd83a1324a5514a82a7b9a NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581
-MD5 0717c0468378647f1e4468c12c1ed72a NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257
-RMD160 d8c7987c4053835ec4d23facee855ebc35d95da4 NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257
-SHA256 554aa9e63f1ac9e5f2f218f8532a73b514783d5ea1c674bbf888500998877ec7 NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257
-MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735
-RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735
-SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11
index d0720dcdcac5..09f448a7d1aa 100644
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11
@@ -7,6 +7,3 @@ SHA256 60b459b797d9fea16b4a804f71010c90bb516fe164370df488b0fdd31feab5a4 NVIDIA-L
 MD5 060dfcab02bc903ce6f18da4fad6f74f NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502
 RMD160 d357c75e9043e1cb089b3136635af04c88420943 NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502
 SHA256 3215f786838d2d05005ec53cc9e3a684d46939ae2ea8c8e6b3e20f092be3b5e1 NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502
-MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735
-RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735
-SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop b/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop
deleted file mode 100644
index 65f2fd56b7f6..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=nvidia-settings
-Icon=nvidia-settings
-Categories=Application;System;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings.png b/x11-drivers/nvidia-drivers/files/nvidia-settings.png
deleted file mode 100644
index 361c20050d59..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-settings.png
+++ /dev/null
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild
index e2aaf5a1357b..9b0aa6db12ba 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild,v 1.3 2007/07/05 22:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild,v 1.1 2007/07/14 10:52:13 cardoe Exp $
 
-inherit eutils multilib versionator linux-mod flag-o-matic
+inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
-SETTINGS_V="1.0"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
@@ -14,35 +13,27 @@ DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
 	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz"
+	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="gtk multilib"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="x11-base/xorg-server
-	x11-libs/libXt
+	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-	!media-video/nvidia-settings
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	>=x11-libs/gtk+-2
-	dev-util/pkgconfig
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-misc/imake
-	x11-misc/gccmakedep"
+	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
 	media-libs/mesa
-	app-admin/eselect-opengl
-	>=x11-libs/gtk+-2"
+	app-admin/eselect-opengl"
+PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -94,19 +85,18 @@ QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
 
 export _POSIX2_VERSION="199209"
 
-if use x86 ; then
+if use x86; then
 	PKG_V="-pkg0"
 	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64 ; then
+elif use amd64; then
 	PKG_V="-pkg2"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd ; then
+elif use x86-fbsd; then
 	PKG_V=""
 	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
 fi
 
 S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
-SETTINGS_DIR="${WORKDIR}/nvidia-settings-${SETTINGS_V}"
 
 # On BSD userland it wants real make command
 MAKE="make"
@@ -129,23 +119,29 @@ mtrr_check() {
 }
 
 pkg_setup() {
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ] ; then
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
 		eerror "This ebuild doesn't currently support changing your default abi."
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		linux-mod_pkg_setup
 		MODULE_NAMES="nvidia(video:${S})"
 		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
 		mtrr_check
 	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
 }
 
 src_unpack() {
 	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
 			echo
 			ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
@@ -157,9 +153,9 @@ src_unpack() {
 		fi
 	fi
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		cd "${WORKDIR}"
-		bash "${DISTDIR}/${NV_PACKAGE}${PKG_V}.run" --extract-only
+		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
 	else
 		unpack ${A}
 	fi
@@ -172,8 +168,10 @@ src_unpack() {
 	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
+	# allow on board sensors to work with lm_sensors
+	epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		# Quiet down warnings the user does not need to see
 		sed -i \
 			-e 's:-Wpointer-arith::g' \
@@ -184,53 +182,41 @@ src_unpack() {
 		[[ -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
-
-	cd "${WORKDIR}"
-	unpack "nvidia-settings-${SETTINGS_V}.tar.gz"
-	cd "${SETTINGS_DIR}" || die
-	sed -i.orig \
-		-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
-		src/libXNVCtrl/Imakefile || die "sed Imakefile"
 }
 
 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.
-	if use x86-fbsd ; then
+	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
 	else
 		linux-mod_src_compile
 	fi
-
-	# nvidia-settings
-	einfo "Building libXNVCtrl..."
-	cd "${SETTINGS_DIR}/src/libXNVCtrl"
-	xmkmf -a || die "Running xmkmf failed"
-	make clean || die "Cleaning old libXNVCtrl failed"
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl"
-
-	cd "${SETTINGS_DIR}"
-	einfo "Building nVidia-Settings..."
-	emake CC="$(tc-getCC)" || die "emake settings"
 }
 
 src_install() {
 	local MLTEST=$(type dyn_unpack)
 
-	cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+	cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V}
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		linux-mod_src_install
 
+		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "$VIDEOGROUP" ]; then
+			eerror "Failed to determine the video group gid."
+			die "Failed to determine the video group gid."
+		fi
+
 		# Add the aliases
-		[[ -f "${FILESDIR}"/nvidia ]] || die "nvidia missing in FILESDIR"
-		sed -e 's:\${PACKAGE}:'${PF}':g' "${FILESDIR}"/nvidia > "${WORKDIR}"/nvidia
+		[ -f "${FILESDIR}/nvidia-2" ] || die "nvidia-2 missing in FILESDIR"
+		sed -e 's:\${PACKAGE}:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-2 > "${WORKDIR}"/nvidia
 		insinto /etc/modules.d
 		newins "${WORKDIR}"/nvidia nvidia || die
 	else
@@ -249,18 +235,18 @@ src_install() {
 		ABI=${OABI}
 		unset OABI
 	elif use amd64 ; then
-		src_install-libs lib32 "$(get_multilibdir)"
-		src_install-libs lib "$(get_libdir)"
+		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
 
 	is_final_abi || return 0
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		# Docs
 		newdoc usr/share/doc/README.txt README
 		dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog
@@ -274,22 +260,8 @@ src_install() {
 		dohtml doc/html/*
 	fi
 
-	# Taking nvidia-settings from nvidia-drivers - more up-to-date
-	dobin usr/bin/nvidia-{settings,xconfig} || die
-
-	# nvidia-settings
-	cd "${SETTINGS_DIR}"
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a || die
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die
-
-	# Install icon and .desktop entry
-	doicon "${FILESDIR}/nvidia-settings.png" || die "doicon"
-	domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu"
-
-	doman doc/nvidia-settings.1 || die
-	dodoc doc/*.txt
+	# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
+	dobin usr/bin/nvidia-xconfig || die
 }
 
 # Install nvidia library:
@@ -303,9 +275,9 @@ donvidia() {
 	libname=$(basename $2)
 
 	doexe $2.$3
-	dosym "${libname}.${3}" "${1}/${libname}"
+	dosym ${libname}.$3 $1/${libname}
 
-	[[ ${3} != "1" ]] && dosym "${libname}.${3}" "${1}/${libname}.1"
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
 }
 
 src_install-libs() {
@@ -321,9 +293,8 @@ src_install-libs() {
 
 	local usrpkglibdir=usr/${pkglibdir}
 	local libdir=usr/X11R6/${pkglibdir}
-	local modules=${libdir}/modules
-	local drvdir=${modules}/drivers
-	local extdir=${modules}/extensions
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
 	local incdir=usr/include/GL
 	local sover=${PV}
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
@@ -335,7 +306,7 @@ src_install-libs() {
 		X11_LIB_DIR="/usr/${inslibdir}"
 	fi
 
-	if use x86-fbsd ; then
+	if use x86-fbsd; then
 		# on FreeBSD everything is on obj/
 		pkglibdir=obj
 		usrpkglibdir=obj
@@ -351,32 +322,31 @@ src_install-libs() {
 	fi
 
 	# The GLX libraries
-	donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libGL.so "${sover}"
-	donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libGLcore.so "${sover}"
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
 
-	donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libnvidia-cfg.so "${sover}"
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
 
-	dodir "${NO_TLS_ROOT}"
-	donvidia "${NO_TLS_ROOT}" "${usrpkglibdir}"/libnvidia-tls.so "${sover}"
+	dodir ${NO_TLS_ROOT}
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
 
-	if ! use x86-fbsd ; then
-		donvidia "${TLS_ROOT}" "${usrpkglibdir}"/tls/libnvidia-tls.so "${sover}"
+	if ! use x86-fbsd; then
+		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
 	fi
 
 	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so "${NV_ROOT}"/lib
-		dosym ../tls/libnvidia-tls.so.1 "${NV_ROOT}"/lib
-		dosym "../tls/libnvidia-tls.so.${sover}" "${NV_ROOT}"/lib
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
 	else
-		dosym ../no-tls/libnvidia-tls.so "${NV_ROOT}"/lib
-		dosym ../no-tls/libnvidia-tls.so.1 "${NV_ROOT}"/lib
-		dosym "../no-tls/libnvidia-tls.so.${sover}" "${NV_ROOT}"/lib
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
 	fi
 
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[[ -f "${FILESDIR}"/libGL.la-r2 ]] \
-			|| die "libGL.la-r2 missing in FILESDIR"
+		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
 		local ver1=$(get_version_component_range 1)
 		local ver2=$(get_version_component_range 2)
 		local ver3=$(get_version_component_range 3)
@@ -385,44 +355,44 @@ 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
+	exeinto ${X11_LIB_DIR}/modules/drivers
 
 	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe "${drvdir}"/nvidia_drv.so
+		doexe ${drvdir}/nvidia_drv.so
 
-	insinto "/usr/${inslibdir}"
+	insinto /usr/${inslibdir}
 	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins "${libdir}"/libXvMCNVIDIA.a
-	exeinto "/usr/${inslibdir}"
+		doins ${libdir}/libXvMCNVIDIA.a
+	exeinto /usr/${inslibdir}
 	# fix Bug 131315
 	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe "${libdir}/libXvMCNVIDIA.so.${PV}" && \
-		dosym "libXvMCNVIDIA.so.${PV}" \
-			"/usr/${inslibdir}"/libXvMCNVIDIA.so
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
+		dosym libXvMCNVIDIA.so.${PV} \
+			/usr/${inslibdir}/libXvMCNVIDIA.so
 
-	exeinto "${NV_ROOT}"/extensions
-	[[ -f ${modules}/libnvidia-wfb.so.${sover} ]] && \
-		newexe "${modules}/libnvidia-wfb.so.${sover}" libwfb.so
+	exeinto ${NV_ROOT}/extensions
+	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
+		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
 	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe "${extdir}/libglx.so.${sover}" libglx.so
+		newexe ${extdir}/libglx.so.${sover} libglx.so
 
 	# Includes
-	insinto "${NV_ROOT}"/include
-	doins "${incdir}"/*.h
+	insinto ${NV_ROOT}/include
+	doins ${incdir}/*.h
 }
 
 pkg_preinst() {
 	# Can we make up our minds ?!?!?
-	local NV_D=${D} dir
+	local NV_D=${D}
 
 	if ! has_version x11-base/xorg-server ; then
 		for dir in lib lib32 lib64 ; do
 			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
-				mv "${NV_D}/usr/${dir}"/xorg/* "${NV_D}/usr/${dir}"
-				rmdir "${NV_D}/usr/${dir}"/xorg
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
 			fi
 		done
 	fi
@@ -430,21 +400,32 @@ pkg_preinst() {
 	# Clean the dynamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
 	fi
 	# Make sure we nuke the old nvidia-glx's env.d file
 	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
+		rm -f ${ROOT}/etc/env.d/09nvidia
 	fi
 }
 
 pkg_postinst() {
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		linux-mod_pkg_postinst
 	fi
 
 	# Switch to the nvidia implementation
 	eselect opengl set --use-old nvidia
+
+	echo
+	elog "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "nVidia has requested that any bug reports submitted have the"
+	elog "output of /usr/bin/nvidia-bug-report.sh included."
+	elog
+	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
+	elog
+	elog "If you are having resolution problems, try disabling DynamicTwinView."
+	echo
 }
 
 want_tls() {
@@ -481,7 +462,7 @@ want_tls() {
 }
 
 pkg_postrm() {
-	if ! use x86-fbsd ; then
+	if ! use x86-fbsd; then
 		linux-mod_pkg_postrm
 	fi
 	eselect opengl set --use-old xorg-x11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
index f16d9a8c2b12..70d91c1b7694 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.6 2007/07/13 18:27:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.7 2007/07/14 10:52:13 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
-SETTINGS_V="1.0"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
@@ -14,8 +13,7 @@ DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
 	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	 gtk? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz )"
+	 x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
@@ -25,25 +23,17 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="x11-base/xorg-server
-	x11-libs/libXt
-	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	!media-video/nvidia-settings
+	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	>=x11-libs/gtk+-2
-	dev-util/pkgconfig
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-misc/imake
-	x11-misc/gccmakedep"
+	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
 	media-libs/mesa
-	app-admin/eselect-opengl
-	>=x11-libs/gtk+-2"
+	app-admin/eselect-opengl"
+PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -107,7 +97,6 @@ elif use x86-fbsd; then
 fi
 
 S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv"
-SETTINGS_DIR="${WORKDIR}/nvidia-settings-${SETTINGS_V}"
 
 # On BSD userland it wants real make command
 MAKE="make"
@@ -195,15 +184,6 @@ src_unpack() {
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		cd "${S}"; convert_to_m Makefile.kbuild
 	fi
-
-	if use gtk; then
-		cd "${WORKDIR}"
-		unpack "nvidia-settings-${SETTINGS_V}.tar.gz"
-		cd "${SETTINGS_DIR}" || die
-		sed -i.orig \
-			-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
-			src/libXNVCtrl/Imakefile || die "sed Imakefile"
-	fi
 }
 
 src_compile() {
@@ -217,19 +197,6 @@ src_compile() {
 	else
 		linux-mod_src_compile
 	fi
-
-	if use gtk; then
-		# nvidia-settings
-		einfo "Building libXNVCtrl..."
-		cd "${SETTINGS_DIR}/src/libXNVCtrl"
-		xmkmf -a || die "Running xmkmf failed"
-		make clean || die "Cleaning old libXNVCtrl failed"
-		emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl"
-
-		cd "${SETTINGS_DIR}"
-		einfo "Building nVidia-Settings..."
-		emake CC="$(tc-getCC)" || die "emake settings"
-	fi
 }
 
 src_install() {
@@ -247,7 +214,7 @@ src_install() {
 		fi
 
 		# Add the aliases
-		[[ -f "${FILESDIR}"/nvidia-2 ]] || die "nvidia-2 missing in FILESDIR"
+		[ -f "${FILESDIR}/nvidia-2" ] || die "nvidia-2 missing in FILESDIR"
 		sed -e 's:\${PACKAGE}:'${PF}':g' \
 			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-2 > "${WORKDIR}"/nvidia
 		insinto /etc/modules.d
@@ -295,23 +262,6 @@ src_install() {
 
 	# Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf
 	dobin usr/bin/nvidia-xconfig || die
-
-	if use gtk; then
-		# nvidia-settings
-		dobin usr/bin/nvidia-settings || die
-		cd "${SETTINGS_DIR}"
-		insinto "/usr/$(get_libdir)"
-		doins src/libXNVCtrl/libXNVCtrl.a || die
-		insinto /usr/include/NVCtrl
-		doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die
-
-		# Install icon and .desktop entry
-		doicon "${FILESDIR}/nvidia-settings.png" || die "doicon"
-		domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu"
-
-		doman doc/nvidia-settings.1 || die
-		dodoc doc/*.txt
-	fi
 }
 
 # Install nvidia library:
@@ -343,9 +293,8 @@ src_install-libs() {
 
 	local usrpkglibdir=usr/${pkglibdir}
 	local libdir=usr/X11R6/${pkglibdir}
-	local modules=${libdir}/modules
-	local drvdir=${modules}/drivers
-	local extdir=${modules}/extensions
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
 	local incdir=usr/include/GL
 	local sover=${PV}
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
@@ -397,8 +346,7 @@ src_install-libs() {
 
 	if ! use x86-fbsd; then
 		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[[ -f "${FILESDIR}"/libGL.la-r2 ]] \
-			|| die "libGL.la-r2 missing in FILESDIR"
+		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
 		local ver1=$(get_version_component_range 1)
 		local ver2=$(get_version_component_range 2)
 		local ver3=$(get_version_component_range 3)
@@ -426,8 +374,8 @@ src_install-libs() {
 			/usr/${inslibdir}/libXvMCNVIDIA.so
 
 	exeinto ${NV_ROOT}/extensions
-	[[ -f ${modules}/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${modules}/libnvidia-wfb.so.${sover} libwfb.so
+	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
+		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
 	[[ -f ${extdir}/libglx.so.${sover} ]] && \
 		newexe ${extdir}/libglx.so.${sover} libglx.so