sci-geosciences/mapserver: bump to version 7.2.2

- apache support not mandatory
- add oracle support
- fix compilation with proj-6.0.0

Bug: https://bugs.gentoo.org/674480
Closes: https://github.com/gentoo/gentoo/pull/12016
Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
Signed-off-by: Amy Liffey <amynka@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

2 files changed, 221 insertions, 0 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 3a462cc37764..55e7e461d6e1 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1,3 @@
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753
 DIST mapserver-7.0.7.tar.gz 2634698 BLAKE2B fadde68803d7f74b116aa23c05c25f9c52c67e0a8ea69eace2c865843d7f223c24d8c42cbed54578f2eb631cb58bae3652075872f76e9b88238d76e044d4314b SHA512 94225dbe64edf6623bb5e92649d505809f70f86c24ca06675f6277ac4a161c40c369fd1973db649e6c864fa5e2e4a8a93cbd36d1524297a0e47b96ab59c0941c
+DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
diff --git a/sci-geosciences/mapserver/mapserver-7.2.2.ebuild b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
new file mode 100644
index 000000000000..643020ee7545
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.2.2.ebuild
@@ -0,0 +1,220 @@
+# 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
+	)
+	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
+}