9 files changed, 309 insertions, 4 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 39c065e4a00e..a192c3d8e091 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
index 0ca448711467..81e43f3ccaa8 100644
--- a/sci-geosciences/bt747/Manifest
+++ b/sci-geosciences/bt747/Manifest
@@ -1,5 +1,5 @@
 AUX jchart2d-3.2.patch 490 BLAKE2B c676f77a4d7db06a61b445c85ad551aa1510820599e43e8d98d9803788f829da80485e2e3dfdd0e20c4a57c48acc8a5d2fbad7564930cd849c4adc3c1d615669 SHA512 75f9d1d9cc3cd5c6ce4f99dc6c68b97f4566fd5841d04f5d21fcc44294a8bb6c8046599180564ed9d0e6760bc1bf16a44ae817b07952303fcbd6c1b3ef774641
 DIST BT747_2.1.7_full.zip 9649645 BLAKE2B ec714f90395875c26679ace3ea732effff977dcdf3f7003f6282cd3ac87935956b5fc829a60e98acd8533d7b6fc482bc9c7ee9348f3972b5cf59db5476009730 SHA512 362533ccbf6b9252d6d7e09497a75038b0776e76a2c2f73f05e2abc0c521d0a640d0ae9e7d5d40da1d14850838a2924f17622d91535e90b900a5ae97b66f6b3d
 DIST bt747.gif 5903 BLAKE2B ae5516dc716ab147b261ea43c0bbb480ae8ab6f3523147fb9fe980e5c53142ac0021448eee3fc7958467a3cd1a38d989f7894112e5a2d5361300e8644b96df00 SHA512 55c3bbc9ec5fe12261b2604980c7b5d4416afa3ec73f7834c62d3ebbdf4580b247c1feb2ac112f876e7110a8aabe652da39d2181f01661435ba465671a631252
-EBUILD bt747-2.1.7-r3.ebuild 1723 BLAKE2B 5dd339c0b626644448b011d5972a5e5aca1264b3d34a2dd33fd3de66d5c6c3878af400ff8f915465c4d7015f5542acff58644e4c859f71305e9c6123af756e17 SHA512 bc69de391b2bd7cfc675ad73636afe5032542d2b966ffe122426ca0f2289c77cecafea2717fb214be52737a58bb30c8d4637f1ec850e01054e1fee4c3143b5cb
+EBUILD bt747-2.1.7-r3.ebuild 1718 BLAKE2B 3f5eb51923e2ff52bd1a0624cb221b87cca9e4d46e3815565ff1af5d6e3313062359f3df2989417e4cc704a4bb07dee960b2ed81ba7897cf380cf0ab2dd747ca SHA512 ebfe30ec6d3c35a71074895173e42c06fad6ccf7288236c135578049bcfd87e3f2c917f9922e4abf9a8d0d360943d564a6992fe95d65c1ca0d3a572e30843cf0
 MISC metadata.xml 939 BLAKE2B 09e8faea8d375dc63be360cf1d28db08e511a4a76b024b4902decd7065e11661b6b2ab35fde78aa2e118cf8c5d83661c8911aae24bed4578150529bc81d180e0 SHA512 fdf33fb97c25281d4409578979dad4f0549a225df9ab1f2bddda1a30d90b7004b0963a2649ff37a3475d3b5b29f80bb99603b0a96a2852c171a75186d3a6ba59
diff --git a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
index 4d6823b6b5da..124e05d65111 100644
--- a/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
+++ b/sci-geosciences/bt747/bt747-2.1.7-r3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 BDEPEND="app-arch/unzip:0"
 CDEPEND="
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index ff3e4fba9eb7..06d7634d7926 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,4 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-13.22.tar.gz 5634011 BLAKE2B b708ea4a81679109ce4e67302e336e070a508799ba8bbcf67121b617390e3808e2a054170e57a112c734fa7d22698f71da5f902ec704fda0f0fcf2818495b29f SHA512 0a12304c608ee86ebdd226a3179fde538ac0f64d5300ede4a032be373059ccbe1dcbcb6db76326c9988620b9fd41dd0f36e8e922b305a16fd27e87a56385fcba
+DIST gpxsee-13.23.tar.gz 5635256 BLAKE2B d6f69b4fd69aaa850994f9f3ee61790ff4e407adab85074b80940c7d9a24da010b4e2e485e79f0bd564b20a1295e34ae454504c59f60f56b161c7a5ac8fbd1ea SHA512 bf917e36deef824289d432d2ebdaffd417a34b843c2b7ef129e5469f3f5a723d54b4b1af756571614329dee7ba01daa38b110d730a7787dfcf617b4faa007ee3
 EBUILD gpxsee-13.22.ebuild 1513 BLAKE2B f5262b4edabfdb6b1e92a4626c2c06d583d7203be056a104f8c98461fc2927f728584daef4bc87c38993a0f011233ad7fab9116409a6df411079e20a63d1e7ff SHA512 586dbcdcb1465ff66a20d88ae235dfe651b5a7ad15ae4454cad1be356aa15219429f319994358f79889da526f342427f160de73ec8bf19773a121832905e81b4
