gentoo resync : 29.03.2018

4 files changed, 81 insertions, 4 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 48d8f6d137d2..27df4d8b1d94 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,10 @@
 DIST pkgconf-1.3.10.tar.xz 272704 BLAKE2B 7d39a17ba100818eecb64acc46d7000a5d7ecb2493d7d9b75a7f2451ac3499bb5de68a38cca2188b19937410b3a82bc8a910a8b7cec211315980c0d9c49f8c81 SHA512 22ccc6b41b4571992f00e0b2e6f9922fd7f1bf9ef1b790ff978d8bff8ca0697321f7a7ecf1a193ccb4efda2c5d6430c1ad24487a50d3ab27f9f16e6be9fb9e83
 DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
+DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
 EBUILD pkgconf-1.3.10.ebuild 1297 BLAKE2B 033585762fe3fb08869fb9264f3ca37717da75061098cef3ab073fee9a63b8856d81a2142874081e9e419c1f07ed285ee16a5620663701fb5bfaa54dc9884068 SHA512 0e3b7a27767b6f2570947dd1cd433cafa0df4936d9925bd4b04b61602c58341073b9c9479a6241d3acbc4a3e701c048e965fae6240b8ad254efab520edaf96ff
 EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 0ab8f8e988a9d412585b6c53cbd06a6be0c71ab09a50fdceffaa2b90615c00de9864af9b8742f047d7b8a0b901844362582d90114728c8802d5a1563e1cb62f9 SHA512 60b22b469624108ba9f3aef81de7d493e7a4fa931f4579e4d909b41fde068c2ecb60283daff61133ac9d3682e326351a05551f265a651f2bfc7ce8e3a3cfd511
 EBUILD pkgconf-1.3.90.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-EBUILD pkgconf-9999.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-MISC metadata.xml 422 BLAKE2B 4bee8465a075878dc0f2c8534524f70bc3e5c94a1f2fa74c6304b90d1037355a0c3bed6eee6985f3299271666fd83999ac041c5c8a31e8a2c4b7277783f67688 SHA512 b67d102a6370d513225251717959bc61b916ec0adf9bd6c628614b2237845a26ad669e3652dac178e222b45ed98ba4fed6da23c40466df65ddae8d1d33f50b63
+EBUILD pkgconf-1.4.2.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
+EBUILD pkgconf-9999.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
+MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 6707db3556f0..f6730b8bcc6e 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -5,6 +5,9 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<slots>
+		<subslots>SONAME version of libpkgconf</subslots>
+	</slots>
 	<use>
 		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
 	</use>
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
new file mode 100644
index 000000000000..e2b768e8e572
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit multilib-minimal
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0/3"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	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() {
+	ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+	else
+		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 86434bc5ebfd..e2b768e8e572 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DESCRIPTION="pkg-config compatible replacement with no dependencies other than A
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
 LICENSE="BSD-1"
-SLOT="0"
+SLOT="0/3"
 IUSE="+pkg-config test"
 
 # tests require 'kyua'