gentoo resync : 08.01.2021

12 files changed, 354 insertions, 185 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 14270363f1be..f1cfb2f10fc0 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 239434492d72..0d5e3abf4fbe 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -4,9 +4,11 @@ DIST gpxsee-7.35.tar.gz 5403169 BLAKE2B 901c77aa0fd0a54976a8d88daa98acc0125dacae
 DIST gpxsee-7.36.tar.gz 5404628 BLAKE2B 252acab21aed260eb6f01b9ee38f3c7a88067953b9e481cf2c6e77fcfd52c14fb995c69330dd381fbb3d2b9f7ea5bd345f6d2d3ae8b5be0f6b020680ef9e5f21 SHA512 8a0c718e80544506a6e393fd9b95a2d29092332d8c9fe141351cc1e3553759c909aaac12953a0206dca47f855b8516ecdaacaee577b1ce3dd0e75be2595e4062
 DIST gpxsee-7.37.tar.gz 5406206 BLAKE2B eecc311a89ee94aa1e52cb742802ee78634199d13173106938b559f787029df2496a60642c08109928051cd0d478b794f8ca0db050fe4406b2aca51c290d317e SHA512 891689e78a7cb3ece63d28cc892cadd483770ab88add241021bcee70a6acb744410a9b412e0f2286e63552eadf6398671c25a594ef02b0a09d8ecf89fa9ca278
 DIST gpxsee-7.38.tar.gz 7700995 BLAKE2B 6b2f47bf79501509cdd67ccb5387134fd04b916913cb34eeac54c0c6a60b45ebee534b94771f38c13ad29062b9917acccc412bdcee82e7348ff85368e77ef89f SHA512 9887e9be559eac8c19c4901751f2403b8824aae89c5a159f581f14e4b72154f91e9761eae871cce8b794eb193b2b744b77e6e7b5968bb4a8f9d505220de20cc9
+DIST gpxsee-8.1.tar.gz 7715535 BLAKE2B f71c3e4212747f3084e2a9ed102fcd4b7c701292cfb933b01cfd1965ac41b3d09f1c67c291ca9eac8cdf66fb4c150937fdc1ccb7369d63e65c30155016fe915f SHA512 beb6a5bdae1e20cac3b5a29a398b5e2742ec28b8f2f1239c027d3470a11c354991465895ab81caa1f7c31dbc77f391aef978a1c746efd35214989505980f4654
 EBUILD gpxsee-7.29.ebuild 1330 BLAKE2B 0d730eeb63edd9346d61c39e7837eed78de1fcd84c7d14dcf115d6d673cd6905bace2ebe4b6c1063facfbb68148e66c80ef55adaeb54841ef72221c017671d9e SHA512 9b97ba9c3d5c010e678085f1b8a20228798ed0c32b1fe4ec7381e6dc14a858293e0fb5b2429e649552606abf96a142ef10462bbaa0058808eff6eefcf528375b
 EBUILD gpxsee-7.35.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-7.36.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-7.37.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
 EBUILD gpxsee-7.38.ebuild 1119 BLAKE2B c4a2afa52638bcbb201ddf86021cbc69e7dd07d764d28953ebae6dfdba82cf42d8d3dd28e1c8acaf4cf6a4a068d669b84505abe1618cf7b85efc38c5fb09fd52 SHA512 74d0a8384c80d94bc6a345cff9616aba04f85f041bd0281cfc4ebb085024935a74e5b586e54aa481e83162eaf3eca78d185624fecf73bb51eda472b14e14234b
+EBUILD gpxsee-8.1.ebuild 1122 BLAKE2B 89424b1d8c6d32e7a8d99401dde527959ec52ae819f2c1234b07020e9e7abe1869070a3f1e38808d7334a914d966e9df120383212a764fb6153bcfc27ac5f20b SHA512 ed5846751a5ddc69ef5077e7ec895147de115825aeea5d896dc8e33c85a41e3ae58dddb8ee3a35277e46af03000568d9e215042ab3f19e1aaa4c43402db6166d
 MISC metadata.xml 452 BLAKE2B ff5c6d1a028e9e7c38ac529383e5b80a668f142ea84e742e2c16c48870b4b961580e6b9bbde24eae4a9200d942a58e0c3d14d7e52cc261be9417f04d4e0f7459 SHA512 87df33dd06fedc5f454445089edf56d13e27d683b8faba7aee4f29493f2c38989fb252b851bb59a36665e4431cdcf58d8ce35c23460d957db5d928bb8f1d03d4
diff --git a/sci-geosciences/gpxsee/gpxsee-8.1.ebuild b/sci-geosciences/gpxsee/gpxsee-8.1.ebuild
new file mode 100644
index 000000000000..950a8b5cfcfa
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk"
+inherit desktop qmake-utils l10n 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/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 511697538c62..74fab763aedb 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,5 +2,5 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a
 DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
 DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
 EBUILD grass-7.8.3.ebuild 7009 BLAKE2B 2f00bedbadc55b5d323db7918935702b135c14a2e2e2ca536a48bd322ba38186b1f2d511b52d4ebc84ba534bc5d70448bc9b65de7796f16bda8bc3f22b3080f4 SHA512 07d5b4c87ad1b2eb5b2a2193780232f87c6f73e09040e80dbb4d2fb246bbb710f1a79459a7d3e57b35cb715bf0213856ced0a3b146f8e24534bc0b92c6f92dbc
-EBUILD grass-7.8.4.ebuild 6956 BLAKE2B 836e476d4cf0e198e9801011fd760e74b8cdba2ddea6dc6f88efe48ade6b81e0a4fe56d9922794c71bfff5ad7b196849f3fa990971c0e36118371ccfabf8ce6c SHA512 bf7406779df0c250558e08f783a2b97e3c19c4624bfb6488450e06d2244fe97c4b5d21e18e77415440bbfa3afe261248b0c7691d226ef671515c4fcb6e24dda1
+EBUILD grass-7.8.4.ebuild 6955 BLAKE2B dcfa8baf52539f4ba4463bab98f3229f121738f36fa51f4259011ae5e21f56256022a2d2e3bad442084918985fc6c1a53e0392e4db355e8133fb22be5b6e734b SHA512 dbdad12127ea9558c0a4ed3a22db408f899ef61ad02774f7526fca61409cb22cd66a037136e980e05020faef9083de84660aa6c97513c8d8dd41cef31f1454b7
 MISC metadata.xml 1058 BLAKE2B fcaa70c36866e086db663b4f5fb00f7a0ba4d725af2c69752e060134203758bf8b094f958dae363c9343f60ced6f9958d59ad5cab775affbf4234ae39b227e92 SHA512 eefd4994f62f769eb2359c20871d2ad816713186e6b536afa4493d363b086a37d156a8220f54432fc94199854ba98a97eb995e1e00f228f0ea4add1f395ae6e0
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
index 25b4f871366d..888ec0b7e1d2 100644
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ b/sci-geosciences/grass/grass-7.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index a692a8efde17..5d7cab32079e 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,5 @@
 DIST mapserver-7.6.0.tar.gz 2713965 BLAKE2B 35e81b470afba58b1cf8cc63f70e6cc230a338c4066d38e8aa57d34a55e7414e9e3eeb6cc9c6d54ac8f60d076b90d25e23354f33f35c235d3d1d85d4f19979e7 SHA512 6e8a4639a025d3bdeaa74599ea10b58fbd20fc87367d39ccc9c29586a599d47ee4c45f6fe16dc76d593b3d7c51e26f8ca9d8656c5c3a3636181824d3aa26db36
+DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
 EBUILD mapserver-7.6.0.ebuild 7301 BLAKE2B b9d2f090e15cad539c0976c36c4e2c02456eed16ca725a2ef59ac4cab898f2fd97478f56179a7c606c4d5a8d5aab7bc896c0b0729897a8c0710b26a4245ab1c9 SHA512 36a143de7a376fcee8f3770f22a9be3b5fab29e6df2c438e76000bc8ec144850581735f394dddcb2463d11a60cfedcb558d304a95d863c8137921dfaf5deb175
+EBUILD mapserver-7.6.2.ebuild 7303 BLAKE2B 36c8f9119155751f19d4c693fa305a1f2aa4b7b1c3d8ffcb515888f6c1bf6c32377300ab4f6c9a08644b9eba7d63080c699d8905df3a0ccc16731e036efea9c8 SHA512 ef937ae7b6a16ccf27f52a37bf1731f3731bce6811fac6a22134061a1500a78669e7c1da9e93a8c4738a7267aa94e65a6a13884a5c607c15fdc5416c5708f031
 MISC metadata.xml 496 BLAKE2B 5903d53c86d30548162025cfed484a3405ea3a9bd611d475177a355a374b7a4bbf73d439a1c1457176d3f7f58355da06d842327407437c89cab426473be22bab SHA512 2dc21e4e1a785b4dff3de94bc3c621dfd4c3dfe092761681b4ffc536532f7f87b6a9fbbd0dc82895132ebd3cdb0f5750e6fe77b681c49d5996d9233096478a8e
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 000000000000..98676a2de015
--- /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
+}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 79b8f6ba1a32..fd6c3caa99a1 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -3,7 +3,7 @@ DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958
 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
 EBUILD osm2pgsql-0.96.0.ebuild 930 BLAKE2B 7a5b8e4557fc0aaa76bbb34abc4dc431e4bf7a8d115fa457a538b0ab124f81cb246d0f340abe7d5366ad63cad42fe875aac570bf3c0cc89357863b0edef3d1de SHA512 3741889922dd3cbebadf15083b56a8a6611c9cec3402f36367f2fc1c510538e05856d8b610e1da06c69f077e67533a909a7a6136cbd5a06c472362c2135b6585
