gentoo auto-resync : 24:11:2024 - 03:02:54

11 files changed, 237 insertions, 12 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 63217a97008b..36818d631ee4 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index e7db9bc9d6bb..6ce5a4334732 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,3 +1,5 @@
 DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752
+DIST mapserver-8.2.2.tar.gz 2966634 BLAKE2B d7de9089e7159bc2c4fc54bc7e87992b7287ca56db5c6c38b700d70acef10f36b213370ab1081e14d3b03f2f86e5df8062b64f1f3a2735c2a3f87d20cdc5956d SHA512 e91454c4f71931d6a6f8540191441cef0b7b9f5ad1d4ccf65ee504b1d84272cfe19900141846300f6bcaace2a70b919f1fd5b2a80158c38dfaef413b1ce01a22
 EBUILD mapserver-8.0.2.ebuild 5545 BLAKE2B 82b8166d6e51ca625271d080140abc58f3083814d8b8f9544ce9fdc9ef2d73b317cbfbc77feb4bb0d2c9e605c3beeadf90d84abbd8578cbcfc7ea2e7337146af SHA512 56cc2843fc791b8c34665577fcf6a0ce948493a95d486b2cfde63eab8236419a0754e927dbf059523646be6a39e098937383c14b6e78664768c24f016f716b7a
+EBUILD mapserver-8.2.2.ebuild 5287 BLAKE2B 1721f7993f5d3277f6164e99ea8e3599390fa8d6b503caafd40639577d34c528fc170bf015a7162d0bce773e8cce8114f72c7d04d68f882c24d70344a61c6ea9 SHA512 fbe62d526bd4fcb062c4f8e396beb869fd5428cf98f30f24a5c79af771d8f06ecacb96bc3c844a8253dccb627c8e3f3a3e562df74c53510e4bab0086c93148d0
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
diff --git a/sci-geosciences/mapserver/mapserver-8.2.2.ebuild b/sci-geosciences/mapserver/mapserver-8.2.2.ebuild
new file mode 100644
index 000000000000..bcfb04e9da81
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-8.2.2.ebuild
@@ -0,0 +1,223 @@
+# 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 test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( 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=(
+		"-DBUILD_TESTING=$(usex test)"
+		"-DBUILD_FUZZER_REPRODUCER=OFF"
+		"-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_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}"
+
+	cmake_src_test
+}
+
+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
+}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index d3e021bd13b1..ef0cfda2cb44 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -3,6 +3,6 @@ AUX osm2pgsql-2.0.0-cmake_lua_version.patch 339 BLAKE2B ed2ec6d882f9905627ab30dd
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
 DIST osm2pgsql-2.0.0.tar.gz 2712209 BLAKE2B 064bca5796f8ede6f6fb816c8fa3758f066788c8e41c300b4a9cadd8058ca9bed49379a260ee8e5990d7a38061808f7ec78d2895c4964e5546b2ed3862d74239 SHA512 24310f0370fe5e5f87f81f553c61cc24ec80d29054f0679a2d34a3f1d72eacff93ef59611ba0938e552c9faf167f187d7117f5a08f0c0c26f258d95ebee86743
 EBUILD osm2pgsql-1.4.0-r100.ebuild 1277 BLAKE2B 64e9feb460d2fb5a7fa5a73fc45cc253758a51d71197af07a0b03cad5cdc83a87e77cf7929e0b624298d872251686e3bfc5e19e3ba41153b1f0737edc68ab9a7 SHA512 4be2b264d763430d231c0950e7cdf365e6b123d2bc32bcb752d7d36210ea4ec4a2853756c97801e5cb8a7e738898c117b60b1db7168192141e8c3a78a82edb6c
