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/Manifest | 10 - 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 ---- dev-db/postgis/postgis-2.1.8-r1.ebuild | 281 --------------------- dev-db/postgis/postgis-2.3.3.ebuild | 116 --------- dev-db/postgis/postgis-2.4.0.ebuild | 116 --------- 8 files changed, 738 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 delete mode 100644 dev-db/postgis/postgis-2.1.8-r1.ebuild delete mode 100644 dev-db/postgis/postgis-2.3.3.ebuild delete mode 100644 dev-db/postgis/postgis-2.4.0.ebuild (limited to 'dev-db/postgis') diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index efc009c24425..1bad1a6d0947 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -1,16 +1,6 @@ -AUX postgis-2.0-arflags.patch 539 BLAKE2B 5e2e9c332aaaaaab6b5e80e1e4cc43b743bd49a5113ddc84733dfbcc0f6358c46a6eb2ba3114634d69fbfeab6e10286407b4a70a507a1dca9757a8eb58d7be9b SHA512 e600cf3548fa7c13f7cddec24a0f9078646155b48fb42cd1d41bff311976718ba93bcf7d8361d0494df5e3c6bdff74af5b8b4821026a49618ad3d835383f2785 -AUX postgis-2.1-ldflags.patch 1367 BLAKE2B aa604884a3f6ad9996fa0fa0ffdd912eba1036a2cb0ef44a257c5bb38aa95bfdafcd730af5961c7505562f2ce1ee32315fdb05da7ae6dc3e8fac92bab3d6be4f SHA512 7bfce943698b8ba41fea5606c1a3dc43b2cc11daeb8e81e432701c2cebf300984ff54e8c8817e245ec4195a85b8d28bcfc6b30d111bd6c05341c93e7c769ab35 -AUX postgis-2.1.4-pkgconfig-json.patch 4276 BLAKE2B 9b0d05ec5ad7b6e2d74aeb4ca0109994395d404f42be6b2cc7b7261cd0ee4bf0e865dba081db1f582314cd230c6edaf066436e0737a83a1580343c7070d494e1 SHA512 7439b2221bee6e3940485b1964edda10d320493b3dc8b86e1579824a9f0c6b5ff21a3d444077fa331096a9e0e4442df2c792d8a51c79dcf6c680404cbebf9275 AUX postgis-2.2.0-arflags.patch 535 BLAKE2B 6420573e9623d4e2115ed3616bc3b8648ae7782bf4624ee60d3827a4d61cbdac1dc62b4937f36113ed6d0856af4728f5cc1b544d502512e88dd87a7b590135ab SHA512 7f8b92a582dd11b3040832278b75e65036315ca0e438cb9b19cc5b63a7b5c5bcae8ec274a487a29abadfbbc31cdfacf6c668e46f249d4bf88c09607501cacf66 AUX postgis-2.4.2-jsonc_0.13.patch 786 BLAKE2B c55fd81f28b9a4db965ef3f4bb3ca6fcf2cd6ba44d4f7a93c35ade90ffdcb195325ce219348aa6dc3645f6822214b4bc75263c02fc316f3dd9b4369114eb5493 SHA512 9088304bb77db2d86dd077510f94ae8b3796474a02377f1f076476c739d9506f0b7c7c6dcf6e90ad51e84bc528302a6ecda4bedc6eac42dfeba3a71c0144a399 -AUX postgis_dbs 2096 BLAKE2B 97ff57e264e6a6ddd68ff0e87fcb1a3646c54f953cb370eef95bcc237ed550b494df2a1ea9a023c9be1d794003b71a9e10a3c9aa4fb1a8074b2f0eb4ced749f5 SHA512 5a11a3ce0153461f363d1b9a393dd10392e123c7b18b20610a5e26f2c7c6ed258a1517082a244c6ab5de40d439bc8a370848a0177c3c2ffcffc67a24fca8e66a -DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B f39debafea797fec2595b1ba2256ce3ed19875f15e57829f3480b15ec82ddfbc51702bb29513a9b1cd381696ee0b0857c34e79395a1f627f38a1e41344485ba7 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 -DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c -DIST postgis-2.4.0.tar.gz 12576979 BLAKE2B 2d0312ca9202f92f55700e78881ecdd7128064393b1e7197dd658f8fcee676723c048fa2c7f199aa9d61a5638c0ad0129b6d2dc61d6324caeec3b7163f0f4edc SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 -EBUILD postgis-2.1.8-r1.ebuild 7355 BLAKE2B 2558aea2a69722d1d2c67713fdd839991dd8530af69d9fcc6c109dfce8a164efd57bfcfbe0423accc243a3d826152d5c9e9062789712dd8bd569c715a69361e6 SHA512 e9d76347fe6962406190a4005fa8b17e7c9d02e58c0374de25441014def93923e726c6943e0e482a3992b9c3f42a36186ba486d00a60ff64e4d4051471ac554a -EBUILD postgis-2.3.3.ebuild 2736 BLAKE2B 73c2720eefa27ee1f4443ac028b0552d8686d78e6f493d6f1c8cb32dd68a373256151a2898d1c08dff597b7a42c09b027e7a320288bc6e42746be5523b072e90 SHA512 1f0dc5ad11cddbe1ac8c9a361180aa224cc7709e67ea94cf0e14338014221d2838055f45b3fbf91cac1e0c7f330209f026f66b1d1c10bec789caf98fa38e5a27 -EBUILD postgis-2.4.0.ebuild 2739 BLAKE2B fef6b6ce675926a548d124386eedabe6e509412ed053ad02fd56dbb39798de1e100f24153875a9a78641c21b43642cd97bb79d23cd775db9a3842598527f91a5 SHA512 e22ddc46b7c604909375b9ca4ec6eae5b986690ac3e9b2df276a0c9b900692df6d9d7287d11efd51ad97e6706bcdf940aff91d3c9116e499c9c67d20f26300b1 EBUILD postgis-2.4.2.ebuild 3111 BLAKE2B d8b8673824c2cbc0934f5e384549abe379dae7534f406cf0fb2ddfb5ba6100176f335028a6db2be0caec341fa07781d2542dab2d0262b79239171e55955fc199 SHA512 ada96e8ae149e765da8cd9d689b563cff87332277df84ecf12b093b691ea97da4ee3994c19efcc545cecd99fe882641884363845abbb940d6c7baa45878a40c9 EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada 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" diff --git a/dev-db/postgis/postgis-2.1.8-r1.ebuild b/dev-db/postgis/postgis-2.1.8-r1.ebuild deleted file mode 100644 index 9774fabdbc3e..000000000000 --- a/dev-db/postgis/postgis-2.1.8-r1.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -POSTGRES_COMPAT=( 9.{2,3,4} ) - -inherit autotools eutils versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc gtk static-libs test" - -RDEPEND=" - || ( - dev-db/postgresql:9.4[server] - dev-db/postgresql:9.3[server] - dev-db/postgresql:9.2[server] - ) - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.4.2 - >=sci-libs/proj-4.6.0 - >=sci-libs/gdal-1.10.0:= - gtk? ( x11-libs/gtk+:2 ) -" - -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - virtual/imagemagick-tools[png] - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -PGIS="$(get_version_component_range 1-2)" - -REQUIRED_USE="test? ( doc )" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -MAKEOPTS+=' -j1' - -# These modules are built using the same *FLAGS that were used to build -# dev-db/postgresql. The right thing to do is to ignore the current -# *FLAGS settings. -QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - -postgres_check_slot() { - if ! declare -p POSTGRES_COMPAT &>/dev/null; then - die 'POSTGRES_COMPAT not declared.' - fi - -# Don't die because we can't run postgresql-config during pretend. -[[ "$EBUILD_PHASE" = "pretend" \ - && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0 - - local res=$(echo ${POSTGRES_COMPAT[@]} \ - | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null) - - if [[ "$res" -eq "0" ]] ; then - eerror "PostgreSQL slot must be set to one of: " - eerror " ${POSTGRES_COMPAT[@]}" - return 1 - fi - - return 0 -} - -pkg_setup() { - postgres_check_slot || die - export PGSLOT="$(postgresql-config show)" -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-2.1-ldflags.patch" \ - "${FILESDIR}/${PN}-2.0-arflags.patch" \ - "${FILESDIR}/${PN}-2.1.4-pkgconfig-json.patch" - - local AT_M4DIR="macros" - eautoreconf -} - -src_configure() { - local myargs="" - use gtk && myargs+=" --with-gui" - econf \ - --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \ - ${myargs} -} - -src_compile() { - emake - emake -C topology - - if use doc ; then - emake comments - emake cheatsheets - emake -C doc html - fi -} - -src_install() { - emake DESTDIR="${D}" install - use doc && emake DESTDIR="${D}" comments-install - emake -C topology DESTDIR="${D}" install - dobin ./utils/postgis_restore.pl - - dodoc CREDITS TODO loader/README.* doc/*txt - - use doc && dohtml -r doc/html/* - - docinto topology - dodoc topology/{TODO,README} - - insinto /etc - doins "${FILESDIR}/postgis_dbs" - - use static-libs || find "${ED}" -name '*.a' -delete -} - -pkg_postinst() { - postgresql-config update - - elog "To finish installing or updating PostGIS edit:" - elog " ${EROOT%/}/etc/postgis_dbs" - elog - elog "Then, run:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config(){ - source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}" - source "${EROOT%/}/etc/postgis_dbs" - local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}" - - if [[ -n ${configured} ]] ; then - einfon "Password for PostgreSQL user '${pguser}': " - read -s PGPASSWORD - export PGPASSWORD - echo - else - eerror "You must edit:" - eerror " ${EROOT%/}/etc/postgis_dbs" - eerror "Before running 'emerge --config =${CATEGORY}/${PF}'" - eerror - die "Edit postgis_dbs" - fi - - # The server we work with must be the same slot we built against. - local server_match - server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ - -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}") - if [[ $? = 0 ]] ; then - if [[ $server_match -ne 1 ]] ; then - unset PGPASSWORD - eerror "Server version must be ${PGSLOT}.x" - die "Server version isn't ${PGSLOT}.x" - fi - else - unset PGPASSWORD - eerror "Is the server running?" - die "Couldn't connect to server." - fi - - local retval - safe_exit() { - unset PGPASSWORD - sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" - eend $retval - eerror "All actions could not be performed." - eerror "Read above to see what failed." - eerror "Once you fix the issue, you'll need to edit:" - eerror " ${EROOT%/}/etc/postgis_dbs" - eerror "As some things may have succeeded." - eerror - die "All actions could not be performed" - } - - local db - for db in ${databases[@]} ; do - ebegin "Performing CREATE LANGUAGE on ${db}" - createlang -U ${pguser} -p ${PGPORT} plpgsql ${db} - retval=$? - # In this case, only error code 1 is fatal - [[ $retval == 1 ]] && safe_exit || eend 0 - - ebegin "Enabling PostGIS on ${db}" - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/postgis.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - for db in ${templates[@]} ; do - ebegin "Creating template database '${db}'" - createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \ - ${db} "PostGIS Template" - retval=$? - [[ $retval != 0 ]] && safe_exit - - psql -q -U ${pguser} -p ${PGPORT} -c \ - "UPDATE pg_database \ - SET datistemplate = TRUE, datallowconn = TRUE \ - WHERE datname = '${db}'" - retval=$? - [[ $retval != 0 ]] && safe_exit - - createlang -U ${pguser} -p ${PGPORT} plpgsql ${db} - retval=$? - # In this case, only error code 1 is fatal - [[ $retval == 1 ]] && safe_exit - - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/postgis.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - for db in ${epsg_databases[@]} ; do - ebegin "Adding EPSG to ${db}" - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/spatial_ref_sys.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - for db in ${comment_databases[@]} ; do - ebegin "Adding comments on ${db}" - local comment_file - for comment_file in "${postgis_path}"/*_comments.sql ; do - psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}" - retval=$? - [[ $retval == 0 ]] && continue || safe_exit - done - eend 0 - done - - for db in ${upgrade_from_1_3[@]} ; do - ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}" - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - for db in ${upgrade_from_1_4[@]} ; do - ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}" - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - for db in ${upgrade_from_1_5[@]} ; do - ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}" - psql -q -U ${pguser} -p ${PGPORT} -d ${db} \ - -f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql" - retval=$? - [[ $retval == 0 ]] && eend 0 || safe_exit - done - - # Clean up and make it so the user has to edit postgis_dbs again that - # way this script won't step on any toes due to user error. - unset PGPASSWORD - sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" - einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled." - einfo - einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled." -} diff --git a/dev-db/postgis/postgis-2.3.3.ebuild b/dev-db/postgis/postgis-2.3.3.ebuild deleted file mode 100644 index 1655d70d7c37..000000000000 --- a/dev-db/postgis/postgis-2.3.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{2..6} ) -POSTGRES_USEDEP="server" - -inherit autotools eutils postgres-multi versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc gtk static-libs test" - -RDEPEND=" - ${POSTGRES_DEP} - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 - >=sci-libs/proj-4.6.0 - >=sci-libs/gdal-1.10.0 - gtk? ( x11-libs/gtk+:2 ) -" - -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[imagemagick,png] - ) - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -PGIS="$(get_version_component_range 1-2)" - -REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -MAKEOPTS+=' -j1' - -# These modules are built using the same *FLAGS that were used to build -# dev-db/postgresql. The right thing to do is to ignore the current -# *FLAGS settings. -QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" - - local AT_M4DIR="macros" - eautoreconf - postgres-multi_src_prepare -} - -src_configure() { - local myargs="" - use gtk && myargs+=" --with-gui" - postgres-multi_foreach econf ${myargs} -} - -src_compile() { - postgres-multi_foreach emake - postgres-multi_foreach emake -C topology - - if use doc ; then - postgres-multi_foreach emake comments - postgres-multi_foreach emake cheatsheets - postgres-multi_forbest emake -C doc html - fi -} - -src_install() { - postgres-multi_foreach emake DESTDIR="${D}" install - postgres-multi_foreach emake -C topology DESTDIR="${D}" install - postgres-multi_forbest dobin ./utils/postgis_restore.pl - - dodoc CREDITS TODO loader/README.* doc/*txt - - docinto topology - dodoc topology/{TODO,README} - - if use doc ; then - postgres-multi_foreach emake DESTDIR="${D}" comments-install - - docinto html - postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} - - docinto html/images - postgres-multi_forbest dodoc doc/html/images/* - fi - - use static-libs || find "${ED}" -name '*.a' -delete -} - -pkg_postinst() { - ebegin "Refreshing PostgreSQL symlinks" - postgresql-config update - eend $? - - elog "To finish installing PostGIS, follow the directions detailed at:" - elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" -} diff --git a/dev-db/postgis/postgis-2.4.0.ebuild b/dev-db/postgis/postgis-2.4.0.ebuild deleted file mode 100644 index 1f6443716a46..000000000000 --- a/dev-db/postgis/postgis-2.4.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{2..6} 10 ) -POSTGRES_USEDEP="server" - -inherit autotools eutils postgres-multi versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc gtk static-libs test" - -RDEPEND=" - ${POSTGRES_DEP} - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 - >=sci-libs/proj-4.6.0 - >=sci-libs/gdal-1.10.0 - gtk? ( x11-libs/gtk+:2 ) -" - -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[imagemagick,png] - ) - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -PGIS="$(get_version_component_range 1-2)" - -REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -MAKEOPTS+=' -j1' - -# These modules are built using the same *FLAGS that were used to build -# dev-db/postgresql. The right thing to do is to ignore the current -# *FLAGS settings. -QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" - - local AT_M4DIR="macros" - eautoreconf - postgres-multi_src_prepare -} - -src_configure() { - local myargs="" - use gtk && myargs+=" --with-gui" - postgres-multi_foreach econf ${myargs} -} - -src_compile() { - postgres-multi_foreach emake - postgres-multi_foreach emake -C topology - - if use doc ; then - postgres-multi_foreach emake comments - postgres-multi_foreach emake cheatsheets - postgres-multi_forbest emake -C doc html - fi -} - -src_install() { - postgres-multi_foreach emake DESTDIR="${D}" install - postgres-multi_foreach emake -C topology DESTDIR="${D}" install - postgres-multi_forbest dobin ./utils/postgis_restore.pl - - dodoc CREDITS TODO loader/README.* doc/*txt - - docinto topology - dodoc topology/{TODO,README} - - if use doc ; then - postgres-multi_foreach emake DESTDIR="${D}" comments-install - - docinto html - postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} - - docinto html/images - postgres-multi_forbest dodoc doc/html/images/* - fi - - use static-libs || find "${ED}" -name '*.a' -delete -} - -pkg_postinst() { - ebegin "Refreshing PostgreSQL symlinks" - postgresql-config update - eend $? - - elog "To finish installing PostGIS, follow the directions detailed at:" - elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" -} -- cgit v1.2.3