gentoo resync : 15.12.2019

9 files changed, 90 insertions, 7 deletions

diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index c2f1f86e036b..627806894a30 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,12 +1,14 @@
+AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
 AUX setup_unicode.patch 698 BLAKE2B a4a007ac79df195e261161c59a92bf2fc50beea9d12818e0059e64527c7485a10ea8ea51ff9dbd2705a23ecacb957288da16f4c38ee740d989987b1fdccc3909 SHA512 f3e2766a1da5586a5c534d4e2eae1a00545d5af90e0f7ce92d2a1e38644f07b6db90c7ab20742d390e79198b6d5957900a7cd6777515a773fab2f1f98e09c8dd
 DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82
 DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d
 DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d
 DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
-EBUILD Shapely-1.3.0.ebuild 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
-EBUILD Shapely-1.3.2.ebuild 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
-EBUILD Shapely-1.5.17-r1.ebuild 1052 BLAKE2B 71a677a56a589598ee692554ecb4e1c07fad83af3f34e521b1f3ba039dc9ca52174431560e9a5624ccb58b51ab5c86c901e773947d08579f1e6d9aef51d767cd SHA512 20ddcc090a596b4fe9da47f5ca361a0710ab8e04e708a021e9d59ff35ded397779931b649937c204332521cf4cf514e7d8d4db196358f91a61d58d225b298c35
-EBUILD Shapely-1.5.17.ebuild 688 BLAKE2B 03b1db2cd2deb926ab58b75228d729ae3315f83533021bb01ca157a3dc210e44d07da0e411f609de99758c655424bca9c158648694851af49bb5b4bc13df7b98 SHA512 11d9431fea44f608a3a50f1bb132c82fe63aaa0ed3591ed36900e3fd1943c55ae9e993ef48edbecf172ef30d7d4008e4bc6cb65bc7e0fd14758fd2ad36fc5d67
-EBUILD Shapely-1.6.4_p2.ebuild 1145 BLAKE2B dac69677d50fc0eb36522f4969f162bea9d2a7501c524731396555d28e4e84f554018d6fe581fed9ec2012457e4fa54c7a0c95503eddf5590c7085d0bc02f18d SHA512 59f6cf247d595d9ee2b597a5dc92b97dbbe2fef1ba94b473968bbb1992de7287ef1a72ee74f90333b050b7bab7672cf637633503d3d0b593ff880f91529da08b
-EBUILD Shapely-9999.ebuild 580 BLAKE2B 1662dcbd1c300b5c039e5d619f7b323d8206967f354f09b3b512cfc91e8f4f4b8d922d1db411f6307c38d33f06f4fd2d0944c7596020c9aa700cf498a38d0f77 SHA512 43dc089ac4901fe171b8bc1df7081d265c01471c6f27981e8c4d99ab13c4ebb7dc807fdb6cf11c2b93f34592307f0fce88dd3350ad2de60a85d6831466b95665
+EBUILD Shapely-1.3.0.ebuild 630 BLAKE2B e1a1dd2631504d2bff39be9810dfb5bc582c172d6bf07cb7c8e66c2fb209882856cb9b076a27a6d02b91539cce943368c5877404f94a39f152823a3634f835a5 SHA512 2189a3826dde73a4860a8a0baecb8c3438d7a286cc8b7ad0e6dc3f34ee61db4f0d4a1b379b211d3ccb90a189a580025f90b5c9a07698ed409fa9c7ed836189bc
+EBUILD Shapely-1.3.2.ebuild 630 BLAKE2B e1a1dd2631504d2bff39be9810dfb5bc582c172d6bf07cb7c8e66c2fb209882856cb9b076a27a6d02b91539cce943368c5877404f94a39f152823a3634f835a5 SHA512 2189a3826dde73a4860a8a0baecb8c3438d7a286cc8b7ad0e6dc3f34ee61db4f0d4a1b379b211d3ccb90a189a580025f90b5c9a07698ed409fa9c7ed836189bc
+EBUILD Shapely-1.5.17-r1.ebuild 1079 BLAKE2B 82941c1ec13100c47128bbe373d6580bdd6da42783df7d991c5488e26155b3313c55bf02a55f5cfa8985aafa2b9cf6d4a4f908ba2986218888da37a6fafd4b9c SHA512 a7ff580487dd3099bf4e7cee423bd15cc08c8694d60489d961dd9e04f73738c8d3b0aa0e2c4ab3372758d1eb4a3628467953d6ddabd4db3970bbff0338e9f43c
+EBUILD Shapely-1.5.17.ebuild 715 BLAKE2B 24fa2f05db4df4199f52bcfeafd1895158545137a62c71fc443d62e8ee010190cb39b7489ab3d6df778f79c343ea07badcf60410d8922c625b757852cdec9e98 SHA512 3cc5342029d4a49aaad3c8c15a8ef1508af884f056179045ec6e43187807b1d4826921d041813b295af9d4da3bcf390bbfac76c09c2028ec2ba396fdc0a13932
+EBUILD Shapely-1.6.4_p2-r1.ebuild 1234 BLAKE2B 0c98aebdfb0f4e67a444bf1cacd35ecb038f96611d2499a019448ff7c1ad7066bf12650d1c8219bf3fc9ca1ee464cc98ac40b57cf509338d9fb334606088d6b1 SHA512 1f606a5fe9bf25bfc52175b39322599380733db52400d1af74e1205e977ccf34615ac9e0b6b86a6c837ed42b29c9b1819582be1fd87bbeb39d0fa84f4795eb02
+EBUILD Shapely-1.6.4_p2.ebuild 1242 BLAKE2B 84a91a4a627e519b199538e6047629276cee36119b0414eaa9d8f1c2066de81dbfb14ae621c5cad7db5e7c3f588a797e9ba6ac91e03802431c3ef3450dd58ea1 SHA512 daa23676af10b2e8f91028e6f70156f123ec3fe8efc6724e030a3bbed2bba41841ab2bf2fd76a72edbb0282854a59936e6358e351d96b6a669282f9b0faabc8b
+EBUILD Shapely-9999.ebuild 607 BLAKE2B 5483a76c62d0b98d78a53bff1c97965660eecdd3af808e70e36e1d0786da5f7045523c9a8147c0d5a76b27df629305c5cae3511ae6c7537e9344811c15238c38 SHA512 b227dd717bf6f9744305b0e957ad557267bcb0468fbe010b2eac9ff420d47e0c00d2d6fa27098ac69e5bca22e1ddd0044b40a34d8ded426a4ceb8746f3dcefc3
 MISC metadata.xml 293 BLAKE2B 556bed997454d3e7c0a32291cae2326e9fcdd3cd91d5a3f43fd5934bb093daf397c3f3628b0f921460f7cb846b1c961a02de772437275193883d59c90f018e78 SHA512 850b4e0ef0b365030c29a55c20eba931ea283a3f1603d0c0f887e80fad352ffcee0c546cd68ada65d4ba9f33fc0bfb2a817b11e630e704a22928380c7180deb4
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
index 4d072d5665d9..4ea83ff68b95 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
index 4d072d5665d9..4ea83ff68b95 100644
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
index be87714e1305..10f755d4cc3a 100644
--- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.3
 	dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
