gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 164 deletions

diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index da78d5c0c016..5fec21e3b81d 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,11 +1,5 @@
-AUX pyquery-1.4.0-network-tests.patch 700 BLAKE2B 6ae1cf19f7ae717df3ce5ea509938d37024b4e06ecb422c91e3ff41992fcd2d2bdcd79f47ebb591fe803dbf6bf5085f2422b575ead44f00b04f3b5abe1237dfd SHA512 b491c1cfc8c917eefed0c261dbc25a91e65db4007ee393b39b666a9043d00d26affd38897f277436ebe18ae2eaf6e817b6001b14f12b43f335b82b22961b28fb
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
-DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410acdf008fe9afd08136a0a7f47d66b99071cce61a1569853ec9c3c38d20ca66aec0950532e94949b36d4814c3e SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6
-DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.2.13-r1.ebuild 1364 BLAKE2B b3154caaa87434768e6aa9242e70ac2c82121a14a20d2cd73725f2eee5e481de1ff35c2f64ffdd1c2154301a75fd599a2ff11b93fa4759eac8148c7db7e0fffb SHA512 645e08930f8947055ce7528b991f9157e9495c3126753c4de4dd90f091656b67d52ab728ceb9a35ca7f47b19ff818a5e1824a3387ffc19768688b5b324410e8d
-EBUILD pyquery-1.2.13.ebuild 1349 BLAKE2B 665c2d1975918b9445aa23e3c2634c4ac39324d46b0adbe38680852361dce6ead0ace314fa7153b110831d0cabf9b0703010119b9bc97ef2b36f2fa1ff14aa93 SHA512 03bfb000ccd8e5575b3451a353238535b58dc2b6f8f0d940c981a0a9f44d9e7ec8004e6758fb2e8f6cf50448f8efda420e3d6b96a38407c88e244a015edee1e5
-EBUILD pyquery-1.4.0.ebuild 1220 BLAKE2B 8aaeec62ef8d9d02dadb4ceb4e4f281eb7f9f55b00ee0f2bd536ac0a59b7e4f8962212316e7ff4c9da91ea800e2efcb3ce0b80e756d3ec717b14adaff80f71c3 SHA512 b7df9a1b37b40da59c11105e707d19d8ad25fc9930ba55bce5ac2459806a8ce88503af1a1fa7ff3868efeb69a020899542c5629d4e5863ae714b5ee0b37a8983
-EBUILD pyquery-1.4.1.ebuild 1295 BLAKE2B 015de1eb07641622509c2729e3145b7990c801b535be7c1043ec8cf2e2e1656b40e97a2ebfabd64464579fc90dfb38031bfe9e7b2976c4e5aabe38021dadbc16 SHA512 f170135a90ad26e536cc0d9bba46f400fcaffe1fc9030f2747928ea44fa8a97ceedb4325e9c5df6818a8b2bce2c3bfd381e7a2e69a0ccba4462aad152405cc35
+EBUILD pyquery-1.4.1.ebuild 1285 BLAKE2B d76e1677cd25d289eee7dfefb6df0d17e6e1d2624ac1f89b0c04453b39991b0e200efa89cab641fcd8c05c69dfc622c66756410e844ed23eb56f07e26bee91dc SHA512 564ab6b6bfe641fd23e06ac12a6b3a3fafd09a1ca6c1ae83f8b756fa2f113f11adbc2acb324e3e1aee8b5d15b45d31ed3799e948cae3bc664cdb3d6509966ccc
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch b/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
deleted file mode 100644
index 337728794bb9..000000000000
--- a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disable test that requires a network connection.
-
---- a/tests/test_pyquery.py
-+++ b/tests/test_pyquery.py
-@@ -613,10 +613,10 @@
-         self.s.shutdown()
- 
- 
--class TestWebScrappingEncoding(TestCase):
--
--    def test_get(self):
--        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
--               method='get')
--        print(d)
--        self.assertEqual(d('#pt-login').text(), u'Войти')
-+#class TestWebScrappingEncoding(TestCase):
-+#
-+#    def test_get(self):
-+#        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
-+#               method='get')
-+#        print(d)
-+#        self.assertEqual(d('#pt-login').text(), u'Войти')
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
deleted file mode 100644
index e05023718be3..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
deleted file mode 100644
index b5b8640285b2..000000000000
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-python_prepare_all() {
-	# Disable tests needing a network connection
-	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
deleted file mode 100644
index 2353f291849b..000000000000
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
-
-PATCHES=( "${FILESDIR}/${P}-network-tests.patch" )
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.1.ebuild b/dev-python/pyquery/pyquery-1.4.1.ebuild
index 7e4bcaef3983..492ec9f7550a 100644
--- a/dev-python/pyquery/pyquery-1.4.1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="