gentoo auto-resync : 23:01:2023 - 06:54:34

2 files changed, 19 insertions, 16 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 181fb038798f..be96bda5fca6 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,8 @@
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-DIST pkgconf-1.9.3.tar.xz 308612 BLAKE2B 90d48171e24235906c41e97f7a2fa53825724c7500e90e502e5e2e4d668d3be863119e39b83a8e02adcef83a7def42e1c5e3641e77f6194bd81f653776bc95b4 SHA512 f65583f78571e4da161201d6387091562b38893adc31df421b0e6d560a060deb306a0b7ad8b28266253244c935d0a8169f35e04825a7857f21a09527d36f921e
+DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba
 DIST pkgconf-1.9.4.tar.xz 309164 BLAKE2B f0a99f9c7aaf571b14aa24b6dae441fb041d794294e560601232c03254e521a49a5724e41c5ada537f7933bb4831b63482896c8569a9502c8c5d841190e1d091 SHA512 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755
 EBUILD pkgconf-1.8.0-r1.ebuild 1628 BLAKE2B a331c5e6da602547564a077f346d24cd8ec374d61806a2504203bbf0ef2409850556a641294678142a6da04692e395e73020404b1c556c3e275c7c1278fd3cd6 SHA512 fbd538560cfc2a4440519d89abe3dac785145f468bd9f8d1def6e7a7838e30c2af1da36032736d4c035f5b28a4e9c50618642f2ad50ba3c4d55051978590e983
-EBUILD pkgconf-1.9.3.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
+EBUILD pkgconf-1.8.1.ebuild 1617 BLAKE2B 9ebcbe85582ab382a61c7bdb692ffe865d16bd8c0c0360af184ef35823dd646846b1e49174eee2ce00826a1366e227c6846466eb140861c19788f8b545154ee1 SHA512 7b0ec467a6a5354514e0732ae19d4e90d6ff902f4a64c7560e38912aed1f233c3f66a78320fdbdbbc374bbdf18852504f3ee758bc8e97f4366a6ec7fff7d8b23
 EBUILD pkgconf-1.9.4.ebuild 1621 BLAKE2B da3f310e7f3aba9be5e6b001a4137356f2baebe91c7e0a484a26f89f3f4ee5d069baf6ec09e9269bfd6d7da7acc85994925e8f83d2ff8a50f42ccfeac46ad29d SHA512 9b98f592d34118a9dc6878bc00f4e52af17735658791c593c3bd9f744a0648c0f94df3f59808ab8f81eae61b57a4c7bda20221a9099c42ffa93c349f66c946ad
 EBUILD pkgconf-9999.ebuild 1621 BLAKE2B 0053a74d4104c9913bed7cf8bebe00d31635c7fd1cf5fa5f12cfe03dd97bf67b169a8ce1b37b313fb01d1c87bda58be0e165f1b23caebc38477c96f0e654649e SHA512 d22ccb7de7591d90e1ac82b5673df9be62e94d3f4079a01957ddc242231e4973740a57bcb3f5ccb9608d59a0f25b629874268974ca2407853d8c94350fe8f8c3
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.9.3.ebuild b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
index e962927aff1a..311850a40d1d 100644
--- a/dev-util/pkgconf/pkgconf-1.9.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 2012-2022 Gentoo Authors
+# Copyright 2012-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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"
-	# Per release notes, 1.9.x 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"
+	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"
+SLOT="0/3"
 IUSE="test"
 
+# tests require 'kyua'
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -29,26 +29,30 @@ BDEPEND="
 		dev-util/kyua
 	)
 "
-RDEPEND="!dev-util/pkgconfig"
+RDEPEND="
+	!dev-util/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf$(get_exeext)
+)
 
 src_prepare() {
 	default
 
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/pkgconf
+	[[ ${PV} == "9999" ]] && eautoreconf
+	MULTILIB_CHOST_TOOLS+=(
 		/usr/bin/pkg-config$(get_exeext)
 	)
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
+	local ECONF_SOURCE="${S}"
+	local args=(
 		--with-system-includedir="${EPREFIX}/usr/include"
 		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
 	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
@@ -65,6 +69,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-
 	find "${ED}" -type f -name '*.la' -delete || die
 }