Sync with portage [Wed Jun 9 00:32:41 MSK 2021].

3 years ago · 83dc921924
parent 9d0ad1148b
commit 83dc921924
20463 changed files with 25365 additions and 26111 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@ -1 +1,2 @@
 DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
+DIST keepassxc-2.6.5.tar.gz 9809372 BLAKE2B d51782c65fffc4499d85cfa893a908b1f5964fc018a8b878ee61896684e55c8f3d935f7c14d38ba75f26fda3b59b6e408b77b68e11504b9fb95d82fdcc02bf5a SHA512 a5993170ff7e28cb56fc14fbbb7e93a5821b2edefd6d8cd6ce798f810c8045595913a8508c9a256363028be93aaad6ff2f13904ebc19229309d356e119ed0dce
--- a/app-admin/keepassxc/keepassxc-2.6.5.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.5.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
+	sys-libs/readline:0=
+	sys-libs/zlib:=
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	keeshare? ( dev-libs/quazip:0= )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+"
+BDEPEND="
+	ccache? ( dev-util/ccache )
+	doc? ( dev-ruby/asciidoctor )
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
+		printf '%s' "${PV}" > .version || die
+	fi
+
+	 cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
+	local mycmakeargs=(
+		-DWITH_CCACHE="$(usex ccache)"
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS="$(usex doc)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
+		-DWITH_XC_KEESHARE="$(usex keeshare)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake_src_configure
+}
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@ -24,7 +24,7 @@ fi

 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="doc autotype browser ccache keeshare +network test yubikey"
+IUSE="autotype browser ccache doc keeshare +network test yubikey"

 RESTRICT="!test? ( test )"

@ -62,12 +62,14 @@ BDEPEND="
 	doc? ( dev-ruby/asciidoctor )
 "

-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-quazip1.patch ) # pending upstream PR#5511
-
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die

+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
+		printf '%s' "${PV}" > .version || die
+	fi
+
 	 cmake_src_prepare
 }

