From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1248205-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D9C11382C5 for <garchives@archives.gentoo.org>; Fri, 5 Feb 2021 07:00:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4A83E08ED; Fri, 5 Feb 2021 07:00:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A595BE08ED for <gentoo-commits@lists.gentoo.org>; Fri, 5 Feb 2021 07:00:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45CE1342B83 for <gentoo-commits@lists.gentoo.org>; Fri, 5 Feb 2021 07:00:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B73A34BC for <gentoo-commits@lists.gentoo.org>; Fri, 5 Feb 2021 07:00:47 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1612508444.a9f700c8c4ea3a0c2b3ef1a9d0f91a1ef0708e7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/neofetch/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/neofetch/neofetch-7.1.0.ebuild app-misc/neofetch/neofetch-9999.ebuild X-VCS-Directories: app-misc/neofetch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a9f700c8c4ea3a0c2b3ef1a9d0f91a1ef0708e7a X-VCS-Branch: master Date: Fri, 5 Feb 2021 07:00:47 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a6261bfa-c4a8-4794-9789-56d4ed9fbdad X-Archives-Hash: 439702d5b772b44f798a2c41cb559fb7 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 }