[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Amy Winston]

commit:     64b32d1e88e7adfb309a96cc940300fb08ecd66c
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 12:20:01 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 12:20:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b32d1e

sci-geosciences/mapserver: drop old security bug #497302

Package-Manager: portage-2.2.26

 sci-geosciences/mapserver/Manifest                 |   1 -
 .../mapserver/mapserver-6.0.1-r2.ebuild            | 234 ---------------------
 .../mapserver/mapserver-6.0.1-r3.ebuild            | 221 -------------------
 3 files changed, 456 deletions(-)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index c981436..735318a 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
 DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b

diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
deleted file mode 100644
index 6766c1d..0000000
--- a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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-4 php5-5"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-PYTHON_MODNAME="mapscript.py"
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
-
-RDEPEND="
-	!${CATEGORY}/${PN}:${PV}
-	dev-libs/expat
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa
-	)
-	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] )
-"
-for i in perl python; do
-	SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
-done
-DEPEND="${RDEPEND} ${SWIG_DEPEND}"
-unset SWIG_DEPEND
-unset i
-
-need_apache2
-
-S=${WORKDIR}/${MY_P}
-
-_enter_build_dir() {
-	[[ -z ${1} ]] && die "Missing path argument"
-	local workdir=${1}
-	shift
-	[[ -z ${1} ]] && die "missing command argument"
-
-	echo ">>> Running \"${@}\" in work directory \"${workdir}\""
-	pushd "${workdir}" > /dev/null || die "Failed to enter directory"
-	${@} || die
-	popd > /dev/null
-}
-
-each_ruby_configure() { ${RUBY} extconf.rb || die ; }
-
-ext-source-r2_src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-	done
-	php-ext-source-r2_createinifiles
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-	use perl && perl_set_version
-	use python && python_pkg_setup
-	#use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r2_src_unpack
-	# HACK: and then remove it and replace by symlink
-	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
-		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
-		"${FILESDIR}/6.0.0_rc1-bool.patch" \
-		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
-		"${FILESDIR}/6.1.0-php-5.4.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	if use gdal && use proj ; then
-		myopts+="
-			--with-wfs
-			--with-wcs
-			--with-wfsclient
-			--with-wmsclient
-		"
-		use xml && myopts+=" --with-sos"
-	fi
-
-	# some scripts require configure time options so place it here
-	if use php ; then
-		use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
-		use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
-	fi
-
-	# sde is ESRI package that you have to buy first
-	# oraclespatial needs oracle server for testing/usage
-	# note that some options accept just path, they are not on/off switches!
-	econf \
-		--without-oraclespatial \
-		--without-sde \
-		--with-libiconv \
-		--with-jpeg \
-		--with-gd \
-		--with-gif="${EPREFIX}/usr/" \
-		--with-wms \
-		--with-kml \
-		--with-curl-config \
-		--with-agg-svg-symbols \
-		--with-httpd="${APACHE_BIN}" \
-		--with-fastcgi \
-		$(use_with opengl ogl) \
-		$(use_with opengl ftgl) \
-		$(use_with proj) \
-		$(use_with threads) \
-		$(use_with geos) \
-		$(use_with gdal) \
-		$(use_with gdal ogr) \
-		$(use_with postgis) \
-		$(use_with mysql) \
-		$(use_with xml xml2-config) \
-		$(use_with xslt) \
-		$(use_with xslt xml-mapfile) \
-		$(use_with bidi fribidi-config) \
-		$(use_with cairo) \
-		${myopts}
-
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
-}
-
-src_compile() {
-	default
-	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
-	#use php && php-ext-source-r2_src_compile # already compiled by the emake all
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
-}
-
-src_install() {
-	local step="Installing"
-	local extra_dir="fonts tests tests/vera symbols"
-	local i
-
-	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
-		sortshp tile4ms msencrypt mapserver-config
-
-	dodoc INSTALL README HISTORY.TXT
-
-	for i in ${extra_dir}; do
-		docinto /usr/share/doc/${PF}/${i}
-		dodoc -r ${i}/* || die
-	done
-
-	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
-	use php && ext-source-r2_src_install
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
-
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}/mapserv"
-	webapp_src_install
-}
-
-pkg_preinst() {
-	use perl && perl_set_version
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	use python && distutils_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}

diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
deleted file mode 100644
index 5e981d3..0000000
--- a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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-4 php5-5"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
-
-RDEPEND="
-	!${CATEGORY}/${PN}:${PV}
-	dev-libs/expat
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg:=
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa
-	)
-	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] )
-"
-for i in perl python; do
-	SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
-done
-DEPEND="${RDEPEND} ${SWIG_DEPEND}"
-unset SWIG_DEPEND
-unset i
-
-need_apache2
-
-S=${WORKDIR}/${MY_P}
-
-_enter_build_dir() {
-	[[ -z ${1} ]] && die "Missing path argument"
-	local workdir=${1}
-	shift
-	[[ -z ${1} ]] && die "missing command argument"
-
-	echo ">>> Running \"${@}\" in work directory \"${workdir}\""
-	pushd "${workdir}" > /dev/null || die "Failed to enter directory"
-	${@} || die
-	popd > /dev/null
-}
-
-each_ruby_configure() { ${RUBY} extconf.rb || die ; }
-
-ext-source-r2_src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-	done
-	php-ext-source-r2_createinifiles
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-	use perl && perl_set_version
-	#use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r2_src_unpack
-	# HACK: and then remove it and replace by symlink
-	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
-		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
-		"${FILESDIR}/6.0.0_rc1-bool.patch" \
-		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
-		"${FILESDIR}/6.1.0-php-5.4.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	if use gdal && use proj ; then
-		myopts+="
-			--with-wfs
-			--with-wcs
-			--with-wfsclient
-			--with-wmsclient
-		"
-		use xml && myopts+=" --with-sos"
-	fi
-
-	# some scripts require configure time options so place it here
-	if use php ; then
-		use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
-		use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
-	fi
-
-	# sde is ESRI package that you have to buy first
-	# oraclespatial needs oracle server for testing/usage
-	# note that some options accept just path, they are not on/off switches!
-	econf \
-		--without-oraclespatial \
-		--without-sde \
-		--with-libiconv \
-		--with-jpeg \
-		--with-gd \
-		--with-gif="${EPREFIX}/usr/" \
-		--with-wms \
-		--with-kml \
-		--with-curl-config \
-		--with-agg-svg-symbols \
-		--with-httpd="${APACHE_BIN}" \
-		--with-fastcgi \
-		$(use_with opengl ogl) \
-		$(use_with opengl ftgl) \
-		$(use_with proj) \
-		$(use_with threads) \
-		$(use_with geos) \
-		$(use_with gdal) \
-		$(use_with gdal ogr) \
-		$(use_with postgis) \
-		$(use_with mysql) \
-		$(use_with xml xml2-config) \
-		$(use_with xslt) \
-		$(use_with xslt xml-mapfile) \
-		$(use_with bidi fribidi-config) \
-		$(use_with cairo) \
-		${myopts}
-
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
-}
-
-src_compile() {
-	default
-	use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
-	#use php && php-ext-source-r2_src_compile # already compiled by the emake all
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
-}
-
-src_install() {
-	local step="Installing"
-	local extra_dir="fonts tests tests/vera symbols"
-	local i
-
-	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
-		sortshp tile4ms msencrypt mapserver-config
-
-	dodoc INSTALL README HISTORY.TXT
-
-	for i in ${extra_dir}; do
-		docinto /usr/share/doc/${PF}/${i}
-		dodoc -r ${i}/* || die
-	done
-
-	use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
-	use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
-	use php && ext-source-r2_src_install
-	#use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
-
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}/mapserv"
-	webapp_src_install
-}
-
-pkg_preinst() {
-	use perl && perl_set_version
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam Jorna]

commit:     3c1f1e58b246fa7e7cdcad0214b558d465524da3
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 11:40:10 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 11:58:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1f1e58

sci-geosciences/mapserver: bump to 7.0.1

Package-Manager: portage-2.2.28

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-7.0.1.ebuild | 174 +++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 735318a..918b376 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b
+DIST mapserver-7.0.1.tar.gz 2606929 SHA256 2c9567e59ae3ebd99bb645740485be6a25798b8b57f93ca3413a3e0369a1bd8f SHA512 10cf58920a3083280a748efa087f105ed2e29650d10b56b7d457c46fd7fc4670a021db1aa27186997aaa3ea1b6a5b2772f2ffc5d8de48130f5ebed654215f2df WHIRLPOOL 0ef70bd312aba706c19ebc8d324e9ac2bc72bb400cbdb539c20ca0ea383744f363425dbc2dc1b70f8e133b0e84409645505a880f2e5689345e8c7bd7c5e952d5

diff --git a/sci-geosciences/mapserver/mapserver-7.0.1.ebuild b/sci-geosciences/mapserver/mapserver-7.0.1.ebuild
new file mode 100644
index 0000000..30abc85
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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-4 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )
+			xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/fcgi
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	bidi? ( dev-libs/fribidi
+			media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? ( >=sci-libs/gdal-1.8.0 )
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	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 )"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	# unpack A and then copy the php thingies into workdir/php-slot
+	php-ext-source-r2_src_unpack
+	# HACK: and then remove it and replace by symlink
+	for slot in $(php_get_slots); do
+		rm -rf "${WORKDIR}/${slot}" || die
+		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
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_ORACLESPATIAL=OFF"
+		"-DWITH_SDE=OFF"
+		"-DWITH_APACHE_MODULE=ON"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DWITH_FCGI=ON"
+		"-DINSTALL_LIB_DIR=$(get_libdir)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal 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)"
+	)
+
+	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
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	webapp_src_preinst
+	exeinto "${MY_CGIBINDIR}"
+	doexe "${S}_build/mapserv"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Brian Evans]

commit:     3265cb53d2eddc3f861cbe596366371f5357f5d1
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 20:30:30 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 20:30:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3265cb53

sci-geosciences/mapserver: Revision bump for php 5.6 and library fixes

Non-maintainer commit; reviewed by Amynka on IRC
The main libmapserver.so was being installed to $D/$D which could not be found
Support php 5.6 and fix finding the correct php-config binary for the various slots

Reviewed-by: amynka <AT> gentoo.org

Package-Manager: portage-2.3.0

 .../mapserver/mapserver-7.0.1-r1.ebuild            | 185 +++++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild
new file mode 100644
index 0000000..0392bd6
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-6 php_targets_php5-5 ) )
+			xslt? ( xml )"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/fcgi
+	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+	media-libs/giflib
+	net-misc/curl
+	virtual/jpeg:=
+	virtual/libiconv
+	x11-libs/agg
+	bidi? ( dev-libs/fribidi
+			media-libs/harfbuzz )
+	cairo? ( x11-libs/cairo )
+	gdal? ( >=sci-libs/gdal-1.8.0 )
+	geos? ( sci-libs/geos )
+	mysql? ( virtual/mysql )
+	opengl? (
+		media-libs/ftgl
+		media-libs/mesa
+	)
+	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 )"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
+	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+	use perl && perl_set_version
+	#use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	# unpack A and then copy the php thingies into workdir/php-slot
+	php-ext-source-r2_src_unpack
+	# HACK: and then remove it and replace by symlink
+	local slot
+	for slot in $(php_get_slots); do
+		rm -rf "${WORKDIR}/${slot}" || die
+		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
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DWITH_ORACLESPATIAL=OFF"
+		"-DWITH_SDE=OFF"
+		"-DWITH_APACHE_MODULE=ON"
+		"-DWITH_ICONV=ON"
+		"-DWITH_GD=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_CURL=ON"
+		"-DWITH_FCGI=ON"
+		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
+		"-DWITH_PROJ=$(usex proj ON OFF)"
+		"-DWITH_WMS=$(usex proj ON OFF)"
+		"-DWITH_KML=$(usex xml ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_GDAL=$(usex gdal ON OFF)"
+		"-DWITH_OGR=$(usex gdal 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)"
+	)
+
+	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
+			mycmakeargs+=( -DPHP5_CONFIG_EXECUTABLE="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" )
+		done
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use php ; then
+		php-ext-source-r2_createinifiles
+	fi
+	webapp_src_preinst
+	exeinto "${MY_CGIBINDIR}"
+	doexe "${S}_build/mapserv"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	webapp_pkg_prerm
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam Jorna]

commit:     ceba01e641ac710cdfe813e43226cf693bf7e8cc
Author:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 23:08:45 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 23:09:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceba01e6

sci-geosciences/mapserver: bump to 7.0.3 #602616

Version bump to 7.0.3. Resolves information leakage from OGR driver.
Remove PHP5.5.

Gentoo-bug: 602616
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/mapserver/Manifest                       |  2 +-
 ...{mapserver-7.0.1-r1.ebuild => mapserver-7.0.3.ebuild} | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index c4d472d..c93b27c 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1 @@
-DIST mapserver-7.0.1.tar.gz 2606929 SHA256 2c9567e59ae3ebd99bb645740485be6a25798b8b57f93ca3413a3e0369a1bd8f SHA512 10cf58920a3083280a748efa087f105ed2e29650d10b56b7d457c46fd7fc4670a021db1aa27186997aaa3ea1b6a5b2772f2ffc5d8de48130f5ebed654215f2df WHIRLPOOL 0ef70bd312aba706c19ebc8d324e9ac2bc72bb400cbdb539c20ca0ea383744f363425dbc2dc1b70f8e133b0e84409645505a880f2e5689345e8c7bd7c5e952d5
+DIST mapserver-7.0.3.tar.gz 2621285 SHA256 dbec8f0ccdf506e7117cec5b704e8f9692451f72a07d9f4879d508ed96c55550 SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b WHIRLPOOL 4306a29758ae2b8f6acaf5f8c9157f0851a028f25fba4cd130022d37b5f31e35f486be49b4393351123f5e9923ab2c342430d33dc15e4b07c0904c3bcad7e259

diff --git a/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
similarity index 89%
rename from sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild
rename to sci-geosciences/mapserver/mapserver-7.0.3.ebuild
index 0392bd6..4010eda 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.1-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
@@ -10,7 +10,7 @@ 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 php5-5"
+USE_PHP="php5-6"
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -30,7 +30,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
 
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-6 php_targets_php5-5 ) )
+REQUIRED_USE="php? ( php_targets_php5-6 )
 			xslt? ( xml )"
 
 RDEPEND="
@@ -153,7 +153,17 @@ src_configure() {
 	if use php ; then
 		local slot
 		for slot in $(php_get_slots); do
-			mycmakeargs+=( -DPHP5_CONFIG_EXECUTABLE="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" )
+			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
 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Brian Evans]

commit:     34dc926aa3cb3ee6e3983a97c112b4cbd00cccf2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 00:29:26 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 01:28:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34dc926a

sci-geosciences/mapserver: Apply php-ext-source-r3 changes to src_unpack

 sci-geosciences/mapserver/mapserver-7.0.5.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index 69fae655f2c..a412b4ed85e 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -83,12 +83,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r3_src_unpack
-	# HACK: and then remove it and replace by symlink
+	default
+	# HACK: Make symlinks for php targets
 	local slot
 	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
 		ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
 	done
 }

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Andreas Sturmlechner]

commit:     810e843cd8195281fe783129291d4cc94ed576b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 19:53:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 20:00:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810e843c

sci-geosciences/mapserver: Drop 7.0.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-geosciences/mapserver/Manifest               |   1 -
 sci-geosciences/mapserver/mapserver-7.0.3.ebuild | 194 -----------------------
 2 files changed, 195 deletions(-)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 37d855bfdbc..47f5601db65 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-7.0.3.tar.gz 2621285 BLAKE2B b2fd9a4050ffee3bf4175971e0588ddc022f473e35c3953a098865898275ae66c2f889aef7df21231a9d9fdbecfda75490c21c67771745f0b6f18dbf11febb8e SHA512 7630461948e7b371c6d4d6d49cc596ad8fc6b076a8bbfdc88358fc076fa0d4ebaaab10663ec9c3c64e246b5735a07cef5cc28eba88b00dd09259048a49d2b81b
 DIST mapserver-7.0.5.tar.gz 2631454 BLAKE2B 88467d7d8ae90be73d6629619410f114081588d214eea3cd1752f0f97a5d934aa8e39bc2ce6a59ab969a4ac5eb2df15b60bd78f34c18356befb490a211de830f SHA512 18485ace6e3b198e19acc3dda2ba44b136c55c4a783e472cb4c8f7a0615ed676b9bcdcaedc348227a7929d0ccf6199c90aead572bf8243e7902a5a2051a20753

diff --git a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild b/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
deleted file mode 100644
index 44a5419ef6a..00000000000
--- a/sci-geosciences/mapserver/mapserver-7.0.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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
-
-inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl 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
-	dev-libs/fcgi
-	>=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
-	media-libs/giflib
-	net-misc/curl
-	virtual/jpeg:=
-	virtual/libiconv
-	x11-libs/agg
-	bidi? ( dev-libs/fribidi
-			media-libs/harfbuzz )
-	cairo? ( x11-libs/cairo )
-	gdal? ( >=sci-libs/gdal-1.8.0 )
-	geos? ( sci-libs/geos )
-	mysql? ( virtual/mysql )
-	opengl? (
-		media-libs/ftgl
-		media-libs/mesa
-	)
-	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 )"
-
-need_apache2
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.0-sec-format.patch"  # see https://github.com/mapserver/mapserver/pull/5248
-	"${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	use perl && perl_set_version
-	#use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	# unpack A and then copy the php thingies into workdir/php-slot
-	php-ext-source-r2_src_unpack
-	# HACK: and then remove it and replace by symlink
-	local slot
-	for slot in $(php_get_slots); do
-		rm -rf "${WORKDIR}/${slot}" || die
-		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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DWITH_ORACLESPATIAL=OFF"
-		"-DWITH_SDE=OFF"
-		"-DWITH_APACHE_MODULE=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_GD=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_FCGI=ON"
-		"-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)"
-		"-DWITH_PROJ=$(usex proj ON OFF)"
-		"-DWITH_WMS=$(usex proj ON OFF)"
-		"-DWITH_KML=$(usex xml ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_GDAL=$(usex gdal ON OFF)"
-		"-DWITH_OGR=$(usex gdal 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)"
-	)
-
-	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() {
-	cmake-utils_src_install
-
-	if use php ; then
-		php-ext-source-r2_createinifiles
-	fi
-	webapp_src_preinst
-	exeinto "${MY_CGIBINDIR}"
-	doexe "${S}_build/mapserv"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	webapp_pkg_prerm
-}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Andreas Sturmlechner]

commit:     819d1a070306982f8da7ef69fd18f34de54c9e07
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 19 19:27:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 10:29:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819d1a07

sci-geosciences/mapserver: use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/mapserver/mapserver-7.0.5.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
index a412b4ed85e..262043174b9 100644
--- a/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,8 @@ WEBAPP_MANUAL_SLOT=yes
 inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r3 multilib cmake-utils # ruby-ng
 
 DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Amy Liffey]

commit:     d862379c4a596183d61f47da86dafcb7314baea1
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Thu May 16 10:00:05 2019 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun May 26 08:54:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d862379c

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 <AT> gmail.com>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-7.2.2.ebuild | 220 +++++++++++++++++++++++
 2 files changed, 221 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 3a462cc3776..55e7e461d6e 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 00000000000..643020ee754
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     18c6a60dd2029db1fde5b5078d2647dc4daf1d55
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 11:25:39 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  9 00:32:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c6a60d

sci-geosciences/mapserver: security bump to 7.6.0

Changes:
* Bump to 7.6.0
* Add PHP 7.x support, new module w/ multiple builds
* Add Python 3.x, multiple builds
* Drop old Proj compatibility workaround
* Tidy up plenty of dependencies
* Use sub-slot operator where appropriate
* Use php-ext-source-r3's functions to simplify ebuild
* Modernise as much as possible, bar EAPI 7 because
  of depend.apache.

Bug: https://bugs.gentoo.org/688290
Closes: https://bugs.gentoo.org/649772
Closes: https://bugs.gentoo.org/659260
Closes: https://bugs.gentoo.org/666054
Closes: https://bugs.gentoo.org/729100
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-7.6.0.ebuild | 289 +++++++++++++++++++++++
 sci-geosciences/mapserver/metadata.xml           |   6 +-
 3 files changed, 293 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 15ab00e5aff..a8b03ed7f07 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 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/mapserver-7.6.0.ebuild b/sci-geosciences/mapserver/mapserver-7.6.0.ebuild
new file mode 100644
index 00000000000..7e15a26e21b
--- /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 bc9652c1add..fbe0a42676c 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -7,10 +7,10 @@
 	</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="gdal" restrict="&lt;=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">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections)</flag>
-		<flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag>
+		<flag name="proj" restrict="&lt;=sci-geosciences/mapserver-7.6.0">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections); deprecated</flag>
+		<flag name="xslt" restrict="&lt;=sci-geosciences/mapserver-7.6.0">Enable xslt and exslt support xml-mapfile support; deprecated</flag>
 	</use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     01913b6dc8c26256365d6509207681de0287e9a4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 06:33:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 06:33:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01913b6d

sci-geosciences/mapserver: bump to 7.6.2

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-7.6.2.ebuild | 289 +++++++++++++++++++++++
 2 files changed, 290 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 0eb1e410b4a..dc400a27540 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
+DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791

diff --git a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
new file mode 100644
index 00000000000..98676a2de01
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 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,9} )
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     1f3f5a1275e53f113eb8c691e68aace48a85ec0b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 22:33:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 22:33:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3f5a12

sci-geosciences/mapserver: drop PHP 7.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../mapserver/{mapserver-7.6.2.ebuild => mapserver-7.6.2-r1.ebuild}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
similarity index 99%
rename from sci-geosciences/mapserver/mapserver-7.6.2.ebuild
rename to sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index 0e9c7aabc65..b6827ae663d 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscriptng"
 PHP_EXT_SKIP_PHPIZE="yes"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 PYTHON_COMPAT=( python3_{7,8,9} )
 
 WEBAPP_MANUAL_SLOT=yes

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     b6211cb23ff9e4f365f3a1403a318da6f90ceae4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 00:57:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 00:57:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6211cb2

sci-geosciences/mapserver: don't double apply patch with USE=php

Closes: https://bugs.gentoo.org/818478
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index b6827ae663d..090466afc3c 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -7,6 +7,7 @@ EAPI=7
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscriptng"
 PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
 
 USE_PHP="php7-3 php7-4"
 PYTHON_COMPAT=( python3_{7,8,9} )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     d504c7f3b7fe1f51d1e84a4e59153b5c82eae727
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 04:40:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 04:40:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d504c7f3

sci-geosciences/mapserver: add 7.6.4

Bug: https://bugs.gentoo.org/798129
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-7.6.4.ebuild | 286 +++++++++++++++++++++++
 2 files changed, 287 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index b154aff6400..5464718b756 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
+DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce

diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
new file mode 100644
index 00000000000..4a23194cd84
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Variables for the miscellaneous bindings we provide
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscriptng"
+PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
+
+USE_PHP="php7-3 php7-4"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache 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}"
+BDEPEND="
+	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_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_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_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_src_configure
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake_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_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_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_src_install
+
+			cd "${S}" || die
+		done
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake_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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Andrew Ammerlaan]

commit:     26b2d77395b154fb4fccea673d725fd15f3c1f66
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Thu Dec 16 19:03:13 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 13:59:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b2d773

sci-geosciences/mapserver: add python 3.10

Closes: https://bugs.gentoo.org/829367
Closes: https://github.com/gentoo/gentoo/pull/23339
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild | 2 +-
 sci-geosciences/mapserver/mapserver-7.6.4.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index a9f1ea99c8ad..412784bd8b54 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_SKIP_PHPIZE="yes"
 PHP_EXT_SKIP_PATCHES="yes"
 
 USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes

diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
index 3c1b5cb396a8..3dabd26adb30 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_SKIP_PHPIZE="yes"
 PHP_EXT_SKIP_PATCHES="yes"
 
 USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     ed51a673727c4bdf6343ebd4241d9bd07a978c88
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 03:06:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 03:06:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed51a673

sci-geosciences/mapserver: fix WhitespaceFound

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/mapserver-7.6.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
index 3dabd26adb30..2f50ae84e13c 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,7 +87,7 @@ BDEPEND="
 "
 
 PATCHES=(
-    "${FILESDIR}"/${PN}-oracle21.patch
+	"${FILESDIR}"/${PN}-oracle21.patch
 )
 
 want_apache2 apache

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Sam James]

commit:     b5e929c2cc7c11c4ccef002efda74a8e48f540c0
Author:     Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Fri May 12 05:47:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 00:03:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e929c2

sci-geosciences/mapserver: bump to 8.0.1

Closes: https://bugs.gentoo.org/906176
Closes: https://github.com/gentoo/gentoo/pull/31004
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-8.0.1.ebuild | 287 +++++++++++++++++++++++
 2 files changed, 288 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 2306a474faa7..f57397f89b33 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1,3 @@
 DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
 DIST mapserver-8.0.0.tar.gz 2945524 BLAKE2B b67fb10f62e3c8cf4ae6d69863ef841fd2dd4106de55fd08dfc8146191bed1f18f12003455462503afcdb49e45d1368d89be591c152dcabba2b18587d27efaef SHA512 b9275f5e3399efb3cb189472ed28d081055e79da9aa35f7c9b8567b2d2d3cfc425ea7750b36a40db9ab537261c099356dc923e7b91941919d79c38f740327b97
+DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1

diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
new file mode 100644
index 000000000000..c8bc5c5d9238
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Variables for the miscellaneous bindings we provide
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscriptng"
+PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
+
+USE_PHP="php7-4"
+PYTHON_COMPAT=( python3_{10..11} )
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache 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/libjpeg-turbo
+	>=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/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}"
+BDEPEND="
+	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_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"
+		"-DWITH_OGCAPI=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_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_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_src_configure
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake_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_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_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_src_install
+
+			cd "${S}" || die
+		done
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake_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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Pacho Ramos]

commit:     0343e050e71f1abb84c923c5566914741f02b100
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 07:44:47 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 21:11:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0343e050

sci-geosciences/mapserver: bump version to 8.0.2

- fix compilation errors with libxml2 2.12
- add java mapscript support
- update python target to 3.12 / remove egg-info
- update to EAPI 8

Closes: https://bugs.gentoo.org/924292
Closes: https://bugs.gentoo.org/929767
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37288
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-8.0.2.ebuild | 227 +++++++++++++++++++++++
 2 files changed, 228 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 8f0bfa381bf8..7ac053ae9167 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
+DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752

diff --git a/sci-geosciences/mapserver/mapserver-8.0.2.ebuild b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild
new file mode 100644
index 000000000000..91d7c76780a7
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+JAVA_PKG_WANT_SOURCE="11"
+JAVA_PKG_WANT_TARGET="11"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache java-pkg-opt-2 perl-functions 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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: opengl removed for now as no support for it in upstream CMake
+IUSE="apache bidi cairo geos java mysql oracle perl 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 python-r1 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/libjpeg-turbo
+	>=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/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}"
+BDEPEND="
+	virtual/pkgconfig
+	java? (
+		virtual/jdk
+		>=dev-lang/swig-4.0
+	)
+	perl? ( >=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
+
+	if use java ; then
+		QA_SONAME="usr/$(get_libdir)/libjavamapscript.so"
+	fi
+}
+
+src_prepare() {
+	cmake_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)"
+		"-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}"
+		"-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"
+		"-DWITH_OGCAPI=OFF"
+	)
+
+	echo "${args[@]}"
+}
+
+src_configure() {
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+	fi
+
+	# 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)"
+		"-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}"
+		"-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_JAVA=$(usex java 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_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_src_configure
+		python_foreach_impl python_optimize
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake_src_compile
+	fi
+}
+
+src_install() {
+	# Needs to be first
+	use apache && webapp_src_preinst
+
+	if use python ; then
+		python_foreach_impl cmake_src_install
+		python_foreach_impl python_optimize
+		remove_egg_info() { rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die; }
+		python_foreach_impl remove_egg_info
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake_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
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/mapscript/java/mapscript.jar
+	fi
+}
+
+pkg_postinst() {
+	use apache && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use apache && webapp_pkg_prerm
+}

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/

[Andreas Sturmlechner]

commit:     fada1aef0fd153c80a808d3137c0ae3695de0fd1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 13:32:09 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 14:40:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fada1aef

sci-geosciences/mapserver: drop 8.0.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 -
 sci-geosciences/mapserver/mapserver-8.0.1.ebuild | 204 -----------------------
 2 files changed, 205 deletions(-)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 7ac053ae9167..ec2e4a7fe117 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,2 +1 @@
-DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
 DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752

diff --git a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild b/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
deleted file mode 100644
index 060fae52b9e2..000000000000
--- a/sci-geosciences/mapserver/mapserver-8.0.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions 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 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 python-r1 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/libjpeg-turbo
-	>=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/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}"
-BDEPEND="
-	virtual/pkgconfig
-	perl? ( >=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_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"
-		"-DWITH_OGCAPI=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_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_src_configure
-		python_foreach_impl python_optimize
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		python_foreach_impl cmake_src_compile
-	fi
-}
-
-src_install() {
-	# Needs to be first
-	use apache && webapp_src_preinst
-
-	if use python ; then
-		python_foreach_impl cmake_src_install
-		python_foreach_impl python_optimize
-	fi
-
-	# Install this last because this build is the most "fully-featured"
-	cmake_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_postinst() {
-	use apache && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use apache && webapp_pkg_prerm
-}