[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/

[Sam James]

commit:     a004655fbad62394aea65603608af5b1d17d9313
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 06:22:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 06:23:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a004655f

dev-util/pkgconf: fix cleanup error

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/pkgconf/{pkgconf-1.9.0.ebuild => pkgconf-1.9.0-r1.ebuild} | 3 ++-
 dev-util/pkgconf/pkgconf-9999.ebuild                               | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/pkgconf/pkgconf-1.9.0.ebuild b/dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild
similarity index 97%
rename from dev-util/pkgconf/pkgconf-1.9.0.ebuild
rename to dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild
index c63109267d0a..743bdb4a60b0 100644
--- a/dev-util/pkgconf/pkgconf-1.9.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.9.0-r1.ebuild
@@ -36,7 +36,8 @@ src_prepare() {
 
 	[[ ${PV} == 9999 ]] && eautoreconf
 
-	MULTILIB_CHOST_TOOLS+=(
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }

diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index a889721e17d0..f2e53e490eb3 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	# Per release notes, 1.9.0 is a testing/development release.
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -35,7 +36,8 @@ src_prepare() {
 
 	[[ ${PV} == 9999 ]] && eautoreconf
 
-	MULTILIB_CHOST_TOOLS+=(
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }