Gentoo Archives: gentoo-commits

From: Sam Jorna <wraeth@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgis/files/
Date: Sun, 27 Mar 2016 12:02:14
Message-Id: 1459079861.81ccd9d9ed5fcfaa8d85ccacb3bbd456ed59048f.wraeth@gentoo
1 commit: 81ccd9d9ed5fcfaa8d85ccacb3bbd456ed59048f
2 Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 10:51:16 2016 +0000
4 Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 11:57:41 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ccd9d9
7
8 dev-db/postgis: remove unneeded patches
9
10 Package-Manager: portage-2.2.28
11
12 dev-db/postgis/files/postgis-1.5-ldflags.patch | 28 ---------------
13 dev-db/postgis/files/postgis_dbs-1.4 | 49 --------------------------
14 2 files changed, 77 deletions(-)
15
16 diff --git a/dev-db/postgis/files/postgis-1.5-ldflags.patch b/dev-db/postgis/files/postgis-1.5-ldflags.patch
17 deleted file mode 100644
18 index 3ccbb71..0000000
19 --- a/dev-db/postgis/files/postgis-1.5-ldflags.patch
20 +++ /dev/null
21 @@ -1,28 +0,0 @@
22 -diff -Naurw postgis-1.5.8.orig/loader/Makefile.in postgis-1.5.8/loader/Makefile.in
23 ---- postgis-1.5.8.orig/loader/Makefile.in 2010-09-10 20:44:05.000000000 +0000
24 -+++ postgis-1.5.8/loader/Makefile.in 2013-01-30 14:31:01.189692941 +0000
25 -@@ -79,16 +79,16 @@
26 - $(CC) $(CFLAGS) $(ICONV_CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
27 -
28 - $(PGSQL2SHP): shpopen.o dbfopen.o safileio.o getopt.o pgsql2shp.o $(LIBLWGEOM)
29 -- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
30 -+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@
31 -
32 - $(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o safileio.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
33 -- $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm
34 -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(ICONV_LDFLAGS) -lm
35 -
36 - shp2pgsql-gui.o: shp2pgsql-gui.c
37 - $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c
38 -
39 - $(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o safileio.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES)
40 -- $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
41 -+ $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm
42 -
43 - installdir:
44 - @mkdir -p $(DESTDIR)$(bindir)
45 -@@ -106,4 +106,3 @@
46 -
47 - clean:
48 - @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP) $(GTK_WIN32_RES)
49 --
50
51 diff --git a/dev-db/postgis/files/postgis_dbs-1.4 b/dev-db/postgis/files/postgis_dbs-1.4
52 deleted file mode 100644
53 index fa7ac25..0000000
54 --- a/dev-db/postgis/files/postgis_dbs-1.4
55 +++ /dev/null
56 @@ -1,49 +0,0 @@
57 -# This file is used by 'emerge --config dev-db/postgis' to determine which
58 -# databases it should install to, upgrade or create as a template.
59 -
60 -# Unlike the previous versions of the PostGIS ebuilds, it no longer creates any
61 -# databases except for templates. All databases you list must already exist in
62 -# the cluster.
63 -
64 -# The user to perform the updates as. This user must have the privileges to
65 -# modify all of the databases you list here.
66 -pguser="postgres"
67 -
68 -# By default, no databases will have PostGIS enabled. The databases listed here
69 -# must already exist. The databases you list here must not already be PostGIS
70 -# enabled. Instead, use the upgrade lists further down.
71 -#databases=( "your" "databases" )
72 -
73 -# Anything you place in this list will create a database and make it a template.
74 -# It will be PostGIS-enabled. To add additional features, add the template names
75 -# to the following lists.
76 -#templates=( "template_postgis" )
77 -
78 -# The PostGIS enabled templates will be created using this template.
79 -from_template="template1"
80 -
81 -# For a complete set of EPSG coordinate system definition identifiers, you can
82 -# also load the spatial_ref_sys.sql definitions file and populate the
83 -# spatial_ref_sys table. This will permit you to perform ST_Transform()
84 -# operations on geometries.
85 -#epsg_databases=( "enable" "epsg" "on" "these" "databases" )
86 -
87 -# Add comments to PostGIS functions to the databases in this list.
88 -#comment_databases=( "comments" "on" "these" "databases" )
89 -
90 -# Any databases you have that are already PostGIS enabled can be listed among
91 -# the following list to perform a soft upgrade. If the soft upgrade fails,
92 -# you'll need to do a hard upgrade.
93 -# http://postgis.refractions.net/documentation/manual-1.5/ch02.html#hard_upgrade
94 -
95 -# Upgrade from PostGIS 1.2 to 1.4
96 -#upgrade_from_1_2=( "upgrade" "these" "databases" )
97 -
98 -# Upgrade from PostGIS 1.3 to 1.4
99 -#upgrade_from_1_3=( "upgrade" "these" "databases" )
100 -
101 -# Perform a minor upgrade for PostGIS 1.4
102 -#upgrade_from_1_4=( "upgrade" "these" "databases" )
103 -
104 -# Uncomment this once you're satisfied with the settings in this file.
105 -#configured="true"