Version bump and cleanup. Should also fix bug 321399 and bug 290432

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

12 files changed, 204 insertions, 130 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index c260db479d37..04e6c60e0955 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,17 @@
 # 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.112 2012/04/25 03:01:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.113 2012/04/25 04:27:06 idl0r Exp $
+
+*nvidia-settings-173.14.31 (25 Apr 2012)
+
+  25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  -nvidia-settings-173.14.30.ebuild, +nvidia-settings-173.14.31.ebuild,
+  nvidia-settings-260.19.29.ebuild, nvidia-settings-290.10.ebuild,
+  nvidia-settings-295.20.ebuild, nvidia-settings-295.40.ebuild,
+  +files/nvidia-settings-173.14.31-Makefile.patch,
+  -files/nvidia-settings-190.53-xf86vidmodeproto.patch,
+  -files/icon/nvidia-settings.desktop, -files/icon/nvidia-settings.png:
+  Version bump and cleanup. Should also fix bug 321399 and bug 290432
 
   25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
   -nvidia-settings-185.18.36.ebuild, -nvidia-settings-190.53.ebuild,
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index f5b439d89f4b..f91763f9d0a6 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -3,31 +3,29 @@ Hash: SHA256
 
 AUX 0001-Makefile-improvements.patch 5269 RMD160 c80118b3aa18f3f1d90f7aff0974b7f9df08939c SHA1 8b24d0307eecd84382b3009e9ba2ce115176234f SHA256 c7dddefa196f4b06a96592e27a903bc969580ed74291f76faf213f1f3276d4b7
 AUX 0002-Build-libNVCtrl-with-PIC.patch 578 RMD160 168a9b38d1c743798eb0e2b7e8de2efd60cf7c32 SHA1 49d6d4847621034de6624d388f71703abc6e42a4 SHA256 1492edfdbfd682b16e5f26be41bc61ab7320478c37f92730ff2b1ef1c520ceb2
-AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
-AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
-AUX nvidia-settings-190.53-xf86vidmodeproto.patch 459 RMD160 92de8111fbaa05d72aa361f4f03b4e5d6614dce0 SHA1 fb62377feb1e2bf3dee9eb4156cfc67eaae58e1a SHA256 ceda295eb10c446edb9240480cb69bcf595682dcf084357723d1108818db8dad
-DIST nvidia-settings-173.14.30.tar.gz 1301602 RMD160 ca2644ddbf39ebbc7027cd2554dcbd6abc5cb797 SHA1 1540ff9d055f7930ae6779f96bc38ae5ee85a58d SHA256 22777902e8e20ed615da6891cae4c229824fc02e45d22da14caff937b6fc13e6
+AUX nvidia-settings-173.14.31-Makefile.patch 3138 RMD160 da3cf1ec37c13b0657524a50854562495e0d6066 SHA1 55f2414cee969106009d6e5c9d6545af49204125 SHA256 05ed03a0fce667a9245dfa31953d37779f32874cbbe6089c2417a997cdc3f2f9
+DIST nvidia-settings-173.14.31.tar.gz 1301584 RMD160 55abbed7135660abe53980d0a2a73937c3631809 SHA1 9395ea99cb01a474bc5bb580bd6cd2947bc42d60 SHA256 0798bfd154daec49d8d79354d055325976179b502bbe2879620f82a0583882b2
 DIST nvidia-settings-260.19.29.tar.bz2 1536011 RMD160 a1fcb31d6e23a96530e6c9e9b871deaf220bfd2c SHA1 d73c5274e95cd4ede405c4e7e9d5ad02da3bdcfd SHA256 60dc2e2693ac1950301f3a3f837e5ca6470087b1509efa54c26b6bd5544974f5
 DIST nvidia-settings-275.43.tar.bz2 1542739 RMD160 759a7891e101e269e1592638c2060293fb9e39e5 SHA1 d89c4c0d409d6ebd3ef043c86a1445abf75d1a90 SHA256 32018f8bb6431264ffe07eeb7f05ac0967cdfe09827a93f85c32b8e6c458b739
 DIST nvidia-settings-290.10.tar.bz2 1544400 RMD160 d114a1441dac0b178922ac3b7736e32af1d55f94 SHA1 92acce8ed9816b55edc5a8ffc3090c258ce58f38 SHA256 c20dac225e5c67135d0d3f784ee058ce6337687a4232e20335997061f1ec5e26
 DIST nvidia-settings-295.20.tar.bz2 1545451 RMD160 d9de1231cf7e48f0c285ec0a30b8a78a0a1d58da SHA1 621095bcbd7cd5f75d22488d4f750993172845f5 SHA256 92a8f32d20bdf62c0d7c71b176ff4e5d8ad848492d5411aadef4cee0a2d45595
 DIST nvidia-settings-295.40.tar.bz2 1545625 RMD160 c2075ffb84fa6662e390b2b6baaccce733eedefc SHA1 6fb8c496210a3c0a0f669613014b92930a3d432b SHA256 68e8da979ef69b487a5ef237d7cc0f6d1d1cf3e027ffa2e90fa2501dc793d909
