gentoo resync : 25.08.2020

6 files changed, 292 insertions, 275 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 2551d4f9f64d..a692a8efde17 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,5 +1,3 @@
-AUX mapserver-7.0.0-missing-nzz18.patch 563 BLAKE2B fcfe0f19bca658586dda345a14c3ad6c1ddc8a13abde8c3929d4585003fa4cd12c770d651fb1e1032ef1123f77dec38e4db16bc46fc857db6897fca61cc1dadb SHA512 5122b2bda7052663a01d8bff51582a7c09fe9e69bc9ed3c9d23b2036144f559cc9890d43e96e01c09298fc48fee0570c9c37da6a340262e1a38f4c29f042ef9c
-AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c
-DIST mapserver-7.2.2.tar.gz 2677800 BLAKE2B 3f26517f634098fd7f005aa5a1f71fc8ba9b831b9bd0385a64272db6705ad3bd7563848bea1532c08f28177c51b104b1185fe6aa319de8c4ed95ec649a1bf7f4 SHA512 8c66a52ec04741495e0cf2bf5ec28f8e3cafac9834ab314ef998d6cf8d50b893dcc66a05d4b30f29694c357cd175a1cb28712c94bf15da4c8bcb9bfd98f0d2af
-EBUILD mapserver-7.2.2.ebuild 4943 BLAKE2B 3e39d474fceeff3ba1486070c6ebf735fcbab8c66b3a6e5dc1e42dc720fa9ebba13300eb3428c7a83d87c8131f5b328cfb7b6a8c609e6ce59564d001a4618508 SHA512 908d6b5f8a544909c63637b01bbd604636461d5ca1ea9d92b10a3ce6c195fce2985dd114094ef2ef85f5873058ecce7f2b7e74c91676e8e8cd7264696e14a135
-MISC metadata.xml 748 BLAKE2B d0cdfaae91bf8b692dd90eb8842c5c5bc78c421e729b713d1091de482e23475aedd1c987de14da5e438228bcbbf15bb488515d7253d635aac6148599fae58c3c SHA512 c0ed4810c5d7eff6fc409ae17f25ece71a89d99ba33fe2c27c04d37859798997a8e29964514fd95d1639688e29044309666e0684befcc598c4ea9ce9c82fd2b6
+DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
+EBUILD mapserver-7.6.0.ebuild 7301 BLAKE2B b9d2f090e15cad539c0976c36c4e2c02456eed16ca725a2ef59ac4cab898f2fd97478f56179a7c606c4d5a8d5aab7bc896c0b0729897a8c0710b26a4245ab1c9 SHA512 36a143de7a376fcee8f3770f22a9be3b5fab29e6df2c438e76000bc8ec144850581735f394dddcb2463d11a60cfedcb558d304a95d863c8137921dfaf5deb175
+MISC metadata.xml 496 BLAKE2B 5903d53c86d30548162025cfed484a3405ea3a9bd611d475177a355a374b7a4bbf73d439a1c1457176d3f7f58355da06d842327407437c89cab426473be22bab SHA512 2dc21e4e1a785b4dff3de94bc3c621dfd4c3dfe092761681b4ffc536532f7f87b6a9fbbd0dc82895132ebd3cdb0f5750e6fe77b681c49d5996d9233096478a8e
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 a22fcf4de6aa..000000000000
--- 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 f438bec9f125..000000000000
--- 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 7d9720fe06c7..000000000000
--- 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/mapserver-7.6.0.ebuild b/sci-geosciences/mapserver/mapserver-7.6.0.ebuild
new file mode 100644
index 000000000000..7e15a26e21b7
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.6.0.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: We have to stick with EAPI 6 for now because of the
+# depend.apache eclass.
+EAPI=6
+
+# Variables for the miscellaneous bindings we provide
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscriptng"
+PHP_EXT_SKIP_PHPIZE="yes"
+
+USE_PHP="php7-2 php7-3 php7-4"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+# NOTE: Similarly, we cannot go cmake-utils -> cmake until we're on EAPI 7
+inherit cmake-utils depend.apache eapi7-ver perl-functions php-ext-source-r3 python-r1 webapp
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
+
+LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# NOTE: opengl removed for now as no support for it in upstream CMake
+IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests:
+# Included tests (tests/*) are seriously outdated
+# Upstream's main test suite (msautotest/*) is not in the release tarball,
+# and upstream sets 'export-ignore' for that directory.
+#
+# The eclasses used normally try to run test suites themselves,
+# or skip if nothing was found.
+# However, because of the php-ext-* eclass usage, this fails and would
+# cause errors running non-existent tests, so we have to restrict here.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.2.8
+	dev-libs/libxml2:2=
+	dev-libs/libxslt[crypt]
+	>=dev-libs/protobuf-c-1.3.2:=
+	>=media-libs/freetype-2.9.1-r3
+	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
+	>=media-libs/giflib-5.2.1:=
+	>=media-libs/libpng-1.6.37:=
+	>=net-misc/curl-7.69.1
+	>=sci-libs/gdal-3.0.4:=[oracle?]
+	>=sci-libs/proj-6.2.1:=
+	virtual/jpeg
+	virtual/libiconv
+	>=x11-libs/agg-2.5-r3
+	apache? (
+		app-admin/webapp-config
+		dev-libs/fcgi
+	)
+	bidi? (
+		dev-libs/fribidi
+		media-libs/harfbuzz:=
+	)
+	cairo? ( x11-libs/cairo )
+	geos? ( sci-libs/geos )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oracle? ( dev-db/oracle-instantclient:=	)
+	perl? ( dev-lang/perl:= )
+	postgis? (
+		dev-db/postgis
+		dev-db/postgresql:=
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	perl? ( >=dev-lang/swig-4.0 )
+	php? ( >=dev-lang/swig-4.0 )
+	python? (
+		>=dev-lang/swig-4.0
+		>=dev-python/setuptools-44.1.0
+	)
+"
+
+want_apache2 apache
+
+pkg_setup() {
+	use apache && webapp_pkg_setup
+	use perl && perl_set_version
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use php && php-ext-source-r3_src_prepare
+	use python && python_copy_sources
+}
+
+_generate_cmake_args() {
+	# Provides a simple, bare config for bindings to build upon
+	# Need WITH_WMS=ON or build fails
+	local args=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DWITH_CAIRO=OFF"
+		"-DWITH_FCGI=OFF"
+		"-DWITH_FRIBIDI=OFF"
+		"-DWITH_GEOS=OFF"
+		"-DWITH_GIF=OFF"
+		"-DWITH_HARFBUZZ=OFF"
+		"-DWITH_ICONV=OFF"
+		"-DWITH_PROTOBUFC=OFF"
+		"-DWITH_POSTGIS=OFF"
+		"-DWITH_WMS=ON"
+		"-DWITH_WCS=OFF"
+		"-DWITH_WFS=OFF"
+	)
+
+	echo "${args[@]}"
+}
+
+src_configure() {
+	# NOTE: We could make this based on _generate_cmake_args, but
+	# then we wouldn't be as-explicit about what is enabled/not,
+	# and reliant on defaults not changing.
+	# Readability and maintainability is better this way.
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DWITH_CLIENT_WMS=ON"
+		"-DWITH_CLIENT_WFS=ON"
+		"-DWITH_CURL=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_ICONV=ON"
+		"-DWITH_KML=ON"
+		"-DWITH_LIBXML2=ON"
+		"-DWITH_PHPNG=OFF"
+		"-DWITH_PROTOBUFC=ON"
+		"-DWITH_SOS=ON"
+		"-DWITH_WMS=ON"
+		"-DWITH_WFS=ON"
+		"-DWITH_WCS=ON"
+		"-DWITH_XMLMAPFILE=ON"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+	)
+
+	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
+
+	# Configure the standard build first
+	cmake-utils_src_configure
+
+	# Minimal build for bindings
+	# Note that we use _generate_cmake_args to get a clean config each time, then add
+	# in options as appropriate. Otherwise we'd get contamination between bindings.
+	if use python ; then
+		mycmakeargs=(
+			$(_generate_cmake_args)
+			"-DWITH_PYTHON=ON"
+		)
+
+		python_foreach_impl cmake-utils_src_configure
+		python_foreach_impl python_optimize
+	fi
+
+	if use php ; then
+		local slot=
+		for slot in $(php_get_slots) ; do
+			# Switch to the slot's build dir
+			php_init_slot_env "${slot}"
+
+			# Take a blank config each time
+			# Add in only *this* slot's PHP includes dir, etc
+			mycmakeargs=(
+				$(_generate_cmake_args)
+				"-DWITH_PHPNG=ON"
+				"-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
+				"-DPHP_INCLUDES=${PHPPREFIX}"
+			)
+
+			BUILD_DIR="${S}/php${slot}" cmake-utils_src_configure
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake-utils_src_compile
+	fi
+
+	if use php ; then
+		local slot=
+		for slot in $(php_get_slots) ; do
+			# Switch to the slot's build dir
+			php_init_slot_env "${slot}"
+
+			# Force cmake to build in it
+			BUILD_DIR="${S}/php${slot}" cmake-utils_src_compile
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Needs to be first
+	use apache && webapp_src_preinst
+
+	if use python ; then
+		python_foreach_impl cmake-utils_src_install
+		python_foreach_impl python_optimize
+	fi
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+
+		local slot=
+		for slot in $(php_get_slots) ; do
+			php_init_slot_env "${slot}"
+
+			BUILD_DIR="${S}/php${slot}" cmake-utils_src_install
+
+			cd "${S}" || die
+		done
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake-utils_src_install
+
+	if use apache ; then
+		# We need a mapserver symlink available in cgi-bin
+		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
+		webapp_src_install
+	fi
+}
+
+pkg_preinst() {
+	# We need to cache the value here of HAD_PHP because we want the
+	# original package version, not the result of us installing a new one
+	HAD_PHP=
+	has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
+}
+
+pkg_postinst() {
+	use apache && webapp_pkg_postinst
+
+	# Let upgrading (from a pre-rewrite version) users know that the PHP module changed
+	local replacing_version=
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "7.6.0" -gt "${replacing_version}" ; then
+			if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
+				elog "Note that MapServer has deprecated the old PHP extension"
+				elog "You can read more at: "
+				elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
+				elog "This may involve porting some of your PHP scripts to use the new module."
+			fi
+
+			# Only show the message once
+			break
+		fi
+	done
+}
+
+pkg_prerm() {
+	use apache && webapp_pkg_prerm
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index bc9652c1add9..5844269c69df 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">Enable <pkg>sci-libs/gdal</pkg> library support</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">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections)</flag>
-		<flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag>
 	</use>
 </pkgmetadata>