gentoo resync : 24.12.2018

4 files changed, 6 insertions, 81 deletions

diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 253cecef8ec3..42893b9cdfbf 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,9 +1,7 @@
-DIST debhelper_11.4.1.tar.xz 475072 BLAKE2B 8220e2e199b174d811c8bf3dd7d1dc34a9d4a371f2ca249c9c210f4abb18e1de29692cbc094a9bdcf17aa2b8b917ced2736109fa8683d128cf50a95233888a62 SHA512 658456cfed3f8549598110b9dd3b9cfec52cddb28d85911d59ee973fbcb8f40b2f430224f48a0a3767a21bca977fface873125ba63f46290b7b696286d53749e
-DIST debhelper_11.5.1.tar.xz 476888 BLAKE2B d75d45d0ce1b91537822b07c85cd32d9c797d6c0c12580d72c44466cd856d5bb5e1b26eefad0f0cd9cbf361b6df046f0eefd962af05b6607dd10d9f94a266b3c SHA512 4bf296d0a61367a554f2fa50ebae09054a544311260532f870f7338cafd67381f85eb2095db01283cfa4ff186d5629e8284413a0e43076b2b1f53b5f3424e3b1
-DIST debhelper_11.5.tar.xz 477084 BLAKE2B 0d32eae102fbb91a42e4ed5d5c8f2456dad28526d2b7e89c6a9fee7a85f6fea4241f1e4c9303b2324806a98c33d161a6ca1aa5d4dbe2f659b377b532629bd299 SHA512 268b03bc9347dc2f396c38e1cbb0f7c8ca3bab765dca72bf5a9a21c26686445fb550daa92586ddae97858ca03fc3210440b4efe87c319ca045cc743ff5ad6af3
+DIST debhelper_11.5.3.tar.xz 478232 BLAKE2B 18ddbaf99d06d8305f5268448144f9149d3cfe09e22e89e6a3f88bf8fe315fd6cc6c863f2c832f47b54bbff3626198768563e321fc3eed37dfa199910c3ba60c SHA512 336da776cb8be7d9220985d04b8277466514b9daaec91ce5e905c63867b4db103d182212a245c47810908c213fc2fed6ed0cc9e5366be2f017d18c5b47437cdf
+DIST debhelper_11.5.4.tar.xz 478008 BLAKE2B 12ac91b2de8f8090f2cea7e746312ac79df15b09f9882010bf90761f99712214ec147134c7e02872778f1cb90dc172d3df3d32e8bff63e1ef3b293723a111764 SHA512 f9c9352db4df9cd3582223ffa70fd72f19d269f2b4a0b33015bbce87cbd7798cb15a2f0c0f732e33e2cdb4d77a71ef69834ba5021386729ed10f470794f2a081
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.4.1.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
-EBUILD debhelper-11.5.1.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
-EBUILD debhelper-11.5.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
+EBUILD debhelper-11.5.3.ebuild 1507 BLAKE2B 16b7f89886d274239047aaa9887f368a9451b3a7ef77de7527859aa6d76a4a586f4b6bad9006937fe32d38258d812fc789b547428173841d091be13f11a2e606 SHA512 f6699e202068bab231ef4f7d6419aafb7174e37405ba3cbf8421a16c2102c4a3a86aa24e9bf2897d409293faec481c8df9bc774550838f05ce6dcb2f22457e42
+EBUILD debhelper-11.5.4.ebuild 1507 BLAKE2B 16b7f89886d274239047aaa9887f368a9451b3a7ef77de7527859aa6d76a4a586f4b6bad9006937fe32d38258d812fc789b547428173841d091be13f11a2e606 SHA512 f6699e202068bab231ef4f7d6419aafb7174e37405ba3cbf8421a16c2102c4a3a86aa24e9bf2897d409293faec481c8df9bc774550838f05ce6dcb2f22457e42
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.4.1.ebuild b/dev-util/debhelper/debhelper-11.5.3.ebuild
index 9606374c12a7..49deff4eb2c9 100644
--- a/dev-util/debhelper/debhelper-11.4.1.ebuild
+++ b/dev-util/debhelper/debhelper-11.5.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
diff --git a/dev-util/debhelper/debhelper-11.5.1.ebuild b/dev-util/debhelper/debhelper-11.5.4.ebuild
index 9606374c12a7..49deff4eb2c9 100644
--- a/dev-util/debhelper/debhelper-11.5.1.ebuild
+++ b/dev-util/debhelper/debhelper-11.5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
diff --git a/dev-util/debhelper/debhelper-11.5.ebuild b/dev-util/debhelper/debhelper-11.5.ebuild
deleted file mode 100644
index 9606374c12a7..000000000000
--- a/dev-util/debhelper/debhelper-11.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}