1 |
commit: 82a9c5cdc6e383a94c5a8b4f412d33629d44a5cf |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 12:11:28 2019 +0000 |
4 |
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 10 12:13:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a9c5cd |
7 |
|
8 |
dev-db/postgis: Cleanup old |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
11 |
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> |
12 |
|
13 |
dev-db/postgis/Manifest | 2 - |
14 |
.../postgis/files/postgis-2.4.2-jsonc_0.13.patch | 23 ---- |
15 |
dev-db/postgis/postgis-2.4.2.ebuild | 126 --------------------- |
16 |
dev-db/postgis/postgis-2.4.3.ebuild | 126 --------------------- |
17 |
dev-db/postgis/postgis-2.5.1.ebuild | 125 -------------------- |
18 |
5 files changed, 402 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest |
21 |
index db040ac97ea..588e5ec51cf 100644 |
22 |
--- a/dev-db/postgis/Manifest |
23 |
+++ b/dev-db/postgis/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 |
26 |
-DIST postgis-2.4.3.tar.gz 12601055 BLAKE2B 662b2afe145bc23c77ebda7306d07a20e39c1a598316cee58e1591e65ce1b2d2a3f727f5463ba144711faa55f7c11e4a038b6ad2a76cab760b4fdd43647f09c3 SHA512 95b2c925cb10943e7136aa3b7b08a9ad3d6ff59a3994c653bba52e4c65193d519daa49684b924f68945dd596187aa17e0c713bf0b9e29f8c5973346b279dba1b |
27 |
DIST postgis-2.4.6.tar.gz 12616474 BLAKE2B 8e33ae7e8ca5ef2a4dd90f64a8e9910118e4ef711444b196f46e4a63f98ff6044709d65a853c5c10de91308658a206965503b6a85a16438ea422becdbbd9bb40 SHA512 eec4276a58549f3cc57d6574186aebc72df0dd7dc2ab9acbaf410604b4d271dee6d5154caacd7297d20493d879434ca78050672e8197ff0fc63a36100c20c66c |
28 |
DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60 SHA512 c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0 |
29 |
|
30 |
diff --git a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch b/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch |
31 |
deleted file mode 100644 |
32 |
index b980e77333d..00000000000 |
33 |
--- a/dev-db/postgis/files/postgis-2.4.2-jsonc_0.13.patch |
34 |
+++ /dev/null |
35 |
@@ -1,23 +0,0 @@ |
36 |
-diff -Naur postgis-2.4.2.old/liblwgeom/lwin_geojson.c postgis-2.4.2/liblwgeom/lwin_geojson.c |
37 |
---- postgis-2.4.2.old/liblwgeom/lwin_geojson.c 2017-12-21 22:52:40.422802160 +0100 |
38 |
-+++ postgis-2.4.2/liblwgeom/lwin_geojson.c 2017-12-21 22:55:36.605430945 +0100 |
39 |
-@@ -31,13 +31,19 @@ |
40 |
- |
41 |
- #if defined(HAVE_LIBJSON) || defined(HAVE_LIBJSON_C) /* --{ */ |
42 |
- |
43 |
-+#define JSON_C_VERSION_013 (13 << 8) |
44 |
-+ |
45 |
- #ifdef HAVE_LIBJSON_C |
46 |
- #include <json-c/json.h> |
47 |
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 |
48 |
- #include <json-c/json_object_private.h> |
49 |
-+#endif |
50 |
- #else |
51 |
- #include <json/json.h> |
52 |
-+#if !defined(JSON_C_VERSION_NUM) || JSON_C_VERSION_NUM < JSON_C_VERSION_013 |
53 |
- #include <json/json_object_private.h> |
54 |
- #endif |
55 |
-+#endif |
56 |
- |
57 |
- #ifndef JSON_C_VERSION |
58 |
- /* Adds support for libjson < 0.10 */ |
59 |
|
60 |
diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild |
61 |
deleted file mode 100644 |
62 |
index 2dd323bc643..00000000000 |
63 |
--- a/dev-db/postgis/postgis-2.4.2.ebuild |
64 |
+++ /dev/null |
65 |
@@ -1,126 +0,0 @@ |
66 |
-# Copyright 1999-2018 Gentoo Foundation |
67 |
-# Distributed under the terms of the GNU General Public License v2 |
68 |
- |
69 |
-EAPI="6" |
70 |
- |
71 |
-POSTGRES_COMPAT=( 9.{3..6} 10 ) |
72 |
-POSTGRES_USEDEP="server" |
73 |
- |
74 |
-inherit autotools eutils postgres-multi versionator |
75 |
- |
76 |
-MY_PV=$(replace_version_separator 3 '') |
77 |
-MY_P="${PN}-${MY_PV}" |
78 |
-S="${WORKDIR}/${MY_P}" |
79 |
- |
80 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
81 |
-HOMEPAGE="http://postgis.net" |
82 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
83 |
-LICENSE="GPL-2" |
84 |
-SLOT="0" |
85 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
86 |
-IUSE="address-standardizer doc gtk static-libs mapbox test topology" |
87 |
- |
88 |
-RDEPEND=" |
89 |
- ${POSTGRES_DEP} |
90 |
- dev-libs/json-c:= |
91 |
- dev-libs/libxml2:2 |
92 |
- >=sci-libs/geos-3.5.0 |
93 |
- >=sci-libs/proj-4.6.0 |
94 |
- >=sci-libs/gdal-1.10.0 |
95 |
- address-standardizer? ( dev-libs/libpcre ) |
96 |
- gtk? ( x11-libs/gtk+:2 ) |
97 |
- mapbox? ( dev-libs/protobuf ) |
98 |
-" |
99 |
- |
100 |
-DEPEND="${RDEPEND} |
101 |
- doc? ( |
102 |
- app-text/docbook-xsl-stylesheets |
103 |
- app-text/docbook-xml-dtd:4.5 |
104 |
- dev-libs/libxslt |
105 |
- || ( |
106 |
- media-gfx/imagemagick[png] |
107 |
- media-gfx/graphicsmagick[imagemagick,png] |
108 |
- ) |
109 |
- ) |
110 |
- virtual/pkgconfig |
111 |
- test? ( dev-util/cunit ) |
112 |
-" |
113 |
- |
114 |
-PGIS="$(get_version_component_range 1-2)" |
115 |
- |
116 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
117 |
- |
118 |
-# Needs a running psql instance, doesn't work out of the box |
119 |
-RESTRICT="test" |
120 |
- |
121 |
-MAKEOPTS+=' -j1' |
122 |
- |
123 |
-# These modules are built using the same *FLAGS that were used to build |
124 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
125 |
-# *FLAGS settings. |
126 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
127 |
- |
128 |
-src_prepare() { |
129 |
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \ |
130 |
- "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch" |
131 |
- |
132 |
- local AT_M4DIR="macros" |
133 |
- eautoreconf |
134 |
- |
135 |
- postgres-multi_src_prepare |
136 |
-} |
137 |
- |
138 |
-src_configure() { |
139 |
- local myargs="" |
140 |
- |
141 |
- use gtk && myargs+=" --with-gui" |
142 |
- |
143 |
- use address-standardizer || myargs+=" --without-address-standardizer" |
144 |
- use mapbox || myargs+=" --without-protobuf" |
145 |
- use topology || myargs+=" --without-topology" |
146 |
- |
147 |
- postgres-multi_foreach econf ${myargs} |
148 |
-} |
149 |
- |
150 |
-src_compile() { |
151 |
- postgres-multi_foreach emake |
152 |
- postgres-multi_foreach emake -C topology |
153 |
- |
154 |
- if use doc ; then |
155 |
- postgres-multi_foreach emake comments |
156 |
- postgres-multi_foreach emake cheatsheets |
157 |
- postgres-multi_forbest emake -C doc html |
158 |
- fi |
159 |
-} |
160 |
- |
161 |
-src_install() { |
162 |
- postgres-multi_foreach emake DESTDIR="${D}" install |
163 |
- postgres-multi_foreach emake -C topology DESTDIR="${D}" install |
164 |
- postgres-multi_forbest dobin ./utils/postgis_restore.pl |
165 |
- |
166 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
167 |
- |
168 |
- docinto topology |
169 |
- dodoc topology/{TODO,README} |
170 |
- |
171 |
- if use doc ; then |
172 |
- postgres-multi_foreach emake DESTDIR="${D}" comments-install |
173 |
- |
174 |
- docinto html |
175 |
- postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} |
176 |
- |
177 |
- docinto html/images |
178 |
- postgres-multi_forbest dodoc doc/html/images/* |
179 |
- fi |
180 |
- |
181 |
- use static-libs || find "${ED}" -name '*.a' -delete |
182 |
-} |
183 |
- |
184 |
-pkg_postinst() { |
185 |
- ebegin "Refreshing PostgreSQL symlinks" |
186 |
- postgresql-config update |
187 |
- eend $? |
188 |
- |
189 |
- elog "To finish installing PostGIS, follow the directions detailed at:" |
190 |
- elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" |
191 |
-} |
192 |
|
193 |
diff --git a/dev-db/postgis/postgis-2.4.3.ebuild b/dev-db/postgis/postgis-2.4.3.ebuild |
194 |
deleted file mode 100644 |
195 |
index a24f81220e5..00000000000 |
196 |
--- a/dev-db/postgis/postgis-2.4.3.ebuild |
197 |
+++ /dev/null |
198 |
@@ -1,126 +0,0 @@ |
199 |
-# Copyright 1999-2018 Gentoo Foundation |
200 |
-# Distributed under the terms of the GNU General Public License v2 |
201 |
- |
202 |
-EAPI="6" |
203 |
- |
204 |
-POSTGRES_COMPAT=( 9.{3..6} 10 ) |
205 |
-POSTGRES_USEDEP="server" |
206 |
- |
207 |
-inherit autotools eutils postgres-multi versionator |
208 |
- |
209 |
-MY_PV=$(replace_version_separator 3 '') |
210 |
-MY_P="${PN}-${MY_PV}" |
211 |
-S="${WORKDIR}/${MY_P}" |
212 |
- |
213 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
214 |
-HOMEPAGE="http://postgis.net" |
215 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
216 |
-LICENSE="GPL-2" |
217 |
-SLOT="0" |
218 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
219 |
-IUSE="address-standardizer doc gtk static-libs mapbox test topology" |
220 |
- |
221 |
-RDEPEND=" |
222 |
- ${POSTGRES_DEP} |
223 |
- dev-libs/json-c:= |
224 |
- dev-libs/libxml2:2 |
225 |
- >=sci-libs/geos-3.5.0 |
226 |
- >=sci-libs/proj-4.6.0 |
227 |
- >=sci-libs/gdal-1.10.0 |
228 |
- address-standardizer? ( dev-libs/libpcre ) |
229 |
- gtk? ( x11-libs/gtk+:2 ) |
230 |
- mapbox? ( dev-libs/protobuf ) |
231 |
-" |
232 |
- |
233 |
-DEPEND="${RDEPEND} |
234 |
- doc? ( |
235 |
- app-text/docbook-xsl-stylesheets |
236 |
- app-text/docbook-xml-dtd:4.5 |
237 |
- dev-libs/libxslt |
238 |
- || ( |
239 |
- media-gfx/imagemagick[png] |
240 |
- media-gfx/graphicsmagick[imagemagick,png] |
241 |
- ) |
242 |
- ) |
243 |
- virtual/pkgconfig |
244 |
- test? ( dev-util/cunit ) |
245 |
-" |
246 |
- |
247 |
-PGIS="$(get_version_component_range 1-2)" |
248 |
- |
249 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
250 |
- |
251 |
-# Needs a running psql instance, doesn't work out of the box |
252 |
-RESTRICT="test" |
253 |
- |
254 |
-MAKEOPTS+=' -j1' |
255 |
- |
256 |
-# These modules are built using the same *FLAGS that were used to build |
257 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
258 |
-# *FLAGS settings. |
259 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
260 |
- |
261 |
-src_prepare() { |
262 |
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" \ |
263 |
- "${FILESDIR}/postgis-2.4.2-jsonc_0.13.patch" |
264 |
- |
265 |
- local AT_M4DIR="macros" |
266 |
- eautoreconf |
267 |
- |
268 |
- postgres-multi_src_prepare |
269 |
-} |
270 |
- |
271 |
-src_configure() { |
272 |
- local myargs="" |
273 |
- |
274 |
- use gtk && myargs+=" --with-gui" |
275 |
- |
276 |
- use address-standardizer || myargs+=" --without-address-standardizer" |
277 |
- use mapbox || myargs+=" --without-protobuf" |
278 |
- use topology || myargs+=" --without-topology" |
279 |
- |
280 |
- postgres-multi_foreach econf ${myargs} |
281 |
-} |
282 |
- |
283 |
-src_compile() { |
284 |
- postgres-multi_foreach emake |
285 |
- postgres-multi_foreach emake -C topology |
286 |
- |
287 |
- if use doc ; then |
288 |
- postgres-multi_foreach emake comments |
289 |
- postgres-multi_foreach emake cheatsheets |
290 |
- postgres-multi_forbest emake -C doc html |
291 |
- fi |
292 |
-} |
293 |
- |
294 |
-src_install() { |
295 |
- postgres-multi_foreach emake DESTDIR="${D}" install |
296 |
- postgres-multi_foreach emake -C topology DESTDIR="${D}" install |
297 |
- postgres-multi_forbest dobin ./utils/postgis_restore.pl |
298 |
- |
299 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
300 |
- |
301 |
- docinto topology |
302 |
- dodoc topology/{TODO,README} |
303 |
- |
304 |
- if use doc ; then |
305 |
- postgres-multi_foreach emake DESTDIR="${D}" comments-install |
306 |
- |
307 |
- docinto html |
308 |
- postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} |
309 |
- |
310 |
- docinto html/images |
311 |
- postgres-multi_forbest dodoc doc/html/images/* |
312 |
- fi |
313 |
- |
314 |
- use static-libs || find "${ED}" -name '*.a' -delete |
315 |
-} |
316 |
- |
317 |
-pkg_postinst() { |
318 |
- ebegin "Refreshing PostgreSQL symlinks" |
319 |
- postgresql-config update |
320 |
- eend $? |
321 |
- |
322 |
- elog "To finish installing PostGIS, follow the directions detailed at:" |
323 |
- elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" |
324 |
-} |
325 |
|
326 |
diff --git a/dev-db/postgis/postgis-2.5.1.ebuild b/dev-db/postgis/postgis-2.5.1.ebuild |
327 |
deleted file mode 100644 |
328 |
index c78f3e5ac27..00000000000 |
329 |
--- a/dev-db/postgis/postgis-2.5.1.ebuild |
330 |
+++ /dev/null |
331 |
@@ -1,125 +0,0 @@ |
332 |
-# Copyright 1999-2018 Gentoo Authors |
333 |
-# Distributed under the terms of the GNU General Public License v2 |
334 |
- |
335 |
-EAPI="6" |
336 |
- |
337 |
-POSTGRES_COMPAT=( 9.{3..6} {10..11} ) |
338 |
-POSTGRES_USEDEP="server" |
339 |
- |
340 |
-inherit autotools eutils postgres-multi versionator |
341 |
- |
342 |
-MY_PV=$(replace_version_separator 3 '') |
343 |
-MY_P="${PN}-${MY_PV}" |
344 |
-S="${WORKDIR}/${MY_P}" |
345 |
- |
346 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
347 |
-HOMEPAGE="http://postgis.net" |
348 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
349 |
-LICENSE="GPL-2" |
350 |
-SLOT="0" |
351 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
352 |
-IUSE="address-standardizer doc gtk static-libs mapbox test topology" |
353 |
- |
354 |
-RDEPEND=" |
355 |
- ${POSTGRES_DEP} |
356 |
- dev-libs/json-c:= |
357 |
- dev-libs/libxml2:2 |
358 |
- >=sci-libs/geos-3.5.0 |
359 |
- >=sci-libs/proj-4.6.0 |
360 |
- >=sci-libs/gdal-1.10.0 |
361 |
- address-standardizer? ( dev-libs/libpcre ) |
362 |
- gtk? ( x11-libs/gtk+:2 ) |
363 |
- mapbox? ( dev-libs/protobuf ) |
364 |
-" |
365 |
- |
366 |
-DEPEND="${RDEPEND} |
367 |
- doc? ( |
368 |
- app-text/docbook-xsl-stylesheets |
369 |
- app-text/docbook-xml-dtd:4.5 |
370 |
- dev-libs/libxslt |
371 |
- || ( |
372 |
- media-gfx/imagemagick[png] |
373 |
- media-gfx/graphicsmagick[imagemagick,png] |
374 |
- ) |
375 |
- ) |
376 |
- virtual/pkgconfig |
377 |
- test? ( dev-util/cunit ) |
378 |
-" |
379 |
- |
380 |
-PGIS="$(get_version_component_range 1-2)" |
381 |
- |
382 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
383 |
- |
384 |
-# Needs a running psql instance, doesn't work out of the box |
385 |
-RESTRICT="test" |
386 |
- |
387 |
-MAKEOPTS+=' -j1' |
388 |
- |
389 |
-# These modules are built using the same *FLAGS that were used to build |
390 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
391 |
-# *FLAGS settings. |
392 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
393 |
- |
394 |
-src_prepare() { |
395 |
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" |
396 |
- |
397 |
- local AT_M4DIR="macros" |
398 |
- eautoreconf |
399 |
- |
400 |
- postgres-multi_src_prepare |
401 |
-} |
402 |
- |
403 |
-src_configure() { |
404 |
- local myargs="" |
405 |
- |
406 |
- use gtk && myargs+=" --with-gui" |
407 |
- |
408 |
- use address-standardizer || myargs+=" --without-address-standardizer" |
409 |
- use mapbox || myargs+=" --without-protobuf" |
410 |
- use topology || myargs+=" --without-topology" |
411 |
- |
412 |
- postgres-multi_foreach econf ${myargs} |
413 |
-} |
414 |
- |
415 |
-src_compile() { |
416 |
- postgres-multi_foreach emake |
417 |
- postgres-multi_foreach emake -C topology |
418 |
- |
419 |
- if use doc ; then |
420 |
- postgres-multi_foreach emake comments |
421 |
- postgres-multi_foreach emake cheatsheets |
422 |
- postgres-multi_forbest emake -C doc html |
423 |
- fi |
424 |
-} |
425 |
- |
426 |
-src_install() { |
427 |
- postgres-multi_foreach emake DESTDIR="${D}" install |
428 |
- postgres-multi_foreach emake -C topology DESTDIR="${D}" install |
429 |
- postgres-multi_forbest dobin ./utils/postgis_restore.pl |
430 |
- |
431 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
432 |
- |
433 |
- docinto topology |
434 |
- dodoc topology/{TODO,README} |
435 |
- |
436 |
- if use doc ; then |
437 |
- postgres-multi_foreach emake DESTDIR="${D}" comments-install |
438 |
- |
439 |
- docinto html |
440 |
- postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} |
441 |
- |
442 |
- docinto html/images |
443 |
- postgres-multi_forbest dodoc doc/html/images/* |
444 |
- fi |
445 |
- |
446 |
- use static-libs || find "${ED}" -name '*.a' -delete |
447 |
-} |
448 |
- |
449 |
-pkg_postinst() { |
450 |
- ebegin "Refreshing PostgreSQL symlinks" |
451 |
- postgresql-config update |
452 |
- eend $? |
453 |
- |
454 |
- elog "To finish installing PostGIS, follow the directions detailed at:" |
455 |
- elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" |
456 |
-} |