gentoo resync : 19.07.2019

3 files changed, 49 insertions, 2 deletions

diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index ac08824512d8..fc9ea6ff7714 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,9 +1,11 @@
 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 988 BLAKE2B 8595db07b837f8c8d31b19415d6e68cb8d91dad412fe4e9bcc31687a230239b8ea94edb71a2aa44bb967e47643e1407e959747e6fb72ed20f8ca6bea0ae8ce23 SHA512 844328048a7f7cf05e6fde4b5b81a5b37b99e719e09878bde75f027735378eefc6461552550c5b093186d3820ce65c53a2e8899bdc28821b04eb01491eb0aecb
-EBUILD mirrorselect-2.2.4-r1.ebuild 972 BLAKE2B 5b38c7b9939926712bc1985138010de3fa111b2ccc5e2b4f9cf4defb94acc8209951929a9db05f40325283ebbbe1fc81800e8d457758f429c2c62813038a0724 SHA512 6dfa79247815db8cd03ae0887ae145fb72d8668f6bf9057decf8525985b9e5de026eb76ea04a1225a1ca9b8c128c78bcf8d7a6cd2c4501ae07b03271b5d59ba1
+EBUILD mirrorselect-2.2.4-r1.ebuild 969 BLAKE2B 25b58d0a15f14d53aa03806b8dff95294905fa0e55cbdb0451be26c0c938901a9521bbdedcf9031b2d4f1bbe93577a152559f8780461d8961b4063f404df4eb2 SHA512 1df86030d3c883ace80c463968a098193ca4ea8e5acd38fdc58f7bdea5c4f73abed974464cb2b6c6ea9a928f3d5e36553cf42b834cca18252c1672d5e4136928
 EBUILD mirrorselect-2.2.5.ebuild 1069 BLAKE2B d5f3eb9996e4787b2bdcd86b50c79beaf9e1863a5fa4d875f857acfe9f9d683066e6be1e81e73494fd337399aa105d6c1ac396951c211b61273a4a0eb8d964d3 SHA512 6c710d4520b3b1ec78e4e3bcffa262461a4cf26386b2e8cedee3717cea55a0df2fca77e662096e81455e63fc3ff134270e03d942d97f27e1297532b1a85e81c1
+EBUILD mirrorselect-2.2.6.ebuild 1320 BLAKE2B a7fd36002fe0f36d3370a186d25b54f2d5dcd56dc653c63e18c72acfbf2d173536507a4e5758622dc21fc54889f3cd92070286d001e3b5ee9f2a76556aaf715f SHA512 35fbe592bbb58a753fd57b7457221ca49a53371e6ef18f139516af42587741a9d71d79840467d9e48b2fab7d37fc94098aaa2c08551e3455c79765ee1c45dee3
 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.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index a6fbbedfe5bd..a24a44ea3fb0 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
new file mode 100644
index 000000000000..9ddb1fff6297
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
@@ -0,0 +1,45 @@
+# 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="ipv6"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+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"
+	if use ipv6; then
+		# The netselect --ipv4 and --ipv6 options are supported only
+		# with >=net-analyzer/netselect-0.4[ipv6(+)] (bug 688214).
+		sed -e '/^NETSELECT_SUPPORTS_IPV4_IPV6 =/s|False|True|' \
+			-i mirrorselect/selectors.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}