| 1 |
commit: 2dbc40c273a4db85ba4629d46ab91777ac90b72a |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 31 19:19:06 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 19:19:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbc40c2 |
| 7 |
|
| 8 |
x11-drivers/nvidia-drivers: Fix nvidia-settings location in /etc/X11/xinit/xinitrc.d/95-nvidia-settings (bug #573452 by Constantin Baranov). |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 | 2 ++ |
| 13 |
...vidia-drivers-304.131-r2.ebuild => nvidia-drivers-304.131-r3.ebuild} | 2 +- |
| 14 |
...{nvidia-drivers-340.96-r3.ebuild => nvidia-drivers-340.96-r4.ebuild} | 2 +- |
| 15 |
...{nvidia-drivers-346.96-r4.ebuild => nvidia-drivers-346.96-r5.ebuild} | 2 +- |
| 16 |
...{nvidia-drivers-352.79-r2.ebuild => nvidia-drivers-352.79-r3.ebuild} | 2 +- |
| 17 |
...{nvidia-drivers-358.16-r3.ebuild => nvidia-drivers-358.16-r4.ebuild} | 2 +- |
| 18 |
...{nvidia-drivers-361.18-r3.ebuild => nvidia-drivers-361.18-r4.ebuild} | 2 +- |
| 19 |
7 files changed, 8 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 b/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..48c41d8 |
| 24 |
--- /dev/null |
| 25 |
+++ b/x11-drivers/nvidia-drivers/files/95-nvidia-settings-r1 |
| 26 |
@@ -0,0 +1,2 @@ |
| 27 |
+#!/bin/sh |
| 28 |
+/usr/bin/nvidia-settings --load-config-only |
| 29 |
|
| 30 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild |
| 31 |
similarity index 99% |
| 32 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild |
| 33 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild |
| 34 |
index 1ff7a6c..31b8b3a 100644 |
| 35 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r2.ebuild |
| 36 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild |
| 37 |
@@ -365,7 +365,7 @@ src_install() { |
| 38 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 39 |
|
| 40 |
exeinto /etc/X11/xinit/xinitrc.d |
| 41 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 42 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 43 |
fi |
| 44 |
|
| 45 |
#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist |
| 46 |
|
| 47 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild |
| 48 |
similarity index 99% |
| 49 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild |
| 50 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild |
| 51 |
index 27e2ed8..d688da9 100644 |
| 52 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r3.ebuild |
| 53 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild |
| 54 |
@@ -379,7 +379,7 @@ src_install() { |
| 55 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 56 |
|
| 57 |
exeinto /etc/X11/xinit/xinitrc.d |
| 58 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 59 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 60 |
|
| 61 |
fi |
| 62 |
|
| 63 |
|
| 64 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild |
| 65 |
similarity index 99% |
| 66 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild |
| 67 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild |
| 68 |
index 9254313..cc9166c 100644 |
| 69 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r4.ebuild |
| 70 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild |
| 71 |
@@ -393,7 +393,7 @@ src_install() { |
| 72 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 73 |
|
| 74 |
exeinto /etc/X11/xinit/xinitrc.d |
| 75 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 76 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 77 |
fi |
| 78 |
|
| 79 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
| 80 |
|
| 81 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild |
| 82 |
similarity index 99% |
| 83 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild |
| 84 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild |
| 85 |
index d329052..27abf7f 100644 |
| 86 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r2.ebuild |
| 87 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild |
| 88 |
@@ -392,7 +392,7 @@ src_install() { |
| 89 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 90 |
|
| 91 |
exeinto /etc/X11/xinit/xinitrc.d |
| 92 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 93 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 94 |
fi |
| 95 |
|
| 96 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
| 97 |
|
| 98 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild |
| 99 |
similarity index 99% |
| 100 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild |
| 101 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild |
| 102 |
index 4a9bf0f..45ab3e6 100644 |
| 103 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r3.ebuild |
| 104 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild |
| 105 |
@@ -393,7 +393,7 @@ src_install() { |
| 106 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 107 |
|
| 108 |
exeinto /etc/X11/xinit/xinitrc.d |
| 109 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 110 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 111 |
fi |
| 112 |
|
| 113 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
| 114 |
|
| 115 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild |
| 116 |
similarity index 99% |
| 117 |
rename from x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild |
| 118 |
rename to x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild |
| 119 |
index 8d5f919..319a228 100644 |
| 120 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r3.ebuild |
| 121 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r4.ebuild |
| 122 |
@@ -384,7 +384,7 @@ src_install() { |
| 123 |
domenu "${FILESDIR}"/nvidia-settings.desktop |
| 124 |
|
| 125 |
exeinto /etc/X11/xinit/xinitrc.d |
| 126 |
- doexe "${FILESDIR}"/95-nvidia-settings |
| 127 |
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings |
| 128 |
fi |
| 129 |
|
| 130 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
Archives