gentoo resync : 02.06.2019

8 files changed, 24 insertions, 142 deletions

diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index e63a0894bc60..d860765f4778 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,14 +1,9 @@
-AUX mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch 721 BLAKE2B 6faf73309a13a2f4b039e00555f9c8ffa01458aaf1a80eecd5ab8fb9349b869f7c9d63d2d288668f2960e230b9c4323cb6c309e9c19aad38ca87dccf5fcf9468 SHA512 032544106b1e6dad76f46131f94913b1875d9605808dbe5145ca0fd80916c158551745a850a25cf4252f9f860e8608ed76e31ca878110db66e05003e86d55127
-AUX mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch 658 BLAKE2B 21ec938fa75ec527f9670eaf25a7d308126a098ce558587fd3a1995ac02ecb82ae21ed76dcb5f0605581e777ba93c987780e11e3990cc3f15383b5a17e3f18e7 SHA512 4f2ce8c8136a380cfcd0f44489fcd51be1a8c66353dba59ff8872ca6f72901c0f19f231f8c44fe396bb5735e6e8e16b389e22bcada1f9a0a793dec20baefe604
-DIST mirrorselect-2.2.0.1.tar.gz 13138 BLAKE2B 40a2724ee8c83018e19a56a49b677cfa3f89d56450ba743ddf67a324b43881fcd8e99022f9532499b5b4d826b8d6700a5606294af3becde1f928ecaa07338f44 SHA512 08216c381b70856dd56e903a208bc0ed202826b89136dd0b1cf69bd7cf2afa2df608ac2a0aed5161a56f51cf4bcb51f3826ad55b3a26e671ba2c68490c9cffad
-DIST mirrorselect-2.2.2.tar.gz 15964 BLAKE2B 96698286c05fd96ea03ec6594c8b0849fad3b1ffdd3f1ecf1a76d205005b07bd4971211e72f10952f5155c91376192fd81efbdfdd5058c9a1c60cf731b0bacd1 SHA512 91ce16d236418ba186c447c6497684c4138afd4279a0ba95ee0f069309e8ce086a5a4ce4715ef21275362b7c3772924d422d7711d188d40c1e0b90f773765cf9
 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-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.0.1.ebuild 858 BLAKE2B a02fbca35c275845f8363b6c62196efc717dc5e598020fcfe87386c938e6c45c883809a17cfa611ce19c446f1f4f202d58105639d8b97e159fc8b8891862e843 SHA512 07bd6b8a86105dd42c6645dbcb97e72c681dd10651591036d5eb63bbd928c3f745a670c5be1adc5149f074f99d8f02ddcca907b0eba98f303ce0da44ea875632
-EBUILD mirrorselect-2.2.2-r2.ebuild 1123 BLAKE2B f46044dbbc399f0a328353d3341d009c49b7ba07d7302c83fcdf1c25e8882b18eea130ae9d2b5352bc8ae1c42edc4dfaa5087e038e0c12e2ee6b88bdae1e1957 SHA512 b591331504d1b799156376682f19ae419a129738fcbd7f3141f92fe0c03d7badc79ffeabad0695c47f6f2b2f17b624bff02e98184cb9551d96dbd40fb8387b37
-EBUILD mirrorselect-2.2.2.ebuild 1009 BLAKE2B c94f8f77acc95639337ec600388242c956cd2804bef08d2b0c472e8e1ebebc30dd6604e0232ca3167cf8293ef1d2a69c98122f26d7b0ea82eb2dde1ca9d2cfaa SHA512 08f27bfcd5101cc0446d586c935639e1724278259490ba34dd45947410559438793d9d8e3c34533f4a47bc68fde0254334c642fbf720ab4cd2fe604011ce347a
 EBUILD mirrorselect-2.2.3.ebuild 988 BLAKE2B 8595db07b837f8c8d31b19415d6e68cb8d91dad412fe4e9bcc31687a230239b8ea94edb71a2aa44bb967e47643e1407e959747e6fb72ed20f8ca6bea0ae8ce23 SHA512 844328048a7f7cf05e6fde4b5b81a5b37b99e719e09878bde75f027735378eefc6461552550c5b093186d3820ce65c53a2e8899bdc28821b04eb01491eb0aecb
