gentoo resync : 02.08.2019

4 files changed, 45 insertions, 25 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 5062181cf38e..423cceea6b91 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
-DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
-EBUILD pkgconf-1.3.7.ebuild 1286 BLAKE2B c0da3d4043a5a8f01ab9cb2c2a89afcf72e810f3e930b37aeb29ad7ec2249e58adc3d57c11a78201ef88bff7d98768b8d569d4022fe55ac4158adeb5da20d3c6 SHA512 a77dc6e3abafd00b9b39861684e145b8a2257029abff868ed08b959aa9d85144718862a8913a784b9d61e959a6ff2afc2ada117df7072df1bb6df36cf4755b4f
+DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-9999.ebuild 1438 BLAKE2B a3c1785865b579242a0b4a95f5298718410bc24af2ef3687847e91510df0ecfa7f294e69e498c027c9fd7298d8e85ce5702e04a6850d37415d7745536f6645ba SHA512 5cedca7911702ec8fac036fa5e7660bdb7368ad126aeb022baf883a7e6091691bded229085518d4d6acae3666bf1594a4df3128806fbc8011323c7035e72d6ba
-MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
+EBUILD pkgconf-1.6.3.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index f6730b8bcc6e..8447141053d6 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -5,6 +5,10 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<slots>
 		<subslots>SONAME version of libpkgconf</subslots>
 	</slots>
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 98f940c603c9..5f58337eda71 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -1,29 +1,30 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-inherit ltprune multilib-minimal
-
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
 
 LICENSE="ISC"
-SLOT="0"
+SLOT="0/3"
 IUSE="+pkg-config test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-libs/atf
 		dev-util/kyua
@@ -53,7 +54,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
+	local ECONF_SOURCE="${S}"
+	econf
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
 }
 
 multilib_src_install() {
@@ -61,12 +68,16 @@ multilib_src_install() {
 
 	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
+		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() {
-	prune_libtool_files
 	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 780b57975a03..5f58337eda71 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,20 +1,21 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-inherit multilib-minimal
-
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
 
 LICENSE="ISC"
 SLOT="0/3"
@@ -23,7 +24,7 @@ IUSE="+pkg-config test"
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-libs/atf
 		dev-util/kyua
@@ -53,7 +54,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
+	local ECONF_SOURCE="${S}"
+	econf
 }
 
 multilib_src_test() {
@@ -68,11 +70,14 @@ multilib_src_install() {
 		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
+		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}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }