From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sci-libs/Shapely/Manifest | 14 ++------ sci-libs/Shapely/Shapely-1.3.0.ebuild | 29 ---------------- sci-libs/Shapely/Shapely-1.3.2.ebuild | 29 ---------------- sci-libs/Shapely/Shapely-1.5.17-r1.ebuild | 4 +-- sci-libs/Shapely/Shapely-1.5.17.ebuild | 33 ------------------ sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild | 6 ++-- sci-libs/Shapely/Shapely-1.6.4_p2.ebuild | 54 ----------------------------- sci-libs/Shapely/Shapely-9999.ebuild | 28 --------------- sci-libs/Shapely/files/setup_unicode.patch | 23 ------------ sci-libs/Shapely/metadata.xml | 4 +-- 10 files changed, 9 insertions(+), 215 deletions(-) delete mode 100644 sci-libs/Shapely/Shapely-1.3.0.ebuild delete mode 100644 sci-libs/Shapely/Shapely-1.3.2.ebuild delete mode 100644 sci-libs/Shapely/Shapely-1.5.17.ebuild delete mode 100644 sci-libs/Shapely/Shapely-1.6.4_p2.ebuild delete mode 100644 sci-libs/Shapely/Shapely-9999.ebuild delete mode 100644 sci-libs/Shapely/files/setup_unicode.patch (limited to 'sci-libs/Shapely') diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest index 627806894a30..cc73ed6c90c6 100644 --- a/sci-libs/Shapely/Manifest +++ b/sci-libs/Shapely/Manifest @@ -1,14 +1,6 @@ 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 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 +EBUILD Shapely-1.5.17-r1.ebuild 1075 BLAKE2B d27f0eda9125b453c17f411e18e4961f10e7507e56f10561c4ffd963a3fda58befb1dc2bc5f8fdbc1d702446dfae48e3d056bd47d642ba4493f796988a1ed648 SHA512 90cc083f8102273faa78aff7b0ad4027fdb8368dd8c3a2b7be4d4c9532ef47dd13c7c2842f2e24434ca15248faf2a940f8760baf6ad715b57ac8e043b34c799d +EBUILD Shapely-1.6.4_p2-r1.ebuild 1231 BLAKE2B bcaa4b3dee9e05d924cd7f6f9fdfb17f410d16e7e7210e446e7a126da16a1e91f3998da71305cf5fe0888071fcd05cc9b131c3a8ee5acfb847017df76bb7a8bc SHA512 57cfa44501741647624ad7e0f3b97c327058a40d1dd351454105644559232835ede3ea855c544158fb8998c5a58b7a36218abb09f45f1154cf724ba8c89c1d31 +MISC metadata.xml 242 BLAKE2B 5314a9f3c3a7dd475d215dc1be8c4fba1947504699ae6658044a1f8d05fa860798ebb24aed8b881a16a89f8eb84d554e2f9a738a2193668807173888bc187f56 SHA512 0d12ba53a623b64840750891b600f6fc2b4f857f8766557c54cf7a0ef473320b0bc09bab1d50d6ce2c8284fcf7a10b3aa1df8d43d9b10274101e82e1a7b1db94 diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild deleted file mode 100644 index 4ea83ff68b95..000000000000 --- a/sci-libs/Shapely/Shapely-1.3.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/setup_unicode.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild deleted file mode 100644 index 4ea83ff68b95..000000000000 --- a/sci-libs/Shapely/Shapely-1.3.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/setup_unicode.patch ) - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild b/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild index 10f755d4cc3a..9c0df2cbe226 100644 --- a/sci-libs/Shapely/Shapely-1.5.17-r1.ebuild +++ b/sci-libs/Shapely/Shapely-1.5.17-r1.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=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_6 ) inherit distutils-r1 diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild deleted file mode 100644 index a6993a3d6fcd..000000000000 --- a/sci-libs/Shapely/Shapely-1.5.17.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" - -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}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild index 488e7c29a06e..036aee50103f 100644 --- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild +++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.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} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then 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" + KEYWORDS="amd64 ~x86" fi LICENSE="BSD" diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild deleted file mode 100644 index 7b76620b7303..000000000000 --- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild +++ /dev/null @@ -1,54 +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,7} ) - -inherit distutils-r1 eapi7-ver - -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" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.3 - dev-python/numpy[${PYTHON_USEDEP}]" -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() { - # 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-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild deleted file mode 100644 index 30efef7c6868..000000000000 --- a/sci-libs/Shapely/Shapely-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -inherit distutils-r1 git-r3 - -DESCRIPTION="Geometric objects, predicates, and operations" -HOMEPAGE="https://pypi.org/project/Shapely/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=sci-libs/geos-3.1" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -python_test() { - esetup.py test -} diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch deleted file mode 100644 index 89e1b058f0f8..000000000000 --- a/sci-libs/Shapely/files/setup_unicode.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- setup.py.orig 2014-06-20 10:27:26.638779565 +0200 -+++ setup.py 2014-06-20 10:27:29.885446151 +0200 -@@ -1,4 +1,5 @@ - #!/usr/bin/env python -+# -*- coding: utf-8 -*- - - from __future__ import print_function - -@@ -74,8 +75,12 @@ - readme_text = fp.read() - readme_text = readme_text.replace(".. include:: CREDITS.txt", "") - --with open('CREDITS.txt', 'r') as fp: -- credits = fp.read() -+if sys.version_info[0] == 3: -+ with open('CREDITS.txt', 'r', encoding='utf-8') as fp: -+ credits = fp.read() -+elif sys.version_info[0] == 2: -+ with open('CREDITS.txt', 'r') as fp: -+ credits = fp.read().decode('utf-8') - - with open('CHANGES.txt', 'r') as fp: - changes_text = fp.read() diff --git a/sci-libs/Shapely/metadata.xml b/sci-libs/Shapely/metadata.xml index a97d495a34c5..8c6ed6fdd97a 100644 --- a/sci-libs/Shapely/metadata.xml +++ b/sci-libs/Shapely/metadata.xml @@ -1,9 +1,7 @@ - - slis@gentoo.org - + Shapely -- cgit v1.2.3