gentoo resync : 18.11.2018

7 files changed, 7 insertions, 229 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 46bfb6330d82..a4854c02d7bd 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,12 +1,6 @@
-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
-DIST pkgconf-1.5.1.tar.xz 289616 BLAKE2B 32cd7b3440635cacbc197ac6163c2d0c0a57281d060e27ba097f7845636e41160c25092f42e3d3dacacc0d9f01f6d3468ffaa2a18a82f98ce5fdc8e9f7267137 SHA512 a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a
-EBUILD pkgconf-1.3.10.ebuild 1300 BLAKE2B 1676e818f15a490f6006b24ccc3a9b943a8560d6b273ece690afb8259c76bb1fb65ef01ed9105d46ede0e62ca01a8803e86682e56a535eb8934dd71517f6abd9 SHA512 b1e869feae15b5710f1176d9885f923e8af96fd135ccca1050660af9d5aaebb90fec78dbc82cf854468856f9c1c89254a953c8fc04ed24ea7b524392449ee417
-EBUILD pkgconf-1.3.7.ebuild 1290 BLAKE2B 1b61b0efd185270da76d3be3251fcc9c735adf4d68aa7b900801268ea0558a72753ac19aa4ffc666be3dd577ff110aaa414ae349564799ea09eba53abbd003df SHA512 83835948caac96c0d9e1b0b84fbe5f12a3481b195c28e85f9babbc8803301608be0838f57d5d5079312ada5b47f520415613b36863ccc5c4d65aada059e9f1f8
-EBUILD pkgconf-1.3.90.ebuild 1313 BLAKE2B 41b8ec46f2aa403425fefa659747d7d749853439e928cee51ca5942a32daf85f5c3592b7fdd26ac18a47495ba6d618f9cdae38cd961598401c2308e0e71e8007 SHA512 ea72be69c717fedfc167fce696c1a9dbf549aa5cab4ec6c60b7641cef6ded07877d0847f941865a74ddc4a91f255424f553381203bdf0f1e2ab7242bd792c776
-EBUILD pkgconf-1.4.2.ebuild 1315 BLAKE2B 90e00841c795e7aadd1d5e6c6b064407fc8249d792df74a0433273e48c60024f9ababa9589df4c3f9b3eabd91b77e9a9400376010228aea7b580215606cc0638 SHA512 c0f77fe282688edfb8979c607da32464efb87f2154884e6bcc577b4e9c673087da65399773db06dbecf92d619bb4677dde5ce33a5ede337d1e59376b41db7018
-EBUILD pkgconf-1.5.1.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
-EBUILD pkgconf-9999.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
+DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
+EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 5400516d497ded4df958693d804fff728c3292b66b55b55c4e22b7a7c73924c14cce3956e00801f8c9dbae91943549574780ba3dcaca4ffa559872be13d3a5c3 SHA512 7f51e8db7ce6645f3dea4589c1ce2e87b3a47c0c052a7e7cfa3db9ae14e809a214f88050dd1572b72905252ab5bddd4e1d8a6d4af77b252d68bc367ebcae2648
+EBUILD pkgconf-1.5.4.ebuild 1388 BLAKE2B e842531227e02aafbc9a9061e4bac7569c5fdf81eff055915c5b544a0a2f0ef1e4f6b13de01bf022dd8a822b2dd9640873633ecbe0d3a0e84d003a2aca48d118 SHA512 22d0bbdddfd8e37613ec4c85ac65a0a5f22b31861bd2e55c565dee3f048f8855d11a518577dd82833ea214863d8b51c96a180a28a8ecb0769f731c79c9adf154
+EBUILD pkgconf-9999.ebuild 1388 BLAKE2B e842531227e02aafbc9a9061e4bac7569c5fdf81eff055915c5b544a0a2f0ef1e4f6b13de01bf022dd8a822b2dd9640873633ecbe0d3a0e84d003a2aca48d118 SHA512 22d0bbdddfd8e37613ec4c85ac65a0a5f22b31861bd2e55c565dee3f048f8855d11a518577dd82833ea214863d8b51c96a180a28a8ecb0769f731c79c9adf154
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
deleted file mode 100644
index 9b9f885eb7a4..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~s390 ~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"
-
-LICENSE="BSD-1"
-SLOT="0"
-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() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index cbfee8e34330..01560acfc6f2 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -16,7 +16,7 @@ inherit ltprune multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0"
 IUSE="+pkg-config test"
 
diff --git a/dev-util/pkgconf/pkgconf-1.3.90.ebuild b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
deleted file mode 100644
index 538e513ea99a..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.90.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~s390 ~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"
-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-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
deleted file mode 100644
index fe8a931fbf14..000000000000
--- a/dev-util/pkgconf/pkgconf-1.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~s390 ~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-1.5.1.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 5b9170fe2f87..4a4d43a5f74e 100644
--- a/dev-util/pkgconf/pkgconf-1.5.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -16,7 +16,7 @@ inherit multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0/3"
 IUSE="+pkg-config test"
 
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 5b9170fe2f87..4a4d43a5f74e 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -16,7 +16,7 @@ inherit multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0/3"
 IUSE="+pkg-config test"