Revert parts of my previous commit for now until we've fixed both, nvidia-drivers and nvidia-settings to not collide.

Package-Manager: portage-2.1.10.44/cvs/Linux i686

6 files changed, 123 insertions, 101 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 041639deba6c..dcbae21ecec5 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.106 2012/02/17 19:49:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.107 2012/02/21 21:38:23 idl0r Exp $
+
+  21 Feb 2012; Christian Ruppert <idl0r@gentoo.org>
+  nvidia-settings-275.09.07.ebuild, nvidia-settings-275.43.ebuild,
+  nvidia-settings-290.10.ebuild, nvidia-settings-295.20.ebuild:
+  Revert parts of my previous commit for now until we've fixed both,
+  nvidia-drivers and nvidia-settings to not collide.
 
 *nvidia-settings-275.43 (17 Feb 2012)
 *nvidia-settings-275.09.07 (17 Feb 2012)
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 529ef7d47192..d6fbfcc7c50d 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -28,20 +28,20 @@ EBUILD nvidia-settings-190.53.ebuild 2015 RMD160 b750992206e9841154200d0780fade6
 EBUILD nvidia-settings-195.36.24.ebuild 2024 RMD160 d07c4c9e3925db8d9397defd80873799ad2e2072 SHA1 67bfe6c7584eba1d686285eef03eef7d9d8483d9 SHA256 ff03cac6dc25fd9adbb9a40236d4e1b01dfea1ca04739b9b2d97641f7a080263
 EBUILD nvidia-settings-195.36.31.ebuild 2026 RMD160 41095f50c603f7a631095bf5519cf0a31a689e17 SHA1 de98c156bbefd6c8c9e2392282257168fa084ba7 SHA256 bbf92cdb9b1464930be89c689e89286611d0e18fdaabe3e0bdabd60186e39470
 EBUILD nvidia-settings-260.19.29.ebuild 1944 RMD160 5e0142afc4893181fe9994d3b295020d3b0e2c76 SHA1 242864e8da517bc467f5ab4d37c0b43fbf41dbc5 SHA256 cce97fc9d2e4cc079a7d68945dbdbf162b3250e4c52b8d9dc7bda936972ae97a