-EBUILD osm2pgsql-2.0.0.ebuild 1094 BLAKE2B 7f85a178b4858565bfae023bebbd9a2f7e20676a371c7a2558ef19ab5b73cd51859d9ab8d15b8092255644e0e676a4578933f0695c7629d397500690b6842676 SHA512 2078839040be3ebb210a7d260c29036d8aca0bca0ca9963b1ba70de076f1e4a7378998e6eecdc383f8a6c02039bdb4ed37f2c668006a4fafdcf3034197540250
+EBUILD osm2pgsql-2.0.0.ebuild 1093 BLAKE2B 282783f6667f381531d586c52cfcbd92aa04c840848024cbbfe5743bcc6c728df6a3198465181dd230cdd512172ed69db6b3c353c443f0123b8adee8b0dda934 SHA512 801f6400abe34a95819d5fec8f2b5f9605dc0a9b0edf2e146bc14d3012bf523c2dad9fa86a7f83718d3c6d59a58c64c4e345b6eec9b63e5274f284f2d4d0d7da
 EBUILD osm2pgsql-99999999.ebuild 1076 BLAKE2B f1898b8b80f9d97538eb276b3014adac1b01150ee52d3b3a9a417f76fed836afa724ccdab4a2699801ae3648641435b6727763a439fadd8f42735503cc22f5fe SHA512 87d67971bbeca7c11ac563a7c6ac26342c3761d590223a9ad27edd3d14a5465136e2f15cd2b3e49d453a8b0a07e1d461351423b5ad712fa7cb514c9b60970558
 MISC metadata.xml 794 BLAKE2B 4f79008b159c609d7727d64873db8a0912933af66c8c78521e43e59f5e1a6c6072ad1f6819fbd107a6491bd46629f2f9e48d57df6546bd1abb3647737323b493 SHA512 7fb0748e5b053f8e646a9d7883440eddec6cf3a6cc80ea78216f7bd376f17440c667c5a6fbea0649f2fd22e0742de106595fad1730ab64e8a43a4a9510369f41
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-2.0.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-2.0.0.ebuild
index 67bfea565657..70f9dbfd4856 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-2.0.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-2.0.0.ebuild
@@ -13,7 +13,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=""
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1325616cd2ba..e48c4edca347 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -3,6 +3,6 @@ AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c37915989
 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8
 DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.38.3.ebuild 12317 BLAKE2B 14ffffd046ea73a2d9c4a51596982d78ce54ef09f4eaefbcffa396c4ece00703e04910c76c87544b0f4f5f5a0ad6e1ade92635c3ccd55fcfe5bc66a17a966e2e SHA512 74398349b6b4d5b4396e3efb97d1e9780ea3251ec558bc3403d408237166c99124724c41a1bc490e4bbe4c70cc1cee0ed3705b50c72b7f817b8ed36ae318429c
-EBUILD qgis-9999.ebuild 12318 BLAKE2B 1750be8492690c1fcb22c39aed9953ae547106b3ec8cff489c52a7d0c97e8cddc3b7dba2230017025f47c7d6336ac1a7e1565820dbc0bc52dda2a02a9e634d28 SHA512 305072baafb6d1763c983edbb6dc4a12a8c65a9654cb2475182e18b7068da653378c181a8f28d06db30749849a00499672783afd61482f5edc04f6cda1153c7a
+EBUILD qgis-3.38.3.ebuild 12317 BLAKE2B aa2c2e6d1ebd39e14bd1415ed09b24a6b151cce3bedf5719cd1701802d09026a313d781cf22b44256375252025064d79cc5da6416723dc6fe30581a3279b55f6 SHA512 f588b6326df4021a94d617d925def0efb44f7346de0cf600acbc0b2fd63a37296bee492a26f7e6c0265faa2e95f1418efb58493c252d19997d4a968d66950bff
+EBUILD qgis-9999.ebuild 12318 BLAKE2B f78c62bf8ed100087a1e09eef915f732d0ad02f3210ce8f4ea4e2b9040820913bab64eec3319474e0e7b118beeeb6f22aabb017b606e1f865a170ee4f950760f SHA512 f342616d80ce20a179ebe6f53027df78a063d0895e5534ae84c3d95e647e0246f6f84877a4836e8862cd65d4c589fdb6f71d89e3d09f703014420eef1fa0ca0b
 MISC metadata.xml 1492 BLAKE2B 7e9411a1d657f64f47f477386b8c78fde0404aea2d5387e1d7e5982a532b9daddf6b8881c35c6238e568c45dc071d2bcb852577ab6a00677a2370b8eac79eeea SHA512 ddf595ddc3ca7f33bbaa57936bc7a3162d11e85e7c07f6fe5b3ef9e57132cfe0686d1c8b3b22d5dba7ea0545cba653b6ecce49dc056049c931120174e27db1dd
