gentoo resync : 15.01.2020

7 files changed, 11 insertions, 129 deletions

diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index aa3e4f2b57c2..e4a7c4bc6a3f 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,13 +1,5 @@
-DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 215641 BLAKE2B 36aed2a16138dae5ba05a22418509cbc8cfbf7878d0f27aa2c71110407c5aaaf48445d29ceaa4c4f041f01bb4f4b408c81b2cf5c9f7ba4470dbf4317457f93a0 SHA512 0ef0edd124eef7f897e0bf8b09ffccefaed5ea9eab149cb11c2874087acfb14f15efa6ff6b3967f285b8910adce4b8c228bc69b8ed54c8a6392d3435fc57875b
-DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
-DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a SHA512 dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
-DIST pycares-2.4.0.tar.gz 214021 BLAKE2B 481d46e9a5726d953d0dcb391a549ba4177e5ac1758a0ecb25bf634b9eb6baa2fbb0544874a78ae46e30a1dd4be8a981f5ebdf1b36cb9aa2e42370074731319e SHA512 7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
 DIST pycares-3.1.0-fix3.tar.gz 217616 BLAKE2B 121d09bd57f60371f9ee7d6f9fec0b0acd9413e86367c278a73dd0b47151e937358bb955f51657c117b72d83de23fc6e530f9418fd6d4c1b96ccb31045096e25 SHA512 d386d1b3434fc7a868783b96a2ef635695efdea62365134287fcaef6e44f75ba266f095c3e667ea1a57940d81d23adbf6e031b8571537a041aba15a36df7a904
