gentoo resync : 30.05.2020

4 files changed, 170 insertions, 2 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index d01b6c41fad9..feff8fdf990d 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1,8 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
+DIST pkgconf-1.7.1.tar.xz 292908 BLAKE2B 004ad290ae97dd8383a24a3c390341e1c054825136b241234396248cedf5edc221d77b68fd3e502aab123a7f18daca62374d1cc7c0311650cec4f87d237c33c8 SHA512 d5d264f48f537ba60efc47baa5aa3a375aecdaebf87f268846c69f7e807e29081f5e25334e21c014adb33e9de77d6e1b8a65124f718617f5825082579af801df
+DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 EBUILD pkgconf-1.6.3.ebuild 1589 BLAKE2B 3718d1065f7b4c5cd49a82ee2befa4f2581435bc212a9455d7fa787439651c4b987ae2fe3980283604b40edb52216f8aec29ce06f85d0e8fb3369ea09e46b73a SHA512 bd162b064e3b94dadda694fbcaf457fb33c7dddf39bf6cd426663a5bfafc036d02949b46a174f5037af218c0fd05409c6f7f4adb3882759afc061a7b2b824a51
-EBUILD pkgconf-9999.ebuild 1598 BLAKE2B 18b98b9185d35d845499e6b0a90c088c888efab2a37b40c8e28df720592a511599f9640743dfcfe8710fb9c7edb66380052f134f832932c0e745002b92d78134 SHA512 f1c57374bc4d5bb5ed0fccebbb7360b3f16ce76d75a93165418c3322a341ecd3a14b19c0d952d9c5283c2541cb2831c5b37e0adfe0d2839564d4f74d15fe3518
+EBUILD pkgconf-1.7.1.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
+EBUILD pkgconf-1.7.2.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
+EBUILD pkgconf-9999.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.1.ebuild b/dev-util/pkgconf/pkgconf-1.7.1.ebuild
new file mode 100644
index 000000000000..c5741a924750
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
+else
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/3"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf --disable-static
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+	else
+		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+		rmdir "${ED}"/usr/share/aclocal || die
+		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+		rmdir "${ED}"/usr/share/man/man7 || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
new file mode 100644
index 000000000000..c5741a924750
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
+else
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/3"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf --disable-static
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+	else
+		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+		rmdir "${ED}"/usr/share/aclocal || die
+		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+		rmdir "${ED}"/usr/share/man/man7 || die
+	fi
+}
+
+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 6297af6bdd01..c5741a924750 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf
+	econf --disable-static
 }
 
 multilib_src_test() {