-EBUILD nvidia-settings-173.14.30.ebuild 1923 RMD160 cc355c3bc90b009e1605b919fcf7201456e70b5d SHA1 8e34fbe918868f2b8c6ef1a88ba753f2ed885104 SHA256 da4dd758eb8cc27d0b842cefc3599b36535c35d5c946558b40644cc0b7097599
-EBUILD nvidia-settings-260.19.29.ebuild 1944 RMD160 5e0142afc4893181fe9994d3b295020d3b0e2c76 SHA1 242864e8da517bc467f5ab4d37c0b43fbf41dbc5 SHA256 cce97fc9d2e4cc079a7d68945dbdbf162b3250e4c52b8d9dc7bda936972ae97a
+EBUILD nvidia-settings-173.14.31.ebuild 1651 RMD160 76750440f4561390435cd9353ba20f3f39d21a2a SHA1 6a6d42325d7c005841e5764bf783af04ea7ea761 SHA256 3523a7dcc625d2fdafefdcf76446f641aebe14e04d6f82006e49f51ddeb4b29e
+EBUILD nvidia-settings-260.19.29.ebuild 1950 RMD160 035b66f1de10cba2a1f2c2f0e6b4a5d1179dcc45 SHA1 2b382882e09990409d71627d4f9a8bc0cf136e50 SHA256 441fa4f2681a2e63ebeaae49bc6a0bee896ebfd00985cae39602918ad755eb07
 EBUILD nvidia-settings-275.43.ebuild 1968 RMD160 507432a898efb1de4071f1e227b8ad0277186734 SHA1 656148e588dd252e33e9e6f0208e44e3b317d0b8 SHA256 0d7a8945f69362396037d8e66eccca80c1af6ef51a6e62af568604d5a698e403
