gentoo auto-resync : 29:01:2023 - 20:56:01

author: V3n3RiX <venerix@koprulu.sector> 2023-01-29 20:56:02 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-29 20:56:02 +0000
commit: 40a4dd47c275aca60d7381a93635d31b8d09451a (patch)
tree: a1e62b25ccb28b5754aac10d175ed75ddb4537b1
parent: 4c51ef39a9b443061a7071e002d7daa2a4d16141 (diff)
140 files changed, 832 insertions, 766 deletions
diff --git a/Manifest b/Manifest
index aec04aef6811..0660e064063b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B ec6124be4945b71cce559c96a7ead5c93687b78cb7023bc90e4ecceb6aa978d055bfda99c2a44fb1c1718c3fd3d51cb1ea586c2dfd60a3063fb419e39908004e SHA512 62c2f9b0d7bef4cf09c963cf52da135f728cb705c02814ef2fb145be2a48087eddca101d533d8e3fe82d40dcd1a1349d427b470c5d3e62e4df9f95a9d27457b0
-TIMESTAMP 2023-01-29T14:09:59Z
+MANIFEST Manifest.files.gz 29446 BLAKE2B d6708f95e27e28d9218c20b4bad277a4a6a07843f2dbaae295f27b23e6883e690181c415b3bd2224130a40aea1e364c9f21aacfc26633cf2db4311b9e57a51a7 SHA512 a781f02600b2104eaa984b67798798f69af6c01bc97eafff86a7d3a075ce6019f35af333bbe58d468e68f0f1586a10ad46c662757cf3c5372814a8eefd710007
+TIMESTAMP 2023-01-29T20:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPWfjdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPW0plfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCQ0xAAqGFYuuj2t56ZA8KtSL4l0V/2HNpjyAgEYbmoHhJ4VTpzHc7CGtU1O5v3
-ZWxBuzuhAo+sgICc4UHSTgctnTZ/fSNnwYmvTT6y0NwTdsZlwLzPi9ZW1+OheCZR
-eA109Nd0eDVxHEFR9PiROE7hvljsuZxdaktP5dBM4anNNjbNsZj/BLLpfSQpEk2r
-8wPciLNH6SKh4nkfUt85TC6NE9hZTUzRIkVPYP6UttxSs1RP6JWv24ifgmoCYkuN
-E+xCCovZTQNfZscFxYRs7SYWyKgtFKWhNoOOyfVE4h21KgjSy6W+f3N2goieNpP6
-f9ywjhWr2Gzud7GxQ3zrvAs1wsiI/IA9R5GrW5+kMBAEa8Div6Og88zo/Vbd0I1j
-sp5DFlEg1lr/bEQIrOBWmv/fwnt+XNcXES+F6ick3Uuoq97PVo2iObdxkgv6zWMF
-XeRHW23DcAF/5I2IevTqQYj/zNzeVc4nzxw+TbpzIgQtgrFITafNW1Z6lOY1ER+k
-FpEJi8gP1IXQOlfdaWAMoMOFj4zAo3bfFSZ05rnfeSLOxL696PXJwNJ4oIurORt2
-N5dKst7c8koxhBlGMCtIoUICshcexzn8oFi3THd9oYoDnsFOT+klQQt4bGR1ktaX
-rU+06/IUlQtcZ9JOYQUCivnRojJIggd8khlYs/J7zDHojK0AgXQ=
-=naD4
+klAkpQ/6AsZvfeQCL3YDtFr+jknywo6BoHF6cPnUs4eQhAcd6BuGK5y8mQMkC6y6
+of/CrjsQVg73kH2oQ24gWQfzUiG/A4/nzzJpvh7lsNrIklGMJYl3cMHFs/WRzs6b
+B/Kd+s6Z8lQmDUULAIy4Gu0puGFQ2ae3w7Dgz8E6bXDIuPq3Z9uBq4rfYELyAI0B
+BgcZ2InNHdIPA0cTrtA6NJDwHuWhwvhkddAJKaF+dgvZGgwg5L6QHKgqAuAqF7Ys
+6jsJWj/0NRniTneSONm1afsr4WjlpbEORIYNQfs3vNNoGg2Xzagn17rXNxz7McIa
+Cf2R7HBTmRSSbjCh3kgxzuY6Ow2A37XGFBK5jf+XULw8KlIkdXUOSZ2QCYjmI7ub
+4Dv62GMUjkbGlgDOrBvu4VpA7Ec0KyNUp92RmX7mbhYe8XgZudyJJyRtiIpaQRx4
+RDpCQaqwKzpjIz3JatCzo8UamzAdfp88joNZNhxhO6sMsomlF92+WjwKwil1j/qn
+El98HWNEQPybBJFoN60QCAIPcH6gTw1ti6ipLuQY+M7HkFNh97QxMXCqTO6EvCsV
+/FMoDYwavz+wiA1ry+RPU+zh0byLfKtnFBoOfUWLQMDA92qm/uuTs3XDsEymrEpU
+28f3kIeHZlhAs8fKR5XLXIWhzwwbNu7h9iOcwFXoTwI90dKXtYg=
+=Vzn7
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d51e74872e92..19ff8d605c81 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 66e4ea40e970..8121ad3d6f8d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 7533d95278d4..8d942d626053 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1,5 +1,8 @@
-AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
+AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e59697499490ed964b7606819c6d67b9eee1ac6691fa52a65750446d8e46ed9af708d946c24e86704b SHA512 66d891b0d2a541fee2017382ccbea6ea3f93d94c4ff15e1d8626ed84d3d7c0231b0939b2473804d41ac3ad2714267255347d1c671e1d99952d484a8b555948be
+AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5b5d45216275715e3acffa8c0c98309d81298795ac007bde02d2f3afd466c7c54e58012a12f156198f SHA512 f31b088e988beb84ef029992255018561417c0e92803dffe35ec481515e1be79ba4611cc139bb5000b0ac79a437f1a6dec3516d6f9580d4b384f1e0f092d8370
 DIST containerd-1.6.14-deps.tar.xz 95727780 BLAKE2B 15782df59512ee66eacbbb65b21520edfe1ae13bf4324a7262b0731c9bf650b328c328a72cb3113d31f23ef87a74e45292a6282f8f07e79db750c1238943e203 SHA512 8db408f87924741b80b55f8e9099ab64da41021f1708ed3c156716de17dd92b2ca6cfa469b3c8d5545fbebd51f9eefcf62c57139de545762815a73eb772fbbec
 DIST containerd-1.6.14.tar.gz 8698335 BLAKE2B 5f088faa35ffbcfd2e62334c12f9c741e23199d6d9999e28c69ad21b760fb85f514ef70cfdeebbdfaab914a8905ea7dae989d9fc8da36f3e077196e14dd6a220 SHA512 d29e2fb4a43f12d7e196f95b59b2c55793a1848177fb64b8bd9a4fd299fe54680a26f8a809b1d63f653ed9f0b30c209fc39d46b78ac0914d3253a10e5d3b015b
+DIST containerd-1.6.16.tar.gz 8699293 BLAKE2B ed56712ba3400c070a94b411ecff50f8c639bdbec3d55372e155dc0868e96e4285731dc5ce18deaf132696d03fc8067dbe0c41ce66ee3d675ee33f960a8ee4d3 SHA512 f10fd7d4ca1f089d0dc0044f192a8faed4c96ac589c58f969074eba299b85fca4361c74d5ef49532c34e297016ee8dab3734f315a22586fa1b8f2eb84f9f08d3
 EBUILD containerd-1.6.14.ebuild 1923 BLAKE2B eb9130e2e695ac5b8b5ed9922bc40bff3bf48a59b392fe95919bf0cb704f56b0b83fcd08e7678f675f4fab1dc1f085f94d1411d57e44d4034cd2237f87cb1a3d SHA512 981fa05826081542e1b8ef3c125ea99f6ba09b82398bbe9cceae8ca3c17ecdd6a5a41c424046bdb523afe86bb87e5cad7a3e762496bedc51ddf4a2960631dc41
+EBUILD containerd-1.6.16.ebuild 1930 BLAKE2B f8431338cf22f069c5eb2259d83674268c1b26d9b6c7efd6ae55c8456a9514542a57f87863d2621af37a5bfdc63f9b47443a9be23663bf888b2a70883f4ba33c SHA512 aad97ef00b03ef7e6f8399a9f58ad445171265be16ae359e727af9f18cb80bb0d48169d7aa860c488b831ddc432bcb7269c0a7722101a43dad47204a23779bc8
 MISC metadata.xml 1093 BLAKE2B 692497be353e27b92d968142a155b5010a60f60739e1cfc9faeb966033f868c67e18c8feaaf661903266f160742a0c9e3d34485258df3ace9e8982d2ad3602d6 SHA512 18280d46fe79ecbcfd4e3f9cc139103da1fca31b6a5cfafb4c9c30d8b2a559fa30bf71f17f228a96c56506c5e18eb7c1f3340b5428c213be9e2e45e4cf5fc407
diff --git a/app-containers/containerd/containerd-1.6.16.ebuild b/app-containers/containerd/containerd-1.6.16.ebuild
new file mode 100644
index 000000000000..51f35f544572
--- /dev/null
+++ b/app-containers/containerd/containerd-1.6.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GIT_REVISION=31aa4358a36870b21a992d3ad2bef29e1d693bec
+inherit go-module systemd
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-containers/runc-1.1.4
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-containers/containerd/files/containerd.confd b/app-containers/containerd/files/containerd.confd
new file mode 100644
index 000000000000..22ef83205e26
--- /dev/null
+++ b/app-containers/containerd/files/containerd.confd
@@ -0,0 +1,3 @@
+# This is the delay to be used in the start_post function to wait for
+# the socket to be active.
+#containerd_socket_delay=5
diff --git a/app-containers/containerd/files/containerd.initd b/app-containers/containerd/files/containerd.initd
index 6536fc9ef209..143305c03336 100644
--- a/app-containers/containerd/files/containerd.initd
+++ b/app-containers/containerd/files/containerd.initd
@@ -22,5 +22,5 @@ start_pre() {
 }
 
 start_post() {
-	ewaitfile 5 /run/containerd/containerd.sock
+	ewaitfile ${containerd_socket_delay:-5} /run/containerd/containerd.sock
 }
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 27b3a20b6219..179d32a16daf 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e1aa6208b787..87ea41d8301b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,5 @@
 DIST eix-0.36.5.tar.xz 640132 BLAKE2B b997be82e21e3316abc6f06bd120434f2a027d62a3bd97e54e7c6298ee201d9998fb0fda91955f88b1b9bbf15b3c6c0c1d821280508215131cde16d1eef621e7 SHA512 fb86367f34ae30dac10f0ba68a649c8e737f0f66fefb2933e100c63c57b778567753759f28a6b4afd0155430b050ff59297821c7b54fa73c6cd65b0231806d89
+DIST eix-0.36.6.tar.xz 640216 BLAKE2B 40f1d247f6a00ecc9e034f272e73346535724e1b0cf304ea990ae849414adb4490d181db1f781bf7825f18c12cee47e03921a3e43054631d2422e0a6c8a915b8 SHA512 4dbea2a0ac66b15061b491a8da15337894ef4ae18bfb2e77eaf74c6741a45487ca7378c80620341ccf4b335592c121ab55755f0562425a9dbf9a16a9c4aa3554
 EBUILD eix-0.36.5.ebuild 2552 BLAKE2B e94b7a44857440c2a9f2423c1e27cfe8eb020ae89f9be58291f03769a4716f3c0787c3caad72742ea835c7977cc9d94c9473e09811c3a8cd52f52f9f3e1dee45 SHA512 e1862471ad658e566c031ae219011eb53c190666289707965f2ca9ddaca0315a89002b0f4cb0a1e756ab51962ffc2104f9ca6fae9b25f0e428bbc3713b971a40
+EBUILD eix-0.36.6.ebuild 2560 BLAKE2B 0ed5d512b076c1e54173b90687d25d40a20daf23ac71eeaeb6bb35f393032292eaec3226a4437ef8a35bbb058799fbe75a21beef388fd7601cef42553c7b0a9a SHA512 23308c4a3047af9b323dc75986c8e51c70ba3eabed8849067141f4e96dbb9dbcb7ccb66e85a7bbb8e9b93b21fa228dfb55c0772cca35cb5f7c8efad54ec5a17b
 MISC metadata.xml 952 BLAKE2B ef76318a2bef5560870b4c4e48ca3122ccf67f5951f8cd4a5423b6a667a39311c9725aa99a115d18e0035106f4ebc2d2679987feea91c477d5f19d6244f885cd SHA512 823873a3a87bf0ff3cbb8ab6bd2eebdf45b1f5541aa13cd4a1411def808e03b5c961050a6fc10fa5210694fac9736e0acb4917df75e7d238391dffdbb2094cd9
diff --git a/app-portage/eix/eix-0.36.6.ebuild b/app-portage/eix/eix-0.36.6.ebuild
new file mode 100644
index 000000000000..94125b74cd60
--- /dev/null
+++ b/app-portage/eix/eix-0.36.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 50365a0418d6..7599f46a19e6 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,9 +1,3 @@
-DIST mgorny-dev-scripts-31.tar.gz 11903 BLAKE2B bbe7dc4ab1978485d9c954e5ac0752e3babb3162a20b3c582d92a14cfd20d82f3710f65d34bd15a3b101547f587cf3c8859b066be555ac5b3d55c10ee7f68568 SHA512 a164bb1b75911a4575813720c2dd10b81ca806dafa6eebf71f2f609eee24cd4bbc645eb3f1c8d40eb6031d25b5ea6575fa761f53b5f03d52e0438d6dfd2dc173
-DIST mgorny-dev-scripts-32.tar.gz 11933 BLAKE2B b10333bfc4afe5ecb8faa1ccadb74c476911056ba8d0f7b0113d8ee5453252a20958bc1a08cee42cf48a1f343f64c1ecb80b157efa6f253cdecf16750759f78f SHA512 1043b12f788130e10eae651f80869b9ba4603bb28c7c7bae3fcb790ecb55b36b2d8b8b5597f7bf34053f5a99fc70590fd029a5f65ccc0bd2ba5ae2a93e5f2199
-DIST mgorny-dev-scripts-33.tar.gz 11943 BLAKE2B 8455d90db5ad1358941e4ccdba1b2f7ea8cc766d0789b3ab598e5b4c3d406b0b66c6d24aaa1a33019560b6103bd648aedcce02dad7deb6df4ac789e4937fe7cf SHA512 b4c17cb1c2eeba86a74fbe011e9ad7b06304a7386960032add1b9c1d7e8200b258a8b2239e0450da7c61ce4c8d1a025206b54fc4050cfa8e343590a1d35e3139
 DIST mgorny-dev-scripts-34.tar.gz 11957 BLAKE2B d277bbfdddd81b5b0c27d1c318c9dc33393f91ac86b0c6768124e72ad688586f099c6e4c965eb29d027e26d931ac9a4e15ee3d1e17d9e736d61e543c3fab7c38 SHA512 f9651ae5c3707dc8794d300b2c049cbaf286d48f50c25a8ad4570623b8b8271925cec08d97babe3eb8331dc658ed49b77f0e8d0a4de0215b3bdff732d2cf8a60
