1 |
commit: 02044f52ba5d595ff0f824e828950035cd054694 |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 5 16:47:25 2018 +0000 |
4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 5 16:47:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02044f52 |
7 |
|
8 |
dev-db/postgis: Cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
dev-db/postgis/Manifest | 3 - |
13 |
dev-db/postgis/files/postgis-2.0-arflags.patch | 18 -- |
14 |
dev-db/postgis/files/postgis-2.1-ldflags.patch | 26 -- |
15 |
.../files/postgis-2.1.4-pkgconfig-json.patch | 122 --------- |
16 |
dev-db/postgis/files/postgis_dbs | 49 ---- |
17 |
dev-db/postgis/postgis-2.1.8-r1.ebuild | 281 --------------------- |
18 |
dev-db/postgis/postgis-2.3.3.ebuild | 116 --------- |
19 |
dev-db/postgis/postgis-2.4.0.ebuild | 116 --------- |
20 |
8 files changed, 731 deletions(-) |
21 |
|
22 |
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest |
23 |
index 63e28feeff2..a1dfb601ce1 100644 |
24 |
--- a/dev-db/postgis/Manifest |
25 |
+++ b/dev-db/postgis/Manifest |
26 |
@@ -1,4 +1 @@ |
27 |
-DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B f39debafea797fec2595b1ba2256ce3ed19875f15e57829f3480b15ec82ddfbc51702bb29513a9b1cd381696ee0b0857c34e79395a1f627f38a1e41344485ba7 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 |
28 |
-DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c |
29 |
-DIST postgis-2.4.0.tar.gz 12576979 BLAKE2B 2d0312ca9202f92f55700e78881ecdd7128064393b1e7197dd658f8fcee676723c048fa2c7f199aa9d61a5638c0ad0129b6d2dc61d6324caeec3b7163f0f4edc SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 |
30 |
DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 |
31 |
|
32 |
diff --git a/dev-db/postgis/files/postgis-2.0-arflags.patch b/dev-db/postgis/files/postgis-2.0-arflags.patch |
33 |
deleted file mode 100644 |
34 |
index fa2e9a8da60..00000000000 |
35 |
--- a/dev-db/postgis/files/postgis-2.0-arflags.patch |
36 |
+++ /dev/null |
37 |
@@ -1,18 +0,0 @@ |
38 |
-diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in |
39 |
---- a/raster/rt_core/Makefile.in 2012-03-21 21:36:59.000000000 +0000 |
40 |
-+++ b/raster/rt_core/Makefile.in 2013-04-28 13:23:21.055728249 +0000 |
41 |
-@@ -8,7 +8,7 @@ |
42 |
- # |
43 |
- ############################################################################# |
44 |
- |
45 |
--AR=ar rs |
46 |
-+ARFLAGS=rs |
47 |
- |
48 |
- CC=@CC@ |
49 |
- LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a |
50 |
-@@ -35,4 +35,4 @@ |
51 |
- rm -f Makefile |
52 |
- |
53 |
- librtcore.a: $(RT_OBJS) $(RT_HEADERS) |
54 |
-- $(AR) $(RT_LIB) $(RT_OBJS) |
55 |
-+ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS) |
56 |
|
57 |
diff --git a/dev-db/postgis/files/postgis-2.1-ldflags.patch b/dev-db/postgis/files/postgis-2.1-ldflags.patch |
58 |
deleted file mode 100644 |
59 |
index de11510ea37..00000000000 |
60 |
--- a/dev-db/postgis/files/postgis-2.1-ldflags.patch |
61 |
+++ /dev/null |
62 |
@@ -1,26 +0,0 @@ |
63 |
-diff -Naruw postgis-2.1.0rc1.orig/loader/Makefile.in postgis-2.1.0rc1/loader/Makefile.in |
64 |
---- postgis-2.1.0rc1.orig/loader/Makefile.in 2013-05-06 08:30:51.000000000 +0000 |
65 |
-+++ postgis-2.1.0rc1/loader/Makefile.in 2013-07-14 17:19:19.313306844 +0000 |
66 |
-@@ -97,11 +97,11 @@ |
67 |
- |
68 |
- $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) |
69 |
- $(LIBTOOL) --mode=link \ |
70 |
-- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ |
71 |
-+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ |
72 |
- |
73 |
- $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) |
74 |
- $(LIBTOOL) --mode=link \ |
75 |
-- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) |
76 |
-+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) |
77 |
- |
78 |
- shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h |
79 |
- $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c |
80 |
-@@ -109,7 +109,7 @@ |
81 |
- $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES) |
82 |
- $(LIBTOOL) --mode=link \ |
83 |
- $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \ |
84 |
-- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) |
85 |
-+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) |
86 |
- |
87 |
- installdir: |
88 |
- @mkdir -p $(DESTDIR)$(bindir) |
89 |
|
90 |
diff --git a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch b/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch |
91 |
deleted file mode 100644 |
92 |
index 13634abb6de..00000000000 |
93 |
--- a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch |
94 |
+++ /dev/null |
95 |
@@ -1,122 +0,0 @@ |
96 |
-diff --git a/configure.ac b/configure.ac |
97 |
-index a13cf13..c0a7842 100644 |
98 |
---- a/configure.ac |
99 |
-+++ b/configure.ac |
100 |
-@@ -780,61 +780,19 @@ dnl =========================================================================== |
101 |
- dnl Detect if json-c installed |
102 |
- dnl =========================================================================== |
103 |
- |
104 |
--CHECK_JSON=yes |
105 |
--HAVE_JSON=no |
106 |
--HAVE_JSON_C=no |
107 |
-- |
108 |
--AC_ARG_WITH([json], |
109 |
-- [AS_HELP_STRING([--without-json], [build without json-c support])], |
110 |
-- [CHECK_JSON="$withval"], []) |
111 |
-- |
112 |
--if test "$CHECK_JSON" != "no"; then dnl { |
113 |
-- |
114 |
--AC_ARG_WITH([jsondir], |
115 |
-- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])], |
116 |
-- [JSONDIR="$withval"], [JSONDIR=]) |
117 |
-- |
118 |
--if test ! "x$JSONDIR" = "x"; then |
119 |
-- dnl Make sure that the directory exists |
120 |
-- if test "x$JSONDIR" = "xyes"; then |
121 |
-- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to]) |
122 |
-- else |
123 |
-- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR]) |
124 |
-- |
125 |
-- dnl Add the include directory to JSON_CPPFLAGS |
126 |
-- JSON_CPPFLAGS="-I$JSONDIR/include" |
127 |
-- JSON_LDFLAGS="-L$JSONDIR/lib" |
128 |
-- fi |
129 |
--fi |
130 |
-- |
131 |
--dnl Check that we can find the json/json.h header file |
132 |
--CPPFLAGS_SAVE="$CPPFLAGS" |
133 |
--CPPFLAGS="$JSON_CPPFLAGS" |
134 |
--AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [ |
135 |
-- AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], []) |
136 |
--]) |
137 |
--CPPFLAGS="$CPPFLAGS_SAVE" |
138 |
-- |
139 |
--dnl Ensure we can link against libjson |
140 |
--LIBS_SAVE="$LIBS" |
141 |
--LIBS="$JSON_LDFLAGS" |
142 |
--AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [ |
143 |
-- AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], []) |
144 |
--], []) |
145 |
--LIBS="$LIBS_SAVE" |
146 |
-- |
147 |
--if test "$HAVE_JSON" = "yes"; then |
148 |
-+PKG_CHECK_MODULES([JSON], [json], |
149 |
-+ [ |
150 |
-+ HAVE_JSON=yes |
151 |
- AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) |
152 |
--fi |
153 |
--if test "$HAVE_JSON_C" = "yes"; then |
154 |
-- AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir]) |
155 |
--fi |
156 |
-- |
157 |
--AC_SUBST([JSON_CPPFLAGS]) |
158 |
--AC_SUBST([JSON_LDFLAGS]) |
159 |
--AC_SUBST([HAVE_JSON]) |
160 |
-- |
161 |
--fi dnl } |
162 |
-+ ], |
163 |
-+ [ |
164 |
-+ PKG_CHECK_MODULES([JSON], [json-c], |
165 |
-+ [ |
166 |
-+ HAVE_JSON=yes |
167 |
-+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) |
168 |
-+ ], |
169 |
-+ [HAVE_JSON=no]) |
170 |
-+ ]) |
171 |
- |
172 |
- dnl =========================================================================== |
173 |
- dnl Detect GTK+2.0 for GUI |
174 |
-@@ -927,7 +885,7 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics]) |
175 |
- CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS" |
176 |
- AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS]) |
177 |
- |
178 |
--SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS" |
179 |
-+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS" |
180 |
- AC_SUBST([SHLIB_LINK]) |
181 |
- dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK]) |
182 |
- |
183 |
-diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in |
184 |
-index 3cc6256..5ccbb3b 100644 |
185 |
---- a/liblwgeom/Makefile.in |
186 |
-+++ b/liblwgeom/Makefile.in |
187 |
-@@ -11,8 +11,8 @@ |
188 |
- # ********************************************************************** |
189 |
- |
190 |
- CC = @CC@ |
191 |
--CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@ |
192 |
--LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@ |
193 |
-+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@ |
194 |
-+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@ |
195 |
- NUMERICFLAGS = @NUMERICFLAGS@ |
196 |
- top_builddir = @top_builddir@ |
197 |
- prefix = @prefix@ |
198 |
-diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c |
199 |
-index 7019626..ec1d594 100644 |
200 |
---- a/liblwgeom/lwin_geojson.c |
201 |
-+++ b/liblwgeom/lwin_geojson.c |
202 |
-@@ -19,13 +19,8 @@ |
203 |
- |
204 |
- #include <string.h> |
205 |
- |
206 |
--#ifdef HAVE_LIBJSON_C |
207 |
--#include <json-c/json.h> |
208 |
--#include <json-c/json_object_private.h> |
209 |
--#else |
210 |
--#include <json/json.h> |
211 |
--#include <json/json_object_private.h> |
212 |
--#endif |
213 |
-+#include <json.h> |
214 |
-+#include <json_object_private.h> |
215 |
- |
216 |
- #ifndef JSON_C_VERSION |
217 |
- // Adds support for libjson < 0.10 |
218 |
|
219 |
diff --git a/dev-db/postgis/files/postgis_dbs b/dev-db/postgis/files/postgis_dbs |
220 |
deleted file mode 100644 |
221 |
index 8a414157f6c..00000000000 |
222 |
--- a/dev-db/postgis/files/postgis_dbs |
223 |
+++ /dev/null |
224 |
@@ -1,49 +0,0 @@ |
225 |
-# This file is used by 'emerge --config dev-db/postgis' to determine which |
226 |
-# databases it should install to, upgrade or create as a template. |
227 |
- |
228 |
-# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any |
229 |
-# databases except for templates. All databases you list must already exist in |
230 |
-# the cluster. |
231 |
- |
232 |
-# The user to perform the updates as. This user must have the privileges to |
233 |
-# modify all of the databases you list here. |
234 |
-pguser="postgres" |
235 |
- |
236 |
-# By default, no databases will have PostGIS enabled. The databases listed here |
237 |
-# must already exist. The databases you list here must not already be PostGIS |
238 |
-# enabled. Instead, use the upgrade lists further down. |
239 |
-#databases=( "your" "databases" ) |
240 |
- |
241 |
-# Anything you place in this list will create a database and make it a template. |
242 |
-# It will be PostGIS-enabled. To add additional features, add the template names |
243 |
-# to the following lists. |
244 |
-#templates=( "template_postgis" ) |
245 |
- |
246 |
-# The PostGIS enabled templates will be created using this template. |
247 |
-from_template="template1" |
248 |
- |
249 |
-# For a complete set of EPSG coordinate system definition identifiers, you can |
250 |
-# also load the spatial_ref_sys.sql definitions file and populate the |
251 |
-# spatial_ref_sys table. This will permit you to perform ST_Transform() |
252 |
-# operations on geometries. |
253 |
-#epsg_databases=( "enable" "epsg" "on" "these" "databases" ) |
254 |
- |
255 |
-# Add comments to PostGIS functions to the databases in this list. |
256 |
-#comment_databases=( "comments" "on" "these" "databases" ) |
257 |
- |
258 |
-# Any databases you have that are already PostGIS enabled can be listed among |
259 |
-# the following list to perform a soft upgrade. If the soft upgrade fails, |
260 |
-# you'll need to do a hard upgrade. |
261 |
-# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade |
262 |
- |
263 |
-# Upgrade from PostGIS 1.3 to 1.5 |
264 |
-#upgrade_from_1_3=( "upgrade" "these" "databases" ) |
265 |
- |
266 |
-# Upgrade from PostGIS 1.4 to 1.5 |
267 |
-#upgrade_from_1_4=( "upgrade" "these" "databases" ) |
268 |
- |
269 |
-# Perform a minor upgrade for PostGIS 1.5 |
270 |
-#upgrade_from_1_5=( "upgrade" "these" "databases" ) |
271 |
- |
272 |
-# Uncomment this once you're satisfied with the settings in this file. |
273 |
-#configured="true" |
274 |
|
275 |
diff --git a/dev-db/postgis/postgis-2.1.8-r1.ebuild b/dev-db/postgis/postgis-2.1.8-r1.ebuild |
276 |
deleted file mode 100644 |
277 |
index 9774fabdbc3..00000000000 |
278 |
--- a/dev-db/postgis/postgis-2.1.8-r1.ebuild |
279 |
+++ /dev/null |
280 |
@@ -1,281 +0,0 @@ |
281 |
-# Copyright 1999-2017 Gentoo Foundation |
282 |
-# Distributed under the terms of the GNU General Public License v2 |
283 |
- |
284 |
-EAPI="5" |
285 |
-POSTGRES_COMPAT=( 9.{2,3,4} ) |
286 |
- |
287 |
-inherit autotools eutils versionator |
288 |
- |
289 |
-MY_PV=$(replace_version_separator 3 '') |
290 |
-MY_P="${PN}-${MY_PV}" |
291 |
-S="${WORKDIR}/${MY_P}" |
292 |
- |
293 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
294 |
-HOMEPAGE="http://postgis.net" |
295 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
296 |
-LICENSE="GPL-2" |
297 |
-SLOT="0" |
298 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
299 |
-IUSE="doc gtk static-libs test" |
300 |
- |
301 |
-RDEPEND=" |
302 |
- || ( |
303 |
- dev-db/postgresql:9.4[server] |
304 |
- dev-db/postgresql:9.3[server] |
305 |
- dev-db/postgresql:9.2[server] |
306 |
- ) |
307 |
- dev-libs/json-c:= |
308 |
- dev-libs/libxml2:2 |
309 |
- >=sci-libs/geos-3.4.2 |
310 |
- >=sci-libs/proj-4.6.0 |
311 |
- >=sci-libs/gdal-1.10.0:= |
312 |
- gtk? ( x11-libs/gtk+:2 ) |
313 |
-" |
314 |
- |
315 |
-DEPEND="${RDEPEND} |
316 |
- doc? ( |
317 |
- app-text/docbook-xsl-stylesheets |
318 |
- app-text/docbook-xml-dtd:4.5 |
319 |
- dev-libs/libxslt |
320 |
- virtual/imagemagick-tools[png] |
321 |
- ) |
322 |
- virtual/pkgconfig |
323 |
- test? ( dev-util/cunit ) |
324 |
-" |
325 |
- |
326 |
-PGIS="$(get_version_component_range 1-2)" |
327 |
- |
328 |
-REQUIRED_USE="test? ( doc )" |
329 |
- |
330 |
-# Needs a running psql instance, doesn't work out of the box |
331 |
-RESTRICT="test" |
332 |
- |
333 |
-MAKEOPTS+=' -j1' |
334 |
- |
335 |
-# These modules are built using the same *FLAGS that were used to build |
336 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
337 |
-# *FLAGS settings. |
338 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
339 |
- |
340 |
-postgres_check_slot() { |
341 |
- if ! declare -p POSTGRES_COMPAT &>/dev/null; then |
342 |
- die 'POSTGRES_COMPAT not declared.' |
343 |
- fi |
344 |
- |
345 |
-# Don't die because we can't run postgresql-config during pretend. |
346 |
-[[ "$EBUILD_PHASE" = "pretend" \ |
347 |
- && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0 |
348 |
- |
349 |
- local res=$(echo ${POSTGRES_COMPAT[@]} \ |
350 |
- | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null) |
351 |
- |
352 |
- if [[ "$res" -eq "0" ]] ; then |
353 |
- eerror "PostgreSQL slot must be set to one of: " |
354 |
- eerror " ${POSTGRES_COMPAT[@]}" |
355 |
- return 1 |
356 |
- fi |
357 |
- |
358 |
- return 0 |
359 |
-} |
360 |
- |
361 |
-pkg_setup() { |
362 |
- postgres_check_slot || die |
363 |
- export PGSLOT="$(postgresql-config show)" |
364 |
-} |
365 |
- |
366 |
-src_prepare() { |
367 |
- epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \ |
368 |
- "${FILESDIR}/${PN}-2.0-arflags.patch" \ |
369 |
- "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch" |
370 |
- |
371 |
- local AT_M4DIR="macros" |
372 |
- eautoreconf |
373 |
-} |
374 |
- |
375 |
-src_configure() { |
376 |
- local myargs="" |
377 |
- use gtk && myargs+=" --with-gui" |
378 |
- econf \ |
379 |
- --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \ |
380 |
- ${myargs} |
381 |
-} |
382 |
- |
383 |
-src_compile() { |
384 |
- emake |
385 |
- emake -C topology |
386 |
- |
387 |
- if use doc ; then |
388 |
- emake comments |
389 |
- emake cheatsheets |
390 |
- emake -C doc html |
391 |
- fi |
392 |
-} |
393 |
- |
394 |
-src_install() { |
395 |
- emake DESTDIR="${D}" install |
396 |
- use doc && emake DESTDIR="${D}" comments-install |
397 |
- emake -C topology DESTDIR="${D}" install |
398 |
- dobin ./utils/postgis_restore.pl |
399 |
- |
400 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
401 |
- |
402 |
- use doc && dohtml -r doc/html/* |
403 |
- |
404 |
- docinto topology |
405 |
- dodoc topology/{TODO,README} |
406 |
- |
407 |
- insinto /etc |
408 |
- doins "${FILESDIR}/postgis_dbs" |
409 |
- |
410 |
- use static-libs || find "${ED}" -name '*.a' -delete |
411 |
-} |
412 |
- |
413 |
-pkg_postinst() { |
414 |
- postgresql-config update |
415 |
- |
416 |
- elog "To finish installing or updating PostGIS edit:" |
417 |
- elog " ${EROOT%/}/etc/postgis_dbs" |
418 |
- elog |
419 |
- elog "Then, run:" |
420 |
- elog " emerge --config =${CATEGORY}/${PF}" |
421 |
-} |
422 |
- |
423 |
-pkg_config(){ |
424 |
- source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}" |
425 |
- source "${EROOT%/}/etc/postgis_dbs" |
426 |
- local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}" |
427 |
- |
428 |
- if [[ -n ${configured} ]] ; then |
429 |
- einfon "Password for PostgreSQL user '${pguser}': " |
430 |
- read -s PGPASSWORD |
431 |
- export PGPASSWORD |
432 |
- echo |
433 |
- else |
434 |
- eerror "You must edit:" |
435 |
- eerror " ${EROOT%/}/etc/postgis_dbs" |
436 |
- eerror "Before running 'emerge --config =${CATEGORY}/${PF}'" |
437 |
- eerror |
438 |
- die "Edit postgis_dbs" |
439 |
- fi |
440 |
- |
441 |
- # The server we work with must be the same slot we built against. |
442 |
- local server_match |
443 |
- server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ |
444 |
- -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}") |
445 |
- if [[ $? = 0 ]] ; then |
446 |
- if [[ $server_match -ne 1 ]] ; then |
447 |
- unset PGPASSWORD |
448 |
- eerror "Server version must be ${PGSLOT}.x" |
449 |
- die "Server version isn't ${PGSLOT}.x" |
450 |
- fi |
451 |
- else |
452 |
- unset PGPASSWORD |
453 |
- eerror "Is the server running?" |
454 |
- die "Couldn't connect to server." |
455 |
- fi |
456 |
- |
457 |
- local retval |
458 |
- safe_exit() { |
459 |
- unset PGPASSWORD |
460 |
- sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" |
461 |
- eend $retval |
462 |
- eerror "All actions could not be performed." |
463 |
- eerror "Read above to see what failed." |
464 |
- eerror "Once you fix the issue, you'll need to edit:" |
465 |
- eerror " ${EROOT%/}/etc/postgis_dbs" |
466 |
- eerror "As some things may have succeeded." |
467 |
- eerror |
468 |
- die "All actions could not be performed" |
469 |
- } |
470 |
- |
471 |
- local db |
472 |
- for db in ${databases[@]} ; do |
473 |
- ebegin "Performing CREATE LANGUAGE on ${db}" |
474 |
- createlang -U ${pguser} -p ${PGPORT} plpgsql ${db} |
475 |
- retval=$? |
476 |
- # In this case, only error code 1 is fatal |
477 |
- [[ $retval == 1 ]] && safe_exit || eend 0 |
478 |
- |
479 |
- ebegin "Enabling PostGIS on ${db}" |
480 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
481 |
- -f "${postgis_path}/postgis.sql" |
482 |
- retval=$? |
483 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
484 |
- done |
485 |
- |
486 |
- for db in ${templates[@]} ; do |
487 |
- ebegin "Creating template database '${db}'" |
488 |
- createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \ |
489 |
- ${db} "PostGIS Template" |
490 |
- retval=$? |
491 |
- [[ $retval != 0 ]] && safe_exit |
492 |
- |
493 |
- psql -q -U ${pguser} -p ${PGPORT} -c \ |
494 |
- "UPDATE pg_database \ |
495 |
- SET datistemplate = TRUE, datallowconn = TRUE \ |
496 |
- WHERE datname = '${db}'" |
497 |
- retval=$? |
498 |
- [[ $retval != 0 ]] && safe_exit |
499 |
- |
500 |
- createlang -U ${pguser} -p ${PGPORT} plpgsql ${db} |
501 |
- retval=$? |
502 |
- # In this case, only error code 1 is fatal |
503 |
- [[ $retval == 1 ]] && safe_exit |
504 |
- |
505 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
506 |
- -f "${postgis_path}/postgis.sql" |
507 |
- retval=$? |
508 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
509 |
- done |
510 |
- |
511 |
- for db in ${epsg_databases[@]} ; do |
512 |
- ebegin "Adding EPSG to ${db}" |
513 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
514 |
- -f "${postgis_path}/spatial_ref_sys.sql" |
515 |
- retval=$? |
516 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
517 |
- done |
518 |
- |
519 |
- for db in ${comment_databases[@]} ; do |
520 |
- ebegin "Adding comments on ${db}" |
521 |
- local comment_file |
522 |
- for comment_file in "${postgis_path}"/*_comments.sql ; do |
523 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}" |
524 |
- retval=$? |
525 |
- [[ $retval == 0 ]] && continue || safe_exit |
526 |
- done |
527 |
- eend 0 |
528 |
- done |
529 |
- |
530 |
- for db in ${upgrade_from_1_3[@]} ; do |
531 |
- ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}" |
532 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
533 |
- -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql" |
534 |
- retval=$? |
535 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
536 |
- done |
537 |
- |
538 |
- for db in ${upgrade_from_1_4[@]} ; do |
539 |
- ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}" |
540 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
541 |
- -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql" |
542 |
- retval=$? |
543 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
544 |
- done |
545 |
- |
546 |
- for db in ${upgrade_from_1_5[@]} ; do |
547 |
- ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}" |
548 |
- psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ |
549 |
- -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql" |
550 |
- retval=$? |
551 |
- [[ $retval == 0 ]] && eend 0 || safe_exit |
552 |
- done |
553 |
- |
554 |
- # Clean up and make it so the user has to edit postgis_dbs again that |
555 |
- # way this script won't step on any toes due to user error. |
556 |
- unset PGPASSWORD |
557 |
- sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" |
558 |
- einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled." |
559 |
- einfo |
560 |
- einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled." |
561 |
-} |
562 |
|
563 |
diff --git a/dev-db/postgis/postgis-2.3.3.ebuild b/dev-db/postgis/postgis-2.3.3.ebuild |
564 |
deleted file mode 100644 |
565 |
index 1655d70d7c3..00000000000 |
566 |
--- a/dev-db/postgis/postgis-2.3.3.ebuild |
567 |
+++ /dev/null |
568 |
@@ -1,116 +0,0 @@ |
569 |
-# Copyright 1999-2017 Gentoo Foundation |
570 |
-# Distributed under the terms of the GNU General Public License v2 |
571 |
- |
572 |
-EAPI="6" |
573 |
- |
574 |
-POSTGRES_COMPAT=( 9.{2..6} ) |
575 |
-POSTGRES_USEDEP="server" |
576 |
- |
577 |
-inherit autotools eutils postgres-multi versionator |
578 |
- |
579 |
-MY_PV=$(replace_version_separator 3 '') |
580 |
-MY_P="${PN}-${MY_PV}" |
581 |
-S="${WORKDIR}/${MY_P}" |
582 |
- |
583 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
584 |
-HOMEPAGE="http://postgis.net" |
585 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
586 |
-LICENSE="GPL-2" |
587 |
-SLOT="0" |
588 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
589 |
-IUSE="doc gtk static-libs test" |
590 |
- |
591 |
-RDEPEND=" |
592 |
- ${POSTGRES_DEP} |
593 |
- dev-libs/json-c:= |
594 |
- dev-libs/libxml2:2 |
595 |
- >=sci-libs/geos-3.5.0 |
596 |
- >=sci-libs/proj-4.6.0 |
597 |
- >=sci-libs/gdal-1.10.0 |
598 |
- gtk? ( x11-libs/gtk+:2 ) |
599 |
-" |
600 |
- |
601 |
-DEPEND="${RDEPEND} |
602 |
- doc? ( |
603 |
- app-text/docbook-xsl-stylesheets |
604 |
- app-text/docbook-xml-dtd:4.5 |
605 |
- dev-libs/libxslt |
606 |
- || ( |
607 |
- media-gfx/imagemagick[png] |
608 |
- media-gfx/graphicsmagick[imagemagick,png] |
609 |
- ) |
610 |
- ) |
611 |
- virtual/pkgconfig |
612 |
- test? ( dev-util/cunit ) |
613 |
-" |
614 |
- |
615 |
-PGIS="$(get_version_component_range 1-2)" |
616 |
- |
617 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
618 |
- |
619 |
-# Needs a running psql instance, doesn't work out of the box |
620 |
-RESTRICT="test" |
621 |
- |
622 |
-MAKEOPTS+=' -j1' |
623 |
- |
624 |
-# These modules are built using the same *FLAGS that were used to build |
625 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
626 |
-# *FLAGS settings. |
627 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
628 |
- |
629 |
-src_prepare() { |
630 |
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" |
631 |
- |
632 |
- local AT_M4DIR="macros" |
633 |
- eautoreconf |
634 |
- postgres-multi_src_prepare |
635 |
-} |
636 |
- |
637 |
-src_configure() { |
638 |
- local myargs="" |
639 |
- use gtk && myargs+=" --with-gui" |
640 |
- postgres-multi_foreach econf ${myargs} |
641 |
-} |
642 |
- |
643 |
-src_compile() { |
644 |
- postgres-multi_foreach emake |
645 |
- postgres-multi_foreach emake -C topology |
646 |
- |
647 |
- if use doc ; then |
648 |
- postgres-multi_foreach emake comments |
649 |
- postgres-multi_foreach emake cheatsheets |
650 |
- postgres-multi_forbest emake -C doc html |
651 |
- fi |
652 |
-} |
653 |
- |
654 |
-src_install() { |
655 |
- postgres-multi_foreach emake DESTDIR="${D}" install |
656 |
- postgres-multi_foreach emake -C topology DESTDIR="${D}" install |
657 |
- postgres-multi_forbest dobin ./utils/postgis_restore.pl |
658 |
- |
659 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
660 |
- |
661 |
- docinto topology |
662 |
- dodoc topology/{TODO,README} |
663 |
- |
664 |
- if use doc ; then |
665 |
- postgres-multi_foreach emake DESTDIR="${D}" comments-install |
666 |
- |
667 |
- docinto html |
668 |
- postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} |
669 |
- |
670 |
- docinto html/images |
671 |
- postgres-multi_forbest dodoc doc/html/images/* |
672 |
- fi |
673 |
- |
674 |
- use static-libs || find "${ED}" -name '*.a' -delete |
675 |
-} |
676 |
- |
677 |
-pkg_postinst() { |
678 |
- ebegin "Refreshing PostgreSQL symlinks" |
679 |
- postgresql-config update |
680 |
- eend $? |
681 |
- |
682 |
- elog "To finish installing PostGIS, follow the directions detailed at:" |
683 |
- elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" |
684 |
-} |
685 |
|
686 |
diff --git a/dev-db/postgis/postgis-2.4.0.ebuild b/dev-db/postgis/postgis-2.4.0.ebuild |
687 |
deleted file mode 100644 |
688 |
index 1f6443716a4..00000000000 |
689 |
--- a/dev-db/postgis/postgis-2.4.0.ebuild |
690 |
+++ /dev/null |
691 |
@@ -1,116 +0,0 @@ |
692 |
-# Copyright 1999-2017 Gentoo Foundation |
693 |
-# Distributed under the terms of the GNU General Public License v2 |
694 |
- |
695 |
-EAPI="6" |
696 |
- |
697 |
-POSTGRES_COMPAT=( 9.{2..6} 10 ) |
698 |
-POSTGRES_USEDEP="server" |
699 |
- |
700 |
-inherit autotools eutils postgres-multi versionator |
701 |
- |
702 |
-MY_PV=$(replace_version_separator 3 '') |
703 |
-MY_P="${PN}-${MY_PV}" |
704 |
-S="${WORKDIR}/${MY_P}" |
705 |
- |
706 |
-DESCRIPTION="Geographic Objects for PostgreSQL" |
707 |
-HOMEPAGE="http://postgis.net" |
708 |
-SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
709 |
-LICENSE="GPL-2" |
710 |
-SLOT="0" |
711 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
712 |
-IUSE="doc gtk static-libs test" |
713 |
- |
714 |
-RDEPEND=" |
715 |
- ${POSTGRES_DEP} |
716 |
- dev-libs/json-c:= |
717 |
- dev-libs/libxml2:2 |
718 |
- >=sci-libs/geos-3.5.0 |
719 |
- >=sci-libs/proj-4.6.0 |
720 |
- >=sci-libs/gdal-1.10.0 |
721 |
- gtk? ( x11-libs/gtk+:2 ) |
722 |
-" |
723 |
- |
724 |
-DEPEND="${RDEPEND} |
725 |
- doc? ( |
726 |
- app-text/docbook-xsl-stylesheets |
727 |
- app-text/docbook-xml-dtd:4.5 |
728 |
- dev-libs/libxslt |
729 |
- || ( |
730 |
- media-gfx/imagemagick[png] |
731 |
- media-gfx/graphicsmagick[imagemagick,png] |
732 |
- ) |
733 |
- ) |
734 |
- virtual/pkgconfig |
735 |
- test? ( dev-util/cunit ) |
736 |
-" |
737 |
- |
738 |
-PGIS="$(get_version_component_range 1-2)" |
739 |
- |
740 |
-REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" |
741 |
- |
742 |
-# Needs a running psql instance, doesn't work out of the box |
743 |
-RESTRICT="test" |
744 |
- |
745 |
-MAKEOPTS+=' -j1' |
746 |
- |
747 |
-# These modules are built using the same *FLAGS that were used to build |
748 |
-# dev-db/postgresql. The right thing to do is to ignore the current |
749 |
-# *FLAGS settings. |
750 |
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
751 |
- |
752 |
-src_prepare() { |
753 |
- eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" |
754 |
- |
755 |
- local AT_M4DIR="macros" |
756 |
- eautoreconf |
757 |
- postgres-multi_src_prepare |
758 |
-} |
759 |
- |
760 |
-src_configure() { |
761 |
- local myargs="" |
762 |
- use gtk && myargs+=" --with-gui" |
763 |
- postgres-multi_foreach econf ${myargs} |
764 |
-} |
765 |
- |
766 |
-src_compile() { |
767 |
- postgres-multi_foreach emake |
768 |
- postgres-multi_foreach emake -C topology |
769 |
- |
770 |
- if use doc ; then |
771 |
- postgres-multi_foreach emake comments |
772 |
- postgres-multi_foreach emake cheatsheets |
773 |
- postgres-multi_forbest emake -C doc html |
774 |
- fi |
775 |
-} |
776 |
- |
777 |
-src_install() { |
778 |
- postgres-multi_foreach emake DESTDIR="${D}" install |
779 |
- postgres-multi_foreach emake -C topology DESTDIR="${D}" install |
780 |
- postgres-multi_forbest dobin ./utils/postgis_restore.pl |
781 |
- |
782 |
- dodoc CREDITS TODO loader/README.* doc/*txt |
783 |
- |
784 |
- docinto topology |
785 |
- dodoc topology/{TODO,README} |
786 |
- |
787 |
- if use doc ; then |
788 |
- postgres-multi_foreach emake DESTDIR="${D}" comments-install |
789 |
- |
790 |
- docinto html |
791 |
- postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} |
792 |
- |
793 |
- docinto html/images |
794 |
- postgres-multi_forbest dodoc doc/html/images/* |
795 |
- fi |
796 |
- |
797 |
- use static-libs || find "${ED}" -name '*.a' -delete |
798 |
-} |
799 |
- |
800 |
-pkg_postinst() { |
801 |
- ebegin "Refreshing PostgreSQL symlinks" |
802 |
- postgresql-config update |
803 |
- eend $? |
804 |
- |
805 |
- elog "To finish installing PostGIS, follow the directions detailed at:" |
806 |
- elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" |
807 |
-} |