1 |
commit: 90d62e3a26af09f03028711f9ddb843e1264a8a2 |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 15 12:25:36 2015 +0000 |
4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 15 12:25:36 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d62e3a |
7 |
|
8 |
dev-db/postgis: Version Bump |
9 |
|
10 |
Version bump fixing bug 564502. |
11 |
|
12 |
Bug: 564502 |
13 |
|
14 |
Package-Manager: portage-2.2.20.1 |
15 |
|
16 |
dev-db/postgis/Manifest | 1 + |
17 |
dev-db/postgis/files/postgis-2.2.0-arflags.patch | 18 +++ |
18 |
dev-db/postgis/postgis-2.2.0.ebuild | 143 +++++++++++++++++++++++ |
19 |
3 files changed, 162 insertions(+) |
20 |
|
21 |
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest |
22 |
index 2862459..06cc042 100644 |
23 |
--- a/dev-db/postgis/Manifest |
24 |
+++ b/dev-db/postgis/Manifest |
25 |
@@ -7,3 +7,4 @@ DIST postgis-2.1.5.tar.gz 6827999 SHA256 0d0e27f72f12b8dba456fbde25ed0f6913f42ba |
26 |
DIST postgis-2.1.6.tar.gz 6803831 SHA256 6ffdf655bc4fca2b5495dd96f44b266e84111912d5c3f91b832023c4fec5c222 SHA512 a6c1263d64f2c1828656d5613840d721fb70ecbdfab3e28099c8f6b80d5404d46a9376913c0ab46c7f1109517c04430800b8c3be0c94d964421c6681afb2f997 WHIRLPOOL 98bfcae992f444b63840a28ef90077c01473ea528aa72ae5fd283b4fdcf7b7e37732afeac1a29fc87e330f687ca491d5afbed44b0792fb00763dc682501d37a3 |
27 |
DIST postgis-2.1.7.tar.gz 6804372 SHA256 00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2 SHA512 021fcb73c2109dafb67cb9d459eb08e0da7e55cf1a5fab81115aad3b0a61809b8f83d7a278aa04e41ecd633164e4257a90d5dfc0e81339b0c322e7d41d3c5eae WHIRLPOOL 938cacf1af4ba8a2f0f3bbefe11c0014a31cd331186cd7fc7fc0a242528094efb617326a484bdad76704bfb98fd065a7f280ab663088440af0555fc69862e36b |
28 |
DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1 |
29 |
+DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2 |
30 |
|
31 |
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch b/dev-db/postgis/files/postgis-2.2.0-arflags.patch |
32 |
new file mode 100644 |
33 |
index 0000000..9777004 |
34 |
--- /dev/null |
35 |
+++ b/dev-db/postgis/files/postgis-2.2.0-arflags.patch |
36 |
@@ -0,0 +1,18 @@ |
37 |
+diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in |
38 |
+--- a/raster/rt_core/Makefile.in 2015-05-13 14:13:18.000000000 -0400 |
39 |
++++ b/raster/rt_core/Makefile.in 2015-12-14 16:49:49.166156232 -0500 |
40 |
+@@ -18,7 +18,7 @@ |
41 |
+ # |
42 |
+ ############################################################################# |
43 |
+ |
44 |
+-AR = ar rs |
45 |
++ARFLAGS = rs |
46 |
+ |
47 |
+ CC = @CC@ |
48 |
+ LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a |
49 |
+@@ -64,4 +64,4 @@ |
50 |
+ rm -f Makefile |
51 |
+ |
52 |
+ librtcore.a: $(RT_OBJS) |
53 |
+- $(AR) $(RT_LIB) $(RT_OBJS) |
54 |
++ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS) |
55 |
|
56 |
diff --git a/dev-db/postgis/postgis-2.2.0.ebuild b/dev-db/postgis/postgis-2.2.0.ebuild |
57 |
new file mode 100644 |
58 |
index 0000000..6fb8ddc |
59 |
--- /dev/null |
60 |
+++ b/dev-db/postgis/postgis-2.2.0.ebuild |
61 |
@@ -0,0 +1,143 @@ |
62 |
+# Copyright 1999-2014 Gentoo Foundation |
63 |
+# Distributed under the terms of the GNU General Public License v2 |
64 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $ |
65 |
+ |
66 |
+EAPI="5" |
67 |
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} ) |
68 |
+ |
69 |
+inherit autotools eutils versionator |
70 |
+ |
71 |
+MY_PV=$(replace_version_separator 3 '') |
72 |
+MY_P="${PN}-${MY_PV}" |
73 |
+S="${WORKDIR}/${MY_P}" |
74 |
+ |
75 |
+DESCRIPTION="Geographic Objects for PostgreSQL" |
76 |
+HOMEPAGE="http://postgis.net" |
77 |
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" |
78 |
+LICENSE="GPL-2" |
79 |
+SLOT="0" |
80 |
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
81 |
+IUSE="doc gtk static-libs test" |
82 |
+ |
83 |
+RDEPEND=" |
84 |
+ || ( |
85 |
+ dev-db/postgresql:9.5[server] |
86 |
+ dev-db/postgresql:9.4[server] |
87 |
+ dev-db/postgresql:9.3[server] |
88 |
+ dev-db/postgresql:9.2[server] |
89 |
+ dev-db/postgresql:9.1[server] |
90 |
+ ) |
91 |
+ dev-libs/json-c |
92 |
+ dev-libs/libxml2:2 |
93 |
+ >=sci-libs/geos-3.5.0 |
94 |
+ >=sci-libs/proj-4.6.0 |
95 |
+ >=sci-libs/gdal-1.10.0 |
96 |
+ gtk? ( x11-libs/gtk+:2 ) |
97 |
+" |
98 |
+ |
99 |
+DEPEND="${RDEPEND} |
100 |
+ doc? ( |
101 |
+ app-text/docbook-xsl-stylesheets |
102 |
+ app-text/docbook-xml-dtd:4.5 |
103 |
+ dev-libs/libxslt |
104 |
+ || ( |
105 |
+ media-gfx/imagemagick[png] |
106 |
+ media-gfx/graphicsmagick[imagemagick,png] |
107 |
+ ) |
108 |
+ ) |
109 |
+ virtual/pkgconfig |
110 |
+ test? ( dev-util/cunit ) |
111 |
+" |
112 |
+ |
113 |
+PGIS="$(get_version_component_range 1-2)" |
114 |
+ |
115 |
+REQUIRED_USE="test? ( doc )" |
116 |
+ |
117 |
+# Needs a running psql instance, doesn't work out of the box |
118 |
+RESTRICT="test" |
119 |
+ |
120 |
+MAKEOPTS+=' -j1' |
121 |
+ |
122 |
+# These modules are built using the same *FLAGS that were used to build |
123 |
+# dev-db/postgresql. The right thing to do is to ignore the current |
124 |
+# *FLAGS settings. |
125 |
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" |
126 |
+ |
127 |
+postgres_check_slot() { |
128 |
+ if ! declare -p POSTGRES_COMPAT &>/dev/null; then |
129 |
+ die 'POSTGRES_COMPAT not declared.' |
130 |
+ fi |
131 |
+ |
132 |
+# Don't die because we can't run postgresql-config during pretend. |
133 |
+[[ "$EBUILD_PHASE" = "pretend" \ |
134 |
+ && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0 |
135 |
+ |
136 |
+ local res=$(echo ${POSTGRES_COMPAT[@]} \ |
137 |
+ | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null) |
138 |
+ |
139 |
+ if [[ "$res" -eq "0" ]] ; then |
140 |
+ eerror "PostgreSQL slot must be set to one of: " |
141 |
+ eerror " ${POSTGRES_COMPAT[@]}" |
142 |
+ return 1 |
143 |
+ fi |
144 |
+ |
145 |
+ return 0 |
146 |
+} |
147 |
+ |
148 |
+pkg_pretend() { |
149 |
+ postgres_check_slot || die |
150 |
+} |
151 |
+ |
152 |
+pkg_setup() { |
153 |
+ postgres_check_slot || die |
154 |
+ export PGSLOT="$(postgresql-config show)" |
155 |
+} |
156 |
+ |
157 |
+src_prepare() { |
158 |
+ epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch" |
159 |
+ |
160 |
+ local AT_M4DIR="macros" |
161 |
+ eautoreconf |
162 |
+} |
163 |
+ |
164 |
+src_configure() { |
165 |
+ local myargs="" |
166 |
+ use gtk && myargs+=" --with-gui" |
167 |
+ econf \ |
168 |
+ --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \ |
169 |
+ ${myargs} |
170 |
+} |
171 |
+ |
172 |
+src_compile() { |
173 |
+ emake |
174 |
+ emake -C topology |
175 |
+ |
176 |
+ if use doc ; then |
177 |
+ emake comments |
178 |
+ emake cheatsheets |
179 |
+ emake -C doc html |
180 |
+ fi |
181 |
+} |
182 |
+ |
183 |
+src_install() { |
184 |
+ emake DESTDIR="${D}" install |
185 |
+ use doc && emake DESTDIR="${D}" comments-install |
186 |
+ emake -C topology DESTDIR="${D}" install |
187 |
+ dobin ./utils/postgis_restore.pl |
188 |
+ |
189 |
+ dodoc CREDITS TODO loader/README.* doc/*txt |
190 |
+ |
191 |
+ use doc && dohtml -r doc/html/* |
192 |
+ |
193 |
+ docinto topology |
194 |
+ dodoc topology/{TODO,README} |
195 |
+ |
196 |
+ use static-libs || find "${ED}" -name '*.a' -delete |
197 |
+} |
198 |
+ |
199 |
+pkg_postinst() { |
200 |
+ postgresql-config update |
201 |
+ |
202 |
+ elog "To finish installing PostGIS, follow the directions detailed at:" |
203 |
+ elog "http://postgis.net/docs/manual-${MY_PV}/postgis_installation.html#create_new_db_extensions" |
204 |
+} |