-DIST pycares-pycares-3.0.0.tar.gz 215445 BLAKE2B 5543d27ee38d9360b9ee74ebf1c09da15f68873d5cc83b486e61f3d337e733353dde44d64d6a0520525f4876e67d34c91a770f1c9717b7a1036f568c227f6c87 SHA512 bf60549044686accae68ed118e6c5e0da07b1d13473b70f91db85693ebd9ac9e4afb87cba763c667f2f7f487de28759e26a1677023081e94311b547a51bf7451
-EBUILD pycares-2.1.1.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
-EBUILD pycares-2.3.0.ebuild 602 BLAKE2B ce0cda0f1b027951c663a279d280937ac152664938c5e5fedac4db04f660d4d2d33e72f7d51515b2fe01ac2d2ff2374446336a1d44bd12913b671ce471189e9b SHA512 a5b6ee83309f088e87daff32f42a35c7cc0f3938a8f8b46bda754601cdd1d78db20846355fdef7e72e3af576e10af536665d792f2d75f383e228ecd15eb7a7b1
-EBUILD pycares-2.4.0.ebuild 600 BLAKE2B dbb606d105ad2e232253b042ecd123ec8b302fa064ada4518e3aaf768954c8de6188341e69bd957e0a67a75e35b4b7f8d312e3f42b56cd5fd9fc345a620c8733 SHA512 ad3623df4d977822230d91d8ed2ab3ee4c5fd92834d904afa7d2599bc9271d77b255eb4112d324bb50c6efea8941766c5857f6386a9eef5ff7ea4fe39896e338
-EBUILD pycares-3.0.0.ebuild 764 BLAKE2B ecdb9ee03850e181ff66dd182c47c7a020bf6a6c6fcad1f18a614bb1c5199bdad38fae9302e83fb00fabdebcdf00dabfdf089193d1f6e737eb3be53613198f57 SHA512 9910861e2edfeb410d09e869788544bc130aed2036c14646d8b67ed48ac23b98854614c5446e46e954742886f2d20c355c20b78095cbb1416f8b6c31e87d33da
-EBUILD pycares-3.0.0_p20190709.ebuild 791 BLAKE2B 7c26bae47661bade0de214a0a309a212d50b3c9cabafc5812d4768edc2c320a116f52fbbeb1e5f5e46cdff5e597cb11456264f370394914265fa59a015986fc1 SHA512 f7a18d40beff2ce2f713f904a4ec806215dfb6e57354b7be6b3213776f412f56a60d29837c12f798af3df4dd644f37459fe655d3736bac06babb847b394aeaa2
-EBUILD pycares-3.1.0_p3.ebuild 704 BLAKE2B 4018b75f6990e73a0c221ae24fc09d284093e7ebe435795d6cc6e6f2798388eba458c0a1e4ab95b36e135aa01bd2ec9d6223f21b7d597732160ab8316db337ce SHA512 217ebf8ded8ff5e9907172c2d2850761670bc1e4e60eb374afa3c5e7bdbacf6625e1149f7377791fe6fe4eb17ab97fd9fe481aedc1397c9b7bf7f4dc48034372
+DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
+EBUILD pycares-3.1.0_p3.ebuild 702 BLAKE2B eca0cd4a2eecc2866064e653f38d79593957a9c0dda199b167513d9994a5918841186289015c5df9e98b8ae9ce2fe8255b02b80156255e972c5a586d9c32f542 SHA512 a86101c9b0a5858669bf62f964b1707a10c99db66f28f68cc3d26111142e9d4c931d41c29d1c67ad9fb6c7eba400d370e9ed890ca601161265d203648a5c3226
+EBUILD pycares-3.1.1.ebuild 660 BLAKE2B fc409b4a538c74ef5bd40d28dd322f7731a95c716607d996ab5e611dd2482bb03531ef427e1a1aa3946417ee995a282c72254f66e9eea321b7999f8813bd7896 SHA512 df7adeb367656003a6a28792e92ea95886be4d3495c654546bdeb24db4530fa74702f15a78b39874b37e5d256f919786f8133c5234295ac9f82c154600b76de8
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-2.1.1.ebuild b/dev-python/pycares/pycares-2.1.1.ebuild
deleted file mode 100644
index 6827684e6fba..000000000000
--- a/dev-python/pycares/pycares-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests/tests.py || die
-}
diff --git a/dev-python/pycares/pycares-2.3.0.ebuild b/dev-python/pycares/pycares-2.3.0.ebuild
deleted file mode 100644
index 6827684e6fba..000000000000
--- a/dev-python/pycares/pycares-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests/tests.py || die
-}
diff --git a/dev-python/pycares/pycares-3.0.0.ebuild b/dev-python/pycares/pycares-3.0.0.ebuild
deleted file mode 100644
index 5581faeccb30..000000000000
--- a/dev-python/pycares/pycares-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +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} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=pycares-3.0.0
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-3.0.0_p20190709.ebuild b/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
deleted file mode 100644
index 12865ccb31f9..000000000000
--- a/dev-python/pycares/pycares-3.0.0_p20190709.ebuild
+++ /dev/null
@@ -1,31 +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} )
-
-inherit distutils-r1
-
-EGIT_COMMIT=0c831407bc32c6e78a80c5b3d7865ba4c7ac26df
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests/tests.py -v || die
-}
diff --git a/dev-python/pycares/pycares-3.1.0_p3.ebuild b/dev-python/pycares/pycares-3.1.0_p3.ebuild
index 40e86c064a53..fba0f774f511 100644
--- a/dev-python/pycares/pycares-3.1.0_p3.ebuild
+++ b/dev-python/pycares/pycares-3.1.0_p3.ebuild
@@ -1,8 +1,8 @@
-# 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} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycares/pycares-2.4.0.ebuild b/dev-python/pycares/pycares-3.1.1.ebuild
index 63fae6d646f7..d813fe5ac6d7 100644
--- a/dev-python/pycares/pycares-2.4.0.ebuild
+++ b/dev-python/pycares/pycares-3.1.1.ebuild
@@ -1,14 +1,15 @@
-# 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=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python interface for c-ares"
 HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,7 +19,8 @@ IUSE=""
 RESTRICT="test"
 
 # uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
 
 python_test() {
 	"${EPYTHON}" tests/tests.py -v || die