Gentoo Archives: gentoo-commits

From: Dennis Lamm <expeditioneer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, sci-libs/Rtree/, sci-libs/rtree/
Date: Sun, 11 Oct 2020 13:50:48
Message-Id: 1602424237.ead3dbad2e9beb6bc3ecde96730c931beb79ebb5.expeditioneer@gentoo
1 commit: ead3dbad2e9beb6bc3ecde96730c931beb79ebb5
2 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 11 13:15:18 2020 +0000
4 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 11 13:50:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3dbad
7
8 sci-libs/rtree: renamed from Rtree to rtree
9
10 removed old
11
12 Closes: https://bugs.gentoo.org/738596
13
14 Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org>
15 Closes: https://github.com/gentoo/gentoo/pull/17885
16 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
17
18 profiles/updates/4Q-2019 | 1 +
19 sci-libs/Rtree/Manifest | 2 --
20 sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild | 28 ----------------------
21 sci-libs/rtree/Manifest | 1 +
22 sci-libs/{Rtree => rtree}/metadata.xml | 0
23 .../rtree-0.9.4.ebuild} | 5 +++-
24 6 files changed, 6 insertions(+), 31 deletions(-)
25
26 diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019
27 index 55d4ca51132..8bf87c31899 100644
28 --- a/profiles/updates/4Q-2019
29 +++ b/profiles/updates/4Q-2019
30 @@ -5,3 +5,4 @@ move app-admin/graylog2 app-admin/graylog
31 move media-libs/libclthreads dev-libs/libclthreads
32 move media-libs/libclxclient x11-libs/libclxclient
33 slotmove net-misc/teamviewer 15 0
34 +move sci-libs/Rtree sci-libs/rtree
35
36 diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
37 deleted file mode 100644
38 index 5d97cab36f4..00000000000
39 --- a/sci-libs/Rtree/Manifest
40 +++ /dev/null
41 @@ -1,2 +0,0 @@
42 -DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c
43 -DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
44
45 diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
46 deleted file mode 100644
47 index 0832cb96d36..00000000000
48 --- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
49 +++ /dev/null
50 @@ -1,28 +0,0 @@
51 -# Copyright 1999-2020 Gentoo Authors
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI="7"
55 -PYTHON_COMPAT=( python3_{6,7} )
56 -
57 -inherit distutils-r1
58 -
59 -EGIT_COMMIT_HASH="c6437a8ae182cb58aef1d0a4465bfc0c6f75b273"
60 -
61 -DESCRIPTION="R-Tree spatial index for Python GIS"
62 -HOMEPAGE="https://github.com/Toblerity/rtree"
63 -SRC_URI="https://github.com/Toblerity/rtree/archive/${EGIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
64 -
65 -LICENSE="LGPL-2.1"
66 -SLOT="0"
67 -KEYWORDS="~amd64 ~x86"
68 -IUSE="test"
69 -RESTRICT="!test? ( test )"
70 -
71 -RDEPEND="sci-libs/libspatialindex"
72 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
73 -
74 -S="${WORKDIR}/rtree-${EGIT_COMMIT_HASH}"
75 -
76 -python_test() {
77 - pytest -vv || die
78 -}
79
80 diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
81 new file mode 100644
82 index 00000000000..405a862ae51
83 --- /dev/null
84 +++ b/sci-libs/rtree/Manifest
85 @@ -0,0 +1 @@
86 +DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
87
88 diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/rtree/metadata.xml
89 similarity index 100%
90 rename from sci-libs/Rtree/metadata.xml
91 rename to sci-libs/rtree/metadata.xml
92
93 diff --git a/sci-libs/Rtree/Rtree-0.9.4.ebuild b/sci-libs/rtree/rtree-0.9.4.ebuild
94 similarity index 81%
95 rename from sci-libs/Rtree/Rtree-0.9.4.ebuild
96 rename to sci-libs/rtree/rtree-0.9.4.ebuild
97 index ee3030b4dff..a7ec9222022 100644
98 --- a/sci-libs/Rtree/Rtree-0.9.4.ebuild
99 +++ b/sci-libs/rtree/rtree-0.9.4.ebuild
100 @@ -7,9 +7,12 @@ PYTHON_COMPAT=( python3_{7..8} )
101
102 inherit distutils-r1
103
104 +MY_PN="Rtree"
105 +MY_P="${MY_PN}-${PV}"
106 +
107 DESCRIPTION="R-Tree spatial index for Python GIS"
108 HOMEPAGE="https://rtree.readthedocs.io/en/latest/"
109 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
110 +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
111 LICENSE="MIT"
112
113 KEYWORDS="~amd64 ~x86"