gentoo resync : 15.01.2020

5 files changed, 6 insertions, 72 deletions

diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index bc47a6de4ace..4287d521d6ff 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,9 +1,5 @@
 DIST pycountry-16.11.8.tar.gz 9042735 BLAKE2B 66f5dcb0b9b55be692e398c998babeb49542cb5383a706bb74091088eaa3703f41da33f59e2267046c53f8f025f85945096d1e8d251ad5af57c5d39a27896cf2 SHA512 eb0a91f1efae6aeace0b49cd44b0770efa0b57add208c4247e7f58a3c46774f9f8007c51ee88a0e108c90ced3ad69204b4322c9c23f51df0b2202aa98c314a37
-DIST pycountry-17.9.23.tar.gz 9208478 BLAKE2B 381497b220991f76bdac235b71fd9c10984f5762e9cc16b813cb37cfef0444bbaada01e1ed9513848c681a06335ff58544f6f7c2217b51ef98c7415db4b3d285 SHA512 168e2d2693629a39a85a4c6aa7187323693ca73d6af0cc947d3536ae373eca602e7e3add91ba114966db4ebf52118ef3d6a3dbf8339734ec68682bab559beeb5
-DIST pycountry-18.5.26.tar.gz 9779056 BLAKE2B 11928f29cb7446db7159936619a5d0828af89ec7a2ca355d809c97887605174e41d3f93d7e459f3f37ce37b9a7650432df1e7619f9fdfa1f9ea010a39af4501a SHA512 9760175a7926347920542a2fd2420cc3d4f36ac11df5aa6f7aaabbd9b46dd9cb61801933133a589ed35fd2e279db2a70e98340d8cf8856987dc88d6fdb715437
 DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669
-EBUILD pycountry-16.11.8.ebuild 919 BLAKE2B e13795148ecfc893047c88e151d2802a7d2f048da7f81d45461f84b0885df0773274295cd38444961ad132a76299d782317f86d084ee7206ab774a4b4a4a2de7 SHA512 43feb3422ccb5995b7dfb4df3f487a9cf7ebfa16dd8d24911b0e50c45180bf21d8974dc710d87360318b948884489f5324c1cb5cc18af3b212b679fcf3c2f0a8
-EBUILD pycountry-17.9.23.ebuild 922 BLAKE2B c8b932ebc4d997ef2c6ff7ac0e3dbd70951bf944238f88a34e5413da01b9f2417fd0d0bb503b2ff7770aa5aad20799f7f4f85322b8d7d27dc06dad30db9f86ea SHA512 fd3b2f3ba597c2870f68e07f2a48fba54cc59784b03ecfd330000331bed45034c24d8da59cf0f62ca4d8440547d207d717329c8877fd8127520b9fd686fe10bd
-EBUILD pycountry-18.5.26.ebuild 919 BLAKE2B bb5212f2342b1939666f1bae12783a0414dc6f776e97dcec67f075e12df1576e2ae016d05e5f70323a23b75322768f41d48029910e693d730459eaef19541f31 SHA512 3d916ccfd4c6ecc6e540e46ee656e89561643c3d96d4b7b2f7f8ebaea1733a9487323fb28536650fccbc2207e89e5eb3c9be5db376309ee3befde7a3806896d4
-EBUILD pycountry-19.8.18.ebuild 910 BLAKE2B 244548255798b9a71d6fe78ef61dfe17fd7338d41ec4f32946f2db9ccbcaa043b636fd5974312d09ef8c056a94d812fcdf90da419503a780d652817ffd2f369a SHA512 687756de3248868739065821ad4acade36ec542315450c2c8b1c9111ba4028828806652e13c1a04c8a292e968cc211d9ca3d0dc59606d8c76e2a165b51a1a44d
+EBUILD pycountry-16.11.8.ebuild 910 BLAKE2B eb4ef7c349c45b1937d58b3de47ef0da7db3f431ee517f1b9af8c60c2c519a35af92502a5c72b1730ffdb6d9bb587cea33142f625679042b1560ff662db7782f SHA512 a67aab3de12d03c12eb255c3ff2beb14d16c114f789d91c0b380dd267abf146f3852b1424df1a52364b82ba1493c42f317968dd39f2b6a0377889779311daf7f
+EBUILD pycountry-19.8.18.ebuild 903 BLAKE2B 66186f5d369ebe4785d73c89313f17f1cb3a1748cc8e561ca16399313a90fc79a59782ff1738b09be252c5187eb80f18c6524e0fbc6a1ae499ee98b51b536650 SHA512 8059d73a4624e61fda29fbb72d12d35e5ff6d73f787be7b01fcb8d5bbb0c01470f753b7883cf5b7012f23bd147f87e23d21220ccceb4037bda86d266200cf3ee
 MISC metadata.xml 516 BLAKE2B 8e3dabec1ed6b181d44db184d87d2a7b05bef670aae39e71bc35c8d3fbd8e606c929b4b7abe5b8d6d8faa69ca373238fbb8c31d40334ef87d8ff6f07ea1c6f53 SHA512 901c2f02b6dcaacbaae30e82fe886b104051a434ed4c079443a77f5b474cef24f16f658cbe7c01a30966126af78d7950f65207bb8b16e2e1c9bfc71bc05d0c3a
diff --git a/dev-python/pycountry/pycountry-16.11.8.ebuild b/dev-python/pycountry/pycountry-16.11.8.ebuild
index 02fee902fb05..25106dc525c4 100644
--- a/dev-python/pycountry/pycountry-16.11.8.ebuild
+++ b/dev-python/pycountry/pycountry-16.11.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycountry/pycountry-17.9.23.ebuild b/dev-python/pycountry/pycountry-17.9.23.ebuild
deleted file mode 100644
index 7b3da4279cce..000000000000
--- a/dev-python/pycountry/pycountry-17.9.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	pushd "${BUILD_DIR}"/lib > /dev/null
-	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
-		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
-	fi
-	py.test ${PN}/tests/test_general.py || die
-	popd > /dev/null
-}
diff --git a/dev-python/pycountry/pycountry-18.5.26.ebuild b/dev-python/pycountry/pycountry-18.5.26.ebuild
deleted file mode 100644
index 7439d69b58ef..000000000000
--- a/dev-python/pycountry/pycountry-18.5.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
-	fi
-	pytest -o cache_dir="${T}" -vv || die
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild
index 1bf3d5552cec..0ce91bc3e4d6 100644
--- a/dev-python/pycountry/pycountry-19.8.18.ebuild
+++ b/dev-python/pycountry/pycountry-19.8.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} pypy pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1