Version bump to the new nvidia-settings for bug #148860. This is still masked because there are reports that it requires the masked BETA nvidia-drivers to function properly.

(Portage version: 2.1.2_pre1-r4)

3 files changed, 108 insertions, 1 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index edaba629eab1..9be2f1881656 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,14 @@
 # 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.27 2006/10/05 21:45:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.28 2006/10/06 18:39:56 wolf31o2 Exp $
+
+*nvidia-settings-1.0.20060919 (06 Oct 2006)
+
+  06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +nvidia-settings-1.0.20060919.ebuild:
+  Version bump to the new nvidia-settings for bug #148860. This is still
+  masked because there are reports that it requires the masked BETA
+  nvidia-drivers to function properly.
 
   05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-settings-1.0.20051122-r3.ebuild,
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919
new file mode 100644
index 000000000000..3301a744653e
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919
@@ -0,0 +1,3 @@
+MD5 6b70f0a178573b685f6c76e55067756c nvidia-settings-1.0.20060919.tar.gz 1298171
+RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 nvidia-settings-1.0.20060919.tar.gz 1298171
+SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477 nvidia-settings-1.0.20060919.tar.gz 1298171
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild
new file mode 100644
index 000000000000..ab033035c962
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild
@@ -0,0 +1,96 @@
+# 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.20060919.ebuild,v 1.1 2006/10/06 18:39:56 wolf31o2 Exp $
+
+inherit eutils toolchain-funcs multilib
+
+# The following were added to work with the new nvidia-drivers and
+# nvidia-legacy-drivers ebuilds.
+NVIDIA_NEW_VERSION="1.0.9625"
+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"
+#SRC_URI="ftp://download.nvidia.com/XFree86/nvidia-settings/${P}.tar.gz"
+
+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-libs/libXv
+		x11-proto/xf86driproto
+		x11-misc/imake
+		x11-misc/gccmakedep"
+RDEPEND="|| (
+			>=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"
+
+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
+}