[gentoo-commits] repo/gentoo:master commit in: app-misc/neofetch/

[Sam James]

commit:     a9f700c8c4ea3a0c2b3ef1a9d0f91a1ef0708e7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 07:00:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 07:00:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f700c8

app-misc/neofetch: post PR-merge changes

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/neofetch/neofetch-7.1.0.ebuild | 9 +++++----
 app-misc/neofetch/neofetch-9999.ebuild  | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-misc/neofetch/neofetch-7.1.0.ebuild 
b/app-misc/neofetch/neofetch-7.1.0.ebuild
index 8c04178cf5f..59e074f9284 100644
--- a/app-misc/neofetch/neofetch-7.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0.ebuild
@@ -29,12 +29,13 @@ RDEPEND="sys-apps/pciutils
                x11-apps/xwininfo
        )"
 
-export PREFIX=${EPREFIX}/usr
-
-src_prepare () {
+src_prepare() {
        if use prefix; then
+               # bug #693526
                hprefixify neofetch
-               sed -e "/has emerge/s:\${br_prefix}:${EPREFIX}:" -i neofetch
+               sed -e "/has emerge/s:\${br_prefix}:${EPREFIX}:" -i neofetch \
+                       || die "Failed to adjust for Prefix"
        fi
+
        default
 }

diff --git a/app-misc/neofetch/neofetch-9999.ebuild 
b/app-misc/neofetch/neofetch-9999.ebuild
index 7ab81b16a8a..2d459ec3fba 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -29,12 +29,13 @@ RDEPEND="sys-apps/pciutils
                x11-apps/xwininfo
        )"
 
-export PREFIX=${EPREFIX}/usr
-
-src_prepare () {
+src_prepare() {
        if use prefix; then
+               # bug #693526
                hprefixify neofetch
-               sed -e "/has emerge/s:\${br_prefix}:${EPREFIX}:" -i neofetch
+               sed -e "/has emerge/s:\${br_prefix}:${EPREFIX}:" -i neofetch \
+                       || die "Failed to adjust for Prefix"
        fi
+
        default
 }