--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
+++ b/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
@ -0,0 +1,22 @@
+From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <j@jasper.la>
+Date: Fri, 26 Feb 2021 15:21:20 +0100
+Subject: [PATCH] Fix potential memory corruption with negative memmove() size
+
+---
+ lib/lz4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/lz4.c b/lib/lz4.c
+index 5f524d01d..c2f504ef3 100644
+--- a/lib/lz4.c
+++ b/lib/lz4.c
+@@ -1749,7 +1749,7 @@ LZ4_decompress_generic(
+                  const size_t dictSize         /* note : = 0 if noDict */
+                  )
+ {
+-    if (src == NULL) { return -1; }
+    if ((src == NULL) || (outputSize < 0)) { return -1; }
+ 
+     {   const BYTE* ip = (const BYTE*) src;
+         const BYTE* const iend = ip + srcSize;
--- a/app-arch/lz4/lz4-1.9.3-r1.ebuild
+++ b/app-arch/lz4/lz4-1.9.3-r1.ebuild
@ -18,6 +18,10 @@ IUSE="static-libs"

 CMAKE_USE_DIR=${S}/build/cmake

+PATCHES=(
+	"${FILESDIR}"/${P}-negative-memmove.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@ -1 +1,2 @@
 DIST cri-tools-1.18.0.tar.gz 5295512 BLAKE2B 9dda4a401b858e98aa60521d3268d8f6ff6a2c1bd2c219a0e5e9e5360fba58d41e97258c636da26ee57bbfc3286798c74107c7de92d3e3398bdf53b7d9078e94 SHA512 849b496e6d19eec29e0e56f0b37c094649311b80514f319b0c68c6519e3ddd48e1973c3d288144db998826676416644ec705b7ea0916c21898b40928ea800af1
+DIST cri-tools-1.21.0.tar.gz 6739482 BLAKE2B 365e3e9b220e63713dd21af4154b2282c20db1d19ba6b32da616c5d73957a375ab12ed2a86694abb9d90e1020be1fd89c128ed3e469d2f7524dcf42139e7df56 SHA512 a307f5526fb8b7b23a1635b168a8f3b9b9b4bd6ccb94d461dc5af2065e6d1be527dadcb1c86e04808b244d0851a4901ee78a0263f58cf673f6ca503621d5eb61
--- a/app-emulation/cri-tools/cri-tools-1.21.0.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.21.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
+SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+
+RESTRICT+=" test"
+
+src_compile() {
+	emake VERSION="${PV}"
+	./build/bin/crictl completion bash > "${PN}.bash" || die
+	./build/bin/crictl completion zsh > "${PN}.zsh" || die
+}
+
+src_install() {
+	dobin ./build/bin/crictl
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
+}
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@ -1 +1,2 @@
 DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082
+DIST appliance-1.40.1.tar.xz 111566640 BLAKE2B b6ddd3b120a466ce343d67d9e058c201a78f5e605b8bbc2d47fc30c5eaaa874cc032b879a67c5f134b8fa65c58fc27893b062de0c3a21705b64766dd86df648f SHA512 2d63b2ce8850929b42ddc91518b0e2b37d13e358be94bb54899da6c310afa308d708a3443b9f3b3aa3c46f4f2079036a6a4b34027788f183c17a20b68fcf4e6e
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

 CHECKREQS_DISK_USR=500M
 CHECKREQS_DISK_BUILD=500M
@ -9,20 +9,18 @@ CHECKREQS_DISK_BUILD=500M
 inherit check-reqs

 DESCRIPTION="VM appliance disk image used in libguestfs package"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+S="${WORKDIR}"

 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""

-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 # Mixing libguestfs versions causes weird problems. #501588
 RDEPEND="!<app-emulation/libguestfs-${PV}"

-S="${WORKDIR}"
-
 src_unpack() {
 	# We'll unpack the tarball directly into ${D} to speed up install.
 	# Otherwise we need to duplicate hundreds of data.
@ -31,7 +29,7 @@ src_unpack() {

 src_install() {
 	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs
+	cd "${ED}"/usr/share/guestfs || die
 	unpack ${A}
 	cd appliance || die
 	dodoc README*
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_USR=500M
+CHECKREQS_DISK_BUILD=500M
+
+inherit check-reqs
+
+DESCRIPTION="VM appliance disk image used in libguestfs package"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/xz-utils"
+# Mixing libguestfs versions causes weird problems. #501588
+RDEPEND="!<app-emulation/libguestfs-${PV}"
+
+src_unpack() {
+	# We'll unpack the tarball directly into ${D} to speed up install.
+	# Otherwise we need to duplicate hundreds of data.
+	:
+}
+
+src_install() {
+	dodir /usr/share/guestfs
+	cd "${ED}"/usr/share/guestfs || Die
+	unpack ${A}
+
+	cd appliance || die
+	dodoc README*
+	# Don't rm README.* here, at least README.fixed is needed for libguestfs, see
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1183780
+	chmod 755 . || die
+	chmod 644 * || die
+
+	newenvd "${FILESDIR}"/env.file 99${PN}
+}
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{7,8,9} )

-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 toolchain-funcs xdg-utils flag-o-matic

 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@ -46,6 +46,7 @@ COMMON_DEPEND="
 	>=app-admin/augeas-1.8.0
 	sys-fs/squashfs-tools:*
 	dev-libs/libconfig:=
+	dev-libs/jansson:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
@ -135,6 +136,14 @@ src_prepare() {
 }

 src_configure() {
+	# bug #794877
+	tc-export AR
+
+	# Skip Bash test
+	# (See 13-test-suite.log in linked bug)
+	# bug #794874
+	export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
 	# Disable feature test for kvm for more reason
 	# i.e: not loaded module in __build__ time,
 	# build server not supported kvm, etc. ...
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi

 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ b/app-i18n/opencc/opencc-1.1.2.ebuild
@ -22,7 +22,7 @@ fi

 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"

--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/autojump/autojump-22.5.3-r1.ebuild
+++ b/app-shells/autojump/autojump-22.5.3-r1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.ta

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x64-macos"
+KEYWORDS="~amd64 ~hppa ~x64-macos"
 IUSE="ipython test"
 REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"

--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"

 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector

 RESTRICT="!test? ( test )"
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@ -1,2 +1,2 @@
-DIST notcurses-2.2.8.tar.gz 11255362 BLAKE2B d56f48ecfcfc107d696bb1da029afba8c8a29ea6f0d6317ccdd42d895d890c0cc1d46120566c2f60bd554c2a57aa60409276632216608b29469421a1c22cecf2 SHA512 7455ad1dfbeda68a0b2c35ba3bb28eab3bc0be1ca4db12ce0e3662cf12f1e541dec506c9896624f77ef8032ae6b644ee85ac5abf2272f54fb1c9038b33214892
-DIST notcurses-doc-2.2.8.tar.gz 115654 BLAKE2B c770f81a3ad4071f75e84caaa4370f26e68ced2489586ae857a8e3c2cf998e0d7b5d84b8fd09150ace51898731150e499f648ad2e6d5be442df11c648ba58ccd SHA512 1a2c8931bd4f68dfdd2fa921d06b639d5fa382d826d5c9e0186b4d0160f220f3f32b1eb19f17136c4d452c8afd9f6fff1b4f463a11d847ef9216ddb94b5c8ab8
+DIST notcurses-2.3.2.tar.gz 11753206 BLAKE2B 4ed5a26e71827bbdf64f8c4cca7d7c8b4e6858ac8df304e5d96cefccd11fe0563eec241b1fd756d99b2184d46f30b46effe405cd8aba5a79c84d7bef40d857b3 SHA512 cedd965ec0235762e2c978adeec1771c91018fcfbb135330032038cc4ef6122f31990d29f286ad8eca3166a074e2576420779090c154013af5c79f2d723bf530
+DIST notcurses-doc-2.3.2.tar.gz 121736 BLAKE2B a87d2d3919c6dc4ed67ca5e86a984c65eaaa130d6dcaf87e2ea9bd47bafc96c8ddee9133b4e1966812b473b9991fed39b5884b0a35378688c2df7302174f2a28 SHA512 b8886acae72e3df47b7a793f66688bac615bb43164cd81aa8ccba888db25206601d76c4a7db254be3508957be12cd365bcf686166e9ad0ed20a004c2b487c68f
--- a/dev-cpp/notcurses/notcurses-2.3.2.ebuild
+++ b/dev-cpp/notcurses/notcurses-2.3.2.ebuild
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86 ~amd64-linux"
 IUSE="doc"

 BDEPEND="doc? ( app-doc/doxygen )"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@ -8,3 +8,4 @@ DIST percona-xtrabackup-2.4.22.tar.gz 61911038 BLAKE2B 4e0eb211b253ac3bbe82af7b4
 DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
 DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
 DIST percona-xtrabackup-8.0.23-16.tar.gz 288261551 BLAKE2B ca82bfcac881cd1d9d3a1d0ea4647d809030b617cc8605f26f1378fba74f106b522447fc67be3968fe72bd8c6bd9fa64ba1943d8379c11f241178aa232680f06 SHA512 11927649ab2a25dbfc5268ab2196dbdd2b102229728a41dc61995aec92a133718c0bf79d3fe15ea91e0917cd4201bba806647d259a6aa0fc7b59ff8bd533e810
+DIST percona-xtrabackup-8.0.25-17.tar.gz 291581323 BLAKE2B 3860994ce969abc72378d29b32768c70ab4210f55400ad47d446b6e50b97fd6e90f124388663b02ba0e41fbb1c0ac4106c337861da46006442072591cfff2ba5 SHA512 f7186881c8422f6802efb813644c5721bb274db54afb591b58fe9ee1a084fba6546c7673f461b4d581c01ff0cbda588cb96b7fe21d669b3d9cbe3b5898288e08
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.25-remove-rpm.patch
@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -193,33 +193,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+ 
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+-  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+-  IF(MY_UNAME)
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+-      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_RESULT
+-      )
+-    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -m
+-      OUTPUT_VARIABLE MY_HOST_MACHINE_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_UNAME_MACHINE_RESULT
+-      )
+-    EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
+-  ENDIF()
+-  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+-  IF(MY_RPM)
+-    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+-      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      RESULT_VARIABLE MY_RPM_RESULT
+-      )
+-  ENDIF()
+-ENDIF()
+-
+ # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
+ IF(APPLE)
+   IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
+ 
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.25.17.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/icu:=
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	dev-libs/rapidjson
+	dev-libs/re2:=
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.25-remove-rpm.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DBUILD_SHARED_LIBS=OFF
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_MAN_PAGES=ON
+		-DWITH_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/xbcloud_osenv
+	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+	# cannot use dolib.so because helper would append libdir to target dir
+	insinto /usr/$(get_libdir)/${PN}/plugin
+	insopts -m 0755
+	doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+	doman "${p}"/doc/source/build/man/*
+}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/rat/Manifest
+++ b/dev-java/rat/Manifest
@ -1,2 +0,0 @@
-DIST apache-rat-core-0.11-sources.jar 124710 BLAKE2B 354755c1e9be4952f3313ae948bd0ef034d0b5ca653f646af33f78b3ec0db4b137b44fa9d30352b82c25c94b0f097a2f533697aee5307b91df710ed7977ecdf0 SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991
-DIST apache-rat-tasks-0.11-sources.jar 17602 BLAKE2B c960c73e708db5888bea6c12b19958ce7549d54fe2df644ebfc46d86b6724aaf2307a99e58cb1e8530ff1ff1ada57d9bdf26b00a3e902da516652125492e0ba3 SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565
--- a/dev-java/rat/rat-0.11.ebuild
+++ b/dev-java/rat/rat-0.11.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="apache-${PN}"
-
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
-HOMEPAGE="https://creadur.apache.org/rat/"
-
-SRC_URI="
-	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-core/${PV}/${MY_PN}-core-${PV}-sources.jar
-	https://repo1.maven.org/maven2/org/apache/${PN}/${MY_PN}-tasks/${PV}/${MY_PN}-tasks-${PV}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/commons-io:1
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-compress:0
-	dev-java/commons-collections:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	ant-core
-	commons-io-1
-	commons-cli-1
-	commons-compress
-	commons-lang-2.1
-	commons-collections
-"
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher "${MY_PN}" --main org.apache.rat.Report
-}
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@ -1 +1,2 @@
 DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
+DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
--- a/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/go/go-1.15.13.ebuild
+++ b/dev-lang/go/go-1.15.13.ebuild
@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
--- a/dev-lang/go/go-1.16.5.ebuild
+++ b/dev-lang/go/go-1.16.5.ebuild
@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@ -1 +1,2 @@
 DIST scala-2.13.1.tgz 19685743 BLAKE2B aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2 SHA512 028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
+DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
--- a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -14,7 +14,7 @@ DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://scala.epfl.ch/"
 SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"

-LICENSE="BSD"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
--- a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/"
+SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	!dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	ebegin 'Cleaning .bat files'
+	rm -f bin/*.bat || die
+	eend $?
+
+	ebegin 'Patching SCALA_HOME variable in bin/ directory'
+	local f
+	for f in bin/*; do
+		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" || die
+	done
+	eend $?
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	ebegin 'Installing bin scripts'
+	dobin bin/*
+	eend $?
+
+	ebegin 'Installing jar files'
+
+	cd lib/ || die
+
+	# Unversion those libs.
+	java-pkg_newjar jline-*.jar jline.jar
+	java-pkg_newjar scalap-*.jar scalap.jar
+
+	# Install these the usual way.
+	java-pkg_dojar scala-compiler.jar
+	java-pkg_dojar scala-library.jar
+	java-pkg_dojar scala-reflect.jar
+
+	eend $?
+
+	cd ../ || die
+
+	ebegin 'Installing man pages'
+	doman man/man1/*.1
+	eend $?
+
+	if use doc; then
+		ebegin 'Installing documentation'
+		java-pkg_dohtml -r doc/tools
+		eend $?
+	fi
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@ -1,2 +1 @@
-DIST ncnn-20210322.tar.gz 11339362 BLAKE2B 26848f8c6598c98e10e62717bf4aa86f803b425848bdeebd7dacd752f57174e4c3a7fe56d309cafa150be7cb80176fbd8f487c9fe79bc957e29157b1781fe849 SHA512 78862bdbba3ae4127d856f514ea37903098e8a9e827ccbdc85faa498d8a343b4c404465b7f55d368f2ea867063340f33facf286c2bad6a0587b903ba8bbf2394
 DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
--- a/dev-libs/ncnn/ncnn-20210322.ebuild
+++ b/dev-libs/ncnn/ncnn-20210322.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A high-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn"
-
-SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-PATCHES=( "${FILESDIR}"/ncnn-fix-glslang-include.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-		-DNCNN_SYSTEM_GLSLANG=ON
-		-DGLSLANG_TARGET_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-	)
-
-	cmake_src_configure
-}
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@ -1,2 +1,2 @@
 DIST raft-0.10.1.tar.gz 318911 BLAKE2B 42ef22dfc89f05a3a9f130011c0f906201126a1615f9a60648587e014bbb63e038b3afd1593c2c07b046c3c35ef07deaa45cdce58062707409e4dbd3a9f7516e SHA512 6fa99d9dbb5895299c5124f5c8cfb544cf1bccae4ee196bc8011cd4cf9c632cd896f8cd93181409fbaf7da115235c72a4e10568080dd9957eceb978784dc0f9d
-DIST raft-0.11.0.tar.gz 324254 BLAKE2B 401be37c2cf9ee9337c24d3e010ce084b983056725096f23654ae0496e6cb1210ab4d6fa38543c19a53d7aa6427bfe01052f85618afe2475a113edc4ba8d2745 SHA512 808ea593e019ed1740ced2de4afd7f522056e08ccd739be77b069de80dd21e60dc9469395d6e18cb8f8056c12f4ef34859ca5892a3937280e708515a8bb3cebf
+DIST raft-0.11.1.tar.gz 324285 BLAKE2B 10e62a392bdbb98f262068ad2bcfbcd24488918fbb7d4c3b13101c3d771ff8b9d592bad31bfe69cfcb4d6e9c93e1d38da24d11a3167d37208906af4e354c9280 SHA512 5afbf0f7e325ed242c5a37a39038818395c1b39184e2440bf89db6662dee73b9abaa8fac0efc28dbc3478267aa66fd94e908e320a061fb5b343735e111dbea86
--- a/dev-libs/raft/raft-0.11.1.ebuild
+++ b/dev-libs/raft/raft-0.11.1.ebuild
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi

--- a/dev-perl/Graph/Graph-0.972.100.ebuild
+++ b/dev-perl/Graph/Graph-0.972.100.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Data structure and ops for directed graphs"

 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
+++ b/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="set of objects and strings"

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@ -2,3 +2,4 @@ DIST composer-1.10.22.tar.gz 429521 BLAKE2B da7a340b63fd2540886e0fe9252a115bffdf
 DIST composer-2.0.13.tar.gz 497819 BLAKE2B ab51556ff65b0c2822d5419bb6dde2c775c91ed210af6ab84f272db0ea823866d75090173663d517cd36163bbe04ce06f597c670fce45b595716baaf05253d8e SHA512 b16425e0553f69c23e636cc51711e2e433125ac55a29d21c66eead4b40080379449868810e9b443996e3959feae2be6ed9c9a100bc5e3f84d210654dd160887f
 DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d885bd1fe8f70ed495bc28e13a93f477c24df7d9510d0611941addc894d914b6856ef823762f0aeb596fef9332526 SHA512 7eb87f8454d38a091bf97ad470c41f6d1b82bc153618312093935d2b7b5890bf3d1eba25f9bd8e46c5f8ae462729e85ea19eb03184a4484332694a6369a82917
 DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16f4c2de30739c40a1fae396e7f188173c5ef9356c6f55922457ea52c7c3e19e9040c37e86fdb4575016aac07808 SHA512 22105ab3f831ab89cf80e247c6e6f6263f3116a24394b9367b7e7c1e1aebfdcf9bb833add4763c34c621714dd8f22c87327ccf6c8eeef113f753ba800a111a5c
+DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9
--- a/dev-php/composer/composer-2.1.2.ebuild
+++ b/dev-php/composer/composer-2.1.2.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"

 distutils_enable_tests pytest
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DOCS=( CHANGELOG.rst README.rst )

--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@ -0,0 +1 @@
+DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Use Search URLs in your Django Haystack Application"
+HOMEPAGE="
+	https://pypi.org/project/dj-search-url/
+	https://github.com/dstufft/dj-search-url/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
--- a/dev-python/dj-search-url/metadata.xml
+++ b/dev-python/dj-search-url/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dj-search-url</remote-id>
+		<remote-id type="github">dstufft/dj-search-url</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"

 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )

--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@ -0,0 +1 @@
+DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A helper for organizing Django settings"
+HOMEPAGE="
+	https://pypi.org/project/django-configurations/
+	https://github.com/jazzband/django-configurations/
+	https://django-configurations.readthedocs.io/"
+SRC_URI="
+	https://github.com/jazzband/django-configurations/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pkg_resources, https://github.com/jazzband/django-configurations/pull/282
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/django-cache-url[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/dj-email-url[${PYTHON_USEDEP}]
+		dev-python/dj-search-url[${PYTHON_USEDEP}]
+	)"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# sphinx can't find tests package
+	rm tests/test_sphinx.py || die
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings.main
+	local -x DJANGO_CONFIGURATION=Test
+	distutils_install_for_testing
+	django-cadmin test -v2 || die "Tests failed with ${EPYTHON}"
+}
--- a/dev-python/django-configurations/metadata.xml
+++ b/dev-python/django-configurations/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
+++ b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~hppa"

 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
--- a/dev-python/identify/identify-2.2.9.ebuild
+++ b/dev-python/identify/identify-2.2.9.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"

 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"

--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~hppa ~x86"

 # requires network access
 RESTRICT="test"
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"

 RDEPEND="
 	dev-cpp/eigen:3
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@ -1,2 +1,3 @@
 DIST pytest-django-4.2.0.gh.tar.gz 68370 BLAKE2B 94165a01ecd2734a4e02267ecfe8b531df33ca9237cfcd1ebad41f68289fb89590bed0027137d6dddefc4cbbd5c0f8445703e01a516d3992c2307ebe53d6572b SHA512 2dcaa80f3ebb67984d3849cea5de296388990ca65a607f995b89bd67e2d8964f944100bccb42a32bb75c7009849619e50421c2dce077037ce0440233dbdc13f1
 DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
+DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.io/
+	https://github.com/pytest-dev/pytest-django/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django-configurations[${PYTHON_USEDEP}]
+	)
+"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# something else may be loading it
+		tests/test_django_settings_module.py::test_django_not_loaded_without_settings
+	)
+
+	distutils_install_for_testing
+	cp -r pytest_django_test "${TEST_DIR}"/lib || die
+
+	local -x DJANGO_SETTINGS_MODULE
+	for DJANGO_SETTINGS_MODULE in pytest_django_test.settings_sqlite{,_file}; do
+		einfo "Testing ${DJANGO_SETTINGS_MODULE}"
+		epytest tests ${deselect[@]/#/--deselect }
+	done
+}
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~hppa"

 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@ -1 +1,2 @@
 DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
+DIST xapp-2.2.0.tar.gz 20706 BLAKE2B 136ce77c15413fc96651d741992de09c618ef76c8adce6c1927100329401d3721256e5e3a6399a9bcdc79dc2a4cf224a579eea43ccbdd0740f3a1aa07edc3994 SHA512 169c8d6f5b94e58fea49e9bcc3b532ee0268e6a66d79257da2b113e6c4bfa5bc44b7cb03a08556372580667acbceca033e82140085e9367fd3bf97507257f26c
--- a/dev-python/xapp/xapp-2.2.0.ebuild
+++ b/dev-python/xapp/xapp-2.2.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for x11-libs/xapps"
+HOMEPAGE="https://github.com/linuxmint/python3-xapp"
+SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=x11-libs/xapps-2.2.0[introspection]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/python3-xapp-${PV}"
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@ -1 +1,2 @@
 DIST http-cookie-1.0.3.gem 38400 BLAKE2B 6b7292b2a5d7c37b6769cdd38f01d8cf78aa9557b4a204d736dffeae5d31768c57ac58f00577df78252f9a8bdb12a7faecf5e1be64c8ee29aaf67cc9307d0a35 SHA512 43ac1218e98dd47ee22e33e72e20bc5b55f65e60aadd417641f8a4221eba88995d418c7738a4c35dfba132e05c0c4b0df2b2bedd56c22e82c062d1f03de0052f
+DIST http-cookie-1.0.4.gem 39424 BLAKE2B 06ac0e667340ac17827a8eb4ed320efe77ad97509fcd444f7e77d887a77643a6b34e84486db78eba52245891d1719e750d9a446c40a4ab7804f2304b600029bd SHA512 788fdaa642e6b596e7a91c57a7942a832c09a84fed88b30fdd8e5a8ad66d72780afc1246e6c83c4dfd5af8018c278750866dd05d804aef793aa067b09519af8d
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library to handle HTTP cookies"
+HOMEPAGE="https://github.com/sparklemotion/http-cookie"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_http_cookie.rb || die
+	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
+}
--- a/dev-ruby/ruby-macho/Manifest
+++ b/dev-ruby/ruby-macho/Manifest
@ -1,3 +1,4 @@
 DIST ruby-macho-2.2.0.tar.gz 65473 BLAKE2B aedb5524926649d2f1612c135bee2cd18e4740412afd5d0e21616edae46fa4111208d8490fd83a0fe95ed13bd7c33a8a347162c34667f3f4d0bbdf86258bc4c7 SHA512 bfb13d0ec52f3fd2a359d0ae8de1437c272545f0ecf594c13ee491089ee79e5d70341e3557e840e82c0ca7d12dba27daff5d011903239d5caaee44f5d5189a97
 DIST ruby-macho-2.3.0.tar.gz 66200 BLAKE2B 7ef2195a5906b8d7bef1b5baafd74887a0501c5334c6045069c00333b5f94d298487f98e6549739b090bda2f295640ccdf8bfa0d10b26608899b54ac4b02c022 SHA512 8ebcf38cc0282c32c6755d76539e7b3836de8f2ee5d2ef659d74a132b19fda73e24d85182b3e70e8d0dc599d48f904b7494e4232a508722aba9d789b151d2fd6
 DIST ruby-macho-2.5.0.tar.gz 66548 BLAKE2B 256ba814e495a10273cfb8d92e9da9947b6ecb19864b7203f334e58c1dd2aa1de9832300176826e8251784d0b76a8efda2797e1c2d5d3415dbd946e94bbdfcc0 SHA512 a7cbe2944a302e6320ec098258b08db0359808abfddee56ef82d541b0473202d92fbacc5560a73d8cd4d17dff6b0b80e1cb93c021a178a50393facd72b9a980f
+DIST ruby-macho-2.5.1.tar.gz 67901 BLAKE2B 4e3c04b86c664b44d022dc6ffe91e981a9f936152d85999cf8f11846eb51a6e38625e2316f09a1685ace546174800131cf899ebc8810e0f2c6d95950384005cb SHA512 4836af6b81a0452e19a3950e140c8131fded97a45853c2fdfe3955aff52e1619a01471a789c575e092fa62e5c9f09034b6b4d76e669f9c6475669e6b25d3c617
--- a/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
+++ b/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
@ -0,0 +1,25 @@
+# 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_GEMSPEC="ruby-macho.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
+HOMEPAGE="https://github.com/Homebrew/ruby-macho"
+SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid benchmarks with additional dependencies
+	rm -f test/bench.rb || die
+	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
+}
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@ -3,7 +3,7 @@

 EAPI=5

-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"

 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
--- a/dev-tex/rubber/rubber-1.5.1.ebuild
+++ b/dev-tex/rubber/rubber-1.5.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )

 inherit distutils-r1

--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@ -1,5 +1,2 @@
-DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
-DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
-DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
 DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
 DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
--- a/dev-util/bcc/bcc-0.16.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.16.0-r1.ebuild
@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.1.0-r1[static-libs(-)]
-	<dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		$(usex luajit '-DWITH_LUAJIT=1')
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
--- a/dev-util/bcc/bcc-0.17.0-r100.ebuild
+++ b/dev-util/bcc/bcc-0.17.0-r100.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
--- a/dev-util/bcc/bcc-0.17.0.ebuild
+++ b/dev-util/bcc/bcc-0.17.0.ebuild
@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		$(usex luajit '-DWITH_LUAJIT=1')
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
--- a/dev-util/bcc/bcc-0.18.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.18.0-r1.ebuild
@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.3[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
--- a/dev-util/bcc/bcc-0.19.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.19.0-r1.ebuild
@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"

 RDEPEND="
-	>=dev-libs/libbpf-0.3[static-libs(-)]
+	~dev-libs/libbpf-0.3:=[static-libs(-)]
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
 	<=sys-devel/clang-13:=
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"

 # TODO: figure out why these tests - all of which invoke git - fail:
 #  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@ -399,22 +399,22 @@ multilib_env() {
 			export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc}
 			export CHOST_lp64d=${CTARGET}
 			export CTARGET_lp64d=${CTARGET}
-			export LIBDIR_lp64d="lib64/lp64d"
+			export LIBDIR_lp64d=${LIBDIR_lp64d-lib64/lp64d}

 			export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 -march=rv64imac}
 			export CHOST_lp64=${CTARGET}
 			export CTARGET_lp64=${CTARGET}
-			export LIBDIR_lp64="lib64/lp64"
+			export LIBDIR_lp64=${LIBDIR_lp64-lib64/lp64}

 			export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d -march=rv32imafdc}
 			export CHOST_ilp32d=${CTARGET/riscv64/riscv32}
 			export CTARGET_ilp32d=${CTARGET/riscv64/riscv32}
-			export LIBDIR_ilp32d="lib32/ilp32d"
+			export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d}

 			export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac}
 			export CHOST_ilp32=${CTARGET/riscv64/riscv32}
 			export CTARGET_ilp32=${CTARGET/riscv64/riscv32}
-			export LIBDIR_ilp32="lib32/ilp32"
+			export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32}

 			: ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32}
 			: ${DEFAULT_ABI=lp64d}
@ -423,12 +423,12 @@ multilib_env() {
 			export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d}
 			export CHOST_ilp32d=${CTARGET}
 			export CTARGET_ilp32d=${CTARGET}
-			export LIBDIR_ilp32d="lib32/ilp32d"
+			export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d}

 			export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac}
 			export CHOST_ilp32=${CTARGET}
 			export CTARGET_ilp32=${CTARGET}
-			export LIBDIR_ilp32="lib32/ilp32"
+			export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32}

 			: ${MULTILIB_ABIS=ilp32d ilp32}
 			: ${DEFAULT_ABI=ilp32d}
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@ -1,2 +1 @@
-DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
 DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B f8e582005555357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8 SHA512 1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
--- a/games-emulation/desmume/desmume-0.9.11-r2.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r2.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/zziplib
-	gnome-base/libglade
-	media-libs/libsdl[joystick,opengl,video]
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/agg
-	>=x11-libs/gtk+-2.8.0:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README README.LIN )
-
-# fix QA compiler warning, see
-# https://sourceforge.net/p/desmume/patches/172/
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-)
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@ -1,8 +1,4 @@
-DIST emutos-192k-0.9.12.zip 1655923 BLAKE2B 2bc874c761d77d6b80e0ebf35e487951db866ce30c74bc91df155b3e6f58ec004de9fbb6e8402504eda2c3369ed783b8b53f8e80e7fcf05652c14dacd11eedc3 SHA512 7e75f645ff72a2dc7574cf005234261411b39af77113b329835d0d398e60c51d7451dd949f0cecdbdc4adc03561b43bb0449d1460f0dec547894b7bde29b01d1
 DIST emutos-192k-1.0.1.zip 1794284 BLAKE2B 77742519f04d98f8fe6bf22f04bb73944370e58596d9001c2c24726cb1fc172fef4ad982a555e2f1a4c4b539028900320fb40cf96ec0cb87aa618d9f7b14ed7e SHA512 30c965f40b66879cc0e5f0b6801485d2362751d22f0deba1e12dddff05bb526c972c7cafdee7cb81866160a1b97fe56e28f5d5ad4b9c01c68adb840a3c27e355
-DIST emutos-256k-0.9.12.zip 2038241 BLAKE2B e287357877efe2346bd1936768f6c56e655e4b7d249545f4e3827e02c295817e6586477b68058e95690562c65a9085fa9e712da540727d93e12789f5bde325aa SHA512 18f43d2fc215e686fabafe0413b88d3593dc7ef931191541690527fbe7fcb4ff08ee946f75ceadf25d09c05fb69ae7d71230cc5b36ec42c7774fc5770b8a276d
 DIST emutos-256k-1.0.1.zip 2239148 BLAKE2B db1e6eafa44e76ad50efe1cffe60c22b20e40de60e1ca67bd9f2f491aa0fba10aae60e6bfbbb16327b2184d104d2bd4e0d036174b8fe5f510dd6a9fcb481fa72 SHA512 c185e0dcc6fae8bd4a3788f2271330cbe5e49834ae51cbafbad04160895bae9c0210cf05d77bd80bdfd22d29aab85048083c471eefd5092d2e19465c897c48a3
-DIST emutos-512k-0.9.12.zip 301555 BLAKE2B 6341b4ac4fad707d81ab621e2952b2a92b139947b0ebc522983163fa86f308c595482f8b6caa23472bb022f1380f0a5963532b119c53676fe65b5115cde6d413 SHA512 0c68c76dede7d9a36c408f3a1bced2b710b1ad87fee5ba204e1b8c19a48ef1c51942eb766355c20f5cf95cc885423fd2750dc212c5dffe25b1d28620cc117854
 DIST emutos-512k-1.0.1.zip 316348 BLAKE2B bf3f3c932df8e87655006abd7a142765f0905942f9709d02c705a7269c5a4c3a3795d6afed007848c54734c80f3d6c08549a641908f2ead99f0c55a564515982 SHA512 8e3f63d218bc82aa3739c74ab8f9fdad92661de478b2953f60b07de3233a855c2e4dfb14a9bb3cfb81a1915d6d4295736dd74ea50f0af055aa3fc5336fc4f04f
-DIST emutos-aranym-0.9.12.zip 273147 BLAKE2B 863da12081f32ee665180d4536666a6558b475c6413e4f95aacd333f3a7d9a42820a04376b1b0484a975177abc3d41b2765c9147231829724e721dd477ebd328 SHA512 351104f097e5812be21fb30c41c829e62f127da39cc190ca60d26d20d94fedfb21493265b6b7113b9babb262dc30e0b87f1e235c90339f221b559578eacc5c44
 DIST emutos-aranym-1.0.1.zip 287821 BLAKE2B 96581289a1be8f598db4676aa275ce79f3affd36e0dc53466d275f0cd01871ab48b73440e18cba1bf74fa9a35a4ad72d84804231fbc1e11cd151db2139f25b2d SHA512 2178d646e0ab6c128fcf2eaf690597514d26e8dddd7e2b599ee05fa4bd18589489315f11777fdf1f20fadaa63d5c32dc116988d92149cb7f826c72e66fe9fcd8
--- a/games-emulation/emutos/emutos-0.9.12.ebuild
+++ b/games-emulation/emutos/emutos-0.9.12.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERSIONS=(
-	192k
-	256k
-	512k
-	aranym
-)
-
-DESCRIPTION="Single-user single-tasking operating system for 32-bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI=$(printf "mirror://sourceforge/emutos/${PN}-%s-${PV}.zip\n" "${VERSIONS[@]}")
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN}
-
-	doins */*.img
-	use debug && doins */*.sym
-
-	local VERSION
-	for VERSION in "${VERSIONS[@]}"; do
-		newdoc "${PN}-${VERSION}-${PV}"/readme.txt readme-"${VERSION}".txt
-	done
-
-	dodoc "${PN}-512k-${PV}"/doc/{announce,authors,bugs,changelog,emudesk,incompatible,status,todo,xhdi}.txt
-}
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@ -1,2 +1 @@
-DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083
 DIST fbzx_4.6.0.tar.bz2 307308 BLAKE2B 0cf6e9bf3e01c5a03e0925707aab46829ed8e3f0e4c0791d362ab8972d5d0175e35635e5ad6f895db369b4cb543efc40561fa41ec1cfd739c7252762250bdb7e SHA512 4644038c615e2487361e8a7a72d69ae2e136945160d4cc8ed982365243a7e016edff6165ae86a3f50e3f0f4d45540bfd933353ca17596f9d8e10153c492f15d9
--- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Full Screen Sinclair Spectrum emulator"
-HOMEPAGE="https://github.com/rastersoft/fbzx"
-SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-sound/pulseaudio
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die
-
-	tc-export PKG_CONFIG
-
-	default
-}
-
-src_install() {
-	dobin src/fbzx
-
-	insinto /usr/share/${PN}
-	doins -r data/{keymap.bmp,spectrum-roms}
-
-	dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
-	doicon data/fbzx.svg
-	make_desktop_entry fbzx FBZX
-}
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@ -1,2 +1 @@
-DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e
 DIST hatari-2.3.1.tar.bz2 4334129 BLAKE2B f309a31cbf181135b02858ebefa4d70116e66d252ef5de03cffa8254c0e86e4eeebfbf626613103790fb803d08028b318721020b292ea748c79e4d008e6d503d SHA512 78a6c7d80bfcd9b3a85a82754f4180cfd906eb95c6a44c8fbb92c2a648dc9c21c74c9dd18db4783d87259a3061b39e639c54cdd6c033d83de1252afef811382f
--- a/games-emulation/hatari/hatari-2.2.1-r1.ebuild
+++ b/games-emulation/hatari/hatari-2.2.1-r1.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="https://hatari.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="capsimage microphone png portmidi readline +sdl2 udev zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
-	microphone? ( media-libs/portaudio )
-	png? ( media-libs/libpng:0= )
-	portmidi? ( media-libs/portmidi )
-	readline? ( sys-libs/readline:0= )
-	sdl2? ( media-libs/libsdl2[sound,video,X] )
-	!sdl2? ( media-libs/libsdl[sound,video,X] )
-	udev? ( virtual/udev )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=games-emulation/emutos-0.9.9.1
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-default-rom.patch
-	"${FILESDIR}"/${PN}-2.2.1-joystick.patch
-)
-
-DOCS=(
-	readme.txt
-	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
-)
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
-	sed -i "s:\"doc\" + sep + \"hatari\":\"doc/${PF}\":" python-ui/uihelpers.py || die
-	sed -i "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
-
-	# Use emutos package rather than bundled ROM.
-	rm src/tos.img || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DENABLE_SDL2=$(usex sdl2)
-		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/${PN}/
-}
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@ -9,6 +9,5 @@
 	<flag name="capsimage">Use <pkg>dev-libs/spsdeclib</pkg> to read .IPF, .RAW, and .CTR disk images</flag>
 	<flag name="microphone">Use <pkg>media-libs/portaudio</pkg> for Falcon microphone handling</flag>
 	<flag name="portmidi">Use <pkg>media-libs/portmidi</pkg> as an alternative MIDI backend</flag>
-	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 </use>
 </pkgmetadata>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d`
				`@ -0,0 +1 @@`
				`DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2`