gentoo resync : 15.12.2019

7 files changed, 98 insertions, 4 deletions

diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 7ff7ad7b6bc1..775a92116bce 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,7 +1,11 @@
 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
-EBUILD pyquery-1.2.13-r1.ebuild 1339 BLAKE2B c5492d641308e94af0b5dbfb6035341981f3cbdfa12e960557f9cc12acc6719b970fed6761ad06f328720fea3312c7f9c8b8d617997116d0953e86e4fa465db7 SHA512 e2725456271a1fb5d86d936042f0b154d1bafa2af8d73bc7969ce968530aa368091e9045ef45e61b3dd2be843389b89bf978e411c246bd03a7f20088a45de613
-EBUILD pyquery-1.2.13.ebuild 1325 BLAKE2B 1ea72a6a86acd207a7238719282d9ead17c3b39419f35befe5cfbc885ebc5e66215277fe17287aee8e0ee52841db59d70f99aa5d81741cbbf0bcdfb2df2932a2 SHA512 bb4259bf5eadcbe0c1a9f0e41b1ac6bceccab979ab9da2f8668630d9e257f01baa65e985fadcdd3d186ccdd4c2855c20990825cd18b155bce7f67f4c4360d66d
-EBUILD pyquery-1.4.0.ebuild 1194 BLAKE2B 156e3cde4f87d7bf14382873a122a5b15fa2b0b8aa7784f078612734d818c44f5fd20b3e2d8b62ba729d6a2de0a9920815f8a77956e1014db9b940fd4a82d3b9 SHA512 2b25e8bc3e824b99b540d591452637a2b5d5e681d249b85c34a70136b4c1d6cfd45c088beb19b72c2b773b54aa8c6ac1e44dbf106d76d42c7de74c4931f6f118
+DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
+EBUILD pyquery-1.2.13-r1.ebuild 1366 BLAKE2B 4b0327852781ce67e1d109174ed036fb9ac478bd612671bf37215ac79a7ee7f129440aa8c733b35c71593533432e29fb3d575185673e1b97ad632bdff032cce7 SHA512 b743ca204da5e24f0ad117483f018111cbc6cdc213512700cc7efd89788701b93fcb3f45d77cef0984297430d9505e53f0f4180bcf424d2da38adc0091743ea6
+EBUILD pyquery-1.2.13.ebuild 1352 BLAKE2B 00893f812a37590d6c9ea8692b0ea020387d20553eb41a8032b3d2dd62315acc1cfc96accabb2c60f616a71e508720a034c3e4f32f9f60822b55a2060b2713ac SHA512 4370558a57d7f256a05093bc4ad99fffce1cec4921cea7b54155635d181af0e36d3ec4d0481f0e2c0ba0fa293de2dc13e0df76b6c6ab79028ed77403e23c340c
+EBUILD pyquery-1.4.0.ebuild 1221 BLAKE2B 3d4759016dc76e0992bc522d449879a65f8190b8a5f06420bfdc3af9e486c1ddf9c3d3c3d8e9efee4cfe6bd532ee138c48c74c6468317988661a964d34117aa5 SHA512 c8ff1eea0cc9ec0a9980ccff87d853f5b7180a00083beb384d5724c7fe25b7da44d5d52a5eaa376a67e64138ee6715c4bf2813d9b1057027b432268511a244d8
+EBUILD pyquery-1.4.1.ebuild 1300 BLAKE2B 41c2d19eab4cf175de04dac2e37d9c97cb3c1c848488b38f41afc52121e19377d65b475180b66e62489c539dbfa35a11e65a3ed55f76529ea0ca28345ef46de1 SHA512 1a546548974b1dc3677698dd6c37476b6ba029b90d78cbd003704729f4a8c2af470c83fa2d9a5f32ec6febdd81d8bef08538149f671d2d0024e87638349dfdd2
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/files/pyquery-1.4.1-network-tests.patch b/dev-python/pyquery/files/pyquery-1.4.1-network-tests.patch
new file mode 100644
index 000000000000..37664689c0fd
--- /dev/null
+++ b/dev-python/pyquery/files/pyquery-1.4.1-network-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/test_pyquery.py b/tests/test_pyquery.py
+index ca38a83..d29b27b 100644
+--- a/tests/test_pyquery.py
++++ b/tests/test_pyquery.py
+@@ -6,6 +6,7 @@
+ import os
+ import sys
+ import time
++import unittest
+ from lxml import etree
+ from pyquery.pyquery import PyQuery as pq, no_default
+ from pyquery.openers import HAS_REQUEST
+@@ -889,6 +890,7 @@ class TestWebScrapping(TestCase):
+ 
+ class TestWebScrappingEncoding(TestCase):
+ 
++    @unittest.skip("needs internet")
+     def test_get(self):
+         d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
+                method='get')
diff --git a/dev-python/pyquery/files/pyquery-1.4.1-tests-pypy.patch b/dev-python/pyquery/files/pyquery-1.4.1-tests-pypy.patch
new file mode 100644
index 000000000000..f5f160a138de
--- /dev/null
+++ b/dev-python/pyquery/files/pyquery-1.4.1-tests-pypy.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/test_pyquery.py b/tests/test_pyquery.py
+index d29b27b..e6a9230 100644
+--- a/tests/test_pyquery.py
++++ b/tests/test_pyquery.py
+@@ -7,6 +7,7 @@ import os
+ import sys
+ import time
+ import unittest
++import platform
+ from lxml import etree
+ from pyquery.pyquery import PyQuery as pq, no_default
+ from pyquery.openers import HAS_REQUEST
+@@ -33,6 +34,7 @@ path_to_invalid_file = os.path.join(dirname, 'invalid.xml')
+ 
+ class TestUnicode(TestCase):
+ 
++    @unittest.skipIf(sys.hexversion > 0x3000000 and 'pypy' in platform.python_implementation().lower(), "broken on pypy3")
+     def test_unicode(self):
+         xml = pq(u"<html><p>é</p></html>")
+         self.assertEqual(type(xml.html()), text_type)
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
index f3d235eb3121..a8df53f6ea21 100644
--- a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ 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}]
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
index 147b66895907..e47148170088 100644
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13.ebuild
@@ -15,6 +15,7 @@ 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}]
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index 47e5f4649ae9..04033cdd51a9 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -15,6 +15,7 @@ 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}]
diff --git a/dev-python/pyquery/pyquery-1.4.1.ebuild b/dev-python/pyquery/pyquery-1.4.1.ebuild
new file mode 100644
index 000000000000..ddcfe184a05d
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+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"
+
+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')
+	)"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
+	"${FILESDIR}/pyquery-1.4.1-tests-pypy.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
+}