| 1 |
commit: f15208d661780f73287e71d2f22b3b4f5f699bf1 |
| 2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 20:26:53 2020 +0000 |
| 4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 12 18:59:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15208d6 |
| 7 |
|
| 8 |
sci-libs/shapely: moved from sci-libs/Shapely |
| 9 |
|
| 10 |
Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org> |
| 11 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/updates/3Q-2020 | 1 + |
| 14 |
sci-libs/{Shapely => shapely}/Manifest | 2 +- |
| 15 |
.../files/shapely-1.6.4_p2-test_operations.patch} | 0 |
| 16 |
sci-libs/{Shapely => shapely}/metadata.xml | 0 |
| 17 |
.../shapely-1.6.4_p2-r1.ebuild} | 12 +++++++----- |
| 18 |
.../Shapely-1.7.0.ebuild => shapely/shapely-1.7.0.ebuild} | 5 +++++ |
| 19 |
6 files changed, 14 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020 |
| 22 |
index 4678c55b344..9d7504fc580 100644 |
| 23 |
--- a/profiles/updates/3Q-2020 |
| 24 |
+++ b/profiles/updates/3Q-2020 |
| 25 |
@@ -145,3 +145,4 @@ slotmove dev-haskell/network 3 0 |
| 26 |
move sci-libs/scipy dev-python/scipy |
| 27 |
move dev-perl/frontier-rpc dev-perl/Frontier-RPC |
| 28 |
move sci-libs/Rtree sci-libs/rtree |
| 29 |
+move sci-libs/Shapely sci-libs/shapely |
| 30 |
|
| 31 |
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/shapely/Manifest |
| 32 |
similarity index 89% |
| 33 |
rename from sci-libs/Shapely/Manifest |
| 34 |
rename to sci-libs/shapely/Manifest |
| 35 |
index 4fab9715505..d2eb3633fd2 100644 |
| 36 |
--- a/sci-libs/Shapely/Manifest |
| 37 |
+++ b/sci-libs/shapely/Manifest |
| 38 |
@@ -1,2 +1,2 @@ |
| 39 |
DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f |
| 40 |
-DIST Shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de |
| 41 |
+DIST shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de |
| 42 |
|
| 43 |
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 |
| 44 |
similarity index 100% |
| 45 |
rename from sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch |
| 46 |
rename to sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch |
| 47 |
|
| 48 |
diff --git a/sci-libs/Shapely/metadata.xml b/sci-libs/shapely/metadata.xml |
| 49 |
similarity index 100% |
| 50 |
rename from sci-libs/Shapely/metadata.xml |
| 51 |
rename to sci-libs/shapely/metadata.xml |
| 52 |
|
| 53 |
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild |
| 54 |
similarity index 86% |
| 55 |
rename from sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild |
| 56 |
rename to sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild |
| 57 |
index a9ad4b613f2..be793427c4b 100644 |
| 58 |
--- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild |
| 59 |
+++ b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild |
| 60 |
@@ -3,6 +3,10 @@ |
| 61 |
|
| 62 |
EAPI=7 |
| 63 |
|
| 64 |
+MY_PN="Shapely" |
| 65 |
+MY_PV="$(ver_cut 1-3).post$(ver_cut 5)" |
| 66 |
+MY_P="${MY_PN}-${MY_PV}" |
| 67 |
+ |
| 68 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 69 |
|
| 70 |
inherit distutils-r1 |
| 71 |
@@ -10,14 +14,12 @@ inherit distutils-r1 |
| 72 |
DESCRIPTION="Geometric objects, predicates, and operations" |
| 73 |
HOMEPAGE="https://pypi.org/project/Shapely/" |
| 74 |
|
| 75 |
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)" |
| 76 |
- |
| 77 |
if [[ ${PV} == "9999" ]] ; then |
| 78 |
inherit git-r3 |
| 79 |
SRC_URI="" |
| 80 |
- EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git" |
| 81 |
+ EGIT_REPO_URI="https://github.com/Toblerity/${MY_PN}.git" |
| 82 |
else |
| 83 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" |
| 84 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}.tar.gz" |
| 85 |
KEYWORDS="amd64 ~arm64 x86" |
| 86 |
fi |
| 87 |
|
| 88 |
@@ -36,7 +38,7 @@ RESTRICT="!test? ( test )" |
| 89 |
|
| 90 |
PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624 |
| 91 |
|
| 92 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
| 93 |
+S="${WORKDIR}/${MY_P}" |
| 94 |
|
| 95 |
python_prepare_all() { |
| 96 |
# fix install path for Cython definition file |
| 97 |
|
| 98 |
diff --git a/sci-libs/Shapely/Shapely-1.7.0.ebuild b/sci-libs/shapely/shapely-1.7.0.ebuild |
| 99 |
similarity index 92% |
| 100 |
rename from sci-libs/Shapely/Shapely-1.7.0.ebuild |
| 101 |
rename to sci-libs/shapely/shapely-1.7.0.ebuild |
| 102 |
index a9bd484c2d6..3e2d10095ce 100644 |
| 103 |
--- a/sci-libs/Shapely/Shapely-1.7.0.ebuild |
| 104 |
+++ b/sci-libs/shapely/shapely-1.7.0.ebuild |
| 105 |
@@ -3,6 +3,9 @@ |
| 106 |
|
| 107 |
EAPI=7 |
| 108 |
|
| 109 |
+MY_PN="Shapely" |
| 110 |
+MY_P="${MY_PN}-${PV}" |
| 111 |
+ |
| 112 |
PYTHON_COMPAT=( python3_{7..8} ) |
| 113 |
|
| 114 |
inherit distutils-r1 |
| 115 |
@@ -24,6 +27,8 @@ BDEPEND="${RDEPEND} |
| 116 |
dev-python/cython[${PYTHON_USEDEP}] |
| 117 |
" |
| 118 |
|
| 119 |
+S="${WORKDIR}/${MY_P}" |
| 120 |
+ |
| 121 |
distutils_enable_tests pytest |
| 122 |
|
| 123 |
distutils_enable_sphinx docs dev-python/matplotlib |
Archives