-EBUILD mgorny-dev-scripts-31.ebuild 695 BLAKE2B a743b633c5732c86e68e91b2cb70462379021d834abe8818fbe40a90200efb624de722cdebfa64a5e187f70c83eacb21194c67bb16f938f89f033ccc0e7b0e33 SHA512 f52d547ca624087dd58db3871e02897e7187baf26bb6e455810ac01436a9b961201adad9d898730816933386960f5ed5a12d0fcaeed84c8bbf0180d67a355943
-EBUILD mgorny-dev-scripts-32.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
-EBUILD mgorny-dev-scripts-33.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
-EBUILD mgorny-dev-scripts-34.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
+EBUILD mgorny-dev-scripts-34.ebuild 695 BLAKE2B b410554da320824b048f1875bfb16b4c2602565228d370e5652f2ebd7fd924bfe02ccb7f0fe8963a8690bae3b3d7d51813ec0749473653c5d51f0cc9ef973e6c SHA512 f5280de950ee5d20f4cad98de0d1d4906c8bf3d235aba574d7f76a7dc103cc30af9d6697cd0ec96391f292c8604266889a15d8b4c27e0c722596873317e186c6
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild
deleted file mode 100644
index 4cd466d472db..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-31.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-32.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-32.ebuild
deleted file mode 100644
index 4d51b8b82ec1..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-32.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-33.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-33.ebuild
deleted file mode 100644
index 4d51b8b82ec1..000000000000
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-33.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Handy scripts for ebuild development and more"
-HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
-SRC_URI="
-	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	app-portage/gentoolkit
-	app-portage/portage-utils
-	dev-perl/URI
-	dev-util/pkgcheck
-	dev-vcs/git
-	net-misc/wget
-	sys-apps/portage
-	x11-misc/xdg-utils
-	!dev-util/pkgdiff
-"
-
-src_install() {
-	dodoc README.rst
-	rm -f COPYING README.rst || die
-	dobin *
-}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
index 4d51b8b82ec1..931592a8a97e 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6e0015f96805..951bd023fc7e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 8c1df9fd010f..530a89da2285 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
 DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
 EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
-EBUILD xapian-omega-1.4.21.ebuild 1184 BLAKE2B 35431346bc247e40826dc4557606a573a41bf9ff52350dc490701e39480e351554d2ad53a26240c0a8004a11776defe69e43d27c077c5c658ce7ef62a81d2e6c SHA512 30251cf7c24b0dcd7b7d1a7fd28b28c83bcea27d8622d1041420e6462ca158e2e7023ae788953db3b3bf9a7adc5bbe4e48a48cdf747a6a17c45cdb71311711c5
+EBUILD xapian-omega-1.4.21.ebuild 1183 BLAKE2B 6e849058fc6a2ce3510ee3c612f056563827a46136c0eff42e9c23981e480379c1ba2e234dab23a81919e7aeabc6a6436cfdad78b5b1fe28345d5207c6d1955f SHA512 78bff567e04d0119f4846f252583a94773410275858db84e13e5db52479a2ddc329b7d7d949eedca9ee0ab739759b6dd6ffdba1eb5c9999b2415ff817225d628
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
index 0bd05a92c0eb..ec98debe4517 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="~dev-libs/xapian-${PV}:0/30
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bcf5b3706cb9..3c731dc236b6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index b1a1c19caaf1..6864683ed9d4 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -3,8 +3,10 @@ DIST libzia-4.34.tar.gz 636031 BLAKE2B f33c13f4159fd6e6e83e3aada2560ed6f2160811e
 DIST libzia-4.36.tar.gz 637486 BLAKE2B d9872b4d3b3dea05a2b18b36fc4aeb75696d83fa98154ed716f70f9906c7cd66fe60a36dae802e2f05145c27945b9c97838b09a4414009b58caae86805e011be SHA512 4eaf2aa19bf85abf17299d70b2d9c6c15b9d99a4b62198675860fe8fedadec8deccfd5c664368a110e4c10cf2f6c936a85e7cc689d59cf03a1150f39a9164cbf
 DIST libzia-4.37.tar.gz 637291 BLAKE2B 1f221a0bf1229a2c6b863363e3634b51177a9d45a1f7b828e5fb85da3e2a9a319e5deebc3a7640ca5c4ed3004fa087b81d5a5bc59197b0ad90e161e1989c02ed SHA512 5b3a708f243ac845505645da0e2a76658775a49edfd8cbfd6fd99edd8bee13e4c54d6038ccccccd258c7a9d80943265486b01bd127a86c7c880fefc0a714cc39
 DIST libzia-4.39.tar.gz 638203 BLAKE2B 0ff2bf9b404b1e554c3cab3145980b8db97345b2e4fd3f3aa94960c150f0da3efcc361306cd7476e839bc3f57868164181f2e3cb79e0dc3f3a7246841d723251 SHA512 61ae1e2aba9f096f7d6593cf7a72d12822bc30f77287bc36f1ea72c01e9669cbef72492adf017efc73bb507fe08b9939f6ca3e4d695388c642619450fc31c024
+DIST libzia-4.40.tar.gz 638193 BLAKE2B bbeee5f6ee699e09aa791c8b6acb39fed90bdf9a875499177c330d009407157e1ebc36aa432e94dcd78553f803c84fe0d00ce9d613abb657324a061588b77d06 SHA512 dd17a80dbcdf88f7617d439f6dde2af6d319c318e9ee55bc9b375ef1bef5ee708c1af7e133ed304d365b0d6d0c3d52f48ae01f44cb2a6e1285625d785f5f5126
 EBUILD libzia-4.34.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
 EBUILD libzia-4.36.ebuild 1190 BLAKE2B 9b6faa760f7ef5c0bd134d72a43903e927db0ba2ab9191611355ca62caa6378920e6265a217e0b85eceee7401a6faa22691b64f9125bd180d944a89474ef9d21 SHA512 4aad61f2c2bab235851613f3175f9b9789458cc911ba6e07e8d2c56e320690696c04e1138459741bb9a16667259d4ce362942c65a2235e0d8349e344993f0cbb
 EBUILD libzia-4.37.ebuild 1270 BLAKE2B bb3eb955980ae74e294aea93772944c0d7eede2ca253ba2cb2207569f9349fcfe0c600448fd61d708badb106a922523b9dad8a1c8922fbef759ce3120583db4f SHA512 1ace05dcf44d84c8c0cf2c137cfc07fd5402a4dab2999b5aeefe3ed759bdafbd0fe925e27c886bad8a7cdc5304727538c860ce72424bf75b2f32bc8d4486f04f
 EBUILD libzia-4.39.ebuild 1191 BLAKE2B fdedbbb747f79407c1697e883d89dab444cc8fb60065c5800f6593010444160dc555f9c7fdc99e8d336ef7cd3409ce828e3c9156dc627143139bb987d7a20c2b SHA512 57c194225792866b997c7c1e5ed386f87f0213f8eeb4837c44148d013df10a61c6c71ddb20409088bb2e236eb3da948fc5c08c574ffc5d5bf962ab6ccb04cf8d
+EBUILD libzia-4.40.ebuild 1193 BLAKE2B 14f99f1cbc754761e90212206e4d0d01a16071f07aee10c232bbfe66548432a576193bc83847a23bb7bd9d3eaa12e036c2e727e52eb2d5ac33c98b2c2f576856 SHA512 f0a68f7a6e158b889856683f2199c85cfdde1283a7b0d7b075adaa82a0859a9cabad1a731f0a13dddc2954e4084ed0c4d959584ca3c7aeb379befb71a366a2a5
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.40.ebuild b/dev-libs/libzia/libzia-4.40.ebuild
new file mode 100644
index 000000000000..9c39a847c882
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.40.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl2
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-libs -lunwind
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
index 5bc1f8c0bbe7..5169c427b34d 100644
--- a/dev-libs/qxlsx/Manifest
+++ b/dev-libs/qxlsx/Manifest
@@ -4,6 +4,6 @@ AUX qxlsx-1.4.4-qtversion.patch 3193 BLAKE2B 1e9534bf4361ff0927ed77ba58c38e0ffa2
 AUX qxlsx-1.4.4-soversion.patch 682 BLAKE2B defb2375ec4ff00e6f042cdf20b52d7983d77806a335b301a1c799679d2da887b88458ed3e024bc085c26d6f6a9f8450868076d969eed8f608b80f30dfe8f14c SHA512 5434a4da6f58fd2aad1ade38b00ce8f48df73e519ef375b9bc7b014cfeb4601912bdc81e9b13529147b97800d6b0ff97fc8669a774f0dcb7814d5189fe90c6d1
 DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee
 DIST qxlsx-1.4.5.tar.gz 4705008 BLAKE2B dd853a20109c9d9dcd5757bbb436e620191eb1fb95c441b1ce3a119bd99397f6206da37b6d770c84e8717c75ce9ad1da4b82397030da02c49a092d958ebef261 SHA512 5ec63c210b12c037acd9f3cc4d351b9bd488add65872a27cca536117349ac2c2501649cb7c2f35e1ee95289e98bf9e9fea6554aef1379deafb50c5016ed21fe5
-EBUILD qxlsx-1.4.4.ebuild 1143 BLAKE2B 77b94bba7b4f89c333c3709498e6cb35007181e625f8c1cbd30e8321268dab27d28148cf6d2c7989aa9cea5ecc883a6be04e1e7ec566ab9b4717d1d0857b0481 SHA512 6d865098eed52729d0b4c6e3256a39561506d4e01104d0b9f31e79de707b9ad305d4cca3c24203b230cfa7bf45f71ea48784aa510b2578ecc88959eee74c6080
+EBUILD qxlsx-1.4.4.ebuild 1142 BLAKE2B ec378e89ea22a43a4ffce7ea1de313ff461a94afd439da4b549ca31c42e44cff7f2c8226b1adda0b1c107fd8b583f8f83ff748035a1f276e68e958b0d6a08d0e SHA512 9c8efcf4a10228df58429455d3482dc8fde3224ecd68aaa1cf09cad9f20356110ada64feed0ad0d66e9f09057fb2460e6dca1aee2f31d5fb9aabc5a174ba10fe
 EBUILD qxlsx-1.4.5.ebuild 996 BLAKE2B cb55f149150090a07296baf7ec67a089f25c4067c8a8052c068e7dea80a0da9d41ca518114752c30377cad939baa222700a74519b0bfecc1e9f397629eb72505 SHA512 358704758e196af3e53be637e974363b7725a0f9afa588f8bf2d25104a746a84cfd1a856e28ba6aa9226c98ba2a8f0b2cd5f36dfc6b10aced076593397935a50
 MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
index 14ef4718f532..b68ab4c3e582 100644
--- a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
+++ b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 # soversion
 SLOT="0/0.${PV}"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 3acde782b611..2600548e9ee6 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
 EBUILD xapian-bindings-1.4.19.ebuild 7115 BLAKE2B 9c93d9f8b020813a6b997a957b10592c3d7564e9ad01410d72beb676d8d48237c7419bdbd44ccccac3581b5b885933ab1b5a2282aadd75bbe83a86892e6cdc79 SHA512 68370978c0ba23e83304613663d387a6cf2ef4b6c6677975702382c76539b069f4c52772e13fbde9aed442fca432ce94b108eb715ee769e46a4036d8e74a322b
-EBUILD xapian-bindings-1.4.21.ebuild 7120 BLAKE2B 2f4e73ac0d3b7de64e1de1c85d80e8953987be7a26cc392cd8174222d825660bcd0407c07ec2701ad3653adedc3f29bda2448a85694aa993a0b922f121e5e5aa SHA512 067c300c4d6c38a8abe438f5263ee88717cfac4573b39b2e3d472d3738343f2a330b90e695042f798f66c8f1d96f3eb7179f18b5f8a157618977dc151e7600ed
+EBUILD xapian-bindings-1.4.21.ebuild 7119 BLAKE2B 28da79127ce839b22daea81505f3d7523209238be7747d4fac27cbedd676fb332f758dc1ccde95eb5fc72217e9d0e97556518f8b743905e7aa19e8c32a6a0cab SHA512 0ab987f1757ccae25087b9b44d62ae8c37cff59f350ee72bc03186ca58a4fea8f91313c3a531b90556e0d622f74fae06f4a36005bc7887d2e0a1ea609204c8ed
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
index 0df45425cdf8..fbec347149c3 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 1a20c3c15769..9288850a9bcc 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,5 +2,5 @@ DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
 EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
 EBUILD xapian-1.4.21-r1.ebuild 1438 BLAKE2B 3c120dab585a626f629ea5ce1bb462b3fbd679fd68402b754bdfe19f27486afc432ac994c86957f025f0705f89654c75b3a837c0cbeb64d532310805168caa31 SHA512 e31d28ece3aa699d98cdcf49868ca7d134557c89e1ab79d5d58806e17f3dcb2b4b443a112c2e6132c3b44f826d243a0dba032a31bbf817fc2ddbfd0dd06c39f1