+EBUILD gpxsee-13.23.ebuild 1516 BLAKE2B fee78110a609facead46ce994c1deefd31a386a567113baef9587cdbcbfbdda809b4c12df41e5e696e5cea18989f67af974ab0c295b24ad5ef1d1501ceac4c81 SHA512 ae318269aa26b278ce16bdf6b585f1b35c7e28bdc8d43f6bc13c688e4fa88de338d9f68da1e92991d8b5fc436683852de08ddae24289de1aa177a18789a59f77
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-13.23.ebuild b/sci-geosciences/gpxsee/gpxsee-13.23.ebuild
new file mode 100644
index 000000000000..6ed42a42478c
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-13.23.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh"
+inherit plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="qt6"
+
+RDEPEND="
+	qt6? (
+		dev-qt/qtbase:6
+		dev-qt/qtpositioning:6
+		dev-qt/qtserialport:6
+	)
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtpositioning:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtserialport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	qt6? ( dev-qt/qttools:6 )
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	if use qt6; then
+		$(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake6 gpxsee.pro
+	else
+		$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
+		eqmake5 gpxsee.pro
+	fi
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 98ab4aa43f2e..9ccf691648cc 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,7 +3,7 @@ DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075e
 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
 DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
 EBUILD grass-8.3.1.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5
-EBUILD grass-8.3.2-r1.ebuild 7071 BLAKE2B 8c7ef62b87d73b8c78afa658e1d171c3f4c28f6b4a0187f04457bee978185623b53d80eb26784c413ac98b8b46b1d5645bcf8b8518f31f6df8b865bb138ad853 SHA512 04d669e5f2a4a0c89be5dca40233010a20db30bfd709719525217ee4661953aed20573d27920af8e7a69e23830d2086bf3f694f4698fb653ffddf9e9a79f63c5
+EBUILD grass-8.3.2-r1.ebuild 7070 BLAKE2B d0a94514f055a3b38c92ef7e8a57e44d319409cc120968df290cdbdd164558f2945f13665b9cd3f01311d6b4ae4865eae1c71923c2eae1ac08ef0c1f95eb4f85 SHA512 300fb07374baad8b410a0b6064450acd46ea5d1d14a3edac0540970d787bcacbb631b2e74f9d20b805ecccbdaeb31ae1ec0307446c1788dd5a8522c91c695124
 EBUILD grass-8.3.2.ebuild 7070 BLAKE2B 24db4f7bc33845d9123e30a2dabd537097efd47066942322454de31b0b99c390524b408079c718a1e686b93d4d43f0426bff334c9e77cfd81222eff172b3656d SHA512 d68bdeb3add17d3f09809ec5c3c3c8e6d5701280a96181e57891db01bcddf188dc961eb8411bd674f6f6e7d7edd315e6c19a26b757bca6b3e60cb4ecb94147c5
 EBUILD grass-8.4.0_rc1.ebuild 7093 BLAKE2B 9f8603ec17ef8575cd0ca648e1ef4d6ccd7f37b24159f3eda08bc846e75c497043f384f6864d72f16b9a0ada95ce8911edd4596de6089b554746d7980e853abc SHA512 8c34fa9dacca31960eadb51f8898cb33f12cb1021d90c93aa9febadbf980abc1d41abf3aef88a6da4357a65080c2544e0d0bd4a80796054d4a2a9e3dec4e2679
 EBUILD grass-9999.ebuild 7033 BLAKE2B 0e43fd7b28dc213204bfaec6ba5a7692431402703c1f9243ae845660c1331fafea77a76261171dc9b7e170868b803fb016638139ca3a1f6be1d0c448ceafa3e9 SHA512 b26f8fcc1b828b58807fc0e24aaa60d2699fd0d1bc1d1484d9fe6b8c919a2774d05540c9fbd5f787724671fb30f9b0760b3f71d73f927ff73c5638615022d8a1
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
index 1d2d329b7e3c..5fa3915b850b 100644
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -30,7 +30,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~ppc ~x86"
+		KEYWORDS="amd64 ~ppc ~x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index bab06b26431f..6410da28e853 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,5 @@
 DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
+DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752
 EBUILD mapserver-8.0.1.ebuild 4940 BLAKE2B 51f02e80b40a9b1ae677d45a6da1d90a68f2ba8bd82027565a302be26315aec3d5a845d0aa0678095561786e32a9c07072ac090eeab9f1572969f20c80ced54a SHA512 8908f0f4ceb4f0140e76b7d2a50c36792e8995cb9e1776ada5cd8b5cc4e0a9507ae520fc289df138381d01db532f391fa240f520fe36e2655f74d5d02c2f1b38
+EBUILD mapserver-8.0.2.ebuild 5545 BLAKE2B 82b8166d6e51ca625271d080140abc58f3083814d8b8f9544ce9fdc9ef2d73b317cbfbc77feb4bb0d2c9e605c3beeadf90d84abbd8578cbcfc7ea2e7337146af SHA512 56cc2843fc791b8c34665577fcf6a0ce948493a95d486b2cfde63eab8236419a0754e927dbf059523646be6a39e098937383c14b6e78664768c24f016f716b7a
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
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
+}