-EBUILD nvidia-settings-290.10.ebuild 1968 RMD160 6be453228aa610899060c9e230fe7b877363f835 SHA1 148c21e8d04de043912ddfdb1437e16506cc8a70 SHA256 d1c13cd7196670035717cb8ddb6ee9e9553840ed331a551cf823119d6f643188
-EBUILD nvidia-settings-295.20.ebuild 1968 RMD160 b4ceffb30de58864e168653ac6bc42355b6ebe49 SHA1 43c619100d4c206a141b51a1357cc200da834584 SHA256 469bf3d2205703d453a24396c840bab89a556b2b34cdde1388b1e28daf1d6e17
-EBUILD nvidia-settings-295.40.ebuild 1968 RMD160 3d283794ea8cdf54cbec1c1288de3948ee4fb1b4 SHA1 4ed87afcedf72d3d2a3e0a1d27a5a0393ff04992 SHA256 cd2e7d1cf0d2c8626afd1ed75cc122516d1466677f817f05eebcabf8a36b0b22
-MISC ChangeLog 22490 RMD160 7ae9230c8058e43035e0f74c3ce8cef575b9eb4e SHA1 b0c99d40b8fdc3f80e9effdf4abf0f68f760e0e2 SHA256 18337b114beed354984e1cf0c354d7346797148ef2da81d8f0e18aff19a42e8b
+EBUILD nvidia-settings-290.10.ebuild 1870 RMD160 551e37c332cade4dcc3ac42b95fd29efedfd6ffd SHA1 357662aadd9c3ef0248c2146f9f77f322743e68e SHA256 52422f98bbf02e593460f47a1cf91f5ad49fedb88fb79c76edfd1fdbd146d0dd
+EBUILD nvidia-settings-295.20.ebuild 1870 RMD160 29ed97702184f08ad2cc1ba8a0eecb3861a599e9 SHA1 4f26cfd255607c933591438ca7f09b75c68cab3a SHA256 9256dfbc6f85c3e8da02ecc6f4c97317acfe79676b24768893b588a220cff77a
+EBUILD nvidia-settings-295.40.ebuild 1870 RMD160 1bd66f376675a046c6739eb10fa3c5c5e070abba SHA1 5440f31d83fec8c80d24f26e643d293292954bb5 SHA256 e676e017c87cea572edf90c2cdb3592ca89e003b98f3c0399c196218b176733a
+MISC ChangeLog 23037 RMD160 439f5b1e82f3a1289ee4e3007d0772b8b2b9ce23 SHA1 8a23d9164d7cdebfa092bb030f162554541e2176 SHA256 74c07d2b2b77175a0b7b15932baaa2b954c72da2350766929fc3d41c205a26c7
 MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPl2kXAAoJEMOx0zmdw4Z1J1AH/iCcMNKUknEha9XSsh9uBVo5
