1 |
commit: 9775c9b0099272ca62b7cdf062b2902c96dd873e |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 08:53:13 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 08:53:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9775c9b0 |
7 |
|
8 |
sci-libs/Shapely: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
sci-libs/Shapely/Manifest | 2 -- |
14 |
sci-libs/Shapely/Shapely-1.3.0.ebuild | 29 ---------------- |
15 |
sci-libs/Shapely/Shapely-1.3.2.ebuild | 29 ---------------- |
16 |
sci-libs/Shapely/Shapely-1.5.17.ebuild | 33 ------------------ |
17 |
sci-libs/Shapely/Shapely-1.6.4_p2.ebuild | 54 ------------------------------ |
18 |
sci-libs/Shapely/files/setup_unicode.patch | 23 ------------- |
19 |
6 files changed, 170 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest |
22 |
index ab1a676fbf8..b64bd533a44 100644 |
23 |
--- a/sci-libs/Shapely/Manifest |
24 |
+++ b/sci-libs/Shapely/Manifest |
25 |
@@ -1,4 +1,2 @@ |
26 |
-DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82 |
27 |
-DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d |
28 |
DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d |
29 |
DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f |
30 |
|
31 |
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild |
32 |
deleted file mode 100644 |
33 |
index 4ea83ff68b9..00000000000 |
34 |
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,29 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI="5" |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
- |
44 |
-inherit distutils-r1 |
45 |
- |
46 |
-DESCRIPTION="Geometric objects, predicates, and operations" |
47 |
-HOMEPAGE="https://pypi.org/project/Shapely/" |
48 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
49 |
- |
50 |
-LICENSE="BSD" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~amd64 ~x86" |
53 |
-IUSE="test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
- |
56 |
-RDEPEND=">=sci-libs/geos-3.1" |
57 |
-DEPEND="${RDEPEND} |
58 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
59 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
60 |
- |
61 |
-PATCHES=( "${FILESDIR}"/setup_unicode.patch ) |
62 |
- |
63 |
-python_test() { |
64 |
- esetup.py test |
65 |
-} |
66 |
|
67 |
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild |
68 |
deleted file mode 100644 |
69 |
index 4ea83ff68b9..00000000000 |
70 |
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,29 +0,0 @@ |
73 |
-# Copyright 1999-2019 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI="5" |
77 |
- |
78 |
-PYTHON_COMPAT=( python2_7 ) |
79 |
- |
80 |
-inherit distutils-r1 |
81 |
- |
82 |
-DESCRIPTION="Geometric objects, predicates, and operations" |
83 |
-HOMEPAGE="https://pypi.org/project/Shapely/" |
84 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
85 |
- |
86 |
-LICENSE="BSD" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="~amd64 ~x86" |
89 |
-IUSE="test" |
90 |
-RESTRICT="!test? ( test )" |
91 |
- |
92 |
-RDEPEND=">=sci-libs/geos-3.1" |
93 |
-DEPEND="${RDEPEND} |
94 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
95 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
96 |
- |
97 |
-PATCHES=( "${FILESDIR}"/setup_unicode.patch ) |
98 |
- |
99 |
-python_test() { |
100 |
- esetup.py test |
101 |
-} |
102 |
|
103 |
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild |
104 |
deleted file mode 100644 |
105 |
index a6993a3d6fc..00000000000 |
106 |
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild |
107 |
+++ /dev/null |
108 |
@@ -1,33 +0,0 @@ |
109 |
-# Copyright 1999-2019 Gentoo Authors |
110 |
-# Distributed under the terms of the GNU General Public License v2 |
111 |
- |
112 |
-EAPI="5" |
113 |
-PYTHON_COMPAT=( python{2_7,3_5} ) |
114 |
- |
115 |
-inherit distutils-r1 |
116 |
- |
117 |
-DESCRIPTION="Geometric objects, predicates, and operations" |
118 |
-HOMEPAGE="https://pypi.org/project/Shapely/" |
119 |
- |
120 |
-if [[ ${PV} == "9999" ]] ; then |
121 |
- inherit git-r3 |
122 |
- SRC_URI="" |
123 |
- EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" |
124 |
-else |
125 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
126 |
- KEYWORDS="~amd64 ~x86" |
127 |
-fi |
128 |
- |
129 |
-LICENSE="BSD" |
130 |
-SLOT="0" |
131 |
-IUSE="test" |
132 |
-RESTRICT="!test? ( test )" |
133 |
- |
134 |
-RDEPEND=">=sci-libs/geos-3.1" |
135 |
-DEPEND="${RDEPEND} |
136 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
137 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
138 |
- |
139 |
-python_test() { |
140 |
- esetup.py test |
141 |
-} |
142 |
|
143 |
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild |
144 |
deleted file mode 100644 |
145 |
index 7b76620b730..00000000000 |
146 |
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,54 +0,0 @@ |
149 |
-# Copyright 1999-2019 Gentoo Authors |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI=6 |
153 |
- |
154 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
155 |
- |
156 |
-inherit distutils-r1 eapi7-ver |
157 |
- |
158 |
-DESCRIPTION="Geometric objects, predicates, and operations" |
159 |
-HOMEPAGE="https://pypi.org/project/Shapely/" |
160 |
- |
161 |
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)" |
162 |
- |
163 |
-if [[ ${PV} == "9999" ]] ; then |
164 |
- inherit git-r3 |
165 |
- SRC_URI="" |
166 |
- EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" |
167 |
-else |
168 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" |
169 |
- KEYWORDS="~amd64 ~x86" |
170 |
-fi |
171 |
- |
172 |
-LICENSE="BSD" |
173 |
-SLOT="0" |
174 |
-IUSE="test" |
175 |
-RESTRICT="!test? ( test )" |
176 |
- |
177 |
-RDEPEND=">=sci-libs/geos-3.3 |
178 |
- dev-python/numpy[${PYTHON_USEDEP}]" |
179 |
-DEPEND="${RDEPEND} |
180 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
181 |
- dev-python/cython[${PYTHON_USEDEP}] |
182 |
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
183 |
- |
184 |
-PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624 |
185 |
- |
186 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
187 |
- |
188 |
-python_prepare_all() { |
189 |
- # fix install path for Cython definition file |
190 |
- sed -i \ |
191 |
- -e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \ |
192 |
- setup.py || die |
193 |
- |
194 |
- distutils-r1_python_prepare_all |
195 |
-} |
196 |
- |
197 |
-python_test() { |
198 |
- distutils_install_for_testing |
199 |
- cd "${TEST_DIR}/lib" || die |
200 |
- cp -r "${S}/tests" . || die |
201 |
- py.test tests || die |
202 |
-} |
203 |
|
204 |
diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch |
205 |
deleted file mode 100644 |
206 |
index 89e1b058f0f..00000000000 |
207 |
--- a/sci-libs/Shapely/files/setup_unicode.patch |
208 |
+++ /dev/null |
209 |
@@ -1,23 +0,0 @@ |
210 |
---- setup.py.orig 2014-06-20 10:27:26.638779565 +0200 |
211 |
-+++ setup.py 2014-06-20 10:27:29.885446151 +0200 |
212 |
-@@ -1,4 +1,5 @@ |
213 |
- #!/usr/bin/env python |
214 |
-+# -*- coding: utf-8 -*- |
215 |
- |
216 |
- from __future__ import print_function |
217 |
- |
218 |
-@@ -74,8 +75,12 @@ |
219 |
- readme_text = fp.read() |
220 |
- readme_text = readme_text.replace(".. include:: CREDITS.txt", "") |
221 |
- |
222 |
--with open('CREDITS.txt', 'r') as fp: |
223 |
-- credits = fp.read() |
224 |
-+if sys.version_info[0] == 3: |
225 |
-+ with open('CREDITS.txt', 'r', encoding='utf-8') as fp: |
226 |
-+ credits = fp.read() |
227 |
-+elif sys.version_info[0] == 2: |
228 |
-+ with open('CREDITS.txt', 'r') as fp: |
229 |
-+ credits = fp.read().decode('utf-8') |
230 |
- |
231 |
- with open('CHANGES.txt', 'r') as fp: |
232 |
- changes_text = fp.read() |