-EBUILD mirrorselect-2.2.4.ebuild 986 BLAKE2B 6eee6df9c8666a281520511348fc7f182e539ea7a3e179c4b31b94b67d22bb96615f73237ae4928b2db9c9e1cf84dfd2dc83446939faf49cc68b0ad276332599 SHA512 c1a1469efaa63b3ffacaabb470abfe3375d6c5fe04c44254f1639340e34fcce6025b56a74b508b456789339c97e0335fdb115dd46ced53c5ee0e3141cf6a7c0e
-EBUILD mirrorselect-9999.ebuild 1046 BLAKE2B b150f3953eb8fab0dafafb9b70862559961cb882fd56304ecf1fb389d77429e53a652c72298d69f1c3a896cdbf5b44dba9e11a620c190be2869535d7e5bafd35 SHA512 4a4aea0b7bcad385dbd6a6a793965a8c3714ad0a5dc6a6a8c3c3603478ffa372441b207c60dcd77ac64eb73fcbbed2e800f0a87007143ccbba3b0ad030b25794
+EBUILD mirrorselect-2.2.4-r1.ebuild 974 BLAKE2B 1f29d20581f56fcc6a8530e342b93e6c0da8251d28be1a8418648f214cd561b8de7e810bd3352e1c0e5106ef9d016b1b59c05a480db17fb34f6774065dfc26f9 SHA512 06381acd35fda51d71ce12386b673aee1963ec336ce316238c53bff30075db2e77393f83c40ae029aacbe43783dcf76508107a7edbbb9d0c7483fd0667ba289a
+EBUILD mirrorselect-2.2.5.ebuild 1069 BLAKE2B d5f3eb9996e4787b2bdcd86b50c79beaf9e1863a5fa4d875f857acfe9f9d683066e6be1e81e73494fd337399aa105d6c1ac396951c211b61273a4a0eb8d964d3 SHA512 6c710d4520b3b1ec78e4e3bcffa262461a4cf26386b2e8cedee3717cea55a0df2fca77e662096e81455e63fc3ff134270e03d942d97f27e1297532b1a85e81c1
+EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 52bd3f705108f52a8cc381fca6b9296264b2152848b88321b5b874fcc9672469fde32f20a27728b2b0fb042ff591f961dcd4a702f77bd73adc9b7ad948b44ada SHA512 eb6bb88fc85b92606f3dcf3fe149e6c41f5bd67bc6a96dd158ff2db1f191909557d82cbf82d3ced101e18de5101a91bb22d53913eee9b719b0e839e78a234b4c
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
deleted file mode 100644
index d170103a4657..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 27 Jan 2015 10:19:05 -0800
-Subject: [PATCH] Add missed output mode function assignment.
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index 59efad1..06dce6c 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -107,6 +107,7 @@ class Extractor(object):
- 		# setup the ssl-fetch ouptut map
- 		connector_output = {
- 			'info':self.output.write,
-+			'debug': self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
- 			'kwargs-debug': {'level':2},
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
deleted file mode 100644
index 2e5fd93c09cb..000000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 26 Jan 2015 18:23:05 -0800
-Subject: [PATCH] Update for ssl-fetch api change
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index ec5f299..59efad1 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -109,6 +109,7 @@ class Extractor(object):
- 			'info':self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
-+			'kwargs-debug': {'level':2},
- 			'kwargs-error': {'level':0},
- 			}
- 
--- 
-2.2.2
-
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
deleted file mode 100644
index 81e105381e8a..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_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/~dolsen/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	"
-
-python_prepare_all()  {
-	python_export_best
-	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
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
deleted file mode 100644
index 2d83632168c0..000000000000
--- a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_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/~dolsen/releases/mirrorselect/${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 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-util/dialog
-	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch"
-	"${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch"
-)
-
-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
-}
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index c70e13ffed3b..70711940f738 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python2_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/~dolsen/releases/mirrorselect/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
 	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 	"
 
@@ -18,17 +18,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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
 	net-analyzer/netselect
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	<dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all()  {
-	python_export_best
+	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"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
index 92d8fee57299..6a451ee30e96 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 
 RDEPEND="
 	dev-util/dialog
-	net-analyzer/netselect
+	>=net-analyzer/netselect-0.4[ipv6(+)]
 	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
 	"
 
@@ -33,3 +33,7 @@ python_prepare_all()  {
 	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-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 36964fd86606..de12fd9a5ea9 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
@@ -22,18 +22,22 @@ KEYWORDS=""
 
 RDEPEND="
 	dev-util/dialog
-	net-analyzer/netselect
+	>=net-analyzer/netselect-0.4[ipv6(+)]
 	=dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
 	"
 
 python_prepare_all()  {
-	python_export_best
+	python_setup
 	eprefixify setup.py mirrorselect/main.py
 	echo Now setting version... VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
 	VERSION="9999-${EGIT_VERSION}" "${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}"
+}
+
 pkg_postinst() {
 	distutils-r1_pkg_postinst