From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 31 Jan 2016 19:19:06 +0000 (+0100)
Subject: x11-drivers/nvidia-drivers: Fix nvidia-settings location in /etc/X11/xinit/xinitrc... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2dbc40c273a4db85ba4629d46ab91777ac90b72a;p=gentoo.git

x11-drivers/nvidia-drivers: Fix nvidia-settings location in /etc/X11/xinit/xinitrc.d/95-nvidia-settings (bug #573452 by Constantin Baranov).

Package-Manager: portage-2.2.27
---

diff --git a/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 b/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1
new file mode 100644
index 000000000000..48c41d8aad0d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/nvidia-settings --load-config-only
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild
index 1ff7a6c0aeb0..31b8b3a55bfb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild
@@ -365,7 +365,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
 
 	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild
index 27e2ed874225..d688da9dc735 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild
@@ -379,7 +379,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 
 	fi
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild
index 92543139cb3b..cc9166ce2f03 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild
@@ -393,7 +393,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
 
 	dobin ${NV_OBJ}/nvidia-bug-report.sh
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild
index d329052d53bc..27abf7f2f397 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild
@@ -392,7 +392,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
 
 	dobin ${NV_OBJ}/nvidia-bug-report.sh
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild
index 4a9bf0f05d85..45ab3e611e78 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild
@@ -393,7 +393,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
 
 	dobin ${NV_OBJ}/nvidia-bug-report.sh
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild
index 8d5f919ed0eb..319a2286774f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild
@@ -384,7 +384,7 @@ src_install() {
 		domenu "${FILESDIR}"/nvidia-settings.desktop
 
 		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
 	fi
 
 	dobin ${NV_OBJ}/nvidia-bug-report.sh