-zZYEhR7UFRMOkW8AtDvhA7LHW1RVlY7WVFIYl3UlBw2KJcXE36R3ikCp+GmVxQ9i
-AJoaeTrI+Ak5dkFOB7tYkOy2ghNHq0WIxcxLFydpPAM2pVQNCAirckqeQblLznPq
-6yzcQe+dtYlHJhZ5/AC0KoGx+oHF1wshAP4rTFAZPiJMH3XfkIPgI6CU8usuQA+8
-3QYO6Ux56kgQxOPIXBS2B2SvdjkYzMFlcqYTHEaU0ssMgwoN5FBmaAKX1xvGJXTs
-To6Ds66jgHEaCDtFTOX8HgQZbAwAdOUr3Lot+1KPFGx9WA4DkpStW8zlYFhjFQs=
-=R0IV
+iQEcBAEBCAAGBQJPl30kAAoJEMOx0zmdw4Z16lUIAJ2lkXbZ+5q9SCvC5je3DWqd
+f2ojGW8OVIny+kgiTzNjad3uBfxOZooyckmJKpVhCup3DYt8AYTRJQtDMjdO5LFZ
+37WSNCekip3RXQMfzO4M0+SWztXrYdXnkPK3D63Z8AWs/GqR98inc8So0Efpq1P+
+Jk4DgxuEL74+QhC13EiPnC5FqNiuGFeQnI2jrmDf4FmgB6O+PSs9EwdsbkROk5Kg
+BG7Z2Gv280KJ93BY7D+0HH29mXWZ3Fg+/JJjCK6i5L79UoJLobHqrOfRms62/Z1P
+4lwFlQApHtAr8MS4aH78cYRQGjpdRARak4EUgADvCZQJd8dgsjfhJunXJqKuWjw=
+=g19M
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
deleted file mode 100644
index 65f2fd56b7f6..000000000000
--- a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=nvidia-settings
-Icon=nvidia-settings
-Categories=Application;System;
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.png b/media-video/nvidia-settings/files/icon/nvidia-settings.png
deleted file mode 100644
index 361c20050d59..000000000000
--- a/media-video/nvidia-settings/files/icon/nvidia-settings.png
+++ /dev/null
diff --git a/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch b/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch
new file mode 100644
index 000000000000..8a9e0322cae4
--- /dev/null
+++ b/media-video/nvidia-settings/files/nvidia-settings-173.14.31-Makefile.patch
@@ -0,0 +1,100 @@
+diff --git a/Makefile b/Makefile
+index 5df7ea5..c183e25 100644
+--- a/Makefile
++++ b/Makefile
+@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib
+ else
+ ECHO=echo
+ define INSTALL_RULE
++	mkdir -p $(bindir)
+ 	$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
+ 	mkdir -p $(mandir)
+ 	$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
+-	gzip -9f $(mandir)/$(MANPAGE)
+ endef
+ endif
+ 
+@@ -116,7 +116,7 @@ mandir = $(exec_prefix)/share/man/man1
+ X11_CFLAGS = $(X11_INC_DIRS)
+ 
+ GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
+-GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
++GTK_LIBS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ 
+ X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
+ 
+@@ -136,16 +136,16 @@ RELATIVE_SRCDIRS = \
+ 	src/gtk+-2.x \
+ 	src/libXNVCtrl \
+ 	src/libXNVCtrlAttributes \
+-	src/XF86Config-parser \
+-	samples
++	src/XF86Config-parser
+ 
+ 
+ SRCDIRS := $(addprefix $(CURDIR)/, $(RELATIVE_SRCDIRS))
+ 
+ INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS))
+ 
+-ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
+-ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS) -lm
++ALL_CFLAGS = -fPIC $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
++ALL_LDFLAGS = -fPIC $(LD_RUN_FLAG) $(LDFLAGS)
++ALL_LIBS = $(X11_LIBS) $(GTK_LIBS) -lm
+ 
+ CPPFLAGS = $(ALL_CFLAGS)
+ 
+@@ -236,10 +236,10 @@ $(XF86PARSER_LIB):
+ 	$(MAKE) NV_CFLAGS='$(NV_CFLAGS)' -C $(XF86PARSER_DIR)
+ 
+ $(XNVCTRL_LIB):
+-	$(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' -C $(XNVCTRL_DIR)
++	$(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' LIBS='$(ALL_LIBS)' -C $(XNVCTRL_DIR)
+ 
+ $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB)
+-	$(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -o $@
++	$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) $(ALL_LIBS) -o $@
+ 
+ .PHONY: $(XF86PARSER_LIB) dist clean clobber
+ 
+diff --git a/src/XF86Config-parser/Makefile b/src/XF86Config-parser/Makefile
+index 721945d..49e4ac2 100644
+--- a/src/XF86Config-parser/Makefile
++++ b/src/XF86Config-parser/Makefile
+@@ -27,7 +27,8 @@ ifndef CC
+   CC = gcc
+ endif
+ 
+-CFLAGS = -Wall -g
++CFLAGS += -Wall
++CFLAGS ?= -g
+ 
+ ifdef NV_CFLAGS
+   CFLAGS += $(NV_CFLAGS)
+diff --git a/src/libXNVCtrl/Makefile b/src/libXNVCtrl/Makefile
+index 49ea8b2..b6eaf3f 100644
+--- a/src/libXNVCtrl/Makefile
++++ b/src/libXNVCtrl/Makefile
+@@ -1,4 +1,5 @@
+ RANLIB ?= ranlib
++CFLAGS += -fPIC
+ 
+ libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
+ 	$(RANLIB) $@
+diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+index 633c078..a65a8b4 100644
+--- a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -211,10 +211,12 @@ NvCtrlInitVidModeAttributes(NvCtrlAttributePrivateHandle *h)
+ 
+     /* restore the original error handler, if we overrode it */
+ 
++#if defined(X_XF86VidModeGetGammaRampSize)
+     if (prev_error_handler) {
+         XSetErrorHandler(prev_error_handler);
+         prev_error_handler = NULL;
+     }
++#endif
+ 
+     return NULL;
+ 
diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch
deleted file mode 100644
index 77ce7d536011..000000000000
--- a/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-+++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-@@ -210,11 +210,12 @@
-     if (vm) free(vm);
- 
-     /* restore the original error handler, if we overrode it */
--
-+#if defined(X_XF86VidModeGetGammaRampSize)
-     if (prev_error_handler) {
-         XSetErrorHandler(prev_error_handler);
-         prev_error_handler = NULL;
-     }
-+#endif
- 
-     return NULL;
- 
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild
deleted file mode 100644
index 593ef5927b2a..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.30.ebuild,v 1.1 2011/05/11 23:49:56 xmw Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-MY_P="${PN}-1.0"
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-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="x11-libs/gtk+:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	make clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	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
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild
new file mode 100644
index 000000000000..9efc66835d5c
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild
@@ -0,0 +1,71 @@
+# 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-173.14.31.ebuild,v 1.1 2012/04/25 04:27:06 idl0r Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}-1.0"
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="examples"
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm[static-libs]
+	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-173.14*
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	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  LOCAL_CFLAGS="" CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	emake prefix="${D}/usr" STRIP="$(type -P true)" install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}
diff --git a/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild b/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild
index ab1ba4364914..823f62b64d4b 100644
--- a/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-260.19.29.ebuild,v 1.5 2011/05/11 23:40:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild,v 1.6 2012/04/25 04:27:06 idl0r Exp $
 
 EAPI=2
 
