commit:     df44107cb756b293f6e58fe0eea012b9dd62ee05
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 17:02:11 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 17:11:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df44107c

x11-drivers/nvidia-drivers: remove powerd service sed

Mostly meaningless now that not sed'ing in /opt. This service is
useless for non-root even if manage to start it, and it spares
iwdevtools from complaining when EPREFIX is empty (no changes).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild   | 3 ---
 x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild   | 2 --
 x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild    | 2 --
 x11-drivers/nvidia-drivers/nvidia-drivers-570.124.04.ebuild   | 2 --
 x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild | 2 --
 5 files changed, 11 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild
index b955ada894cb..2e96ff9c412c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild
@@ -151,12 +151,9 @@ src_prepare() {
        sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
                -i kernel{,-module-source/kernel-open}/conftest.sh || die
 
-       # adjust service files
        sed 's/__USER__/nvpd/' \
                
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
                > "${T}"/nvidia-persistenced.service || die
-       use !powerd || # file is missing on arm64 (masked)
-               sed -i "s|/usr|${EPREFIX}/usr|" 
systemd/system/nvidia-powerd.service || die
 
        # use alternative vulkan icd option if USE=-X (bug #909181)
        use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild
index 3e18a21fd803..9a27911486b6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.144.03.ebuild
@@ -153,11 +153,9 @@ src_prepare() {
        sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
                -i kernel{,-module-source/kernel-open}/conftest.sh || die
 
-       # adjust service files
        sed 's/__USER__/nvpd/' \
                
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
                > "${T}"/nvidia-persistenced.service || die
-       sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || 
die
 
        # use alternative vulkan icd option if USE=-X (bug #909181)
        use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild
index 77678a8ce1bf..afcf7d8e116f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.85.ebuild
@@ -155,11 +155,9 @@ src_prepare() {
        sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
                -i kernel{,-module-source/kernel-open}/conftest.sh || die
 
-       # adjust service files
        sed 's/__USER__/nvpd/' \
                
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
                > "${T}"/nvidia-persistenced.service || die
-       sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || 
die
 
        # use alternative vulkan icd option if USE=-X (bug #909181)
        use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-570.124.04.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-570.124.04.ebuild
index 36dd03de468d..4c74d52e54dc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-570.124.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-570.124.04.ebuild
@@ -161,11 +161,9 @@ src_prepare() {
        sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
                -i kernel{,-module-source/kernel-open}/conftest.sh || die
 
-       # adjust service files
        sed 's/__USER__/nvpd/' \
                
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
                > "${T}"/nvidia-persistenced.service || die
-       sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || 
die
 
        # use alternative vulkan icd option if USE=-X (bug #909181)
        use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild
index 36dd03de468d..4c74d52e54dc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.16-r1.ebuild
@@ -161,11 +161,9 @@ src_prepare() {
        sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
                -i kernel{,-module-source/kernel-open}/conftest.sh || die
 
-       # adjust service files
        sed 's/__USER__/nvpd/' \
                
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
                > "${T}"/nvidia-persistenced.service || die
-       sed -i "s|/usr|${EPREFIX}/usr|" systemd/system/nvidia-powerd.service || 
die
 
        # use alternative vulkan icd option if USE=-X (bug #909181)
        use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die

Reply via email to