Changes to reflect new nvidia drivers

6 files changed, 65 insertions, 8 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 441d7b86329a..6b5dc2703963 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.7 2004/08/16 22:28:05 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.8 2004/11/07 07:25:08 cyfred Exp $
+
+*nvidia-settings-1.0.6629 (07 Nov 2004)
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-settings-1.0.6106.ebuild, nvidia-settings-1.0.6111.ebuild,
+  +nvidia-settings-1.0.6629.ebuild:
+  Changes to reflect new nvidia drivers
 
   17 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; :
   Fixing digests
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index a47cbd922227..2acf99f04a8a 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,7 +1,9 @@
-MD5 633c663cbf364b56a40d276bea5915ce nvidia-settings-1.0.6106.ebuild 1035
-MD5 a847702b9f92c264487624728189fd67 ChangeLog 1338
+MD5 231669615bde3883d1b211ad577dafc2 nvidia-settings-1.0.6106.ebuild 1035
+MD5 63fa8fd6609e071baa5d7125e60ba1b5 nvidia-settings-1.0.6629.ebuild 1129
+MD5 992e0c80004bb3b6c1483b1afd5a030b ChangeLog 1573
 MD5 35db7abed099185f5f46b95057b9e2db metadata.xml 284
-MD5 39abad6aa63ef74c564827e53b15f317 nvidia-settings-1.0.6111.ebuild 1129
+MD5 c246b055dbc1c001a6e5391355acf135 nvidia-settings-1.0.6111.ebuild 1127
 MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
 MD5 9804660f5537e2dcc39373163a727ca1 files/digest-nvidia-settings-1.0.6106 76
 MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
+MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.6629 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.6629
new file mode 100644
index 000000000000..536eaec47cf6
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.6629
@@ -0,0 +1 @@
+MD5 c5dc37bc9de11133521c4b9f747bdbca nvidia-settings-1.0.6629.tar.gz 817715
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.6106.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.6106.ebuild
index 843bd34cd374..fae650611f3e 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.6106.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.6106.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6106.ebuild,v 1.1 2004/08/16 12:15:21 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.6106.ebuild,v 1.2 2004/11/07 07:25:08 cyfred Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* -x86 -amd64"
 RESTRICT=""
 IUSE=""
 
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
index e0cae79bffac..9ad4f43419e3 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6111.ebuild,v 1.1 2004/08/06 01:38:46 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild,v 1.2 2004/11/07 07:25:08 cyfred Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-1.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 RESTRICT=""
 IUSE=""
 
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild
new file mode 100644
index 000000000000..b97b5a4543cf
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 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.6629.ebuild,v 1.1 2004/11/07 07:25:08 cyfred Exp $
+
+inherit eutils
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+NVIDIA_VERSION="1.0.6629"
+SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/${PN}-${NVIDIA_VERSION}.tar.gz"
+S="${WORKDIR}/${PN}-1.0"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT=""
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-libs/gtk+-2*
+	amd64? ( app-arch/bzip2 )"
+RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
+	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+
+	# libXNVCtrl.a is 32 bit built, fixing thanks augustus
+	use amd64 && \
+		bzip2 -dc ${FILESDIR}/libXNVCtrl.a.bz2 \
+			> ${S}/src/libXNVCtrl/libXNVCtrl.a
+}
+
+src_compile() {
+	emake || die "Failed to build nvidia-settings"
+}
+
+src_install() {
+	# Install the executable
+	exeinto /usr/bin
+	doexe nvidia-settings
+
+	# Now install documentation
+	rm -f doc/Makefile*
+	dodoc doc/*
+}