gentoo auto-resync : 03:05:2023 - 11:25:06

2 files changed, 16 insertions, 20 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 230dfc66cc20..86e4c647f6df 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.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 1636 BLAKE2B 3efd3566335892e3ee5bd99fb8be7eb68633ba253e19e70cf9ab53b9a4c88021d37df833c33e5b0a3276b61b7f70a1bd560570e5cd5f98b3da80f9b995bd9666 SHA512 7f0e444071a3b676007969bde041634c14bb501e5ffa599b970dced02f654af70cb097151a853c0efdffa342774f686ecff7753c66f7bb53b7c5683bc027e19e
+DIST pkgconf-1.9.5.tar.xz 310068 BLAKE2B 196babfccbf34c10bf08eb52fe1a4366273e07fcc97fb42d117295bb1cb141811e6a0453597b4aab31dc2bfc06baf9b2507484c68cd6c7474c94e5676a743d0e SHA512 604853d8bb1c3ca14e696f83ac5b161e2592defb921d53e1c16cc949d4b9ecac2b12983c1fbbb3c89898323bda18c8749bff3946e049c8305a1a39a773265f09
 EBUILD pkgconf-1.8.1.ebuild 1617 BLAKE2B 20efd89cd50ff32c60d0b23874f4a4ecd083ce315ea3a3f4800b1eb150c24f7f2367699787435abb04cf27143dae76d261ec2e4253b0239c04288daab542dc6c SHA512 846e030d1a1df7d3a56e6d80102933d61febf5d006ae4a2058df301a078f1db392658646ce8e29b6ba4f105006559c5d42a3da98b13dabf24cc4c253a1b7070a
 EBUILD pkgconf-1.9.4.ebuild 1629 BLAKE2B 18323d1cf88f19840a85818b2ccbd1f3f461e8c3a44ae9cd0587860a5fc3367ac660f3ab0362904d591e1d1a302f9f701d444cad643286376c36af4574a8be99 SHA512 1ed98d1d00cd183fcec38f1b678a83a387378f08631dc1dfaa61cfc0e9ef19d7977c68427d21de66f542645999ed460b64c5e12b8aa3c2ead23ce4d765158ff0
+EBUILD pkgconf-1.9.5.ebuild 1629 BLAKE2B 18323d1cf88f19840a85818b2ccbd1f3f461e8c3a44ae9cd0587860a5fc3367ac660f3ab0362904d591e1d1a302f9f701d444cad643286376c36af4574a8be99 SHA512 1ed98d1d00cd183fcec38f1b678a83a387378f08631dc1dfaa61cfc0e9ef19d7977c68427d21de66f542645999ed460b64c5e12b8aa3c2ead23ce4d765158ff0
 EBUILD pkgconf-9999.ebuild 1629 BLAKE2B 18323d1cf88f19840a85818b2ccbd1f3f461e8c3a44ae9cd0587860a5fc3367ac660f3ab0362904d591e1d1a302f9f701d444cad643286376c36af4574a8be99 SHA512 1ed98d1d00cd183fcec38f1b678a83a387378f08631dc1dfaa61cfc0e9ef19d7977c68427d21de66f542645999ed460b64c5e12b8aa3c2ead23ce4d765158ff0
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.9.5.ebuild
index 2ec0b2d88ab7..1a62309a9c0d 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.9.5.ebuild
@@ -1,26 +1,26 @@
 # Copyright 2012-2023 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	# 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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
 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 +29,26 @@ 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
-	MULTILIB_CHOST_TOOLS+=(
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf
 		/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 +65,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }