From 8fcdcec5fbdd0e3a77391e4f354218014f59f358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2018 20:45:13 +0000 Subject: gentoo resync : 05.01.2018 --- dev-db/postgis/files/postgis-2.0-arflags.patch | 18 --- dev-db/postgis/files/postgis-2.1-ldflags.patch | 26 ----- .../files/postgis-2.1.4-pkgconfig-json.patch | 122 --------------------- dev-db/postgis/files/postgis_dbs | 49 --------- 4 files changed, 215 deletions(-) delete mode 100644 dev-db/postgis/files/postgis-2.0-arflags.patch delete mode 100644 dev-db/postgis/files/postgis-2.1-ldflags.patch delete mode 100644 dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch delete mode 100644 dev-db/postgis/files/postgis_dbs (limited to 'dev-db/postgis/files') diff --git a/dev-db/postgis/files/postgis-2.0-arflags.patch b/dev-db/postgis/files/postgis-2.0-arflags.patch deleted file mode 100644 index fa2e9a8da607..000000000000 --- a/dev-db/postgis/files/postgis-2.0-arflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in ---- a/raster/rt_core/Makefile.in 2012-03-21 21:36:59.000000000 +0000 -+++ b/raster/rt_core/Makefile.in 2013-04-28 13:23:21.055728249 +0000 -@@ -8,7 +8,7 @@ - # - ############################################################################# - --AR=ar rs -+ARFLAGS=rs - - CC=@CC@ - LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a -@@ -35,4 +35,4 @@ - rm -f Makefile - - librtcore.a: $(RT_OBJS) $(RT_HEADERS) -- $(AR) $(RT_LIB) $(RT_OBJS) -+ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS) diff --git a/dev-db/postgis/files/postgis-2.1-ldflags.patch b/dev-db/postgis/files/postgis-2.1-ldflags.patch deleted file mode 100644 index de11510ea37b..000000000000 --- a/dev-db/postgis/files/postgis-2.1-ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naruw postgis-2.1.0rc1.orig/loader/Makefile.in postgis-2.1.0rc1/loader/Makefile.in ---- postgis-2.1.0rc1.orig/loader/Makefile.in 2013-05-06 08:30:51.000000000 +0000 -+++ postgis-2.1.0rc1/loader/Makefile.in 2013-07-14 17:19:19.313306844 +0000 -@@ -97,11 +97,11 @@ - - $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) - $(LIBTOOL) --mode=link \ -- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ -+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@ - - $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) - $(LIBTOOL) --mode=link \ -- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS) - - shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h - $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c -@@ -109,7 +109,7 @@ - $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES) - $(LIBTOOL) --mode=link \ - $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \ -- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) - - installdir: - @mkdir -p $(DESTDIR)$(bindir) 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 deleted file mode 100644 index 13634abb6de2..000000000000 --- a/dev-db/postgis/files/postgis-2.1.4-pkgconfig-json.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a13cf13..c0a7842 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -780,61 +780,19 @@ dnl =========================================================================== - dnl Detect if json-c installed - dnl =========================================================================== - --CHECK_JSON=yes --HAVE_JSON=no --HAVE_JSON_C=no -- --AC_ARG_WITH([json], -- [AS_HELP_STRING([--without-json], [build without json-c support])], -- [CHECK_JSON="$withval"], []) -- --if test "$CHECK_JSON" != "no"; then dnl { -- --AC_ARG_WITH([jsondir], -- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])], -- [JSONDIR="$withval"], [JSONDIR=]) -- --if test ! "x$JSONDIR" = "x"; then -- dnl Make sure that the directory exists -- if test "x$JSONDIR" = "xyes"; then -- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to]) -- else -- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR]) -- -- dnl Add the include directory to JSON_CPPFLAGS -- JSON_CPPFLAGS="-I$JSONDIR/include" -- JSON_LDFLAGS="-L$JSONDIR/lib" -- fi --fi -- --dnl Check that we can find the json/json.h header file --CPPFLAGS_SAVE="$CPPFLAGS" --CPPFLAGS="$JSON_CPPFLAGS" --AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [ -- AC_CHECK_HEADER([json-c/json.h], [HAVE_JSON=yes; HAVE_JSON_C=yes], []) --]) --CPPFLAGS="$CPPFLAGS_SAVE" -- --dnl Ensure we can link against libjson --LIBS_SAVE="$LIBS" --LIBS="$JSON_LDFLAGS" --AC_CHECK_LIB([json-c], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson-c"], [ -- AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes; JSON_LDFLAGS="${JSON_LDFLAGS} -ljson"], [], []) --], []) --LIBS="$LIBS_SAVE" -- --if test "$HAVE_JSON" = "yes"; then -+PKG_CHECK_MODULES([JSON], [json], -+ [ -+ HAVE_JSON=yes - AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) --fi --if test "$HAVE_JSON_C" = "yes"; then -- AC_DEFINE([HAVE_LIBJSON_C], 1, [Define to 1 if libjson resides in a json-c subdir]) --fi -- --AC_SUBST([JSON_CPPFLAGS]) --AC_SUBST([JSON_LDFLAGS]) --AC_SUBST([HAVE_JSON]) -- --fi dnl } -+ ], -+ [ -+ PKG_CHECK_MODULES([JSON], [json-c], -+ [ -+ HAVE_JSON=yes -+ AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) -+ ], -+ [HAVE_JSON=no]) -+ ]) - - dnl =========================================================================== - dnl Detect GTK+2.0 for GUI -@@ -927,7 +885,7 @@ AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics]) - CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS" - AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS]) - --SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS $SFCGAL_LDFLAGS" -+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS $SFCGAL_LDFLAGS" - AC_SUBST([SHLIB_LINK]) - dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK]) - -diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in -index 3cc6256..5ccbb3b 100644 ---- a/liblwgeom/Makefile.in -+++ b/liblwgeom/Makefile.in -@@ -11,8 +11,8 @@ - # ********************************************************************** - - CC = @CC@ --CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@ --LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@ -+CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CFLAGS@ -+LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LIBS@ - NUMERICFLAGS = @NUMERICFLAGS@ - top_builddir = @top_builddir@ - prefix = @prefix@ -diff --git a/liblwgeom/lwin_geojson.c b/liblwgeom/lwin_geojson.c -index 7019626..ec1d594 100644 ---- a/liblwgeom/lwin_geojson.c -+++ b/liblwgeom/lwin_geojson.c -@@ -19,13 +19,8 @@ - - #include - --#ifdef HAVE_LIBJSON_C --#include --#include --#else --#include --#include --#endif -+#include -+#include - - #ifndef JSON_C_VERSION - // Adds support for libjson < 0.10 diff --git a/dev-db/postgis/files/postgis_dbs b/dev-db/postgis/files/postgis_dbs deleted file mode 100644 index 8a414157f6c6..000000000000 --- a/dev-db/postgis/files/postgis_dbs +++ /dev/null @@ -1,49 +0,0 @@ -# This file is used by 'emerge --config dev-db/postgis' to determine which -# databases it should install to, upgrade or create as a template. - -# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any -# databases except for templates. All databases you list must already exist in -# the cluster. - -# The user to perform the updates as. This user must have the privileges to -# modify all of the databases you list here. -pguser="postgres" - -# By default, no databases will have PostGIS enabled. The databases listed here -# must already exist. The databases you list here must not already be PostGIS -# enabled. Instead, use the upgrade lists further down. -#databases=( "your" "databases" ) - -# Anything you place in this list will create a database and make it a template. -# It will be PostGIS-enabled. To add additional features, add the template names -# to the following lists. -#templates=( "template_postgis" ) - -# The PostGIS enabled templates will be created using this template. -from_template="template1" - -# For a complete set of EPSG coordinate system definition identifiers, you can -# also load the spatial_ref_sys.sql definitions file and populate the -# spatial_ref_sys table. This will permit you to perform ST_Transform() -# operations on geometries. -#epsg_databases=( "enable" "epsg" "on" "these" "databases" ) - -# Add comments to PostGIS functions to the databases in this list. -#comment_databases=( "comments" "on" "these" "databases" ) - -# Any databases you have that are already PostGIS enabled can be listed among -# the following list to perform a soft upgrade. If the soft upgrade fails, -# you'll need to do a hard upgrade. -# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade - -# Upgrade from PostGIS 1.3 to 1.5 -#upgrade_from_1_3=( "upgrade" "these" "databases" ) - -# Upgrade from PostGIS 1.4 to 1.5 -#upgrade_from_1_4=( "upgrade" "these" "databases" ) - -# Perform a minor upgrade for PostGIS 1.5 -#upgrade_from_1_5=( "upgrade" "these" "databases" ) - -# Uncomment this once you're satisfied with the settings in this file. -#configured="true" -- cgit v1.2.3