-EBUILD xapian-1.4.21.ebuild 1882 BLAKE2B 507d69f68cab124c7da7dc501676e43eccb1229c750e2578488c5aca354e301932604936384b0df3d02b6ac7e7202d686a924d403204ae0f8c530ac2673925f6 SHA512 22723362bb790445665e748f2340902df608cc3a2088a3942296243285d811284b3d8a016bfcce97c62b9c75c18b5fc192d19f2bc661fd7c7dadc1dd0f5f7fda
+EBUILD xapian-1.4.21.ebuild 1881 BLAKE2B c54cf9d37454b61dc8c8c3716439461d76884651cd68746404d6697c148895848cf01b86b864508687b7be9f689a3d4af0204f44704de073184d9168b0888b15 SHA512 a60e6628a3dfdd1a92a638f88716b8822b3b1bc66cdcb588ce86da516ced52f78640343af4333f55b90b8781a52a61393b64fc547e85e76633020f288ede7975
 MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
diff --git a/dev-libs/xapian/xapian-1.4.21.ebuild b/dev-libs/xapian/xapian-1.4.21.ebuild
index 43bc125557f0..767d663dd8f7 100644
--- a/dev-libs/xapian/xapian-1.4.21.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d5d95b15f416..64a140c7b53d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index fe80142b44eb..9a1bbeb59ac9 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,7 +1,3 @@
-DIST daemons-1.3.1.tar.gz 28805 BLAKE2B 4ddb9cb9a5a6de5ebeac8ac69c2712500f9dd18c9d194efce3152735533a2aef7a4cf0e034e4c1781e5d89c1be18e7e7c119455bafb0bf4d8cec279b1e8f6308 SHA512 ceeeefbf44727a1ee43b651bbc3f8e5ae83c73388d017d240d95624586b91a3b32602464f4a5ff53a854d6cc6fa1dc47e433a665f0ad7f08e440c0a798743d80
-DIST daemons-1.4.0.tar.gz 29257 BLAKE2B 6f8f108727e8d77c18435fae7a8305ecd615eb65cdd196ab36ed0787c50fddd30a5bbf8ab93e1eafff7da23143b2a6ff48781d54d10df45f40f536a7d87eff6f SHA512 cdc86bb06e5713e958b1d229da893f39d32751146c269cce5392f53bdc59cfeb93be0a6fc73bade1dc6b7a007bea16f25b070469ec48aba38cea884efaa770f9
 DIST daemons-1.4.1.tar.gz 29310 BLAKE2B 4f376f0a1a9322d95b32b74862beae93ae5d8636c0d321b059c335053760077b6ba78780cc4c22d5e98fbb95e2dffb85fd5ccfb1dc5152653698c29a0ac86577 SHA512 5b55f644a53efe93a6bb80ca534207c7a847a7c21df127d17ba6f09e2c2d8c665d87e6355382d2d51c3c9f50741fa9a31f5bfd228d9bb45ba8d5d099b7b5d026
-EBUILD daemons-1.3.1.ebuild 815 BLAKE2B 3498d3d79c05cd822dbcbc21451c87a3ac6ab3d55624caca7aeddb8de56e3f6f0ad003c6eb9dd53e433e1502774ced592c8e4ff71b91dfdfa0bfaedcf9725f3e SHA512 e1de60088d4e7f399aa55b6ee3f53197e3937743e04dd3178fe6bfdb3315a1736b73c0823b6c435f0a5185d450780d2a4de40c90196021515799367b56a0bc66
-EBUILD daemons-1.4.0.ebuild 894 BLAKE2B 08ffca8128f192789526d7f8772ee159b31710f4e6e9cfed5867b6d4a124b830bacf98e90c72df3dc213748959969dd2e845ee05931b2c9e144fc07cb740a9dd SHA512 c06410bc02a5d2b88b70b4e108bff13dba5bb79f36a2a81b299c9a78e2f39dbe4e94fb22820b7e1613d9fcb51e75dc326c53b18aed3594687f59cde050483f38
 EBUILD daemons-1.4.1.ebuild 889 BLAKE2B edd3eafb6baa2f2ee0671e7f5d658c4744c0b0207302f8ef0200ef3c82f6d65cc29d16cd14845f4f4ee0d9650becf1662c09bfe330c578a6a0ae5281fb56352d SHA512 931464028defa7dedc5fdad1c1d1987dae5f9f0251d1d6e14d94a35df7148ec0c52de63d7aa4cecfcb130c6a99191f10e96b11b1d1f6afc1858def97400b61c3
 MISC metadata.xml 346 BLAKE2B 4080b9b881a57f1949e1cfd6d9a474ad8ed6e5b153888b24aff577b30d8a15beb64e688b372dffecf1295d1093c6bdecf1832993b438b7a7f9650de81a8f56f8 SHA512 92d1e03932da5ad62e191cd675a64be9e6dfe0d64e36efeac88ffa7c711b23c978661459bdda312afe546706112ec8271d962875ef35b816dbed42d1269dae7d
diff --git a/dev-ruby/daemons/daemons-1.3.1.ebuild b/dev-ruby/daemons/daemons-1.3.1.ebuild
deleted file mode 100644
index 2232851699f9..000000000000
--- a/dev-ruby/daemons/daemons-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.4.0.ebuild b/dev-ruby/daemons/daemons-1.4.0.ebuild
deleted file mode 100644
index 4e4ee879decc..000000000000
--- a/dev-ruby/daemons/daemons-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="daemons.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 15c4fa96908a..642ee439801e 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,3 @@
-DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
-EBUILD multi_json-1.14.1.ebuild 1957 BLAKE2B ca00098daf555e2ea8cd6096cf3d7b55b59130e52193abc53b794e04117b6d37daa47a482a958c42d752cb957664488519cb08555c6c8c70574402d0e7dfe0ad SHA512 007407b9978ed0dbf794698217b037c72c336082aa08b031dd7d03566e26ef6a2af63f4549c71672cdb72ed9d0d1626c20bf56309a9b26e0fd86582c19eb06a1
 EBUILD multi_json-1.15.0.ebuild 2498 BLAKE2B 0f9bf12072db5a695c353a1eaa73e8e39f93375fe349154f94ecf8e42949c52417d7245f7987777f4dccf55fcb4aea3f663dc6ae05b3ec30b0de0222bd661507 SHA512 afba65ab3a916ecb7020d20d22bc64d062a81faee6cf055a6627aaebb589a15f70930ada55ce4720ba22c6b45adbe08a65128f5b8e8660f8ff7224e01cdce674
 MISC metadata.xml 346 BLAKE2B 5ac783be1157fb3847a6fd648f66d421de79a35d5bdbd155455c9791093af408a6b0fca4d4435b95d83d3fb773c835673fa284bba94d29612c5af0c8148172bc SHA512 aa03ee50a365f31b48b294cc667208944ace3f89965feab02ef9e75a90d621086635ce732adc1e2beaf96cfb67c7084fc7bba1c45df139583a6ab705adc7c170
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
deleted file mode 100644
index 797521a074c1..000000000000
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="https://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/json
-	dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove specs specific to oj since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
-		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
-		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
-		-e '/using one-shot parser/,/^  end/ s:^:#:' \
-		-e '/jrjackson/askip "unpackaged"' \
-		spec/multi_json_spec.rb
-
-	# Avoid simplecov which only works with ruby 1.9
-	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
-
-	# Remove unpackaged and for our purposes unneeded coveralls
-	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
-
-	# Avoid testing unpackaged adapters
-	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
-}
-
-each_ruby_test() {
-	for t in spec/*_spec.rb; do
-		${RUBY} -S rspec-3 ${t} || die
-	done
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index aa6be0228d3a..fa2b11b81d3e 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index b95b77c12c07..3c11480fed4f 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -3,8 +3,10 @@ DIST tucnak-4.34.tar.gz 3596477 BLAKE2B 530b1e18167e7704b1596dc606f9c352fa761c6e
 DIST tucnak-4.36.tar.gz 3601081 BLAKE2B 76dfb5a319309203ef452e1e4faff5c47208b5c7f66fb63d9dbf45a6a3a63b35f788d0a05931db44965be6593c5eca1a26c23dcc50e79fd9a70446083f2644b1 SHA512 dee0c6b60ccd66b81257dbc04ead8b9a7df1a77a6c5a73503bcdf8012b8a59318ad8e96ba5a25d6e38ac995312acac23fdf62c5d6d2ad036bc029a691c1a350d
 DIST tucnak-4.37.tar.gz 3603639 BLAKE2B d7ddfc5aae62c4c9745777249940399c4d2945c37814f84785edb69ef266234da1ff91c60ea29c36ff22def727b9b0ae2fb940c5f7284c47e5971fd88e24c909 SHA512 7273da2cfdfa2e99cc7c1873a38ecf4da0efed7e79c75de6b38d502db732fdee62aef40112cea134a7b1551b72b7ed16ab437979b00a0fc02478ced8f3cecf07
 DIST tucnak-4.39.tar.gz 3603142 BLAKE2B 21d7e90f7e84628550e8db8bf270fcc31df2d09490ece7625b34c06c01c7672c841b08e8146754af470c1fc26d612ebefb3cf30dec4a32458cbfc173e6ffc9db SHA512 950d2014579287f3e9a0ea34e2e25ae169170ba8469a48eb2b49b38bf6d5e7246fa6a01f43531d8faa5f3577bbf62181eaa5eb6f11c244e309ee6e8ce2c16c66
+DIST tucnak-4.40.tar.gz 3603819 BLAKE2B 968fe3dca29989b3fac5a00a9ba5670778bb8379c08ff86af7449f1ccb498b70cc652368e57157d15a1b6ffcbcef07ad31909552b1f755376656cbc228e5c5c6 SHA512 9e709f18dd530b963a7868ded16e6f310b904a7c8d2cf8a1455377ce0a97db86da0199ed65da1e2409fe197ae55329885de87c0b1376d6967f853983810cf636
 EBUILD tucnak-4.34.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
 EBUILD tucnak-4.36.ebuild 1959 BLAKE2B a7928ea7a30bedf9441e446ef60fcf4bcc93bba2eafba11c12d5d87dd315ab304b8b04c4129a0e48afc7b766b21114dd19f3a14a3f4c62d660340b9dac6c8218 SHA512 98d2528e8e512f556b50ee327d7087cbf0631a1bef683e704d46adea872aca87ddfa62054d32b46053aee1657cfa6a16d2ebba762803222fb18aa6600323a882
 EBUILD tucnak-4.37.ebuild 2039 BLAKE2B 4b1c1c21a9518fa21806bebbe6425ae8f817d9b145693ccc67fe612d7300c60617e10641b765338cdcb59c6a0d0db833679e4c8b3270b6e08018bc2274491f13 SHA512 e67070bdd3e0e23812be9a9d999da124ff685a0e72573e8ac7cfcd8bc748ba79ef7e8a56e43bbb19ea0c48ccec7f955352b9af494085780028995aedffe3a94a
 EBUILD tucnak-4.39.ebuild 1960 BLAKE2B 2dbb2c6df165a35703ac96e1bfb1ea8296bde955eedbb3580ad4116ef2c6ce1eceb28011c0ff9376898ff9b5ecd141ee9f1cbaf63c7ab99edf4503cc676d0c94 SHA512 470a8a321ad763f74c502b5bc63ac019dd3cf29fa15c43a04dc452131ffb93b86aac97f2f27ea987414fed776430d97ad2cac8a6e15068ce8dad74027065c569
+EBUILD tucnak-4.40.ebuild 1962 BLAKE2B e53545570bfe3d2a0403e0d68ad3772601a2c7dfdae4215392b8ae9f6f15c1adcf2a23ec1becf055987b48a74fdb5c69a11bcf996b020e12e9ada4b1edc3aa81 SHA512 005b02cfac0f57efdae3e8708a2a7084b66fb904313ca96d11679daf5267bcf30a3cbc921a49fc91ff9f71b8348c56e04bdd5e1aaed39fff2d8045e375ead141
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.40.ebuild b/media-radio/tucnak/tucnak-4.40.ebuild
new file mode 100644
index 000000000000..fb72faab87b0
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.40.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	~dev-libs/libzia-4.40
+	media-libs/libsndfile
+	media-libs/libsdl2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 037f6e854ea2..9ee120304e1b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 51a9f691f028..a5a0c2e30439 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,6 +1,5 @@
 AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
 EBUILD clementine-1.4.0_rc2-r2.ebuild 4558 BLAKE2B dcf276a521bbca66abb1179753a8e3c7cf5cf23042a33554991340dc83c49c152a7a921fd51bbfaf2f95813b9b4349872f1362066afb0265597e4467079b08b1 SHA512 0b79cc40fec158d484f1a7dffcdc269d0fcc600359f5db03cf24c2025c393071c9bf89a96db255f1571d5ab7409b78fdaed7c65b44d29b96288ff26293cbe9ed
-EBUILD clementine-1.4.0_rc2.ebuild 4558 BLAKE2B 223403e458f81593ae949508af89828f82d6938b04d42a29caebce70f899f1bb80d5c1d1e64f8f379ce5ea1d9deabb09d534aa1585179544c67862da754bbb6f SHA512 c8550c75dffddf2c617a1f3104641947abb31e7935fd6225d87a81b28af3d8d7a6ec0e6db6e2d7ee81835251d573635c9dcfc9d5271b8229d06af43fdf631e60
 EBUILD clementine-9999.ebuild 4422 BLAKE2B 95c1bec54317bbca03bcaee92720914572a398b700ebbd4a5441bda188487a8dd1749d243debe85ef1937850b85f4ad28f56142f9fae1042371c14291c8920fa SHA512 95fa79701f74cd11bc513cfef5b3ab27f774ae445d95486a91b55d5984b459659f917d7854bc5aa41809b8d2db3f628116b9696dbc87aae785d3cbc86720a933
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc2.ebuild b/media-sound/clementine/clementine-1.4.0_rc2.ebuild
deleted file mode 100644
index 6ef24287a093..000000000000
--- a/media-sound/clementine/clementine-1.4.0_rc2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake flag-o-matic plocale virtualx xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/Clementine-${PV/_}"
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/crypto++:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0= )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-3.1.12:0=
-		virtual/opengl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxml2
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	virtual/glu
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-
-DOCS=( Changelog README.md )
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx cmake_build clementine_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-	elog "depending on your preferences"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 7c86f526b4b5..f5d14f3c71c7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dfc58d0dbd0c..029a57732ba0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 29 Jan 2023 14:09:55 +0000
+Sun, 29 Jan 2023 20:09:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0a80d0b3532e..17f2c83829e1 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-29T14:09:58Z
+TIMESTAMP 2023-01-29T20:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPWfjZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPW0phfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCCYg/+PFIlusfvy8iOYnFc0oZDQylbKQYqye9CLAZRy9d/PGXUPt1CklMpRexu
-froyN/q0oZtJCVYQIlU/S7EdzkfxMyr48JDFe/HNIuBb5AgIITzersYFh/Wm9VXb
-tJKkp4pCM6K58OGThCQ2Q1/wwr2thAXUdBGXwnLi2tk1y4ZWz8HmpgpD1RPIPpT7
-l/wqmVt58xwqvEd2NOCdYckdelfv/vs9dibRLlf0aGcc/jmq2A81K3+8aZIEt0/f
-W0lpYM0gTOfkoEFW5eYxPqiz3f8Ark0L3I8TsDlYHqMYlZHqmnz+BDXgulcvKwON
-MmOnDtRGnI7klvR+X+ERwlqKCG2SvAIBASzni5BzwRGFaK5K8RW7vwJNkC/nnIu4
-DyCyTbyqxEVDFjLA/GZOWfMMsBBisNwEu6Mw4h+b2z9qY5+PTAuw8sXBeJBgUGec
-7U9qdPPKFOdJr0Ezgn+oKJ5063arm5ETVJI2c+uDf6UBn3koDXBu9yxnKndZbIgm
-qJp6g+QlrUjGr/WU5KROQnd3e2FYfte7SgNfaTCS4anU1WvwEHuGkZKZ8ESSVfjK
-1dMbnQkJb8Kb30bg4wxJJ1+5TdHjLrBvfPEhJGWBcWIXRbiLgJBK5xCiIfW9q6X1
-SvtJnPBu3Cx6BJzkUih9QNNBF1q8ovvtLQgcuao5yC7UcauQTag=
-=aQnh
+klAJYhAApZjPBH6KhGYxWSMHaXYkJ7oD/ceTy0+OPQW46cBrxk8RMHopdB/YvdNd
+6x6XKsfwFHQFDhFGOb7WqnXTVoWFeplwWf13zl4latc63gWN2BS/AYPhmP7DzJ2U
+G1K5R0Qucxql84ZBD4WSaoGGaQSucjsLvlkaAG10uHiD7+OgNXIxmxZtoU8c+F27
+fvAgkw1/MIM8LTjV9zTX6M5UgwNwI5MuZyWgGel1w1uX7yu0+/zr8N8+PYq1KC9Q
+E8X/bCZx26ezpm7sw9IOyBpxsEAnO6x/cuQKiAhDNqBR4SJ5sj1ZVzkfgfHUBR2z
+b5J5WmRfgQHct+WtFcvw1zZXPXrqKQ0n+QHj2kmV3zvhGVWenRfJ543qBIvjrAP7
+AUR0Ji8vWNzgfcKkQRnO0ED9Mw1nwS9BMzPsWQ/J/lMVYVum6g0rQXo5KbnBzAtt
+KAlpbSXwgj32Q1GRPq2/Yq6t7mJsfnXiEoWsAr63Ts5ZaMJ+BxieFBCegXA5Qw54
+0vl9BZtdz8BFTTXHejvk7I5u7qqh98n6BlnUtegnFovFcAzRcdr2u4co034U1v9K
+CxRdhIVTZh0z4cqkQaso5u9j8EoBLBJm/fI9LeolyEnKR+qYb3b8zkoPlYVjiInX
+4EzTM8h+D/dbugPRRA3SdSETTeSpqPo31pp+9VMMLqkyl5m2mos=
+=/JOO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dfc58d0dbd0c..ae3d5a0850eb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 29 Jan 2023 14:09:55 +0000
+Sun, 29 Jan 2023 20:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8fc3da4552b6..5c943ef18bbe 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index b4bc24e2effe..a408e0b11638 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/containerd-1.6.16 b/metadata/md5-cache/app-containers/containerd-1.6.16
new file mode 100644
index 000000000000..58b1dc3a4278
--- /dev/null
+++ b/metadata/md5-cache/app-containers/containerd-1.6.16
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=8
+HOMEPAGE=https://containerd.io/
+INHERIT=go-module systemd
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-containers/runc-1.1.4
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.6.16.tar.gz -> containerd-1.6.16.tar.gz
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=73f7b58f5f2e1b23ab5258fcf5075480
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 87f7915c30f7..6fcbe65ece99 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eix-0.36.6 b/metadata/md5-cache/app-portage/eix-0.36.6
new file mode 100644
index 000000000000..1866105e62b2
--- /dev/null
+++ b/metadata/md5-cache/app-portage/eix-0.36.6
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
+DESCRIPTION=Search and query ebuilds
+EAPI=8
+HOMEPAGE=https://github.com/vaeth/eix/
+INHERIT=autotools bash-completion-r1 tmpfiles
+IUSE=debug doc nls sqlite
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.36.6/eix-0.36.6.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d7693533ca4300c1a8c8ea1af107c4c5
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-31 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-31
deleted file mode 100644
index 97594ae1c071..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-31
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v31.tar.gz -> mgorny-dev-scripts-31.tar.gz
-_md5_=a04b75632e172746fe4fd620e60c098d
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-32 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-32
deleted file mode 100644
index 88c5be4d8182..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-32
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v32.tar.gz -> mgorny-dev-scripts-32.tar.gz
-_md5_=72b7ec5a83d2547d1cb405290b5e1201
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-33 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-33
deleted file mode 100644
index e384b96d2db2..000000000000
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-33
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handy scripts for ebuild development and more
-EAPI=8
-HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
-SLOT=0
-SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v33.tar.gz -> mgorny-dev-scripts-33.tar.gz
-_md5_=72b7ec5a83d2547d1cb405290b5e1201
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-34 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
index dcc0f238b66a..dfbb105f02bf 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
 HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
 SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v34.tar.gz -> mgorny-dev-scripts-34.tar.gz
-_md5_=72b7ec5a83d2547d1cb405290b5e1201
+_md5_=9563b43b92eaffad2e0c1dd873627c00
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 88f9126c7a49..b4863e422d30 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.21 b/metadata/md5-cache/app-text/xapian-omega-1.4.21
index 2a494f025a53..fefa6e791fdb 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.21
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.21
@@ -3,9 +3,9 @@ DEPEND=~dev-libs/xapian-1.4.21:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=8
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=~dev-libs/xapian-1.4.21:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.21/xapian-omega-1.4.21.tar.xz
-_md5_=819bb3447644d3959866bcc0279197fe
+_md5_=072d783776ee16ee495a6cd567d07347
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index cf5e70da44ef..88adfd57a3bd 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libzia-4.40 b/metadata/md5-cache/dev-libs/libzia-4.40
new file mode 100644
index 000000000000..99e72aad6267
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.40
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl2 media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+DESCRIPTION=Platform abstraction code for tucnak package
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl2 media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 ) elibc_musl? ( sys-libs/libunwind )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.40.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e3531943779ba95a3a4fe3e821a98a2e
diff --git a/metadata/md5-cache/dev-libs/qxlsx-1.4.4 b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
index fef5b7aef20c..df145bf26c4b 100644
--- a/metadata/md5-cache/dev-libs/qxlsx-1.4.4
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/QtExcel/QXlsx
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=amd64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/0.1.4.4
 SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.4.tar.gz -> qxlsx-1.4.4.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ac288f93002ee2db103cf762b9a3ec88
+_md5_=8522f3f3e6a85a62a2c7c983d237e234
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.21 b/metadata/md5-cache/dev-libs/xapian-1.4.21
index 6d05a56ce764..eeb60788634b 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.21
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.21
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://xapian.org/
 INHERIT=multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=cc55a732c5e54e85a46116706fff29c6
+_md5_=78dc4d03b7a201c0747bc4d5cc3acb66
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
index bc5008ee7e6d..8431b51178ad 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.xapian.org/
 INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-4 php_targets_php8-0 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.21 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-bindings-1.4.21.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	dc84cf08bcde05a1e04a95194d5a19c1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ca417fcf5e6bfc5185b03ce6b9d46f48
+_md5_=b3ab1e83509c91db8c77eb6404e99bf1
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 7f90bdf50fe4..4eb4a8127ac3 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
deleted file mode 100644
index 490ab0273f6f..000000000000
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
-EAPI=6
-HOMEPAGE=https://github.com/thuehlinger/daemons
-INHERIT=ruby-fakegem
-IUSE=examples ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9fdc7239f69e4108f1a153f607c9645b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.0 b/metadata/md5-cache/dev-ruby/daemons-1.4.0
deleted file mode 100644
index 80f6456c278e..000000000000
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
-EAPI=7
-HOMEPAGE=https://github.com/thuehlinger/daemons
-INHERIT=ruby-fakegem
-IUSE=examples ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.0.tar.gz -> daemons-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7d3f9a57569fe967ee35d4ec8363ba18
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.14.1 b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
deleted file mode 100644
index 57dbba5a25f9..000000000000
--- a/metadata/md5-cache/dev-ruby/multi_json-1.14.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/yajl-ruby[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=7
-HOMEPAGE=https://github.com/intridea/multi_json
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intridea/multi_json/archive/v1.14.1.tar.gz -> multi_json-1.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7d69b69aa313fe02b40f7eb04b921a3d
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index aa91e2e2d3e1..5f44085cbecc 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/tucnak-4.40 b/metadata/md5-cache/media-radio/tucnak-4.40
new file mode 100644
index 000000000000..aff2c69839b7
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.40
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 ~dev-libs/libzia-4.40 media-libs/libsndfile media-libs/libsdl2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 ~dev-libs/libzia-4.40 media-libs/libsndfile media-libs/libsdl2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.40.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a5aeb6820b86198f86e134046ac6db2d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f6dd03e153e2..10dfefc13274 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/clementine-1.4.0_rc2 b/metadata/md5-cache/media-sound/clementine-1.4.0_rc2
deleted file mode 100644
index 9fb03ce279e8..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.4.0_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-cpp/gtest-1.8.0 dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib x11-libs/libX11 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0= ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) dev-libs/boost dev-libs/libxml2 dev-qt/qtopengl:5 dev-qt/qtxml:5 virtual/glu box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash )
-DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
-EAPI=8
-HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic plocale virtualx xdg
-IUSE=alsa box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-libs/crypto++:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib x11-libs/libX11 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0= ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/refs/tags/1.4.0rc2.tar.gz -> clementine-1.4.0_rc2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=266839e54ef5c1b5f834fbe11653505c
diff --git a/metadata/md5-cache/net-nds/389-ds-base-2.1.0-r2 b/metadata/md5-cache/net-nds/389-ds-base-2.1.0-r3
index 590113a9fac2..a8bae644674d 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-2.1.0-r2
+++ b/metadata/md5-cache/net-nds/389-ds-base-2.1.0-r3
@@ -1,6 +1,6 @@
-BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/argparse-manpage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/argparse-manpage[python_targets_python3_10(-)] ) doc? ( app-doc/doxygen ) test? ( dev-util/cmocka ) test? ( >=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= net-nds/openldap:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:= !net-nds/389-ds-base:1.4 acct-user/dirsrv acct-group/dirsrv python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/python-ldap[sasl,python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/python-ldap[sasl,python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] ) virtual/perl-Archive-Tar virtual/perl-DB_File virtual/perl-IO virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Time-Local virtual/logger selinux? ( sec-policy/selinux-dirsrv ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) virtual/pkgconfig >=virtual/rust-1.53
+BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/argparse-manpage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/argparse-manpage[python_targets_python3_10(-)] ) doc? ( app-doc/doxygen ) test? ( dev-util/cmocka ) test? ( >=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= <net-nds/openldap-2.6:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:= !net-nds/389-ds-base:1.4 acct-user/dirsrv acct-group/dirsrv python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/python-ldap[sasl,python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/python-ldap[sasl,python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] ) virtual/perl-Archive-Tar virtual/perl-DB_File virtual/perl-IO virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Time-Local virtual/logger selinux? ( sec-policy/selinux-dirsrv ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) virtual/pkgconfig >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= net-nds/openldap:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:=
+DEPEND=>=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= <net-nds/openldap-2.6:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:=
 DESCRIPTION=389 Directory Server (core libraries and daemons)
 EAPI=8
 HOMEPAGE=https://directory.fedoraproject.org/
@@ -8,10 +8,10 @@ INHERIT=autotools distutils-r1 systemd tmpfiles cargo
 IUSE=+accountpolicy +bitwise +dna +pam-passthru +autobind auto-dn-suffix debug doc +ldapi selinux systemd test python_single_target_python3_9 python_single_target_python3_10 debug
 KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-3+ Apache-2.0 BSD MIT MPL-2.0
-RDEPEND=>=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= net-nds/openldap:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:= !net-nds/389-ds-base:1.4 acct-user/dirsrv acct-group/dirsrv python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/python-ldap[sasl,python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/python-ldap[sasl,python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] ) virtual/perl-Archive-Tar virtual/perl-DB_File virtual/perl-IO virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Time-Local virtual/logger selinux? ( sec-policy/selinux-dirsrv ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) virtual/tmpfiles
+RDEPEND=>=app-crypt/mit-krb5-1.7-r100[openldap] dev-db/lmdb:= >=dev-libs/cyrus-sasl-2.1.19:2[kerberos] >=dev-libs/icu-60.2:= dev-libs/nspr >=dev-libs/nss-3.22[utils] dev-libs/libevent:= dev-libs/libpcre:3 dev-libs/openssl:0= >=net-analyzer/net-snmp-5.1.2:= <net-nds/openldap-2.6:=[sasl] sys-libs/cracklib sys-libs/db:5.3 sys-fs/e2fsprogs pam-passthru? ( sys-libs/pam ) selinux? ( python_single_target_python3_9? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) systemd? ( >=sys-apps/systemd-244 ) virtual/libcrypt:= !net-nds/389-ds-base:1.4 acct-user/dirsrv acct-group/dirsrv python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/python-ldap[sasl,python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/python-ldap[sasl,python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] ) virtual/perl-Archive-Tar virtual/perl-DB_File virtual/perl-IO virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Time-Local virtual/logger selinux? ( sec-policy/selinux-dirsrv ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=2.1/0
 SRC_URI=https://github.com/389ds/389-ds-base/archive/refs/tags/389-ds-base-2.1.0.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/concread/0.2.21/download -> concread-0.2.21.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.6/download -> crossbeam-epoch-0.9.6.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.3/download -> crossbeam-queue-0.3.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.6/download -> crossbeam-utils-0.8.6.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fernet/0.1.4/download -> fernet-0.1.4.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.4/download -> getrandom-0.2.4.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.113/download -> libc-0.2.113.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.13/download -> log-0.4.13.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/lru/0.7.2/download -> lru-0.7.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/openssl/0.10.38/download -> openssl-0.10.38.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quote/1.0.15/download -> quote-1.0.15.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.119/download -> serde-1.0.119.crate https://crates.io/api/v1/crates/serde/1.0.135/download -> serde-1.0.135.crate https://crates.io/api/v1/crates/serde_derive/1.0.119/download -> serde_derive-1.0.119.crate https://crates.io/api/v1/crates/serde_derive/1.0.135/download -> serde_derive-1.0.135.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/serde_json/1.0.78/download -> serde_json-1.0.78.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.58/download -> syn-1.0.58.crate https://crates.io/api/v1/crates/syn/1.0.86/download -> syn-1.0.86.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tokio/1.15.0/download -> tokio-1.15.0.crate https://crates.io/api/v1/crates/tokio-macros/1.7.0/download -> tokio-macros-1.7.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zeroize/1.5.0/download -> zeroize-1.5.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.3.1/download -> zeroize_derive-1.3.1.crate
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	dcd5f48510105eb95e550ab968147365	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3838727890223afa6a2d002382d75868
+_md5_=ea3d7d9ceee85e7859ecd6ad4e9ec48d
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 29f10f1157e8..1dabf83ce090 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 22f2c2fff5c3..93247251e66d 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.22 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.22
index aa804ff9cda6..581a9ca09a96 100644
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.22
+++ b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.22
@@ -3,9 +3,9 @@ DEPEND=net-print/cups
 DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
 EAPI=8
 HOMEPAGE=https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ppc64
 LICENSE=GPL-2
 RDEPEND=net-print/cups
 SLOT=0
 SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/13/96/55/c6fced63098ae1ba104f11f572794fd558ffca29/epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz
-_md5_=f9a90fb66b38790bbb002226826c2bec
+_md5_=28a21144ba560680d546dc87ee09b6ea
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index f0d8ad1354f7..caa712f1e88a 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1 b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
index 613e631323a7..b24b44aac367 100644
--- a/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
+++ b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/10110111/CalcMySky
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=amd64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/14
 SRC_URI=https://github.com/10110111/CalcMySky/archive/refs/tags/v0.2.1.tar.gz -> calcmysky-0.2.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2f969f295a5f98d02edaf6f8d2d8a385
+_md5_=40bef3fdfbc42c89d1890168235fddb0
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-1.2 b/metadata/md5-cache/sci-astronomy/stellarium-1.2
index fb4ac83819ce..3515c20dd6cd 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-1.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-1.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://stellarium.org/ https://github.com/Stellarium/stellarium
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx
 IUSE=debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx verify-sig test
-KEYWORDS=amd64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ SGI-B-2.0
 RDEPEND=media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sci-astronomy/calcmysky:=[qt5] gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 ) media? ( dev-qt/qtmultimedia:5[widgets] dev-qt/qtopengl:5 ) scripting? ( dev-qt/qtscript:5 ) telescope? ( dev-qt/qtserialport:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( dev-qt/qtbase:6=[gui,network,widgets] dev-qt/qtcharts:6 sci-astronomy/calcmysky:=[qt6] gps? ( dev-qt/qtpositioning:6 dev-qt/qtserialport:6 ) media? ( dev-qt/qtmultimedia:6[gstreamer] ) scripting? ( dev-qt/qtdeclarative:6 ) telescope? ( dev-qt/qtserialport:6 ) webengine? ( dev-qt/qtwebengine:6[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt6] ) ) telescope? ( sci-libs/indilib:= )
 REQUIRED_USE=|| ( !media !qt6 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium-1.2.tar.xz verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium-1.2.tar.xz.asc ) deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.18/catalog-3.18.dat -> stellarium-dso-catalog-3.18.dat verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.18/catalog-3.18.dat.asc -> stellarium-dso-catalog-3.18.dat.asc ) ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium_user_guide-1.2-1.pdf verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium_user_guide-1.2-1.pdf.asc ) ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=99b97832bd161b3958a0be0ae8e86ed9
+_md5_=c963bd606da27cf9e87c1ee1250dcbd9
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d7f4e62842ed..d59001a13bf2 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0
new file mode 100644
index 000000000000..6abae13a9e3a
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) gui? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/expat sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttranslations:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+DESCRIPTION=GPS waypoints, tracks and routes converter
+EAPI=8
+HOMEPAGE=https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop xdg
+IUSE=doc gui
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttranslations:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+SLOT=0
+SRC_URI=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_8_0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b3553fa139048222517391f11361fd9d
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a40560c1e36e..1288b12dd52e 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.21.0-r1 b/metadata/md5-cache/sci-libs/cartopy-0.21.0-r1
deleted file mode 100644
index a48ca4e02608..000000000000
--- a/metadata/md5-cache/sci-libs/cartopy-0.21.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)] dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm_git_archive[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/filelock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/flufl-lock[python_targets_python3_9(-)] dev-python/pytest-mpl[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] dev-python/pytest-mpl[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] )
-DESCRIPTION=Python package for geospatial data processing and analysis
-EAPI=8
-HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 multiprocessing virtualx
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SciTools/cartopy/archive/v0.21.0.tar.gz -> cartopy-0.21.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=64de0bfbbd6668e8a55757a7dd257df2
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.21.1 b/metadata/md5-cache/sci-libs/cartopy-0.21.1
index c1272a575fae..3fb53bea1e92 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.21.1
+++ b/metadata/md5-cache/sci-libs/cartopy-0.21.1
@@ -1,10 +1,10 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/setuptools_scm_git_archive[python_targets_python3_9(-)] dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm_git_archive[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/filelock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/flufl-lock[python_targets_python3_9(-)] dev-python/pytest-mpl[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] dev-python/pytest-mpl[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=python_single_target_python3_9? ( dev-python/setuptools_scm[python_targets_python3_9(-)] dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) test? ( python_single_target_python3_9? ( dev-python/filelock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/flufl-lock[python_targets_python3_9(-)] dev-python/pytest-mpl[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] dev-python/pytest-mpl[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) sci-libs/gdal[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-libs/geos python_single_target_python3_9? ( >=dev-python/numpy-1.19[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] dev-python/pillow[jpeg,python_targets_python3_9(-)] dev-python/pyproj[python_targets_python3_9(-)] sci-libs/pyshp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] )
 DESCRIPTION=Python package for geospatial data processing and analysis
 EAPI=8
 HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 multiprocessing virtualx
+INHERIT=distutils-r1 multibuild multiprocessing virtualx
 IUSE=test test python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.21.1.tar.gz -> cartopy-0.21.1.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=64de0bfbbd6668e8a55757a7dd257df2
+_md5_=916e4aaf290cad44a903f0479a70807b
diff --git a/metadata/md5-cache/sci-libs/cfitsio-4.2.0 b/metadata/md5-cache/sci-libs/cfitsio-4.2.0
new file mode 100644
index 000000000000..cc5e979b163b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cfitsio-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/fortran
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <dev-lang/cfortran-20110621 virtual/fortran
+DESCRIPTION=C and Fortran library for manipulating FITS files
+EAPI=8
+HOMEPAGE=https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
+INHERIT=fortran-2 multilib-minimal
+IUSE=bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
+LICENSE=ISC
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/fortran
+SLOT=0/10
+SRC_URI=https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.2.0.tar.gz
+_eclasses_=fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=72c9f1106839eb8f736edf2f20e56601
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 01e1cac44ef0..568c213edb31 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-stellarium-20221229 b/metadata/md5-cache/sec-keys/openpgp-keys-stellarium-20221229
index 57401c3d2de6..d20bfc6d9f10 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-stellarium-20221229
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-stellarium-20221229
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used to sign Stellarium releases
 EAPI=8
 HOMEPAGE=https://stellarium.org/ https://github.com/Stellarium/stellarium
-KEYWORDS=amd64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=public-domain
 SLOT=0
-_md5_=9d987afbfa01d54e88bdaf745f04d9b7
+_md5_=eb36dc6eb3311cf356bcd17dc5f07124
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2ca51b74c8d5..22b1782d35f1 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208
index 0ed68de0b614..8b93b843bc1a 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221208/gcc-10-20221208.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	a3f2872c51c83c5d69bf62fdcaff3e9f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f2e507481e3ad1e677f4a3daa5534ff9
+_md5_=af7e8f26a2b7a1add08fb6c540acb79b
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209
index 0883aaa01020..96931aed69aa 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221209/gcc-11-20221209.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	a3f2872c51c83c5d69bf62fdcaff3e9f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b35d674fbf58ff0a2fdff26a6078f94c
+_md5_=801305ad3b6a360d1803e39dad11cf87
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 62b544009f42..c8f5cbad9b2a 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15.0.7[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15.0.7[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15.0.7[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/llvm:15 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15.0.7[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15.0.7[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15.0.7[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	304114cdcc1dd576fac14de2325c4305	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6f5e06edf3030a60715193695e154c4
+_md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index b8ae28bcf255..1e0316e38c7f 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,4 +13,4 @@ RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	304114cdcc1dd576fac14de2325c4305	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7744ae2186e7c6f396414554e314e1c
+_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
index a53147158102..a437283ae736 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230107
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20230107[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-16.0.0_pre20230107[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	304114cdcc1dd576fac14de2325c4305	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7744ae2186e7c6f396414554e314e1c
+_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
index fd35ecd98d19..304998d87b5e 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20230127
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20230127[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-16.0.0_pre20230127[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/archive/46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz -> llvm-project-46d5a57801bc37e5ebb1a4d6b2acc0fa99c01e8d.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	304114cdcc1dd576fac14de2325c4305	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7744ae2186e7c6f396414554e314e1c
+_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index 7554dc21224a..dee1667c5c51 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-17.0.0.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-17.0.0.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-17.0.0.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-17.0.0.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-17.0.0.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-17.0.0.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-17.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
@@ -13,4 +13,4 @@ RDEPEND=~sys-devel/llvm-17.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	304114cdcc1dd576fac14de2325c4305	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c7744ae2186e7c6f396414554e314e1c
+_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9120bd806ff4..5f830ac0785b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15146 BLAKE2B 3e212ba755c645d36d8e55ec77dc1b7f5d9d033db9a096526c25dd1bf974d0d4dbcc42fd7de3a062bc732f841aa9b3e5140edd5c5e078a9a9a4bb32ef4cbf3a5 SHA512 ffa44fba3f12d905eedf1880dbc86bef62db92ae806d38874b085d6675bf3f1ca82471322f7a907fc918e2b8c60e75023a5e823e39879e6f2d8b6fc0927e3e59
-TIMESTAMP 2023-01-29T14:09:58Z
+TIMESTAMP 2023-01-29T20:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPWfjZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPW0phfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBY5hAAt0E2qdFGKefkIHBLg7zPl3NBaK6SOJPjnrqlBragkTQ5oqejsZ2aMk1u
-jQzhUSsG9vO7LRifp9EvS5WAoWrkFj/OoNPPM+QUoBn1D11s7oPCV/AL0cBNnrDx
-fWW0UKXSvdkdjJ3CXUoVIQpti+y0FsBNV8cZKREckybn5C7tpG6D1qaRHnLlOveq
-XL3UR5oalNvYLF7TtAGD8VfTq87yQfwk578NmTyYNXMSIPBsuwXCBvPkcB6qCs5Z
-S7aX7RFqtU+b4YTMU3YaQupcR0fu4x03DLi3UlSVhBVn3rl+dKOssNkIVctw6cyG
-ssnKTNwjY7o93Hbr6cv/62yv01vHEBRM8kBG80OVhGG+hhgR0JEtMBpA47hJO/Dv
-rxGXhrrZt4rXyKiwemBBhnurdIv1oQ1S3gPj9Fcs5+DkJh9HU3qok8AuCJ6riquw
-2KT3H6xWvajoGK4zpfgAK0cAfy+46BZU66Rl3eCxV+FD/0IKpMrC6+JSn0Va8Iio
-aZeM2kgBzlB+rufrQAPJuzHdOTEkiLiD8hPxt0p8biEmRWd4USkgmllGK1unEFhb
-iJAvaiv6H7+xmWzKCqoR8KtbW/AYnSB+F5mtuT2S10mfH1DqHJfX4D5VqOGNHfBt
-hfZt7a2eaeUCBwWiLaiHsD0r6KUkQWZbVyUTOuX1wHbLOFsjTsE=
-=NuzM
+klBN4A//RIkw0ngRBz701B0iv/OKmOnKbMdeA0IDLToRmC/9TMGJWJsi83HkNsG+
+rn9Z4wIBSld32ArTcoY/OjRjAiKaTBlcN5XRpscwSIJvCDJC5d78SM1SKZtk9va0
+TK02J2Zp7aS9MVFz8IKoPa/AOfQ5l7+cwGhNu0KckAfa+uRAy9cr6D43lGD/3mCQ
+mTsWk9SCFg6VDW6O53XSSFqoGCHbXSzN6cQR4Wm09Quc9uUgrXBWpqEVJdgpF9FR
+jCFDVHq+OSBDNpoVzXmjTN7BvHIRd1KXsg4Ofzvbc05l26V/5BvUjpAG5qTn96St
+VIChF5Dbyy0T7AE6FgtOM9CODLA5QMoD9Gx/3G74jp39GsxpxvecrDOgvLFUV7Ue
+eTDRrv5cfnJf8iu1Dol/xNiS5XYIY25/fh6o+TUho67rNvJ3of/Y51TabEiFQNDn
+TtU5p+pJAW6gonRgCMuQxJfPgsWJz2oMfEjxRBwOJW1rms0kN4EIO81jwH3kcRxe
+QMUisOspB6EdFyDYmpszuKXmX6EA13RM99UzNfvFmegYdb8RXNmqi11TGVZa6Blb
+Hjr4VfLXCRwZGfMBx4NDpN05BwtdU1lWqV3jrcnGQ1fZjbC0iiZKAoTbORzFegEd
+VqlC7FZSq/wT37EXVh1XoWEnSop0TNJhTGFZhaxqWasdgtFGtzw=
+=FF59
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dfc58d0dbd0c..ae3d5a0850eb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 29 Jan 2023 14:09:55 +0000
+Sun, 29 Jan 2023 20:09:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 019b3de424d4..ebf5efc06508 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 29 02:09:55 PM UTC 2023
+Sun Jan 29 08:09:57 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ca64bd2c0c49..db0ead4c7f1e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 29 Jan 2023 14:15:01 +0000
+Sun, 29 Jan 2023 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index bb006e087603..86bccebba83c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4fabe03b92554b7724f098026f0086fb1fbf2923 1674999247 2023-01-29T13:34:07+00:00
+534831a8a15fd0823e73436c765c44fe58128ca3 1675022243 2023-01-29T19:57:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 99a71ca68552..fc6751f386c0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675001401 Sun 29 Jan 2023 02:10:01 PM UTC
+1675023001 Sun 29 Jan 2023 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dfc58d0dbd0c..029a57732ba0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 29 Jan 2023 14:09:55 +0000
+Sun, 29 Jan 2023 20:09:57 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1cb34681c2c0..e29e41b1cfdf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 15a51a1e31f9..607c4d5bba3c 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,4 +1,4 @@
-AUX nagstamon-3.10.1-setup.patch 974 BLAKE2B f74093c6e66129843ba7702602fda6f0b4004c02253405c1e48df0391aca898cafe9a3858c1d5bb4fb739bc80ec227fc05aaff5ee62f56dc104c99f7761b05ba SHA512 e5a65c40c5cda55fb3a118bc39cf8a35efa684cffc657838292c0fdad31bf965395965b6ff5e3b536bad52c28646b6a6f6274bb1e7551bc58c323f4215cc4b1e
+AUX nagstamon-3.10.1-setup.patch 1087 BLAKE2B 3ad38e119cb3ed63a254bf38d2f8375ada4791eed423e1a50bc7ec5057d6d7c8b2fd896a695832aa5ad2c6c7201c83ce86896068947be917319f55f4c491084a SHA512 a07ac0cd7265fb85158d994b188797fa92924ac65ef7f6f4f56679516f5c6542c7b67488e8514db56bea9d69a50f1b09e8110809379ea664f4ddc645fd3517b2
 AUX nagstamon-3.8-setup.patch 1190 BLAKE2B 39eec86dc7fcd69d0e6ef5c3b986e1e1c3096bed7e9e60eb1b7986bd83b9542805cd78a46813ba8af566243d4890565c5670c4fa41fc209f3e261a61bc5108aa SHA512 172a11999da5aaba979c800278a2524c9f3de269f7c3b2dd994ea0f658d48ab6891723ba1e03296cbdd4f979b2ca84b391a763bf19279f22588b570be677a3c5
 DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
 DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
index 62f6cdbc2a47..28bb98e1b49a 100644
--- a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
+++ b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
@@ -1,8 +1,11 @@
---- a/setup.py	2022-12-11 07:36:25.144000930 +0100
-+++ b/setup.py	2022-12-11 07:37:00.856204252 +0100
-@@ -47,7 +47,7 @@
+--- a/setup.py	2023-01-29 09:29:13.885165525 +0100
++++ b/setup.py	2023-01-29 09:30:32.585630680 +0100
+@@ -45,9 +45,9 @@
+     else:
+         DIST, DIST_VERSION, DIST_NAME = platform.dist()
      NAME = NAME.lower()
- VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+-VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
++VERSION = AppInfo.VERSION.replace('-', '.')
  
 -NAGSTAMON_SCRIPT = 'nagstamon.py'
 +NAGSTAMON_SCRIPT = 'nagstamon'
diff --git a/net-nds/389-ds-base/389-ds-base-2.1.0-r2.ebuild b/net-nds/389-ds-base/389-ds-base-2.1.0-r3.ebuild
index c91511868d60..658d98ccd8a2 100644
--- a/net-nds/389-ds-base/389-ds-base-2.1.0-r2.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-2.1.0-r3.ebuild
@@ -147,7 +147,7 @@ DEPEND="
 	dev-libs/libpcre:3
 	dev-libs/openssl:0=
 	>=net-analyzer/net-snmp-5.1.2:=
-	net-nds/openldap:=[sasl]
+	<net-nds/openldap-2.6:=[sasl]
 	sys-libs/cracklib
 	sys-libs/db:5.3
 	sys-fs/e2fsprogs
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 50678311a1cb..d8cfd8caa133 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -110,5 +110,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zeroize-1.5.0.crate 17017 BLAKE2B a729d12a0a97e59d80dd024fd351c434829dc2819d9c3179c6d0781d5d80dffac10bf431d6e36ed14444680ef6d3328ab1ea6c4077eb2c31cb6f077d3552ccaf SHA512 6b6d1c5f85111f0f83ee02c633effb0bad87bb8b334d3f4e13d8722cf9c4ff252fc15c73de044c33d11ff62cbf3d2b6d33834cf08830e5b9ce9c8c298442a05c
 DIST zeroize_derive-1.3.1.crate 10268 BLAKE2B cfca89267374c562dc89dbddcad9bc889b33a489d2519fce69b74cbf95d7e8a6b29641a660635f77d303a5f785133caad59560e44b4973f2def52b610f364b9e SHA512 070619a664c404610cac48ad4a831e3f449a2b022c5e55c9f0ba3b19ecb0f737445ae5577f7cb9c314661efeb19801488b158961a9db0cf16e636c2df8758503
 EBUILD 389-ds-base-1.4.4.19-r3.ebuild 7020 BLAKE2B 34a7f6017f1a91a05e35c160b28955fa598a15c5f277f30def74ed62cd3e52c543618f6b1b30f4691b52002f1c93389b37af9011e363a084acf7329309a8cc99 SHA512 db5353b8953181837518b03df10b8ba5fbe40a435227f7ee9b9fa8265983cf561c40e6401865964c5ac78ff5bad135a2f7323bfd6192fe304465138a8bbf61c0
-EBUILD 389-ds-base-2.1.0-r2.ebuild 6924 BLAKE2B 76cf870aceeaa55d193062efa77f3468b2880bfa9d0eb0537aa47a71fe9960125a84bc22415ae630f91e841026c55e6106caaaad83d2916b2bc4d780fb11d37b SHA512 72a42f96068f3d90ff87c8752e62a7202f2ac74e7c100738018dba542e62ccd8746cbeee5d97a2ecb10e95caf2ca08921195eff02635f7931cb4a40ce09685ff
+EBUILD 389-ds-base-2.1.0-r3.ebuild 6929 BLAKE2B b97fb6aad22c28c5e1b5b5e297628a5153a64fe082b6e46eba959f30fd286a52cfe2207ea921f05ca0c6f15b109d5f49ab0126e4b5ba0e730a67edf41818ee6d SHA512 5b43872b5e937afba78bf978d7642c59b2b73405bacb2468877d2d31fc95d5908b06fe19870e467e155de2355f27d3c6902c7aebd86f4d6cbf8f245a99723356
 MISC metadata.xml 1582 BLAKE2B b29c4633cc0264cfc762327d8b24f21abed6a0e7b92d093d46826945f500d73898a488003d00a4c1fd2feef469a095ef3fc3d55c710f1c6543fb469e088ce2fd SHA512 6413a53a8494cb491bfdabfb4f097f657f86163e33e60ea0c7c1f02079a44d2e487ab2fd72a15f0e34d66ce840d52f058212b97213e45f50069d333a910dc83f
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 578d27138963..ede8bd01e970 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 1de2447332c5..55e1c7ffbe71 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index fe6ea4538243..cd23ca76e0c0 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -2,6 +2,6 @@ AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475a
 AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d06acd38722f419c09f994253538d88cc9621051ee58b8a9cbe203c35c279c9ef8b5f0f7cd091118a0b2ccf802e09e2996f4e6346e7927f695 SHA512 5cff64797453868d1d0540a22fd72b53d7214d2e9c574cdf635206baf71fc227147babcfe97c73193ca356ad40afa5bb7ea80107576efee138b936e052b9fb2d
 DIST epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz 5376867 BLAKE2B f512ec20af24fe68a1b2eb5061247743682407eed92345286148d9b7e236d1fb785280f366aad8bbc89e2e473f8e93bcb33f735e05319931a1a6eba46886879b SHA512 2e5ffefff8c5431c584658768e130ef3373a0a008aa6a6c5c3d6bec8760a263442a9180455de5dc38e9d3dafeb9a22944e551e9552f9efb6d4cac71205574e49
 DIST epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz 4809140 BLAKE2B f26b5ce71aec624777e23bd76c65da938b47b24300d3a025b9541a3c1f3aedeb061b342e078f5103b6f4b5d1aa4a72b71764c13b65b842e9014d482aff758c99 SHA512 2d8c36debba52721febef07d18390e3ece6cd5f3a500304dfd285dc31ae33b3712934e0eca8cdb0afe644c18b505190d8a35cd5a69d11d0079f027fa35032195
-EBUILD epson-inkjet-printer-escpr-1.7.22.ebuild 885 BLAKE2B b89b3687e4ed8e10295745e366bc19483c0c729767d0a7344b25361265cc910fd3f5c89d5840e2eaf6ed95fc6e0dbc1d82abc0f652fdfd288af0d3485289dd79 SHA512 a9accd2624bdd3d2c7e06b01ce081f96891a38972dcbdc13af9450859efe90a34468b33e86757347ec8165e9fbaada97f829739c1a1650d451ac182a9dd2640f
+EBUILD epson-inkjet-printer-escpr-1.7.22.ebuild 883 BLAKE2B 100ddf1c54751f5b921130aaeee49651038e0f90b01ae6521566b8482d1d5ddfb27012a9b4fa69c7a1a9d5c44a15acff152dc160210b3df1e816f4d6379d72ac SHA512 b48f39f7305509e34268c0769ab4e2989803fe2dc4e62b4884cad8ef2087c7c6efcd9db2886703cf344dda5f2d9eb616b1338fa26d4ddfd91370d98dfc1a0e41
 EBUILD epson-inkjet-printer-escpr-1.7.8.ebuild 912 BLAKE2B 99b606a378b793d109254e2faa1fe6cf54bcf2f02b37c28d67fd0ca87028679e5be870af0d0ff6151013f8312acd440d5fe6392e2238dc8d72f5c650aee77d97 SHA512 7d3060e5274ca7f5c08ebe558222639394ff3f8a8f5a4a3a272bed46c4731e6f6f7a5ab520026bd95e45c7f4325db577a377b72fead10ab5218dfb49a67cdc9a
 MISC metadata.xml 264 BLAKE2B 3b2c0ccd6bcc91f31c816e8e781976b3c65f16c7f3cfb73c96d3f5ab6df6d4d035ef385d821062afb81e917fc98adf7e77e96780c84f56da7f3a263824e0a6d0 SHA512 fb5a26534c5a78f4168ce051280353e57b0a48885f41c7ff992a12a6d8c28582d625f645f3ddc1f271a2a72475bd827c3e0385a319b4f3bdaf095fbf205a9ea7
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.22.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.22.ebuild
index 27fa85916628..8f5598226e07 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.22.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/13/96/55/c6fced63098ae1ba10
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 91e916e51769..8fe90ab63c0b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 9ed88dd6ea08..fa7d8e8f3ca9 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-26)
@@ -13,6 +13,8 @@ net-analyzer/gsad
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-02-13)
 # Requires qtwebengine
 sci-electronics/eagle
+sci-geosciences/gpsbabel
+sci-geosciences/viking
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-09-09)
 # Jupyterlab and friends require net-libs/nodejs
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index a18f9b5eb3a1..7d7da3bae932 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
index 16c41d9401e7..3136f9c0f2e0 100644
--- a/sci-astronomy/calcmysky/Manifest
+++ b/sci-astronomy/calcmysky/Manifest
@@ -1,3 +1,3 @@
 DIST calcmysky-0.2.1.tar.gz 2161314 BLAKE2B b0aa1abc75f59c9c16429749bb8669e49e17e3dc7716bb78f472a9181c7d77a2c82c2f3800529f620604f233f88855908b0b55d824bf259d0912e157b9537faf SHA512 3915b965ee656b259ce7f158dfdd3c9c11a6c3ff907307899ae55e88ad6c1ccfbec8e0a1f784f5232fb0cb2c8300422fa25b8b1d4d11639d3ebb8c76d67059e5
-EBUILD calcmysky-0.2.1.ebuild 1219 BLAKE2B 81f1fecf36ecab1c8c846aa522509086c83f18133f8914b35f97ed02fcf4d65612920f3d2f4895926ae73258de5e27ec0128ab21395fc6e031b423e98d7a5678 SHA512 46b90c3b23422d51ebea0e20a81c0738b2941512a784fe2a5a6002177ac615214641a8780ec2d2a1918f54adb8dd9d3153a749371f61639f37cdc2834cd56244
+EBUILD calcmysky-0.2.1.ebuild 1218 BLAKE2B 7a0c5714b72df827c2b3ce09747c40a7bcffaea0de5a2832906eba62eefc08c6f23edf85904216af5ee6cb7cdb76d768aabe0e8c01ed9a05d1e27810dccada1d SHA512 ad81c221f32fbcc6b829fb5302f11b6307b13aa05e4763a94c58334e0ab8bd90d1ae95a8177167a1ca861965a41e097724aafcf9e03ce31cfbfc88a50773aca6
 MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408
diff --git a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
index c1c4b09136b4..72e612c2c808 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 # subslot is soversion
 SLOT="0/14"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index dd462c4cb0e4..80521ea474a2 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -22,5 +22,5 @@ DIST stellarium_user_guide-1.2-1.pdf 36821463 BLAKE2B f7ddf7bee8f06c323ee3a493a0
 DIST stellarium_user_guide-1.2-1.pdf.asc 313 BLAKE2B 95a3a5c88a3d4ea37c6fa99ac808caf87fd8e2f24ff57119a16b1d849e1da5280cddb42a5fd300d684bb018a8e6f0f5e80e2de9600e6231a1cddda7cdb40e29a SHA512 8c9e087f38a7e006440a91545d911872adc37dcd865ee75287b493c8ecbaffb6d2d1ca628c332d00910903eb35ac04050d360e6f3b16c7151a3bb84d90b1ec72
 EBUILD stellarium-0.22.2.ebuild 4063 BLAKE2B 0f0e2419f3648ca635712181051fea692862e4a8cca9d44c13d5b7e318cef2009b13ffb15b8648d879666b3284a09487a226b2cf4d287730e65e59ca6b6530c6 SHA512 7a9e3a023bd27808c80781dd8374ef9aad29550fb08a2d20181b79a37cf674781378ac04d30f1df7d389065d494ca770762bd5f3727b6d64632a5880bd9602f4
 EBUILD stellarium-1.1.ebuild 4754 BLAKE2B 0770a2dbcfd18f1622cce006d54a5605eddf7ff5df1c9312caa1cdf2825d1ed7118d0658e1e90db0c182b4624df01023d31840899bf8f16c89a0d761ac95f881 SHA512 b50ab9a079175ff95726e1127850cb91f0ee1d9df956a6e1d387042988e19d07e99d340ff47813e57f0188c8b58fb5a5a14f016c37348b1b15f630692d9830a0
-EBUILD stellarium-1.2.ebuild 5738 BLAKE2B 25ae2d81d87c71f91d9ea2df762e1ec2afdfe6f92a30ebc73237ac0faa3391100a1c4e0a93cdc5e2d1ebaa82e4d4067ca57e1e6be48bbd43cc5eced6f8d505a8 SHA512 5f5da290de46f27d2fd757ba5050636e2bf7da8841312c8a52a1781724950f5fdc624153ddca8e6855a8354d5c2c6bd4c3eba3443c558fd8255a6c74627c04a1
+EBUILD stellarium-1.2.ebuild 5737 BLAKE2B 32fe2ac958046177a64232882d2519a933d60be0b1db69a76331112bab197490b4ae853fde80dc0a4707829eaae7dcd824e2d195f6bfe4cf2cebfe2b0f3c3b48 SHA512 e2d3cb171e24768061e332aa82ce63e100e3c58259dbf9dc096342bccf1e35a2ec834bf103d262d66e89c8cf97275154b2761afd11382c5b4ac919f28b8f6c95
 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/stellarium-1.2.ebuild b/sci-astronomy/stellarium/stellarium-1.2.ebuild
index da203a866f11..f1cff9a5b272 100644
--- a/sci-astronomy/stellarium/stellarium-1.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-1.2.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
 IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
 # Qt6 QAudioOutput crashes on startup; qt 6.4.0
 # https://bugreports.qt.io/browse/QTBUG-108221
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index d5d4fe31d41b..1943dac48399 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 356f12170d1a..b11ca55afff9 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -2,6 +2,8 @@ AUX gpsbabel-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754
 AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
+DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
 EBUILD gpsbabel-1.7.0-r1.ebuild 1769 BLAKE2B 9807d1fedb74f998b87b71b9fef86e8e2b32fa3d517aa9ae0935e2ef5813e326039cc1f662c5d6645306f25e0c0e834225489d658e9e94b1ba66ae1e91654c12 SHA512 60a3988906575b57e7992a086f421de995e32849eb1f457c537ba8a17c9de4c6fbb7ac66b64ea1d4443010a5ecbe201bf44f30665765ebadcbde6e2c419fab04
+EBUILD gpsbabel-1.8.0.ebuild 2013 BLAKE2B 0efa67a029126d3446fa5ff0ad62b775a4ff9307375be1c6d4e35d9e1d32370db909aa06d6e24c81dfaec6aad440c421da58a015a4517eaf496ef54862361301 SHA512 dc806399ac54ad6f7a1aec8fdabaa3b12a1f36bd7385feac84d5661b846891fa12be9b44b9e48e636dfb75a11e8a419d2cab9da4a69e30c726553943c318e332
 EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
new file mode 100644
index 000000000000..47952f41dd2f
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake desktop xdg
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+else
+	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc gui"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+"
+# Even with gui disabled, still links with qtcore
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	dev-qt/qtcore:5
+	gui? (
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qttranslations:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=$(usex gui)
+		-DGPSBABEL_EMBED_MAP=$(usex gui)
+		-DGPSBABEL_EMBED_TRANSLATIONS=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+cmake_src_compile() {
+	cmake_build gpsbabel
+	use gui && cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
+}
+
+src_install() {
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	if use gui; then
+		dobin gui/GPSBabelFE/gpsbabelfe
+		insinto /usr/share/${PN}/translations/
+		doins gui/gpsbabel*_*.qm
+		newicon gui/images/appicon.png ${PN}.png
+		domenu gui/gpsbabel.desktop
+	fi
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c7c3669d5cba..69a10efb700c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 475b30e15383..0c998ae1b938 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,5 +1,3 @@
-DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602 SHA512 bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1
-EBUILD cartopy-0.21.0-r1.ebuild 2057 BLAKE2B b7eb4a78d004895f5b94b6be307be9f308df4028adca7021d9420d2963983bda96828d9415f1e6971f9b5d3cc3b6124779ca5be378643578a50b976b11792a55 SHA512 396920226351df57b1d0dcc9cb2eff525e6e9b6ff9c2595d3123105cb2afa0b24255b4ff08c2cff3a820312fbe072dda09d9bf4042c453e560eba5b9811dc827
-EBUILD cartopy-0.21.1.ebuild 2057 BLAKE2B b7eb4a78d004895f5b94b6be307be9f308df4028adca7021d9420d2963983bda96828d9415f1e6971f9b5d3cc3b6124779ca5be378643578a50b976b11792a55 SHA512 396920226351df57b1d0dcc9cb2eff525e6e9b6ff9c2595d3123105cb2afa0b24255b4ff08c2cff3a820312fbe072dda09d9bf4042c453e560eba5b9811dc827
+EBUILD cartopy-0.21.1.ebuild 2056 BLAKE2B 67d0beee114eff3fa353bce278949c2d3bd7e4e9defd44863746e70216f574763950936334c58475fb61cc8839a7f10e886f0ef2ae20d84ecd2adc2761c578d1 SHA512 fa1a5bd64cbc9b8111529e2daa6566e8e92f1c691f2d20d14721fcb82439ff101a2f48c1418ef4df9a367fb7cf137337a4323775038407f0bd1c1d65aea3a249
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
deleted file mode 100644
index e0c53cc8374c..000000000000
--- a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 multiprocessing virtualx
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python package for geospatial data processing and analysis"
-HOMEPAGE="https://scitools.org.uk/cartopy"
-SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/geos
-	$(python_gen_cond_dep '
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		dev-python/shapely[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-		dev-python/pyproj[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/filelock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/flufl-lock[${PYTHON_USEDEP}]
-			dev-python/pytest-mpl[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Require network access, not covered by markers
-	lib/cartopy/tests/mpl/test_crs.py
-	lib/cartopy/tests/mpl/test_gridliner.py
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	# Prepare matplotlib backend for test suite
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-
-	# Drop all tests needing network access
-	virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed"
-}
diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index e0c53cc8374c..380a7c7ba024 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1 multiprocessing virtualx
+inherit distutils-r1 multibuild multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	test? (
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 8ca77194805b..5ea009d90490 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -5,11 +5,15 @@ AUX cfitsio-4.0.0-pkgconfig.patch 560 BLAKE2B ca784b063cddb88ae6665d205dd9190849
 AUX cfitsio-4.0.0-system-zlib.patch 2406 BLAKE2B f17d54f549b4167d51eb073decd4924acad02c4239ea36fea78bd5c71a4f236d7285d669bd12c8e9de38468416e4262005bfd704ab5146353810bfd11c08036c SHA512 3d82bd4852619b1d10eb765f05e3dd03b8cc11dfac6f4eae48062b20b71e715c8eebe7c374fb83d38dfdb454fdb598a7b62a7d27f6517cc885d56189f4a0f2d7
 AUX cfitsio-4.1.0-pkgconfig.patch 600 BLAKE2B 4cf6c9a10f3b43f85b0b7d63bad64affd4da8aefee0b70884c5d6df70adc069c638379a1101594eeefcae40a7bde1c0f6253b91ea3f01eacde4ed8b35a05b95f SHA512 1f5f6a31ad7fcee675958bc63a679052dbad002dd32ba480a47bbc6d54c224e5bc35c54d213c2b7ba60ce624f9efb943896ded2383a50d01575b3fe78ba0d9a0
 AUX cfitsio-4.1.0-system-zlib.patch 2580 BLAKE2B 9c84cf98d1cfafa824c7122e1833927912af0993566750c06066426a08cdb66505ec62a5eab4018e7da7aed2ed55320018c0a0feb25c8a857dbcc4067f9cf49f SHA512 51d5c5edb6f19ad23f9ee91bfc84aba4b2aed4f53740e5721c1a9b68977549bcf00ac38c1dba0a073ce3b4525cc90239e9401de4d03702467efc72b0810dd69f
+AUX cfitsio-4.2.0-pkgconfig.patch 685 BLAKE2B a231cbaa3df98088248cf9064c00bab5c76398a88c4494c7e827e325627e6c3f74b1228bda1bc4cba1fd7a32916121095ee0a07c8a7fa18adfdf85815717ddb0 SHA512 7ce6e934d19cb08bac4002edcad2310e45d073abfece87db8b654b5d4b52930f382f5ef3713412311bf5bb32361a27cb9ee8ccdd012fb23ca3b2bcae9ea8a028
+AUX cfitsio-4.2.0-system-zlib.patch 2589 BLAKE2B 6dbba94f0a3779d18f92478c82a4ff19c6b1bcef7ce72b9a33623b483de8dc99f771f1e1d5868f87b4dd605de94eb3e6ffef53163a88f9300bd9e5a32ba5a2c0 SHA512 a27692620d0c21641d2e4e739c735daac78af200cf8002dd3cf411a7fc14189faca3e5988f00aca1028d06badd4a76353f27b56d40ea9966cb4c9be183f9176d
 DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
 DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa
 DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
+DIST cfitsio-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853
 EBUILD cfitsio-3.490.ebuild 1718 BLAKE2B 6b89bbad5bc1876148a9360d47931bc3a03a3475a7860a01c1a6ea8ecd87d117c8f10eeff492664c2c284877b7d613aec1e926b472840dd8023b15bd9b0bc17f SHA512 a046886cb8c0e6ede4581128323f1959d24c27713e45f3443a4bfda7fed80f4917f17071a06acf34c891abe07d089ea24f4774f5cb1448da348c823ade163a31
 EBUILD cfitsio-4.0.0.ebuild 1677 BLAKE2B 63c18cc01c1c2037406c01e81d288a56537be3f39b72804306385005d664ac8077ef2db5225b7d585c84351ba6b7995dcbbc6da9dd4a90944acc25635dd56636 SHA512 3137d219a4c46b29f5930a965c10129b125af7887fcf1aed6e9f97e2b5903ef54b32a7984d034e4e98a4c44ab48cc7300c8508d3d0501f9df6575aaf9b10b8f0
 EBUILD cfitsio-4.1.0-r1.ebuild 1899 BLAKE2B 2b650aeca35f4c0422c582d761774fa786e5a2615588196d8345f982dd860ab9b7ded096382e7a17064cba0961657cd0f829c3d98261047208963b84c7734156 SHA512 8f9cabd2a9a0099607c5c759c1a2be608168671ef878031a258edfc26b290d936b5a1ba6d9d35507fbb9fbb2de6b9a122b8c1f268841ae33429a9dc74e3ef5d2
 EBUILD cfitsio-4.1.0.ebuild 1834 BLAKE2B 44e3449fb0f3b5548402b87c06dc657923db89f9548714ba0495b7f781e9efeed493cce75fce513f1fd6417d30845d00ea70b0f0b43e807648b0aeccda131da6 SHA512 2d63153560fc18da4558c629d3ca5904ad381d90fae2c3c799dc2d7f619d9300506f1b37a9f7322c9c8225c01f15502e03100edc7c329bca1878e27b84787391
+EBUILD cfitsio-4.2.0.ebuild 1900 BLAKE2B e53fa4a696bfb452e2bb08839c8c5f03ee70fdf9465be140eaa9f5c9e32a6e3ab27ef5a6659ad57871436bf1387e17b25680b5787c144d11172c6821825f71f5 SHA512 498992fea570c3a7b516f515d435ac90ebf1975aa06d1ec5bf4b0390b78cef1682d00540bd79ae8d15925b39af91535bc104acf0e419cdfc69ee5abeb9328884
 MISC metadata.xml 883 BLAKE2B dca8a38862dcc5f445f40fc77f6979d1d1edcb902af811ce84ba8d41b5e704cdcd5e516b888cd53f6458c09beea06b339cf0c4148471a4fa9f1664ba76c2d2c6 SHA512 ca554514c74c3e96434243e40697f70328715c80e856916b90a3f514337b921968428bb368799322872bf9d32eef3e77f150f79a422a9aaf95a228edff9fc38b
diff --git a/sci-libs/cfitsio/cfitsio-4.2.0.ebuild b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild
new file mode 100644
index 000000000000..f3ec0c5b3190
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 multilib-minimal
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+"
+# Bug #803350
+DEPEND="${RDEPEND}
+	<dev-lang/cfortran-20110621
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.490-ldflags.patch"
+	"${FILESDIR}/${P}-system-zlib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid internal cfortran
+	mv cfortran.h cfortran.h.disabled || die
+	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with bzip2)
+		$(use_enable curl)
+		$(use_enable threads reentrant)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if use tools ; then
+		emake utils
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc README docs/changes.txt
+
+	dodoc docs/{quick,cfitsio,fpackguide}.pdf
+	dodoc docs/fitsio.pdf
+
+	docinto examples
+	dodoc cookbook.c testprog.c speed.c smem.c
+	dodoc cookbook.f testf77.f
+
+	# https://bugs.gentoo.org/855191
+	if use tools; then
+		rm "${ED}/usr/bin/smem" || die
+	fi
+
+	# Remove static libs
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
new file mode 100644
index 000000000000..9ec614616552
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch
@@ -0,0 +1,19 @@
+diff -Naur a/cfitsio.pc.cmake b/cfitsio.pc.cmake
+--- a/cfitsio.pc.cmake	2022-10-31 19:40:23.000000000 +0100
++++ b/cfitsio.pc.cmake	2022-12-14 23:35:53.572102437 +0100
+@@ -1,12 +1,12 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@/cfitsio
+ 
+ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
+ Libs: -L${libdir} -lcfitsio
+-Libs.private: @PKG_CONFIG_LIBS@ -lm
+-Cflags: -I${includedir}
++Libs.private: @PKG_CONFIG_LIBS@ -lm -z
++Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch
new file mode 100644
index 000000000000..fab375507f83
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch
@@ -0,0 +1,53 @@
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2022-10-31 19:40:23.000000000 +0100
++++ b/Makefile.in	2022-12-14 23:37:10.785099554 +0100
+@@ -102,7 +102,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
++		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
+ 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+ 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+ 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+@@ -142,31 +142,31 @@
+ 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
+ 
+ smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
+ 
+ testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ testf77:	testf77.o lib${PACKAGE}.a ${OBJECTS}
+-		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ # Tested with bison 3.8 and flex 2.6.4
+ eval:		# Rebuild eval_* files from flex/bison source
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index d7fde5e26904..4eb38b1bc372 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-stellarium/Manifest b/sec-keys/openpgp-keys-stellarium/Manifest
index a398420d38c1..18dde208dd64 100644
--- a/sec-keys/openpgp-keys-stellarium/Manifest
+++ b/sec-keys/openpgp-keys-stellarium/Manifest
@@ -1,3 +1,3 @@
 AUX stellarium.asc 3250 BLAKE2B 4d0b275795827892de228361ef9ce4e8fac42f5873e00965999caa4def91a877d3952aee04bb9f2d336231c5d549cb3b62b7f80d0c389603609edf90dd583db6 SHA512 e67accc2ae707027cf924088ea1b9302a971173d02bfefb13dd91b897103acb033576639b942dc10155598b286413e191cc20a0117ce198622f7df417222c5ab
-EBUILD openpgp-keys-stellarium-20221229.ebuild 486 BLAKE2B 22d89832bb17f987cc2b13665407c41612c92237b9c2a293777bac00155348e5e15a609b3aa94a44a70009dbc91462f05d8750498e868a4fd0201bb5124a6929 SHA512 686f518998624db756c871fd57cbbd280333b3ee4c2ed124877987b6099f27b14d3295828ca2cbb3d5ac424ccd1c154a7166bf0097b1c7c85cdea843088b204b
+EBUILD openpgp-keys-stellarium-20221229.ebuild 485 BLAKE2B 4a040aba5256e191a61712436e61bf6ddd4a9333a568962e4bee5fd79d515f181f7e79f978e13b0cb94a88d1caf6830d1f8cc0684081c89117562ec471f0566f SHA512 d8c004263321e7a1bc32d041e4aaf127127a73e5e34dc043977a2d1f775d50f5131b9d59464767d95940f4216aaf5901e674e41db3b3d56f6f43edd68edb78d1
 MISC metadata.xml 428 BLAKE2B 61d30fc735267397829e1d38cd93deb1e2462f9ea71cd2898f39d0780ed4c8442f0b74b8b25c4e0d0576c9c284cbc65c73faa54c8aab9bf17cc9071da8f0f116 SHA512 02f6fb0ca385930f2d10b7e84396ed9571af9ca2dd4984f4babf31d80b2766e6d9ba69cd83ee830e2efaa1bf90bb04a4facc3064d15b37ea4ad68adb1bf13239
diff --git a/sec-keys/openpgp-keys-stellarium/openpgp-keys-stellarium-20221229.ebuild b/sec-keys/openpgp-keys-stellarium/openpgp-keys-stellarium-20221229.ebuild
index fd08cf59fa21..84ef0c276feb 100644
--- a/sec-keys/openpgp-keys-stellarium/openpgp-keys-stellarium-20221229.ebuild
+++ b/sec-keys/openpgp-keys-stellarium/openpgp-keys-stellarium-20221229.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 
 S="${WORKDIR}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 979051bdfbc6..97fd3f066886 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index d58a0465f11e..b76c46f10fa5 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,7 +1,7 @@
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
-AUX legacy.conf 97 BLAKE2B 6c3048ec4e3a54b1091d0b844b11549a0173eec749bb936fe344471330b767fe83b60945683439f2c3dba51c622cae3b51e5a48e03a4cc06d90e9bd5a2b02f90 SHA512 1defbf2cb3cc72f4c1ab2898dce13fccb6e0570b1e503ce563e55c0f21f00807a6e9330e559c51dc7bf7a483d3d5e77226aabce345a8e9af269465993d291184
+AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
diff --git a/sys-apps/systemd-utils/files/legacy.conf b/sys-apps/systemd-utils/files/legacy.conf
index cbcac747e5d8..2d322e886960 100644
--- a/sys-apps/systemd-utils/files/legacy.conf
+++ b/sys-apps/systemd-utils/files/legacy.conf
@@ -1,3 +1,3 @@
 # Based on legacy.conf from systemd
-d /run/lock 0755 root root -
+d /run/lock
 L /var/lock - - - - ../run/lock
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f4b05eaba3e4..61da9cc3b43f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4470a0f890a4..590ab225a894 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -33,11 +33,11 @@ DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c5
 DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b7209b72254af279f04dd15dbd39482fb7d905dc9293dc326536e14bca9a53397bd7e1c4b617ed8cbe42bcf617fcce3fb SHA512 50e292e665bfae18bf71c0714074025b4f7cb87042862071815874f7c5b241acac3b8f60d85b8970b11978103c2e7616c02d789f6c3b091d7b736b65c535b743
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
-EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B bbf007f795c00eff7bbaef8a585932b64bf2ecc1e3f9533ea04d67a39075199b965c38b63fc4625751c4475b95e8dbf9e25e817a0e687fe7c70662b2e285bfe1 SHA512 fa33c2a039b3718a53dc51f6f1392de399de6688c2d417dd0f70c07f9ddc442c892f64b6b913d6d944ed54f0493811de9c1c1749f0018b88de759abbb2825fb7
+EBUILD gcc-10.4.1_p20221208.ebuild 1446 BLAKE2B 1e265df2e3abb14402a3f6d7962a88def0b2cc6100edf51ee6398b4b446699fefec054ecfa94bb8d2e0d06205ee44afd44755e979871eee3b5506532d95d1123 SHA512 d40abd3dab6fe7bfc5386a8db768d7f82f8d2781c608c494c43577d2910ad762949a723a2b6cb1492a3d7c2d465e522d91df8eec0ee3330ae2e0120956fa36f0
 EBUILD gcc-10.4.1_p20230119-r1.ebuild 1447 BLAKE2B 645584f005ea2c00aafb7d688c308eb353301561c14e4f1b8f6b2fba9ef645cdf88772ef2713314b596234cbca085bfae074dd3eb391b9668f3a841f4e840edf SHA512 b6ee5ab2ac7f7af53267604af3da1a48baf10b66374afc6661c9ba237dc6da218c6627b0d73b66a520a956d895bded906b10a300fe35fbcb293f6b20af42a27f
 EBUILD gcc-10.4.1_p20230126.ebuild 1450 BLAKE2B a8780add2581289fd13d164d00ffa36b41c28ef064414101028b5950d5c08765c2e0c35444bd8a288395cd15ddf3f5e08a5adffc052c3e296d929cc8f71a50a6 SHA512 8fb960dfc184541d9a7e847b9faa36b8234ea824456cd3ab98d3004f5bf1fdf22dfcbce63f94ad06a188bd34e9cdcacbd717eb7558559d78f780b2efc476d794
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
-EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 14f748b63b486228110ab095f73c1e8f1c0a99cf768391720c9b3107e087b2eba68e8bb3666dd899e50ed4ccc8f3114708edd9f65e3708f7ce425c6655b02658 SHA512 a9344ba134cad8d7a73600cd2c363be629a62d6296985f0efb43b45c80b1d2e2549b8eb8d016b3b96a122213d45487e1dc07c2663276e8c2a800563f01a9eb8f
+EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 858c85e2f1d3b08ed7df5b1ab5278b615267b97618a16412f1c5b52e3ac52e553fbbc946e346a0ccbbfa18665303541be8c6f0306502c1e52b91be65728ebc50 SHA512 0fbf7deeb7df4aaa8a24d7c691b7413c9003e5bd208893921fb97d6393412dbaedf51c2be1d6cd3d05f90984a7bfd545c8f5dbfad996c158451be25bdb9f062b
 EBUILD gcc-11.3.1_p20230120-r1.ebuild 1288 BLAKE2B 2cdae6459f524b1dc5c1d402e2545fd9d173439d779568a6aebb6505a374834eeeb430fdd51ec77185c2376ab6a5d010b4c0430327f84637fb605ebf12f2be64 SHA512 1ec111015625ce45b7cdd8217f914a9c38d708ff2e8c4166ea99d23aea81595778f988811a354bb86e5afb45f328ac00d90bfd1cba74582a171be54fb2eab864
 EBUILD gcc-11.3.1_p20230127.ebuild 1291 BLAKE2B 3396268c2481cd6eab04bbc4be564a6ea12b8b1517ef2efb4ff2953d333dd079843752e4b3c76a9ac4debdfb31a3dd77903ec40786064c0d3131692277329f5e SHA512 8a3fad025fc6a43ff0d38519706b063f320a46bb085ec762ef74e53d272063c067b286cc478b15ed7279a458909c86eecbc611302f28d7edb2515238294a4636
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
index 20cb319e02cf..d109ff1e84d4 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
index d8c443e16e92..f947b7097d30 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 75d67ef1b510..f34ef55ab5e4 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,9 +7,9 @@ DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B 2fed1597f869a715267d27db0ce1a713e9a5dc65bddd21a1ef5be08e2ac756dc04d3db49d5b01c9781161da2a4bf100cd5fc01d772a2ac1819aec1e24408f9c7 SHA512 b690f7092574da74300d3ff36764a6a3b1dc722e1600c0d1d6712eb21052825994fe1c2aaf2db0359466657ac83083f1e617cbc89fc8f0d2c8fff2b6a5bdd948
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
-EBUILD lld-15.0.7.ebuild 2364 BLAKE2B 1858f607c6a84b7f6be57b7201cdb23187000a6bc86c4dc2b2443dc09c74d2209d8e3699a1da7207cef7d16e03022ca7f2017c3f557c92c93aa8708bcc165887 SHA512 75b0a183132827ff94e450aa4e8983461bf4cedd99188431c3c1b145222a724bb61d198fa1db8eab77a0aa2d1474de5c3b66f06e1c0efb89a9a58373b878446d
-EBUILD lld-16.0.0.9999.ebuild 2299 BLAKE2B 5430fcadd8a1bf1391fd0977b3ea1df885bbf416a86563a22475383e4e0fff79f5f5b6c09ede3a85a5f10f33fde819a6150ea476104e53d9d8f46ecc8fff336a SHA512 4dfccb36cb5f791c59dee1f3f29f7bc8782820bb4d277d8bdfbc3345f42d446d94f26d32903176cd56c2bf5cea3078530ef0059f1eab7d7948564288104d1667
-EBUILD lld-16.0.0_pre20230107.ebuild 2299 BLAKE2B 5430fcadd8a1bf1391fd0977b3ea1df885bbf416a86563a22475383e4e0fff79f5f5b6c09ede3a85a5f10f33fde819a6150ea476104e53d9d8f46ecc8fff336a SHA512 4dfccb36cb5f791c59dee1f3f29f7bc8782820bb4d277d8bdfbc3345f42d446d94f26d32903176cd56c2bf5cea3078530ef0059f1eab7d7948564288104d1667
-EBUILD lld-16.0.0_pre20230127.ebuild 2299 BLAKE2B 5430fcadd8a1bf1391fd0977b3ea1df885bbf416a86563a22475383e4e0fff79f5f5b6c09ede3a85a5f10f33fde819a6150ea476104e53d9d8f46ecc8fff336a SHA512 4dfccb36cb5f791c59dee1f3f29f7bc8782820bb4d277d8bdfbc3345f42d446d94f26d32903176cd56c2bf5cea3078530ef0059f1eab7d7948564288104d1667
-EBUILD lld-17.0.0.9999.ebuild 2299 BLAKE2B 5430fcadd8a1bf1391fd0977b3ea1df885bbf416a86563a22475383e4e0fff79f5f5b6c09ede3a85a5f10f33fde819a6150ea476104e53d9d8f46ecc8fff336a SHA512 4dfccb36cb5f791c59dee1f3f29f7bc8782820bb4d277d8bdfbc3345f42d446d94f26d32903176cd56c2bf5cea3078530ef0059f1eab7d7948564288104d1667
+EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
+EBUILD lld-16.0.0.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-16.0.0_pre20230107.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-16.0.0_pre20230127.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-17.0.0.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-15.0.7.ebuild b/sys-devel/lld/lld-15.0.7.ebuild
index 6156f9bae682..9f1faebcbbbf 100644
--- a/sys-devel/lld/lld-15.0.7.ebuild
+++ b/sys-devel/lld/lld-15.0.7.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	!sys-devel/lld:0
 "
 BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
 	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -77,13 +78,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
-			die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
-		mycmakeargs+=(
-			-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		)
-	fi
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
 
 	cmake_src_configure
 }
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!sys-devel/lld:0
 "
 BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
 	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
-			die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
-		mycmakeargs+=(
-			-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		)
-	fi
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
 
 	cmake_src_configure
 }
diff --git a/sys-devel/lld/lld-16.0.0_pre20230107.ebuild b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!sys-devel/lld:0
 "
 BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
 	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
-			die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
-		mycmakeargs+=(
-			-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		)
-	fi
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
 
 	cmake_src_configure
 }
diff --git a/sys-devel/lld/lld-16.0.0_pre20230127.ebuild b/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!sys-devel/lld:0
 "
 BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
 	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
-			die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
-		mycmakeargs+=(
-			-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		)
-	fi
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
 
 	cmake_src_configure
 }
diff --git a/sys-devel/lld/lld-17.0.0.9999.ebuild b/sys-devel/lld/lld-17.0.0.9999.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-17.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-17.0.0.9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	!sys-devel/lld:0
 "
 BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
 	test? (
 		>=dev-util/cmake-3.16
 		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
-			die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
-		mycmakeargs+=(
-			-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-		)
-	fi
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
 
 	cmake_src_configure
 }
author	V3n3RiX <venerix@koprulu.sector>	2023-01-29 20:56:02 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-29 20:56:02 +0000
commit	40a4dd47c275aca60d7381a93635d31b8d09451a (patch)
tree	a1e62b25ccb28b5754aac10d175ed75ddb4537b1
parent	4c51ef39a9b443061a7071e002d7daa2a4d16141 (diff)