@@ -33,7 +33,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-base/xorg-server
 	x11-libs/libXt
 	x11-libs/pango[X]
-	x11-drivers/nvidia-drivers"
+	=x11-drivers/nvidia-drivers-2*"
 
 src_prepare() {
 	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index 056e1a2365dc..9dd91a7b2c88 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.7 2012/04/25 02:43:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.8 2012/04/25 04:27:06 idl0r Exp $
 
 EAPI=4
 
@@ -52,21 +52,18 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr install
 
-	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
 	doins src/libXNVCtrl/libXNVCtrl.a
 
 	insinto /usr/include/NVCtrl
 	doins src/libXNVCtrl/*.h
 
-	# Install icon and .desktop entry
 #	doicon doc/${PN}.png # Installed through nvidia-drivers
 	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# bug 412569 - Installed through nvidia-drivers
 	rm -rf "${D}"/usr/share/man
 
-	# Now install documentation
 	dodoc doc/*.txt
 
 	if use examples; then
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index bbba30b5b268..54ddbc485233 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.6 2012/04/25 02:43:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.7 2012/04/25 04:27:06 idl0r Exp $
 
 EAPI=4
 
@@ -52,21 +52,18 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr install
 
-	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
 	doins src/libXNVCtrl/libXNVCtrl.a
 
 	insinto /usr/include/NVCtrl
 	doins src/libXNVCtrl/*.h
 
-	# Install icon and .desktop entry
 #	doicon doc/${PN}.png # Installed through nvidia-drivers
 	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# bug 412569 - Installed through nvidia-drivers
 	rm -rf "${D}"/usr/share/man
 
-	# Now install documentation
 	dodoc doc/*.txt
 
 	if use examples; then
diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
index 6ec38e8dcc3e..60f4763b8a91 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.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.40.ebuild,v 1.5 2012/04/25 02:43:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.6 2012/04/25 04:27:06 idl0r Exp $
 
 EAPI=4
 
@@ -52,21 +52,18 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX=/usr install
 
-	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
 	doins src/libXNVCtrl/libXNVCtrl.a
 
 	insinto /usr/include/NVCtrl
 	doins src/libXNVCtrl/*.h
 
-	# Install icon and .desktop entry
 #	doicon doc/${PN}.png # Installed through nvidia-drivers
 	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# bug 412569 - Installed through nvidia-drivers
 	rm -rf "${D}"/usr/share/man
 
-	# Now install documentation
 	dodoc doc/*.txt
 
 	if use examples; then