gentoo resync : 28.07.2021

13 files changed, 4 insertions, 429 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 18c659df5abc..028c55a318d1 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 68313068a8cb..45dcc1302bac 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
 DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
-EBUILD gnome-autoar-0.3.2.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
 EBUILD gnome-autoar-0.3.3.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
deleted file mode 100644
index 407c5ae032fb..000000000000
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-arch/libarchive-3.4.0
-	>=dev-libs/glib-2.35.6:2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
-}
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 3c15c6802be0..0309604a06ea 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
 DIST lxqt-archiver-0.4.0.tar.xz 167124 BLAKE2B 2d9295200c284e2dc0c2b538a92952dd0a11882211e5d1d5838141583b4a595b65c26a057e5c9733190182a5f78958e15d0e086356d75dd4e0c72d3510a34cfc SHA512 e1b323cd118af3726009e153c4f9766ec53b29fa0280530da16e2101d36ec45b55de0fe3d87c1386a4e5b3d88712fd209659b4ebb9344af689812600ae136ed6
 EBUILD lxqt-archiver-0.3.0.ebuild 1173 BLAKE2B ed90bcdc16bfe9a9401ef0ee07cbba79cf7c1bba6dd4f87be0a535442f96f63c69b534bb62d0a6767dd974d6ea92c7ad3f05ca8710b66e1f117ac477dbee1f28 SHA512 7396a031b3c47f978d67a01f2cef96cfd7bfd3375b8c409bf6af5dd22f438eb922379d4c70c000f8ac0f56bb7f2652c76598bd962a42911b7e3bdcea5a117385
-EBUILD lxqt-archiver-0.4.0.ebuild 1173 BLAKE2B 4ea39ba93cbebd610143d847c7acfde7825cecd6a991467480b3070ae700a7a96bbfa9b6174650d01f66f24c58653c357e29858e9bfa0a3e8f6821eed75ff9be SHA512 aa68b7ec0372fbf11dfa7aec5564fa56aef856f3828a93d06ca4d1be3919d9d1c00f4a7b95e8a937281802f9b5895323403027feaca4a8cdba7e184c39e24400
+EBUILD lxqt-archiver-0.4.0.ebuild 1180 BLAKE2B e683fb27236235e2dce15e1d957a435be42a953585cd16b881766808e510e390b42b7b7a199d0929d4f51ed8b1de360e78e8e45537f38b5378152da4b2658f95 SHA512 0cef2d37e234144395e7569790be0a2b84b1b67568559da56769cb68dd8af92aa6220d3d6f961904a08ae573a78810f9e09a6e840b08bfbcdd9fb3a72327e3cd
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
index d4ebbcdbf5c7..d677be578265 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 942e717db416..37f4a1df0cd3 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,13 +1,6 @@
-AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
-AUX rpm-4.16.0-libdir.patch 1136 BLAKE2B 6099eb30744db0debf1f1eb0a99e2f88488c805527951b3d3e6315782d793cbca20afe3dded579c3869e90116393dd5c3e37d9fbf98c2c18a41e5c34196fab08 SHA512 c592d5d4430ed41b06dc98dafac2f81bbd63e60f29a34f8d6280b1a9b0b38cfaaf5cb091625a0ea29450b219a620f1426876d8ff3a6dc85258ce9e7a5df141fa
 AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
-AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
-DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
-DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
-EBUILD rpm-4.14.2.1-r1.ebuild 3455 BLAKE2B 3636d33dfe5deec80c1ca78ff0df7a4ac29d6c42549eab4cf09927ceb538996ee6804a978331bd67debbf971e12fcf6956d79ef9df6f39ebfc81bce0a6f62c8a SHA512 96a0bc5a032e69eb91bd5967af59e242d4b9570621b6eba455a7f1f0d6ad67c1adb0c3eb2c8e7eb8587bf3022b328accefd3c7b0d3315f183c3cb4c1c24ec55c
-EBUILD rpm-4.16.0.ebuild 3940 BLAKE2B 3e9adc41250a0cad5389abbcc0b6fc865f0db902b33dc00e2250de9eba0165bf9f9daf1565b9b5702afd2bde9a3043abd3aab7e25ca90ebe12e0161351f9673d SHA512 423a9e7ea8d95c9c96208aba406f4c22815cf533227bd795bb69d9c033af0e3d4b2e8baac3dc9469cb7f57a4cbb70cc6d6135c60b5cd96ca5ed98b238a3a4e65
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/files/rpm-4.11.0-autotools.patch b/app-arch/rpm/files/rpm-4.11.0-autotools.patch
deleted file mode 100644
index 2a2dcb129de3..000000000000
--- a/app-arch/rpm/files/rpm-4.11.0-autotools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN rpm-4.11.0.1.old/configure.ac rpm-4.11.0.1/configure.ac
---- rpm-4.11.0.1.old/configure.ac	2013-03-26 18:38:35.137667450 +0100
-+++ rpm-4.11.0.1/configure.ac	2013-03-26 18:44:08.632673258 +0100
-@@ -824,10 +810,6 @@
- 
- AC_SUBST(OBJDUMP)
- 
--if test "$with_external_db" = no; then
--    AC_CONFIG_SUBDIRS(db3)
--fi
--
- AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
- AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
- AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch
deleted file mode 100644
index c9f5f297233b..000000000000
--- a/app-arch/rpm/files/rpm-4.16.0-libdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
---- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:08:43.780842602 +0100
-+++ rpm-4.16.0/configure.ac	2020-10-01 11:09:03.533705353 +0100
-@@ -935,13 +935,7 @@
- AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
- AC_SUBST(RUNDIR)
- 
--if test X"$prefix" = XNONE ; then
--    usrprefix="$ac_default_prefix"
--else
--    usrprefix=$prefix
--fi
--
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
- AC_SUBST(RPMCONFIGDIR)
- 
- AC_SUBST(OBJDUMP)
-diff -uNr rpm-4.16.0.ORIG/rpm.am rpm-4.16.0/rpm.am
---- rpm-4.16.0.ORIG/rpm.am	2020-10-01 11:08:43.743842859 +0100
-+++ rpm-4.16.0/rpm.am	2020-10-01 11:09:03.533705353 +0100
-@@ -1,10 +1,8 @@
- # Internal binaries
--## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(pkglibexecdir)
- 
- # Host independent config files
--## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(pkglibexecdir)
- 
- # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 10:0:1
diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
deleted file mode 100644
index 221926494411..000000000000
--- a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac
---- rpm-4.9.1.2.old/configure.ac	2012-04-19 12:18:27.584725220 +0200
-+++ rpm-4.9.1.2/configure.ac	2012-04-19 12:34:50.302722933 +0200
-@@ -846,13 +846,7 @@
- AC_SUBST(RPMCANONGNU)
- AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor])
- 
--if test X"$prefix" = XNONE ; then
--    usrprefix="$ac_default_prefix"
--else
--    usrprefix=$prefix
--fi
--
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
- AC_SUBST(RPMCONFIGDIR)
- 
- AC_SUBST(OBJDUMP)
-diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am
---- rpm-4.9.1.2.old/rpm.am	2012-04-19 12:18:27.584725220 +0200
-+++ rpm-4.9.1.2/rpm.am	2012-04-19 12:24:49.035724332 +0200
-@@ -1,7 +1,5 @@
- # Internal binaries
--## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
--rpmlibexecdir = $(prefix)/lib/rpm
-+rpmlibexecdir = $(pkglibexecdir)
- 
- # Host independent config files
--## HACK: it probably should be $(datadir)/rpm
--rpmconfigdir = $(prefix)/lib/rpm
-+rpmconfigdir = $(pkglibexecdir)
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
deleted file mode 100644
index 2d63fdc6f204..000000000000
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc dbus lua nls python selinux test zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dbus? ( sys-apps/dbus )
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( dev-lang/lua:5.1=[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--with-crypto=nss \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in hacking librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
deleted file mode 100644
index cdb8d7392a5a..000000000000
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{2..4} )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="!app-arch/rpm5
-	app-arch/libarchive
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dbus? ( sys-apps/dbus )
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( ${LUA_DEPS} )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-autotools.patch
-	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	eapply "${FILESDIR}"/${P}-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	eapply_user
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	# NOTE: 4.16.0 warns:
-	# "configure: WARNING: Using the nss library with rpm is deprecated and support will be removed in a future release!"
-	# Only libgcrypt (default) and openssl are not deprecated. We should consider this.
-	# bug #780684
-	econf \
-		--without-selinux \
-		--with-crypto=nss \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "doc/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500):
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
-	fi
-}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 460bc1362837..a0df0129f485 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,5 +1,5 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
-EBUILD zstd-1.5.0.ebuild 1675 BLAKE2B c5db040bed77446a213471fc32b804d516cf3795757eb71debd4a2931a9407895f8325fbd5e35d406b86e588f2f954eea3c7c82d328daebd35f35f4008268f94 SHA512 990a9fecd08be1869368ffa41e286e2cb07f83cbceb0341088c56a6a082107077f1aa48891a94d2ec41691400167fb5272dd44d08da45c1d2be9eb1f208c4a60
+EBUILD zstd-1.5.0.ebuild 1671 BLAKE2B 4f1fd55fddfbcf5349978f30b17965e4f26af2b868f9c448f6dc10ade08ca7a2ed236c2ddf7cea592ba917fce5f7f6c35790a4568385753bd0533f75ef57a304 SHA512 0868d7d30c752e2f9bd84bbe14c06b9240ceb0c9e1f829e948ce090a3638ef66f4f42e1463673bbafbc4fe1c412075adafd316f0b986a4d71c89825a7daf4ee4
 MISC metadata.xml 409 BLAKE2B c955efa52a6bb0508c7a648281351c4eb37c8d0381b71317948fb33fcf49acd837ebaa86a66d46c561ec86b97a914f64795ea424ee2f9fc06ae13a5e00343ac8 SHA512 d3a660c20edfc5f404dd02df9819178e7501483db8a548b434cd6f19d9634352b80a6118d5bb5bd27496f0d1a7d5e1aa9adbbc21f1604bfa3f78aa99a252d1b6
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index 801af9e179ba..e4916f5f0bc5 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils