x11-drivers/nvidia-drivers: Fix nvidia-settings location in /etc/X11/xinit/xinitrc...

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 (file)
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 1ff7a6c0aeb091935635bf1352ecea3a90e4da37..31b8b3a55bfbf4a9253a770a575928acb94c95f1 100644 (file)
--- 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 27e2ed874225464095eab6b8af395ccfc304885a..d688da9dc73545e62ab5c44b41bf1f19b3d94623 100644 (file)
--- 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 92543139cb3bd4d4118f30ecb6b0e38bc826824a..cc9166ce2f03eaaa30b3f709acef972906d75193 100644 (file)
--- 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 d329052d53bc89bb05fffc3b28e43bfcf5e2d6aa..27abf7f2f3970a77000cf9411efa42d721e2d8e5 100644 (file)
--- 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 4a9bf0f05d850ec3d3bf05c37731eaa610e94d88..45ab3e611e786de28316cb7c0c55aa02b6c23173 100644 (file)
--- 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 8d5f919ed0eb857d6fc1eb564851a3876fb955b4..319a2286774fb214de164a0463fc6d2f2ca7c23d 100644 (file)
--- 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