-EBUILD nvidia-settings-275.09.07.ebuild 1831 RMD160 59b7b963d1f67aa3b25d21c4ea09a8a25ce15a8c SHA1 8a876561278ddcb90c7384f57b73dea36c1118eb SHA256 9112d6e3cf95ec51646b50eb742729d0fe5ea72d9e690481c1b328af743d5b04
-EBUILD nvidia-settings-275.43.ebuild 1828 RMD160 50f7ebfedd39e5d787464c692c26274fa8be07b0 SHA1 d5970c83275a75c701a3cb7bccf4108be280c01f SHA256 ad9d6fa2b7ba3ba24510c736a66490a99a48357b138a366be35d19e341d4f22e
-EBUILD nvidia-settings-290.10.ebuild 1828 RMD160 9ab0ce7c371ee4322e5b3fe86e7b32fd4de95f24 SHA1 95c56062cba1dd6631a88217c9df43387eed185f SHA256 821f5ee98f4dafea514a99c2c226dd8cf8fc36b723737da7afae2b5b4b6cb059
-EBUILD nvidia-settings-295.20.ebuild 1828 RMD160 ec76f0a998c60aafd223f4c34c2231f7507c1155 SHA1 c1f77715b6e3449cd372d27cf00b92160f951a53 SHA256 4d0959258019a44ab2df746ee57d4959616c1fb2e276624a893191d525ba907c
-MISC ChangeLog 20470 RMD160 01cf414ea5c311eb8bcfce40b3078faced6bb340 SHA1 70ac4daaeb1c4f95e39ca16ad5bef509ca6f7ccf SHA256 3a796a440ff5f0dd34137a22980667c1642b5cf19c351d05aff1ba9ffef2528d
+EBUILD nvidia-settings-275.09.07.ebuild 1906 RMD160 2070af1a8db4f1687dbcf1bd644e461b06c9d746 SHA1 cb3987cc480591f9d12d37eb7ab479c3b2495731 SHA256 55a4ecee5fcee3c6254326fae9e2ef043f9904aa2474f9dc64cb3e80a6f73514
+EBUILD nvidia-settings-275.43.ebuild 1903 RMD160 acd51e073fb1c79f649d04521c73f66197d6b2cd SHA1 04aa5a4825eef6f8f5f60e996a755bc151c7b08f SHA256 9f107bc1db3f5345bf4c6f6067e81c697535b12277351202122f0967a6a24097
+EBUILD nvidia-settings-290.10.ebuild 1903 RMD160 580fc86a38ebd90af304cf6139b6aa84f996febe SHA1 e2a0599a9d193645a2eae6140aaecf22c73b240b SHA256 d356943823ab884e1d46e112472b7d17bfab0203ab6b80eb8ba37984cabdb4cd
+EBUILD nvidia-settings-295.20.ebuild 1903 RMD160 ea0a3ff1c6e40a3402b9efbc1e830de1b5ed2224 SHA1 3ccfa3f5615f2af319aeda92882daff4e57f418c SHA256 3b78689865e9ffedffc6baca54f24452c000159035b6882ae3808bcefc264bcd
+MISC ChangeLog 20776 RMD160 00385e9c1a3bbd0914dd52177fb8d9da21f641b8 SHA1 3791bbdef3f29e420dc7ba3b01a5268113ed7dac SHA256 7127bc3ecf3f846d5b8345d24b3c7d481b0a506178f51accbb2b0ea06965cf9c
 MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPPq9bAAoJEMOx0zmdw4Z1xMgH/27Ah2j/KtiedOvo8W6Efi+V
-DZiHl9eWSKcRBLNNTa4qF7rGz3wLSg8eA7I0c1gemSuS3DRtYWAII+6n9bw+OZ9I
-mOsuP4GOKDgVBhqJ7PJMcLPSetEKxmZmVBs78QP9w+Su+G8TNtPXHZwwVow4e/v+
-wwr4pw+hWTIgDD5PECtdM4//vZyNHnZtS7Qe9hEiC3X63bLgBiEGWKUug8n760y3
-qrxveMFujVoETgQ0npno1tAk0Hd+piUJzEp/nma69MadhElXFuOp+SoyFVRXRN7L
-fPxHumkWEHkrvngdaJqBze8sfsdbcj4+lj1L+0+idvx7re0tlh3Wj6KaUz/q97c=
-=UXio
+iQEcBAEBCAAGBQJPRA7VAAoJEMOx0zmdw4Z1gyUIAL6hPoQio18u60bpr2YxtAx2
+lngiAU7VjtGreMqbwg7oV2yEIZX0n++5QSZid+fvNjyNwDdGh3nTfZ7mKgFeuXX6
+E1/XrxGYtDfZitxIlWgVP8kuk7S3IGTRAbGXXv98+arjcG53NnOb5j707fDJ4QqT
+Ra0h+jpn2llxzQ1XF7+/3Fk5btti+sB39w7QuyFTitdLSoLPPCI94xPmRh3Vi0hx
+cAk9AgVUBwTJwc9SrpO+ivECH+aAF2z1br/YgMJpTn+wuBv8SrcHcdin5j2ytpEy
+FCQvzO3afuJo57A+Gh2NjI5BXs4cJ2TIC8tyn8PI+blqHGkgkhjv9YUgBsbVjDE=
+=gLjO
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild b/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild
index 121fcd89fafd..d5ceab400c87 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild,v 1.1 2012/02/17 19:49:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
 
 EAPI=4
 
@@ -15,22 +15,26 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="examples"
 
