gentoo resync : 25.09.2021

11 files changed, 233 insertions, 17 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index a13a209388b0..1100c8a7eaf6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 21076b2f9c0f..9a0f54261887 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,7 @@
 DIST gnome-maps-40.2.tar.xz 3542008 BLAKE2B 65f23bf61e2e3c24afa80b74400dd929510c91ec463aa7e36759b1ddc60814538e21d883df37b98b5d4da851705e5f8e78e9d54a8b50a9cfd490a3e965f34b87 SHA512 6214ebeb8f5dc5fb28e0aab659a2b9f56d6b0c7b9248cd3482a268a6694ca04c75d91686a7029ec96904efcfca91a028d66d17b6311efa7e95b76379c68f6a0e
 DIST gnome-maps-40.3.tar.xz 3542308 BLAKE2B cc1430a9b66ee638fb64d0bf907a8472833137cbedd19f264bf2933618af493fc4a1ece0fd9fa2edb70ab50e24a434b4775d8c81eb830958014559e2a454e0b6 SHA512 2372a3e12eb17ec9f33521fecf7f74d1edb217dd8ff6f7565485ccd8d55ff535f7eff475284a402acb9da6781b389186bcd5e4df919340374be3b244f4100077
-DIST gnome-maps-40.4.tar.xz 3542388 BLAKE2B 241a0001d2a7fe84ad5af6a2f84e6bc6f6ca74c18aaced3a58086dfb8c968b4e75bcb83ce24422c3321a001c58be805ec88efdfa04a0440b50033037431a9fd3 SHA512 d410b0c846f0b908f12c4fa09ef7f1198611016e6ced8cf86930d5f4ac4752610c540b2d1ff6e457ef9f39db86a9f3b78c50bf8e3368705c37d754ab0a475de8
+DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
 EBUILD gnome-maps-40.2.ebuild 1499 BLAKE2B 2330b20fe4a80551f13627e0b84fe5cccf444a961468fd0d75373952e89792ce33e2b72dadc6cfea060a29b1c7cc2903fa44e2fb6abde77fec3a65ebdd367e48 SHA512 fd4513e27ac54403d066d964bdcb1b2bc528706e860341292a07b71091cd70277fac4eab483f03473dd3453089b33ac10c2d1b3e410abed2d12749bfa3050d21
 EBUILD gnome-maps-40.3.ebuild 1500 BLAKE2B c4ada54156ab4d3faf9f6991df7cca4677f6e50165b742545e38d2b3997ba2670b4d08ea4e503f710a2468e365829a225801586edb12a61a00f124a83f119612 SHA512 150c00848281da75a4cabd680686901bc9d4d547e15c26aa44c30fb7c647760d201f28dd754e6dcbfd0176c989b6fdcabbfd035b98c4ecc99dbe869e0cddfdf6
-EBUILD gnome-maps-40.4.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
+EBUILD gnome-maps-40.5.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.4.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
index 5ec15782805f..5ec15782805f 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.4.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 580e030006f1..2bc9b711173e 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -3,8 +3,10 @@ AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c3
 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
+DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
 DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
 EBUILD gpsd-3.21.ebuild 5672 BLAKE2B bacb23a4e962beec3d3a600c1a289e9f31af31b66529a1f5ea541e67bfa4d248b301de3e3d3436257d84f42c2fd006e65a49bfde782f47b753bb24a89a1ac7c4 SHA512 936b99bf2ef3b6a8e651898cf02144f2a76ba50753ce20693e6a7280af1f61b4da348a31567fae226fc28024606b353b77386fd86fbb54465921e899805ca46f
-EBUILD gpsd-3.23-r2.ebuild 6113 BLAKE2B 570b165646a4857982c63558068910747e0cf79097f28f138da97fd870b8ea3bf8453fbcb3c207bbe833ab93ee3724f42a85eac43134ea0955859f86ac52292e SHA512 4ded93264347958f0eddb717154ec6ffe801502cf6f0183550b6939f338147ffa65de79523f5c44e71c2e64c8b887f6818926bccbfe399afe27288aff6cc5e96
-EBUILD gpsd-9999.ebuild 6113 BLAKE2B 570b165646a4857982c63558068910747e0cf79097f28f138da97fd870b8ea3bf8453fbcb3c207bbe833ab93ee3724f42a85eac43134ea0955859f86ac52292e SHA512 4ded93264347958f0eddb717154ec6ffe801502cf6f0183550b6939f338147ffa65de79523f5c44e71c2e64c8b887f6818926bccbfe399afe27288aff6cc5e96
+EBUILD gpsd-3.23-r2.ebuild 6112 BLAKE2B 2208d25ca2dc0f40ec7dd708f92c5fd908cf02659516711f74494eab9efc42b2d8da4a9458a717e2aa9a69bfd542bcb20c8d7a34983a5f46e0e1a1c7389065b1 SHA512 f5f126b2e22b2c8b17560cdfe922b6a3ff9dc92ea3867a205a0d00a3caafb6a557b1ccbc6fc868b9ffdadb81a8da72a8031fa872d029086e99fa5ba8cfac1133
+EBUILD gpsd-3.23.1.ebuild 6104 BLAKE2B f7b8a9ba8c0f34de907f12788c6d332d3ceaf8ac55168ee720bb6299ce16881790d75a4ebd9ed240a624d880fe41467cf075ca0dbff1c2e4c1b022576e7dd8f0 SHA512 82df3387b6f39eacd92469e8edb84c6bd6a9afd9c00d420a9fe48f0729b32a33a80f5dbe17a2243fb79e5bbaa48e83dc03beeb693bb1bb03ad11c6f28acf10d1
+EBUILD gpsd-9999.ebuild 6104 BLAKE2B f7b8a9ba8c0f34de907f12788c6d332d3ceaf8ac55168ee720bb6299ce16881790d75a4ebd9ed240a624d880fe41467cf075ca0dbff1c2e4c1b022576e7dd8f0 SHA512 82df3387b6f39eacd92469e8edb84c6bd6a9afd9c00d420a9fe48f0729b32a33a80f5dbe17a2243fb79e5bbaa48e83dc03beeb693bb1bb03ad11c6f28acf10d1
 MISC metadata.xml 951 BLAKE2B 81e95d95a4ecd4ea59dd5c8c187bdb53cf32f6334e628b77986fc300d3380c310d1c77cafb113de2b260796db735752d2c7012fd7753504804208f4cc29302d0 SHA512 4383074eaeb476dcc84f38f2c2e68afb956f54c9fc4e0837e09e2d498e02fe59fd31351a11bf886da875c8e08aa84bfb09b1252dbd68ccf171f3c57c5fe1c883
diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
index 550576d658a5..ef5c01d69fe6 100644
--- a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
new file mode 100644
index 000000000000..41d26755b6a3
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit udev distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="https://gpsd.gitlab.io/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/29"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq
+	superstar2 tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	gpsd_protocols_isync? ( gpsd_protocols_ublox )
+	gpsd_protocols_ublox? ( python )
+	gpsd_protocols_greis? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/gpsd
+	acct-group/dialout
+	>=net-misc/pps-tools-0.0.20120407
+	$(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
+	bluetooth? ( net-wireless/bluez:= )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	gpsd_protocols_ublox? ( dev-python/pyserial )
+	gpsd_protocols_greis? ( dev-python/pyserial )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+python_check_deps() {
+	has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1
+}
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
+	) )
+
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	# bug #807661
+	sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
+
+	default
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_setup
+
+	# Extract python info out of SConscript so we can use saner distribute
+	pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; }
+	local pyprogs=$(pyarray python_progs)
+	local pybins=$("${PYTHON}" -c "${pyprogs}; \
+		print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins")
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
+	use gpsd_protocols_greis && pybins+="+ ['zerk']"
+	local pysrcs=$(pyarray packet_ffi_extension)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types")
+
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; }
+	pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+
+	# Post 3.19 the clienthelpers were merged into gps.packet
+
+	# TODO: Fix hardcoding https://gpsd.io/ for now for @URL@
+	sed \
+		-e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \
+		-e "s|@URL@|https://gpsd.io/|" \
+		-e "s|@DEVMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@DOWNLOAD@|$(pyvar download)|" \
+		-e "s|@IRCCHAN@|$(pyvar ircchan)|" \
+		-e "s|@ISSUES@|$(pyvar bugtracker)|" \
+		-e "s|@MAILMAN@|$(pyvar mailman)|" \
+		-e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \
+		-e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \
+		-e "s|@WEBSITE@|https://gpsd.io/|" \
+		"${S}"/packaging/gpsd-setup.py.in > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	scons_opts=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		rundir="/run"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=dialout
+		nostrip=True
+		systemd=$(usex systemd)
+		unitdir="\$prefix/$(get_libdir)"
+		shared=$(usex !static True False)
+		bluez=$(usex bluetooth)
+		libgpsmm=$(usex cxx)
+		clientdebug=$(usex debug)
+		dbus_export=$(usex dbus)
+		ipv6=$(usex ipv6)
+		timing=$(usex latency-timing)
+		ncurses=$(usex ncurses)
+		ntpshm=$(usex ntp)
+		pps=$(usex ntp)
+		python=$(usex python)
+		# force a predictable python libdir because lib vs. lib64 usage differs
+		# from 3.5 to 3.6+
+		$(usex python python_libdir="${EPREFIX}"/python-discard "")
+		qt=$(usex qt5)
+		shm_export=$(usex shm)
+		socket_export=$(usex sockets)
+		usb=$(usex usb)
+	)
+
+	if [[ ${PV} != *9999* ]] ; then
+		scons_opts+=( manbuild=False )
+	fi
+
+	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
+	use qt5 && scons_opts+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
+	done
+
+	# bug #809260
+	python_setup
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons "${scons_opts[@]}"
+
+	pushd "${P}" || die
+	ln -sf ../setup.py . || die
+	use python && distutils-r1_src_compile
+	popd || die
+}
+
+src_install() {
+	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	# Cleanup bad alt copy due to Scons
+	rm -rf  "${D}"/python-discard/gps*
+	find "${D}"/python-discard/ -type d -delete
+	# Install correct multi-python copy
+	pushd "${P}" || die
+	use python && distutils-r1_src_install
+	popd || die
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 550576d658a5..41d26755b6a3 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 SCONS_MIN_VERSION="2.3.0"
 
-inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index be3e220526a4..3cdc35ee0b04 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,5 +2,5 @@ AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a
 AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
-EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
+EBUILD grass-9999.ebuild 6912 BLAKE2B 7bd4ff92016a41bfc90117141715552cdcba802c108d15de90c2ae94a4df25200e0a5df636e9db5b796fa1620ee2816ce39cbdd86e1e6e9290ced2c41a7c8706 SHA512 5705e43a5087fe307d3d9d1b5551beff4f9b56de9a75757d478d60508faf4be29eb6d1bcae3bcce6a01900ce6a62ba105c9211654ba94b6beacbfeb5b7942edf
 MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index a77634827df1..68ab67f5dad5 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
+WANT_AUTOCONF="2.5"
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-MY_P="${PN}7.9"
+MY_P="${PN}8.0"
 MY_PM="${MY_P/.}"
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
@@ -216,6 +216,8 @@ src_install() {
 		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
 	done
 
+	mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
+
 	# get proper folder for grass path in script
 	local gisbase=/usr/$(get_libdir)/${MY_PM}
 	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
@@ -228,13 +230,13 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
 		"${ED}"${gisbase}/etc/fontcap || die
 
 	# set proper python interpreter
-	sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 		-i "${ED}"/usr/bin/${MY_PM} || die
 
-	# set proper GISDBASE directory path in the demolocation .grassrc79 file
+	# set proper GISDBASE directory path in the demolocation .grassrc80 file
 	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc79 || die
+		-i "${ED}"${gisbase}/demolocation/.grassrc80 || die
 
 	if use X; then
 		local GUI="-gui"
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 64a325cd36f5..09c2b64eb75b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -8,7 +8,7 @@ DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a11
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.18.3.ebuild 5333 BLAKE2B bc87c4fed5e992e5ff9e87879a77e8b8dcff0808da1faa2ce8755a9e8305e7625ad6b66c5403a618ea8f3454b2349dc9cf5f01393acd6ad40628370841dca45a SHA512 39ba707d2e9daf9766b174b663496200981bf48d306517985be7d8d94175d02f3fe5d19525234cc94f2d36bad3b2d15a779de75046c1b1e611ef04b475cfe029
 EBUILD qgis-3.20.0-r1.ebuild 5360 BLAKE2B e994dabd1c8cd67cfb0626397c00f383ee5ddab639724a4d9998678e2c73cf07e5065578f8f7b75ceeea777ebf4177e7005a2f092ed9051192736496b55ec825 SHA512 21a5645d6bcf9466f37cf88681d6d75f35b375ae76ec246588a8b206f1fcc4060d43b8988b6eb5c69f92e2ed45a0b7db73ba4e0409b4473befe8a6fdf1c73db2
-EBUILD qgis-3.20.2.ebuild 5407 BLAKE2B 3cddce4905a0f00a26469a02fe24960b6125c986e9a975ee793d9661f2b4af4f5754303e29166ed51057f4e86cf338c3e9c6f0cf25c62dd5f19efd7f47b8ea19 SHA512 58f769971c285e20d64c74b52e8baceed9475ea7ea07951b9959b5054db1c9af815183c516e499fa1a5dfa0b5deb47bd2c07ee629f58b991f1552fc496090cfd
+EBUILD qgis-3.20.2.ebuild 5405 BLAKE2B c7116b756fd1f40ba49bfebb3db77837f93c1498572e1d932a7e874ee0d10163efdb0781252a9f515936d7ea5d5b0adf065983946dd7beb7927fd10413f3c31a SHA512 aa4faadf0078c7ea8f7a7a958dec0d6af35984e1fdafb61816c5e2aa85a91644d80f6bd295b60504bc630d5a9c0670b3f96066ffb35cf07f375dd86bd09cfd4b
 EBUILD qgis-3.20.3.ebuild 5407 BLAKE2B 3cddce4905a0f00a26469a02fe24960b6125c986e9a975ee793d9661f2b4af4f5754303e29166ed51057f4e86cf338c3e9c6f0cf25c62dd5f19efd7f47b8ea19 SHA512 58f769971c285e20d64c74b52e8baceed9475ea7ea07951b9959b5054db1c9af815183c516e499fa1a5dfa0b5deb47bd2c07ee629f58b991f1552fc496090cfd
 EBUILD qgis-9999.ebuild 5407 BLAKE2B 3cddce4905a0f00a26469a02fe24960b6125c986e9a975ee793d9661f2b4af4f5754303e29166ed51057f4e86cf338c3e9c6f0cf25c62dd5f19efd7f47b8ea19 SHA512 58f769971c285e20d64c74b52e8baceed9475ea7ea07951b9959b5054db1c9af815183c516e499fa1a5dfa0b5deb47bd2c07ee629f58b991f1552fc496090cfd
 MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index ba166c281975..51cd2ec672ea 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg