gentoo resync : 02.04.2018

4 files changed, 5 insertions, 57 deletions

diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index bcc10da917e9..38c176a29822 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,10 +1,8 @@
-DIST debootstrap_1.0.87.tar.gz 65875 BLAKE2B dcbd613a3144320377f1f87ce19dc6de51210af3eb2f7f680cf1122d62dce2c4b5a398f272dbbf9a9795863e8b2c996e645002584fb533ae49e8e5b3a91ed1a2 SHA512 a36d566292f25093e0367a912f262e95036e355a3f4872a5b957cff53999f4491cc30d7d65a08c31e68f98d75c0a5229b88681895720ff9a610d5fffe4565060
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
-DIST debootstrap_1.0.92.tar.gz 70042 BLAKE2B d2e42f876c1bcc03d6159f1bbedaa26fece48d11cc847315711c2e89b4d313d98e7394515a319cda0f1fd857965878227862fd5255b50d6e0ccd433c7002f6eb SHA512 42d6cdeb1efbe95d9215522648d87165326ae1b5a024608abd476a6b3889c8c04420a0f29f5eb9cfd2e57adb4aa57a606519b09e356d0442cd4a4a0f6f45f656
 DIST debootstrap_1.0.93.tar.gz 70695 BLAKE2B e0d5747dce7e2c45f5aec271b3a6f1e004ae19e58747abaa10d258f4e16383d305da28aad3a72c51e8ea513ffc15f61980ff27e141de69af5e259572b1afd089 SHA512 c5947a0aafd8f526236d98fe3da3374ef02a69b089844c89a3f5bb5f991fa29d8c2a4ecdbbc84a69a85eca242c628cd592c22e59f444b65c581b8a70d60a3f01
+DIST debootstrap_1.0.95.tar.gz 68631 BLAKE2B e102be7f263426506c5896b50f34c918d76d265e31eaac3f85b0471e6bfede598ef7ffbaaae726d03017b4bd94d482d4267ce02a67226e310687e8c70f88fe6c SHA512 cf2c32430325b19c61de6ef782d7df68a740812faf5f464d837b5b612b9ba0539f8c12876ce23ba20cc1aa23908eb4f45ca602798ee0a6eacf7489c45c5dc7cc
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.87.ebuild 1174 BLAKE2B 61c6b552e68c03898c8cac6d7fa04d7f93dfb12c9967fc01016c0880e92894e23802821c393846284270dc0a6503487d22c0dc02d32af44a370ee51b808c7df5 SHA512 61168ab5fac341d00a9d58cffb56e3912bfd56b4ff7fc1c3fae945edc6618e582d49c1233082b4e2750849607919b724789bef2a242b837dbf766b288061a16a
-EBUILD debootstrap-1.0.89.ebuild 1194 BLAKE2B 42acc53010fc9bab8907b45cb520ec3e567be929f4031dcc5d261e7798cdb529fbaa326e31efe7f8ed15649441162e4088413dad533f426cdd526fde87e3fa89 SHA512 03b7ac7055a6547255ebb433a62c1ce6eb33fe540764cdef5da631e66341dca64445f22b4956ac209dd38c5ca1daf1d4976c4bc3785747c6f50b5cdc60a28c21
-EBUILD debootstrap-1.0.92.ebuild 1183 BLAKE2B c1eca7b9514446790ab5902b6afdd82db051adddc6b3f0c3c6192685193623f7440207637acb6f1227dd723d5cc51da314f2f63d847e014e13cbe530c3d6a706 SHA512 c4ddb7e092b5859048f0fceeb4d68ccb119a8e5bc48f691eed82163a83193255a33b77e5e3d8bb5f0b11bca400d668aac45b5ced70a1ef3e9aeaa83c210ed6ba
+EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 EBUILD debootstrap-1.0.93.ebuild 1201 BLAKE2B 2dfde0fb57862c70df7e8db42dee07cc838bedffd962ae3292b12188dabc76f07fc2b7dec8d193b681023bd5341e49a3815b601ef466507f97caf377661c52f7 SHA512 387cd06ce6abdc06eac71d92b74ad0375b33f2455483a70bb4a75649f9f6536fdbbea5acddba36eab865750d40cb4bfe8921dc1b1b96db1d897ec7fd917287d0
+EBUILD debootstrap-1.0.95.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.87.ebuild b/dev-util/debootstrap/debootstrap-1.0.87.ebuild
deleted file mode 100644
index 46bf8b22850c..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.87.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.89.ebuild b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
index 406c0e4a96d7..bcc76a47559d 100644
--- a/dev-util/debootstrap/debootstrap-1.0.89.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.89.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.92.ebuild b/dev-util/debootstrap/debootstrap-1.0.95.ebuild
index fc955a4bad4e..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.92.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.95.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
@@ -18,7 +18,6 @@ RDEPEND="
 	net-misc/wget
 	sys-devel/binutils
 "
-
 DOCS=( TODO debian/changelog )
 
 src_unpack() {