Added rdepend for new nvidia-drivers or nvidia-legacy-drivers. Bug 139500.

(Portage version: 2.1.1_pre1-r2)

3 files changed, 111 insertions, 1 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index e3b294a411b8..04f000e2ce8f 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.23 2006/06/30 03:33:49 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.24 2006/07/07 14:25:51 augustus Exp $
+
+*nvidia-settings-1.0.20060516-r1 (07 Jul 2006)
+
+  07 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
+  +nvidia-settings-1.0.20060516-r1.ebuild:
+  Added rdepend for new nvidia-drivers or nvidia-legacy-drivers.  Bug 139500.
 
   30 Jun 2006; Olivier Crête <tester@gentoo.org> -files/libXNVCtrl.a,
   nvidia-settings-1.0.6111.ebuild, nvidia-settings-1.0.6629.ebuild:
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1
new file mode 100644
index 000000000000..fab3235ecb7f
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1
@@ -0,0 +1,3 @@
+MD5 42eb8e6795b6b7c98e121e4b2b042ff7 nvidia-settings-1.0.20060516.tar.gz 1119552
+RMD160 784cb63001dae40bcd0c2298f3fbc519438a7266 nvidia-settings-1.0.20060516.tar.gz 1119552
+SHA256 884a1152899ffccfa3180dfc1af9d1e5c7f3bb7367882f1971bd601aa715fada nvidia-settings-1.0.20060516.tar.gz 1119552
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild
new file mode 100644
index 000000000000..8985dd34be0f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild,v 1.1 2006/07/07 14:25:51 augustus Exp $
+
+inherit eutils toolchain-funcs multilib
+
+NVIDIA_VERSION="1.0.7664"
+# The following were added to work with the new nvidia-drivers and
+# nvidia-legacy-drivers ebuilds.  This will be cleaned up once we remove
+# nvidia-kernel and nvidia-glx from portage.
+NVIDIA_NEW_VERSION="1.0.8762"
+NVIDIA_LEGACY_VERSION="1.0.7182"
+S="${WORKDIR}/${PN}-1.0"
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz"
+# Real SRC_URI:  ftp://download.nvidia.com/XFree86/nvidia-settings/
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=
+
+# xorg-server is used in the depends as nvidia-settings builds against some
+# headers in /usr/include/xorg/.
+# This also allows us to optimize out a lot of the other dependancies, as
+# between gtk and xorg-server, almost all libraries and headers are accounted
+# for.
+DEPEND="virtual/libc
+		>=x11-libs/gtk+-2
+		|| ( ( 	x11-base/xorg-server
+				x11-libs/libXt
+				x11-proto/xf86driproto
+				x11-misc/imake
+				x11-misc/gccmakedep )
+			virtual/x11
+		)"
+RDEPEND="|| ( >=media-video/nvidia-glx-${NVIDIA_VERSION}
+			>=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION}
+			>=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )
+		>=x11-libs/gtk+-2
+		|| ( (	x11-base/xorg-server
+				x11-libs/libXt )
+			virtual/x11
+		)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src/libXNVCtrl
+	einfo "Tweaking libXNVCtrl for build..."
+	# This next voodoo is just to work around xmkmf's broken behaviour
+	# after the Xorg move to /usr (or I think, as I have not messed
+	# with it in ages).
+	ln -snf ${ROOT}/usr/include/X11 include
+
+	# Ensure that libNVCtrl.a is actually built
+	# Regardless of how NormalLibXrandr was built
+	# (NormalLibXrandr indicates if Xrandr was built as static or not)
+	# NormalLibXrandr was 'YES' in Xorg-6.8, but is 'NO' in 7.0.
+	sed -i.orig \
+		-e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \
+		Imakefile
+
+	# for a rainy day, when we need a shared libXNVCtrl.so
+	#-e 'a#define DoSharedLib YES\n' \
+}
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	cd ${S}/src/libXNVCtrl
+	xmkmf -a || die "Running xmkmf failed!"
+	make clean || die "Cleaning old libXNVCtrl failed"
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!"
+
+	cd ${S}
+	einfo "Building nVidia-Settings..."
+	emake  CC="$(tc-getCC)" || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	# Install the executable
+	exeinto /usr/bin
+	doexe nvidia-settings
+
+	# Install libXNVCtrl and headers
+	insinto "/usr/$(get_libdir)"
+	doins src/libXNVCtrl/libXNVCtrl.a
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
+
+	# Install icon and .desktop entry
+	doicon "${FILESDIR}/icon/${PN}.png"
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	# Install manpage
+	doman doc/nvidia-settings.1
+
+	# Now install documentation
+	dodoc doc/*.txt
+}