gentoo resync : 03.11.2019

3 files changed, 5 insertions, 42 deletions

diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index f6d0af073810..02dc1e9f25bf 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,11 +1,9 @@
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4 SHA512 af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
-DIST mirrorselect-2.2.5.tar.gz 16638 BLAKE2B b306f146936344309e79469281830bdbd088bae3686de777bf24bce5bd4e915c951b1f01612c9600cadcbc90139c74a9a5774ca5779bae339d1d5f33d17f70f1 SHA512 845df4073f5dc7544d7c1ae410f154e27ef9a9848c2fa182f4d0acd287f17792d11065b1b3394856bd760589d6b24e30e031d10e4ef6c987ac4321dc7e044e4e
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.3.ebuild 978 BLAKE2B 38888e533900bd27b40e5bf67c06fe6466fa4665caed5c1a54a11c88a44eacf36d6a05d70311950bf90b7ddddcad30a75bd4af0cef41e7c402d60beffc2e9f73 SHA512 e73b6f9e4c3d6f14be05937d630bfbbb4edb719136a4c6e1d1ee5734531039fdbb598269c6474bf82596067b9504b52256613b1d0cd6b798ba5699f1c8ea3f4b
 EBUILD mirrorselect-2.2.4-r1.ebuild 959 BLAKE2B 8099445a86cda60203dd60ee2b596c46cca8c3d4e06536fa5ae14f48c09e025030bd9553cf3288061d3acd38a461f4378a8d686f7461ca7dd6f2285624e07ce3 SHA512 3d6865a1decdf07e1d19c0f2e55b69a82323a781cd130f7597d1a130a4bbd8c49b0f708224f5abfe8ff37d582792777f3fdf5da707267484f7598f6026909258
-EBUILD mirrorselect-2.2.5.ebuild 1059 BLAKE2B 25101e55b872c5a14a47c85a21bb96a840212f3cb0ed22c21c8667fc11771202c425d9f0abb1a17cde3ec82d9bd14a2c2bf72b101b7612a908a56553ca140432 SHA512 67f89abf3ea60047ed445fdbc0c3427d2790305749b321d7a67f472cc85aefa2eedb7bc273b894ae78c71401cd19ef60f3289d81245e02f900d0064f0855a757
-EBUILD mirrorselect-2.2.6.ebuild 1310 BLAKE2B a244637c10ddc818f512af4eb1bbfef2259dbef6de7162b924b8b45b7916d8f20334ba6f7715f14d0b954062ecfd38b516f222b7200c84be91027d73a089ddb6 SHA512 f95cd8a60b263fe0bb90c3d28df28b4124c20e6e846219eb4fe8b15a82687814311e4fe9103e7a34c90b70716aa358c6fd8d7002c9a7e9dd27cbfd8ca3f865e0
+EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B bc51100a528b64db0452547e2c2c64e970d570607002412b39628447ceae812fdba9d1ce8fd0ef942528ab997c7d7ec80ac3c6d114dd2ec07459f93372c316ce SHA512 d4fdb62edd163aa79a8b54528cf488e5b8fe292fff43a1c450a97f5426f7e7ef4692f08561e80ec5ec970cf271eb146ad8545c1e21c08580087a0cbfb9cc3de9
 EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
deleted file mode 100644
index 745675eb6f78..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
-	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="
-	dev-util/dialog
-	>=net-analyzer/netselect-0.4[ipv6(+)]
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	python_setup
-	eprefixify setup.py mirrorselect/main.py
-	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index a8348fc40d2b..22fdd516033e 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -37,6 +37,10 @@ python_prepare_all()  {
 		sed -e '/^NETSELECT_SUPPORTS_IPV4_IPV6 =/s|False|True|' \
 			-i mirrorselect/selectors.py || die
 	fi
+
+	# Apply e69ec2d046626fa2079d460aab469d04256182cd for bug 698470.
+	sed -e 's|key = lex.get_token()|\0\n\t\t\tif key is None:\n\t\t\t\tbreak|' -i mirrorselect/configs.py || die
+
 	distutils-r1_python_prepare_all
 }