summaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-01-31 20:19:06 +0100
committerJeroen Roovers <jer@gentoo.org>2016-01-31 20:19:37 +0100
commit2dbc40c273a4db85ba4629d46ab91777ac90b72a (patch)
tree8fbcb7774caa63ae3625d83756ef157d8a02d16b /x11-drivers
parent4b8e9ca20e6f300b2d0e18d2311690d0415699d0 (diff)
downloadgentoo-2dbc40c273a4db85ba4629d46ab91777ac90b72a.tar.gz
gentoo-2dbc40c273a4db85ba4629d46ab91777ac90b72a.tar.xz
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
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/files/95-nvidia-settings-r12
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.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 00000000000..48c41d8aad0
--- /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
index 1ff7a6c0aeb..31b8b3a55bf 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
index 27e2ed87422..d688da9dc73 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
index 92543139cb3..cc9166ce2f0 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
index d329052d53b..27abf7f2f39 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
index 4a9bf0f05d8..45ab3e611e7 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
index 8d5f919ed0e..319a2286774 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