-EBUILD osm2pgsql-1.3.0.ebuild 863 BLAKE2B d1f900a329faf5043d5a52f578ee582503698dccb7bb0233524f8f2e449c27295ed7b26dfb67bec7660955baebc4b79c69eb761aad90cac6804ad8f4a914e6d2 SHA512 3cf9f89c17e050457445d4cc2972d6de38eb20bdb7aee2ae2e98ed9c335551b8ddbb7d8baa311fd87371ad8997e1416765bb02abc9eb7ae1190ff9162aedb236
+EBUILD osm2pgsql-1.3.0.ebuild 862 BLAKE2B 2955a1ae1878f95c4a12a822589489a246fa96677b2ec061f02c76d9869cef04023cf728490651b70dd2e63fb74687b9f1802db0478727d799f22e1897a10d48 SHA512 d40667f5eaa3c1f507187b255af0341e7eed3789e9820275a1cca39d9c1cf3eac4dc2be2a4f00ac17cbb9767cfb5e7d6ee56a9cfcf5af36dcc0745d5b9bfcd27
 EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 4988850b6d4b1814b491cc20e709e217ab7b9d5ec6401da434079fe527c39547b7a1f38c8f936bbc21c489d5413e750ea34c4b51158221f9b5ca1555c3f428ca SHA512 b702dc3c08bb55e20940ed7d276f0a20e7cb1ba69b057274f39cc6f00cf91ba2b4717bee0002aa8d7e7c2d0ae584ffd9777b6b1fd43b0bb221a7440d5461e5b7
 EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
 EBUILD osm2pgsql-99999999.ebuild 1258 BLAKE2B 5986238e26804a4320bb6e291d68bd112926cb84e64b0046b66f5d7b5f6c2928769214119cb2bb9eccd36a97463b67a110e8b41774c2d4178d481b7616e18073 SHA512 b556c71c67187a100b960968c4d6c7c9ab3a0f46f56dc1949e753c92a8e93fdd41eaece622d135156e290ec9eb5280593d7398acd0b072daa9b42ce65e0f0b89
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
index 0e3affca363d..1e47df20181e 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lua luajit"
 
 COMMON_DEPEND="
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 2e07785ad9f6..34df0a20593b 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,8 +1,5 @@
 AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
-DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab1e0158cac4afe2bf8e7d0d9e1d452b3275219fdd8599ebf2044c17267899f2b0508fc36f274557c1db253320 SHA512 ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438
 EBUILD viking-1.7-r1.ebuild 1939 BLAKE2B af65d6185272c5a71256e8928de8c4dc06c2da8a930ecdb08b89e8016b53073afd29f0e90786c76d2802ddc7d96e4dfdadcb789df88bac2f3bee56b88c3c1739 SHA512 18a4ffdafe72f226e8538e9a1a5214839d35881e6f86453f2faf73217c1ecf48c6b5a5e219abf4126b8df93bb70c7b0be2e69ec647b44a9f9b52621262d2de02
-EBUILD viking-1.7.ebuild 1922 BLAKE2B 9c9bc4fdb8ede308da5d6f149e8b25916a167c27b9a1fe17b1dcad4aeb10a03ee1f75a02031aae28e19e028c6260ffe993ab74a6bfc9b6b1281e4399a1c3ef42 SHA512 157328f298a3e3fcef1e7cc1dba866d2fadf75694f046f20bf2d7368fbc327436fe2dc0e13e1fbae852db50813777953ef59cbfb30ef05f0dc54e2a8d538914d
 MISC metadata.xml 907 BLAKE2B 10a21eba422ae7af3ffe08730b31f9304352b3a286b9f91b1e96e202fc5d631d37847ea8ae864b7476d39a705fa82dd90958134915f4572adfbc2d5f359cb0d2 SHA512 5ccd7d0323e266977a06e74c9896e211b903d40915631771956cddf8176ad01c5e4b4df7b8f5494c78ae92027cb9314d354254cc671cb498238059d6465d96b7
diff --git a/sci-geosciences/viking/viking-1.6.2-r2.ebuild b/sci-geosciences/viking/viking-1.6.2-r2.ebuild
deleted file mode 100644
index 365f8b560b11..000000000000
--- a/sci-geosciences/viking/viking-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	>=dev-tcltk/expect-5.45.4
-	dev-libs/expat
-	dev-libs/glib:2
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	gps? ( >=sci-geosciences/gpsd-2.96 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	mapnik? ( sci-geosciences/mapnik )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable mapnik) \
-		$(use_enable nls) \
-		$(use_enable sqlite mbtiles )
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/viking/viking-1.7.ebuild b/sci-geosciences/viking/viking-1.7.ebuild
deleted file mode 100644
index 2669e50c3bae..000000000000
--- a/sci-geosciences/viking/viking-1.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-IUSE="doc +exif libexif geoclue gps +magic mapnik nls oauth sqlite"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	>=dev-tcltk/expect-5.45.4
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nettle
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	geoclue? ( app-misc/geoclue:2.0 )
-	gps? ( >=sci-geosciences/gpsd-2.96 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	mapnik? ( sci-geosciences/mapnik )
-	oauth? ( net-libs/liboauth )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-nettle \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable geoclue) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable mapnik) \
-		$(use_enable nls) \
-		$(use_enable oauth) \
-		$(use_enable sqlite mbtiles )
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}.pdf
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}