-COMMON_DEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="x11-drivers/nvidia-drivers
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
+#COMMON_DEPEND="x11-libs/libX11
+#	x11-libs/libXext
+#	x11-libs/libXxf86vm
+#	x11-libs/gtk+:2
+#	x11-libs/gdk-pixbuf[X]
+#	media-libs/mesa
+#	x11-libs/pango[X]
+#	x11-libs/libXv
+#	x11-libs/libXrandr
+#	dev-libs/glib:2"
+
+#RDEPEND="x11-drivers/nvidia-drivers
+#	${COMMON_DEPEND}"
+#DEPEND="${RDEPEND}
+#	dev-util/pkgconfig
+#	x11-proto/xproto"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -45,12 +49,12 @@ src_compile() {
 	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
-	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+#	einfo "Building nvidia-settings..."
+#	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
+#	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -60,8 +64,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png
+#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
index 9908e874e268..b9a2a53f7a6d 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.1 2012/02/17 19:49:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
 
 EAPI=4
 
@@ -15,22 +15,26 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="examples"
 
-COMMON_DEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="x11-drivers/nvidia-drivers
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
+#COMMON_DEPEND="x11-libs/libX11
+#	x11-libs/libXext
+#	x11-libs/libXxf86vm
+#	x11-libs/gtk+:2
+#	x11-libs/gdk-pixbuf[X]
+#	media-libs/mesa
+#	x11-libs/pango[X]
+#	x11-libs/libXv
+#	x11-libs/libXrandr
+#	dev-libs/glib:2"
+
+#RDEPEND="x11-drivers/nvidia-drivers
+#	${COMMON_DEPEND}"
+#DEPEND="${RDEPEND}
+#	dev-util/pkgconfig
+#	x11-proto/xproto"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -45,12 +49,12 @@ src_compile() {
 	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
-	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+#	einfo "Building nvidia-settings..."
+#	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
+#	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -60,8 +64,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png
+#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index 80c7d5f99299..a4c7767f5c97 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.2 2012/02/17 19:49:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.3 2012/02/21 21:38:23 idl0r Exp $
 
 EAPI=4
 
@@ -15,22 +15,26 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="examples"
 
-COMMON_DEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="x11-drivers/nvidia-drivers
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
+#COMMON_DEPEND="x11-libs/libX11
+#	x11-libs/libXext
+#	x11-libs/libXxf86vm
+#	x11-libs/gtk+:2
+#	x11-libs/gdk-pixbuf[X]
+#	media-libs/mesa
+#	x11-libs/pango[X]
+#	x11-libs/libXv
+#	x11-libs/libXrandr
+#	dev-libs/glib:2"
+
+#RDEPEND="x11-drivers/nvidia-drivers
+#	${COMMON_DEPEND}"
+#DEPEND="${RDEPEND}
+#	dev-util/pkgconfig
+#	x11-proto/xproto"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -45,12 +49,12 @@ src_compile() {
 	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
-	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+#	einfo "Building nvidia-settings..."
+#	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
+#	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -60,8 +64,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png
+#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index dcd4cff8a631..dfecc450315f 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.1 2012/02/17 17:33:27 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
 
 EAPI=4
 
@@ -15,22 +15,26 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="examples"
 
-COMMON_DEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="x11-drivers/nvidia-drivers
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
+#COMMON_DEPEND="x11-libs/libX11
+#	x11-libs/libXext
+#	x11-libs/libXxf86vm
+#	x11-libs/gtk+:2
+#	x11-libs/gdk-pixbuf[X]
+#	media-libs/mesa
+#	x11-libs/pango[X]
+#	x11-libs/libXv
+#	x11-libs/libXrandr
+#	dev-libs/glib:2"
+
+#RDEPEND="x11-drivers/nvidia-drivers
+#	${COMMON_DEPEND}"
+#DEPEND="${RDEPEND}
+#	dev-util/pkgconfig
+#	x11-proto/xproto"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -45,12 +49,12 @@ src_compile() {
 	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
 	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
 
-	einfo "Building nvidia-settings..."
-	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+#	einfo "Building nvidia-settings..."
+#	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
+#	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -60,8 +64,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png
+#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt