commit: 2dbc40c273a4db85ba4629d46ab91777ac90b72a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 19:19:06 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 19:19:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbc40c2
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
x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 | 2 ++
...vidia-drivers-304.131-r2.ebuild => nvidia-drivers-304.131-r3.ebuild} | 2 +-
...{nvidia-drivers-340.96-r3.ebuild => nvidia-drivers-340.96-r4.ebuild} | 2 +-
...{nvidia-drivers-346.96-r4.ebuild => nvidia-drivers-346.96-r5.ebuild} | 2 +-
...{nvidia-drivers-352.79-r2.ebuild => nvidia-drivers-352.79-r3.ebuild} | 2 +-
...{nvidia-drivers-358.16-r3.ebuild => nvidia-drivers-358.16-r4.ebuild} | 2 +-
...{nvidia-drivers-361.18-r3.ebuild => nvidia-drivers-361.18-r4.ebuild} | 2 +-
7 files changed, 8 insertions(+), 6 deletions(-)
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 0000000..48c41d8
--- /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 1ff7a6c..31b8b3a 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 27e2ed8..d688da9 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 9254313..cc9166c 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 d329052..27abf7f 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 4a9bf0f..45ab3e6 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 8d5f919..319a228 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