index 9a95905ea012..a6993a3d6fcd 100644
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ b/sci-libs/Shapely/Shapely-1.5.17.ebuild
@@ -21,6 +21,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
new file mode 100644
index 000000000000..488e7c29a06e
--- /dev/null
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/"
+
+MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_prepare_all() {
+	# fix install path for Cython definition file
+	sed -i \
+		-e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}/lib" || die
+	cp -r "${S}/tests" . || die
+	py.test tests || die
+}
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
index 50528d9087df..7b76620b7303 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eapi7-ver
 
@@ -24,6 +24,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.3
 	dev-python/numpy[${PYTHON_USEDEP}]"
@@ -31,6 +32,9 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
+
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 python_prepare_all() {
diff --git a/sci-libs/Shapely/Shapely-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
index 9ae0eb5cd352..30efef7c6868 100644
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ b/sci-libs/Shapely/Shapely-9999.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sci-libs/geos-3.1"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
new file mode 100644
index 000000000000..a9213a333765
--- /dev/null
+++ b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
@@ -0,0 +1,17 @@
+Description: Mark test_operations as xfail.
+         # Intersection
+ >       self.assertIsInstance(point.intersection(Point(-1, -1)),
+                               GeometryCollection)
+ E       AssertionError: <shapely.geometry.point.Point object at 0xffffb6e2c250> is not an instance of <class 'shapely.geometry.collection.GeometryCollection'>
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/tests/test_operations.py
++++ b/tests/test_operations.py
+@@ -7,6 +7,7 @@ from shapely.geos import TopologicalErro
+ 
+ class OperationsTestCase(unittest.TestCase):
+ 
++    @pytest.mark.xfail(reason="Intersection: Point is not an instance of GeometryCollection")
+     def test_operations(self):
+         point = Point(0.0, 0.0)
+