3 files changed, 83 insertions, 18 deletions
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 6df324bc2f9d..61c8b6e9a500 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1,6 @@
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
+DIST pkgconf-1.9.0.tar.xz 306336 BLAKE2B 5e66082ed0d4279eacc5d8428e1243196e446c9346171f78fa693bc028edbe80ba585274e00a4d461a3118bb33845f42b4e54c6a0092a642320a59cf2807cd6a SHA512 14b53b8a5a2e90b62d23c4ca3ea8e6f3113aac1ab4bc63bb59fef27d61d2f13953d02ea022c38ed9aa039b075a9ff93cf9fd58f93013cd1ea78bef411937055a
 EBUILD pkgconf-1.8.0-r1.ebuild 1628 BLAKE2B a331c5e6da602547564a077f346d24cd8ec374d61806a2504203bbf0ef2409850556a641294678142a6da04692e395e73020404b1c556c3e275c7c1278fd3cd6 SHA512 fbd538560cfc2a4440519d89abe3dac785145f468bd9f8d1def6e7a7838e30c2af1da36032736d4c035f5b28a4e9c50618642f2ad50ba3c4d55051978590e983
-EBUILD pkgconf-9999.ebuild 1558 BLAKE2B a8b18319c480f7e1224e0dbb1f6fc5f1992d028817cc3cdfb7fc6e0b1b32ee230e281ef3671a17f153fc8281b278a8e06f2f32e9fa2352719c94fbdcbe3efca2 SHA512 61f629939f1b138aa6e3a654b3fcc9e1d22aa4fbb53bdfbc85390f770d76d037297e87f18e502858d546c839213de53aa4957d03dfeb3ba85f05e91aa392228c
+EBUILD pkgconf-1.9.0.ebuild 1603 BLAKE2B 0793774df7769eaf61687ee60d56152f0aecdb3cf1ec0678b1cc10a511cd4641c66e8ded0342f71a1acc73c3ffcbb2cd2bbdf94ac0c406fe74d91efb886ff55b SHA512 78281fc07e390c8a5f7bf337614724223c66ac61c0830777cead94dd38c4b4578d25f66b0af400266de2df041a9ff1b00233be08a6fdb71d3c9861fa30c37508
+EBUILD pkgconf-9999.ebuild 1540 BLAKE2B 2b462c617a2523cbe79ac5b4597bc251ef4959324096d8cb790a264cb949650f2d4089ad0cf8e7c7437b19527bc7b9b5bbd190eea03512b4c49496e8b6243ef5 SHA512 60cf49933796596fc5d6088f07259cea27ba40c0dd3e8ce5d9437f44f985c589613d206dfb6349f8deb312079966c61bd263f44a25c52f96d7cca12f0d855360
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.9.0.ebuild b/dev-util/pkgconf/pkgconf-1.9.0.ebuild
new file mode 100644
index 000000000000..c63109267d0a
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.9.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	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
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/4"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="!dev-util/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/pkg-config$(get_exeext)
+	)
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index ecbccf339c73..a889721e17d0 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,26 +1,25 @@
 # Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib multilib-minimal
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
+	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
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
 
 LICENSE="ISC"
-SLOT="0/3"
+SLOT="0/4"
 IUSE="test"
 
-# tests require 'kyua'
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -29,31 +28,25 @@ BDEPEND="
 		dev-util/kyua
 	)
 "
-RDEPEND="
-	!dev-util/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf$(get_exeext)
-)
+RDEPEND="!dev-util/pkgconfig"
 
 src_prepare() {
 	default
 
-	[[ ${PV} == "9999" ]] && eautoreconf
+	[[ ${PV} == 9999 ]] && eautoreconf
+
 	MULTILIB_CHOST_TOOLS+=(
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }
 
 multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	local args=(
-		--disable-static
+	local myeconfargs=(
 		--with-system-includedir="${EPREFIX}/usr/include"
 		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
 	)
-	econf "${args[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
@@ -70,5 +63,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }