1 |
commit: 28e6a8e2f30713703d5658eec46216b9596a76ae |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 31 14:17:47 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 31 14:17:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e6a8e2 |
7 |
|
8 |
sci-geosciences/mapserver: cleanup old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/798129 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
13 |
|
14 |
sci-geosciences/mapserver/Manifest | 1 - |
15 |
.../mapserver/files/mapserver-7.6.2-proj8.patch | 19 -- |
16 |
.../mapserver/mapserver-7.6.2-r1.ebuild | 291 --------------------- |
17 |
3 files changed, 311 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest |
20 |
index 5464718b7562..f71ac13a5ac5 100644 |
21 |
--- a/sci-geosciences/mapserver/Manifest |
22 |
+++ b/sci-geosciences/mapserver/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791 |
25 |
DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce |
26 |
|
27 |
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch |
28 |
deleted file mode 100644 |
29 |
index 24a5066c01c9..000000000000 |
30 |
--- a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch |
31 |
+++ /dev/null |
32 |
@@ -1,19 +0,0 @@ |
33 |
-https://github.com/MapServer/MapServer/issues/6249 |
34 |
- |
35 |
-From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001 |
36 |
-From: Even Rouault <even.rouault@×××××××××.com> |
37 |
-Date: Mon, 8 Mar 2021 15:19:50 +0100 |
38 |
-Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer |
39 |
- proj_api.h (fixes #6249) |
40 |
- |
41 |
---- a/cmake/FindProj.cmake |
42 |
-+++ b/cmake/FindProj.cmake |
43 |
-@@ -6,7 +6,7 @@ |
44 |
- # PROJ_LIBRARY |
45 |
- |
46 |
- |
47 |
--FIND_PATH(PROJ_INCLUDE_DIR proj_api.h) |
48 |
-+FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h) |
49 |
- |
50 |
- FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i) |
51 |
- |
52 |
|
53 |
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild |
54 |
deleted file mode 100644 |
55 |
index 412784bd8b54..000000000000 |
56 |
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild |
57 |
+++ /dev/null |
58 |
@@ -1,291 +0,0 @@ |
59 |
-# Copyright 1999-2021 Gentoo Authors |
60 |
-# Distributed under the terms of the GNU General Public License v2 |
61 |
- |
62 |
-EAPI=7 |
63 |
- |
64 |
-# Variables for the miscellaneous bindings we provide |
65 |
-PHP_EXT_OPTIONAL_USE="php" |
66 |
-PHP_EXT_NAME="php_mapscriptng" |
67 |
-PHP_EXT_SKIP_PHPIZE="yes" |
68 |
-PHP_EXT_SKIP_PATCHES="yes" |
69 |
- |
70 |
-USE_PHP="php7-3 php7-4" |
71 |
-PYTHON_COMPAT=( python3_{8..10} ) |
72 |
- |
73 |
-WEBAPP_MANUAL_SLOT=yes |
74 |
-WEBAPP_OPTIONAL=yes |
75 |
- |
76 |
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp |
77 |
- |
78 |
-DESCRIPTION="Development environment for building spatially enabled webapps" |
79 |
-HOMEPAGE="https://mapserver.org/" |
80 |
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz" |
81 |
- |
82 |
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk" |
83 |
-KEYWORDS="~amd64 ~x86" |
84 |
-SLOT="0" |
85 |
- |
86 |
-# NOTE: opengl removed for now as no support for it in upstream CMake |
87 |
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python" |
88 |
- |
89 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
90 |
- |
91 |
-# Tests: |
92 |
-# Included tests (tests/*) are seriously outdated |
93 |
-# Upstream's main test suite (msautotest/*) is not in the release tarball, |
94 |
-# and upstream sets 'export-ignore' for that directory. |
95 |
-# |
96 |
-# The eclasses used normally try to run test suites themselves, |
97 |
-# or skip if nothing was found. |
98 |
-# However, because of the php-ext-* eclass usage, this fails and would |
99 |
-# cause errors running non-existent tests, so we have to restrict here. |
100 |
-RESTRICT="test" |
101 |
- |
102 |
-RDEPEND=" |
103 |
- >=dev-libs/expat-2.2.8 |
104 |
- dev-libs/libxml2:2= |
105 |
- dev-libs/libxslt[crypt] |
106 |
- >=dev-libs/protobuf-c-1.3.2:= |
107 |
- >=media-libs/freetype-2.9.1-r3 |
108 |
- >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] |
109 |
- >=media-libs/giflib-5.2.1:= |
110 |
- >=media-libs/libpng-1.6.37:= |
111 |
- >=net-misc/curl-7.69.1 |
112 |
- >=sci-libs/gdal-3.0.4:=[oracle?] |
113 |
- >=sci-libs/proj-6.2.1:= |
114 |
- virtual/jpeg |
115 |
- virtual/libiconv |
116 |
- >=x11-libs/agg-2.5-r3 |
117 |
- apache? ( |
118 |
- app-admin/webapp-config |
119 |
- dev-libs/fcgi |
120 |
- ) |
121 |
- bidi? ( |
122 |
- dev-libs/fribidi |
123 |
- media-libs/harfbuzz:= |
124 |
- ) |
125 |
- cairo? ( x11-libs/cairo ) |
126 |
- geos? ( sci-libs/geos ) |
127 |
- mysql? ( dev-db/mysql-connector-c:= ) |
128 |
- oracle? ( dev-db/oracle-instantclient:= ) |
129 |
- perl? ( dev-lang/perl:= ) |
130 |
- postgis? ( |
131 |
- dev-db/postgis |
132 |
- dev-db/postgresql:= |
133 |
- ) |
134 |
- python? ( ${PYTHON_DEPS} ) |
135 |
-" |
136 |
-DEPEND="${RDEPEND}" |
137 |
-BDEPEND=" |
138 |
- virtual/pkgconfig |
139 |
- perl? ( >=dev-lang/swig-4.0 ) |
140 |
- php? ( >=dev-lang/swig-4.0 ) |
141 |
- python? ( |
142 |
- >=dev-lang/swig-4.0 |
143 |
- >=dev-python/setuptools-44.1.0 |
144 |
- ) |
145 |
-" |
146 |
- |
147 |
-PATCHES=( |
148 |
- "${FILESDIR}"/${P}-proj8.patch |
149 |
- "${FILESDIR}"/${PN}-oracle21.patch |
150 |
-) |
151 |
- |
152 |
-want_apache2 apache |
153 |
- |
154 |
-pkg_setup() { |
155 |
- use apache && webapp_pkg_setup |
156 |
- use perl && perl_set_version |
157 |
-} |
158 |
- |
159 |
-src_prepare() { |
160 |
- cmake_src_prepare |
161 |
- |
162 |
- use php && php-ext-source-r3_src_prepare |
163 |
- use python && python_copy_sources |
164 |
-} |
165 |
- |
166 |
-_generate_cmake_args() { |
167 |
- # Provides a simple, bare config for bindings to build upon |
168 |
- # Need WITH_WMS=ON or build fails |
169 |
- local args=( |
170 |
- "-DCMAKE_SKIP_RPATH=ON" |
171 |
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" |
172 |
- "-DWITH_CAIRO=OFF" |
173 |
- "-DWITH_FCGI=OFF" |
174 |
- "-DWITH_FRIBIDI=OFF" |
175 |
- "-DWITH_GEOS=OFF" |
176 |
- "-DWITH_GIF=OFF" |
177 |
- "-DWITH_HARFBUZZ=OFF" |
178 |
- "-DWITH_ICONV=OFF" |
179 |
- "-DWITH_PROTOBUFC=OFF" |
180 |
- "-DWITH_POSTGIS=OFF" |
181 |
- "-DWITH_WMS=ON" |
182 |
- "-DWITH_WCS=OFF" |
183 |
- "-DWITH_WFS=OFF" |
184 |
- ) |
185 |
- |
186 |
- echo "${args[@]}" |
187 |
-} |
188 |
- |
189 |
-src_configure() { |
190 |
- # NOTE: We could make this based on _generate_cmake_args, but |
191 |
- # then we wouldn't be as-explicit about what is enabled/not, |
192 |
- # and reliant on defaults not changing. |
193 |
- # Readability and maintainability is better this way. |
194 |
- local mycmakeargs=( |
195 |
- "-DCMAKE_SKIP_RPATH=ON" |
196 |
- "-DINSTALL_LIB_DIR=/usr/$(get_libdir)" |
197 |
- "-DWITH_CLIENT_WMS=ON" |
198 |
- "-DWITH_CLIENT_WFS=ON" |
199 |
- "-DWITH_CURL=ON" |
200 |
- "-DWITH_GIF=ON" |
201 |
- "-DWITH_ICONV=ON" |
202 |
- "-DWITH_KML=ON" |
203 |
- "-DWITH_LIBXML2=ON" |
204 |
- "-DWITH_PHPNG=OFF" |
205 |
- "-DWITH_PROTOBUFC=ON" |
206 |
- "-DWITH_SOS=ON" |
207 |
- "-DWITH_WMS=ON" |
208 |
- "-DWITH_WFS=ON" |
209 |
- "-DWITH_WCS=ON" |
210 |
- "-DWITH_XMLMAPFILE=ON" |
211 |
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" |
212 |
- "-DWITH_CAIRO=$(usex cairo ON OFF)" |
213 |
- "-DWITH_FCGI=$(usex apache ON OFF)" |
214 |
- "-DWITH_GEOS=$(usex geos ON OFF)" |
215 |
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" |
216 |
- "-DWITH_MYSQL=$(usex mysql ON OFF)" |
217 |
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)" |
218 |
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" |
219 |
- "-DWITH_POSTGIS=$(usex postgis ON OFF)" |
220 |
- "-DWITH_PERL=$(usex perl ON OFF)" |
221 |
- ) |
222 |
- |
223 |
- use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" ) |
224 |
- |
225 |
- # Configure the standard build first |
226 |
- cmake_src_configure |
227 |
- |
228 |
- # Minimal build for bindings |
229 |
- # Note that we use _generate_cmake_args to get a clean config each time, then add |
230 |
- # in options as appropriate. Otherwise we'd get contamination between bindings. |
231 |
- if use python ; then |
232 |
- mycmakeargs=( |
233 |
- $(_generate_cmake_args) |
234 |
- "-DWITH_PYTHON=ON" |
235 |
- ) |
236 |
- |
237 |
- python_foreach_impl cmake_src_configure |
238 |
- python_foreach_impl python_optimize |
239 |
- fi |
240 |
- |
241 |
- if use php ; then |
242 |
- local slot= |
243 |
- for slot in $(php_get_slots) ; do |
244 |
- # Switch to the slot's build dir |
245 |
- php_init_slot_env "${slot}" |
246 |
- |
247 |
- # Take a blank config each time |
248 |
- # Add in only *this* slot's PHP includes dir, etc |
249 |
- mycmakeargs=( |
250 |
- $(_generate_cmake_args) |
251 |
- "-DWITH_PHPNG=ON" |
252 |
- "-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}" |
253 |
- "-DPHP_INCLUDES=${PHPPREFIX}" |
254 |
- ) |
255 |
- |
256 |
- BUILD_DIR="${S}/php${slot}" cmake_src_configure |
257 |
- |
258 |
- # Return to where we left off, in case we add more |
259 |
- # to this phase. |
260 |
- cd "${S}" || die |
261 |
- done |
262 |
- fi |
263 |
-} |
264 |
- |
265 |
-src_compile() { |
266 |
- cmake_src_compile |
267 |
- |
268 |
- if use python ; then |
269 |
- python_foreach_impl cmake_src_compile |
270 |
- fi |
271 |
- |
272 |
- if use php ; then |
273 |
- local slot= |
274 |
- for slot in $(php_get_slots) ; do |
275 |
- # Switch to the slot's build dir |
276 |
- php_init_slot_env "${slot}" |
277 |
- |
278 |
- # Force cmake to build in it |
279 |
- BUILD_DIR="${S}/php${slot}" cmake_src_compile |
280 |
- |
281 |
- # Return to where we left off, in case we add more |
282 |
- # to this phase. |
283 |
- cd "${S}" || die |
284 |
- done |
285 |
- fi |
286 |
-} |
287 |
- |
288 |
-src_install() { |
289 |
- # Needs to be first |
290 |
- use apache && webapp_src_preinst |
291 |
- |
292 |
- if use python ; then |
293 |
- python_foreach_impl cmake_src_install |
294 |
- python_foreach_impl python_optimize |
295 |
- fi |
296 |
- |
297 |
- if use php ; then |
298 |
- php-ext-source-r3_createinifiles |
299 |
- |
300 |
- local slot= |
301 |
- for slot in $(php_get_slots) ; do |
302 |
- php_init_slot_env "${slot}" |
303 |
- |
304 |
- BUILD_DIR="${S}/php${slot}" cmake_src_install |
305 |
- |
306 |
- cd "${S}" || die |
307 |
- done |
308 |
- fi |
309 |
- |
310 |
- # Install this last because this build is the most "fully-featured" |
311 |
- cmake_src_install |
312 |
- |
313 |
- if use apache ; then |
314 |
- # We need a mapserver symlink available in cgi-bin |
315 |
- dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv |
316 |
- webapp_src_install |
317 |
- fi |
318 |
-} |
319 |
- |
320 |
-pkg_preinst() { |
321 |
- # We need to cache the value here of HAD_PHP because we want the |
322 |
- # original package version, not the result of us installing a new one |
323 |
- HAD_PHP= |
324 |
- has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1 |
325 |
-} |
326 |
- |
327 |
-pkg_postinst() { |
328 |
- use apache && webapp_pkg_postinst |
329 |
- |
330 |
- # Let upgrading (from a pre-rewrite version) users know that the PHP module changed |
331 |
- local replacing_version= |
332 |
- for replacing_version in ${REPLACING_VERSIONS} ; do |
333 |
- if ver_test "7.6.0" -gt "${replacing_version}" ; then |
334 |
- if use php && [[ ${HAD_PHP} -eq 1 ]] ; then |
335 |
- elog "Note that MapServer has deprecated the old PHP extension" |
336 |
- elog "You can read more at: " |
337 |
- elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration" |
338 |
- elog "This may involve porting some of your PHP scripts to use the new module." |
339 |
- fi |
340 |
- |
341 |
- # Only show the message once |
342 |
- break |
343 |
- fi |
344 |
- done |
345 |
-} |
346 |
- |
347 |
-pkg_prerm() { |
348 |
- use apache && webapp_pkg_prerm |
349 |
-} |