diff --git a/sci-geosciences/qgis/qgis-3.38.3.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild
index bc460c790b5e..f882c81156e0 100644
--- a/sci-geosciences/qgis/qgis-3.38.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild
@@ -88,7 +88,7 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-2.10.1[qt6]
 		')
 	)
@@ -114,7 +114,7 @@ BDEPEND="${PYTHON_DEPS}
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
+				dev-python/pyqt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 46fc70e8479c..e3db08636738 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -88,7 +88,7 @@ COMMON_DEPEND="
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
 			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
 			>=dev-python/qscintilla-2.10.1[qt6]
 		')
 	)
@@ -114,7 +114,7 @@ BDEPEND="${PYTHON_DEPS}
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
+				dev-python/pyqt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 9a40812dacda..fe6827d0da22 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,6 +1,6 @@
 AUX dbus-r1.patch 1778 BLAKE2B 94515e2418d13a72479d4517316c915f11694e2176acdbebbb410fce9dd23a414deceace0b348d0026a9c638889dc08e695b9a448d33b301b57d446119481f9e SHA512 add33ab9744d6552d5500530a88771bb89c09434f8d10573398e63cc3805f5ff0dbb5da19c5bca3d50ffe36dca4ea1ab00dcd755e49df26848d66eed9fcb9d18
 DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c
 DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80
-EBUILD qmapshack-1.17.1.ebuild 974 BLAKE2B 7ad2c6158aca5ad05afa5118ab0d868ac81b1bb4c43c4cb4195f1ca43ef8aa2e201e3eeb11e1072c901a5f19be5d1a338cba1311bfc7b4cadf70580de5deb7d0 SHA512 e73cd171b4db592739fa2c9d8f4b028c97fd2864e781cc30291354d5b88c6b3359286f120babca4d586aeb0a548abc71559906e6ee2cd2f81c2a08bde89db850
-EBUILD qmapshack-1.17.1_p601.ebuild 1254 BLAKE2B 0e02b4708e2e579f9e5f475b1651a39cfc5e4aa45a8acf3a87026f48769767dfd6ca0e0f68f34e4cdfd64da0fb53958046f1e1f8e182309d0c6e206f3c3f57c2 SHA512 9428eac70fac6a005fb78a53126e0cd0f6af332df5581e24c579660353c2d6aad37f287a4a902be4d20b01d28f637bc08ec9cbde333c7e88871101c2e7a9773d
+EBUILD qmapshack-1.17.1.ebuild 969 BLAKE2B c493f1a1c94a3a4f09e8653e9f6c16ad50a44bfe05194d6f4a5518c1855841503dee1326e8dfbbb4ebc93f959ce343dfc100476bb42609b26874da4c5bdaddc4 SHA512 1219fdc5c23217295f31393347e047198dd803f8691686821ed69f7bb56c2bbdc2ded947c5a74a1114d84efe2b1450f507f77a7d109cdd1ba069b39f99f82f95
+EBUILD qmapshack-1.17.1_p601.ebuild 1249 BLAKE2B e41696112d560b226665b81b513cb379f64eafdff2685b8a31e96bf09b7a55b27e754840906c4be06c8a9d38213595de729176ec12c5be1b1c502e9330e774db SHA512 2352fbb61601867b5aab107d1835ab410f22dcc3b6f25a2ddcc264d6fe978a50a6ed604f85989538df12e42b9b1381f24d5a20654bfce3d519d2dc6bef5678a7
 MISC metadata.xml 834 BLAKE2B af7dac2c7ce98d1a40e993e51e646fdadb328515d1aa1e3e8c508e30f47ae1bc25e71ddb774b7ab65126f4644e119aa2be1a01c075c783fcd5f5fa2d06f23e75 SHA512 8e6e2d99a1ed77eee5b511901c190b8e9b2dc12e9a83525463cb96db811cda03c4a7dc3bd6fe7bc83dff93bd5d202ac7a66f69f350f7ac0773a6e894e6b64a85
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild
index 6df2a19e36ff..e1064ed971fb 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/quazip:0=[qt5(+)]
diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
index d8473b11f33a..656f6b3977ce 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 S="${WORKDIR}"/${PN}-${COMMIT}
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="dbus"
 
 RDEPEND="