Update version. Change version scheme to make updates easier. Include NVCtrl lib and headers, bug #80427.

(Portage version: 2.0.51.22-r1)

4 files changed, 71 insertions, 16 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index ab9f31ad59a5..a8d1034f13a1 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.12 2005/06/12 12:15:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.13 2005/06/21 08:15:45 azarah Exp $
+
+*nvidia-settings-1.0.20050525 (21 Jun 2005)
+
+  21 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-settings-1.0.20050525.ebuild:
+  Update version. Change version scheme to make updates easier. Include NVCtrl
+  lib and headers, bug #80427.
 
   12 Jun 2005; Sven Wegener <swegener@gentoo.org>
   nvidia-settings-1.0.6111.ebuild, nvidia-settings-1.0.6629.ebuild,
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 42401fb60a84..6cca9821d904 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
-MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
+MD5 a321f6c5ae0d71c12cf557d7353156f7 nvidia-settings-1.0.20050525.ebuild 1537
+MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
+MD5 d58a2678dab8723c2a046bb4ce96e717 .nvidia-settings-1.0.20050525.ebuild.swp 12288
 MD5 9eac091ac0195501ee3e4a9ffddb213a ChangeLog 2284
+MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
+MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
 MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
-MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
-MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
-MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
 MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76
 MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrCdrI1lqEGTUzyQRAtz0AKDP+eFZRlKDKku6xH5hi5dDNPdW6ACeM766
-l9UMQ3a7v5jWbetyNAn1L4U=
-=Mo/G
------END PGP SIGNATURE-----
+MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
+MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81
+MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20050525 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20050525
new file mode 100644
index 000000000000..3c968e075580
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20050525
@@ -0,0 +1 @@
+MD5 e0c413a6fde25d3c78193a7f73273354 nvidia-settings-1.0.20050525.tar.gz 1048551
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild
new file mode 100644
index 000000000000..12e093ea9f71
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 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.20050525.ebuild,v 1.1 2005/06/21 08:15:45 azarah Exp $
+
+inherit eutils toolchain-funcs multilib
+
+NVIDIA_VERSION="1.0.7664"
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE=
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-libs/gtk+-2"
+RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
+	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
+
+src_compile() {
+	cd ${S}/src/libXNVCtrl
+	einfo "Building libXNVCtrl..."
+	# 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
+	xmkmf -a || die "Running xmkmf failed!"
+	make CCOPTIONS="${CFLAGS}" clean 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
+
+	# Now install documentation
+	rm -f doc/Makefile*
+	dodoc doc/*
+}