commit: 1a978c51583a22031f007f5c5d22719b0360e9f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 19:27:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 23:07:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a978c51
sci-geosciences/mapserver: Drop 7.2.2
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/mapserver/Manifest | 1 -
.../files/mapserver-7.0.0-missing-nzz18.patch | 13 --
.../files/mapserver-7.0.0-no-applicable-code.patch | 34 ----
sci-geosciences/mapserver/mapserver-7.2.2.ebuild | 220 ---------------------
sci-geosciences/mapserver/metadata.xml | 3 -
5 files changed, 271 deletions(-)
diff --git a/sci-geosciences/mapserver/Manifest
b/sci-geosciences/mapserver/Manifest
index a8b03ed7f07..0eb1e410b4a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B
3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4
SHA512
8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B
35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7
SHA512
6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
diff --git
a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
b/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
deleted file mode 100644
index a22fcf4de6a..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-missing-nzz18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
-index 18055f7..2568b5e 100644
---- a/cmake/FindOracle.cmake
-+++ b/cmake/FindOracle.cmake
-@@ -37,7 +37,7 @@ if(DEFINED ENV{ORACLE_HOME})
- ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
-
- set(ORACLE_OCI_NAMES clntsh libclntsh oci)
-- set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 ociw32)
-+ set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 libnnz11 nnz12 libnnz12 nnz18
libnnz18 ociw32)
- set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11 oraocci12)
-
- set(ORACLE_LIB_DIR
diff --git
a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
deleted file mode 100644
index f438bec9f12..00000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/mapwfs11.c b/mapwfs11.c
-index 20ab164..4dc15fc 100755
---- a/mapwfs11.c
-+++ b/mapwfs11.c
-@@ -29,12 +29,12 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
-
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- /************************************************************************/
-diff --git a/mapwfs20.c b/mapwfs20.c
-index 710d444..cf69ee3 100755
---- a/mapwfs20.c
-+++ b/mapwfs20.c
-@@ -29,10 +29,10 @@
-
- #include "mapserver.h"
- #include "mapows.h"
-+#include "mapowscommon.h"
-
- #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
- #include "maplibxml2.h"
--#include "mapowscommon.h"
- #include "mapogcfilter.h"
-
- #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
deleted file mode 100644
index 7d9720fe06c..00000000000
--- a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-6"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib
perl-module php-ext-source-r3 webapp # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/";
-SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz";
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-# force default gdal and proj if not cause compilation problem
-IUSE="apache bidi cairo +gdal geos mysql opengl oracle perl php postgis +proj
python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="
- php? ( php_targets_php5-6 )
- xslt? ( xml )"
-
-RDEPEND="
- dev-libs/expat
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- apache? (
- dev-libs/fcgi
- app-admin/webapp-config
- )
- bidi? ( dev-libs/fribidi
- media-libs/harfbuzz )
- cairo? ( x11-libs/cairo )
- gdal? (
- sci-libs/gdal:=[oracle?]
- dev-libs/protobuf-c
- )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa[X(+)]
- )
- oracle? (
- dev-db/oracle-instantclient:=
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-DEPEND="${RDEPEND}
- perl? ( >=dev-lang/swig-2.0 )
- python? ( >=dev-lang/swig-2.0 )"
-
-want_apache2 apache
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
- "${FILESDIR}/${PN}-7.0.0-missing-nzz18.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use apache ; then
- webapp_pkg_setup
- fi
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- default
- # HACK: Make symlinks for php targets
- local slot
- for slot in $(php_get_slots); do
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- local glibdir="${EPREFIX}/usr/include/glib-2.0"
- local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-
- sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
- sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
- -i "${S}/CMakeLists.txt" || die
-
- # For enable compilation with proj-6
- if use proj ; then
- append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DCMAKE_SKIP_RPATH=ON"
- "-DWITH_SDE=OFF"
- "-DWITH_ICONV=ON"
- "-DWITH_GD=ON"
- "-DWITH_GIF=ON"
- "-DWITH_CURL=ON"
- "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
- "-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
- "-DWITH_PROJ=$(usex proj ON OFF)"
- "-DWITH_WMS=$(usex proj ON OFF)"
- "-DWITH_KML=$(usex xml ON OFF)"
- "-DWITH_FCGI=$(usex apache ON OFF)"
- "-DWITH_GEOS=$(usex geos ON OFF)"
- "-DWITH_GDAL=$(usex gdal ON OFF)"
- "-DWITH_OGR=$(usex gdal ON OFF)"
- "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
- "-DWITH_POSTGIS=$(usex postgis ON OFF)"
- "-DWITH_MYSQL=$(usex mysql ON OFF)"
- "-DWITH_LIBXML2=$(usex xml ON OFF)"
- "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
- "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
- "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
- "-DWITH_CAIRO=$(usex cairo ON OFF)"
- "-DWITH_PHP=$(usex php ON OFF)"
- "-DWITH_PYTHON=$(usex python ON OFF)"
- "-DWITH_PERL=$(usex perl ON OFF)"
- "-DWITH_PROTOBUFC=$(usex gdal ON OFF)"
- )
-
- if use gdal && use proj ; then
- mycmakeargs+=( "-DWITH_WFS=ON"
- "-DWITH_WCS=ON"
- "-DWITH_CLIENT_WMS=ON"
- "-DWITH_CLIENT_WFS=ON"
- "-DWITH_SOS=$(usex xml ON OFF)"
- )
- else
- mycmakeargs+=( "-DWITH_WFS=OFF"
- "-DWITH_WCS=OFF"
- "-DWITH_CLIENT_WMS=OFF"
- "-DWITH_CLIENT_WFS=OFF"
- "-DWITH_SOS=OFF"
- )
- fi
-
- if use php ; then
- local slot
- for slot in $(php_get_slots); do
- local
php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config"
- [[ -x ${php_config} ]] \
- || die "php-config '${php_config}' not valid or
not executable"
-
- local php_include_dir=$(${php_config} --include-dir)
- [[ -d ${php_include_dir} ]] || die "PHP Include dir not
found or not valid"
-
- mycmakeargs+=(
- -DPHP5_CONFIG_EXECUTABLE="${php_config}"
- -DPHP5_INCLUDES="${php_include_dir}"
- )
- done
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- if use apache ; then
- webapp_src_preinst
- fi
-
- cmake-utils_src_install
-
- if use php ; then
- php-ext-source-r3_createinifiles
- fi
-
- if use apache ; then
- webapp_src_install
- fi
-}
-
-pkg_postinst() {
- if use apache ; then
- webapp_pkg_postinst
- fi
-}
-
-pkg_prerm() {
- if use apache ; then
- webapp_pkg_prerm
- fi
-}
diff --git a/sci-geosciences/mapserver/metadata.xml
b/sci-geosciences/mapserver/metadata.xml
index fbe0a42676c..5844269c69d 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -7,10 +7,7 @@
</maintainer>
<use>
<flag name="apache">Enable mapserver to run under apache</flag>
- <flag name="gdal"
restrict="<=sci-geosciences/mapserver-7.6.0">Enable <pkg>sci-libs/gdal</pkg>
library support; deprecated</flag>
<flag name="geos">Enable <pkg>sci-libs/geos</pkg> library
support</flag>
<flag name="postgis">Enable <pkg>dev-db/postgis</pkg>
support</flag>
- <flag name="proj"
restrict="<=sci-geosciences/mapserver-7.6.0">Enable <pkg>sci-libs/proj</pkg>
library support (geographic projections); deprecated</flag>
- <flag name="xslt"
restrict="<=sci-geosciences/mapserver-7.6.0">Enable xslt and exslt support
xml-mapfile support; deprecated</flag>
</use>
</pkgmetadata>
