17 files changed, 188 insertions, 131 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 4c2907a4942d..b6c38df6c66f 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index e41bbcbd164a..10f845a44288 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,4 +1,6 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 DIST lha-114i_p20210328.tar.gz 231115 BLAKE2B f9587fd2f99aa80498ed69f43efe189a6db12881c6ea748763e8ae071180a30578651db11cbba0216103f6a7741d37a0e55b2530a7e458046a7230f6101f05e7 SHA512 46fc722f9f15dbe75600c2aeecbf94357aa24da964bb03f8326d9d13affa2ea60d4ec5dd21a4f5014f2cbe4e06f4bb959aa8de89a5491e1600eafdd909b293d2
-EBUILD lha-114i_p20210328.ebuild 733 BLAKE2B 78257bc45feae94d75132506dd3944866b304a00ae2f085dbf798349285fdea5d1af13f9fa8da937a6f206d90cee2bd20ffbc96b2131b80b5de536bba541742d SHA512 3ac36e88cdb961fa1eb5f02b6c75a25a51d6c997ef39dd5041bd5717f37db98f8c863cd13d549763a89be85892d060edd9e9bc4e352c37424e33003df0bdb753
+DIST lha-114i_p20250112.tar.gz 231162 BLAKE2B 94c8f471c99bf43ab42acb2cf8e04e65fadfb9496cb728e3d6bc1ff156390e74e5cd526657ad4d47b0842bf94ea65aaa9496bd6066d8c47613fed1a996b3c5f3 SHA512 dde46c906666bb261a4f2101876429f8b55b11242772e8506faf637fab9cc852c927a4ec2b7ee7a44fed5035ee172783b66e312ed9f33f6cbab3bd4f69cf082f
+EBUILD lha-114i_p20210328.ebuild 813 BLAKE2B 37d192a6bf5ccf3987b287850f3e528de68c0db78ecadb96e8b23368db229cb17c2578935c2a6ae2764e75d7093e401561153c6253a5e3f7d1cf833bf56c3567 SHA512 090f3d28c929b25edf6cc3e2ec7047b153a31a8221ff9a003ccd3bc0a02acfa93ba0d6948c6853f4c124fd98a7d90cb984cce9d1b8002456cf2daa0429bd7731
+EBUILD lha-114i_p20250112.ebuild 818 BLAKE2B 762c26902c77f37e2e87b9e6063bfc960432b8c384844b7bf7cbcb1b22506213b0da6d17e4b44d367c734c458543eb11b57645784bb089f5d212fc8a1817d4bd SHA512 2c7462e36bf38074af0527ccd1bd95e9416f19e8452424a762d115caed5ecf405dd1421e8e9e20bffefca167be8dd99044add9d93064a54e0193f0e5ff1a1394
 MISC metadata.xml 366 BLAKE2B a7fc5ecb79726152b5a531145574116fe5cc90f91580ea2a206489319a930420ef7397bfb9bf857d9340f5d66e18d98d587977554ddcb6b73c5b590bbe0011a0 SHA512 a219c8eaa5817fb989ce891a170166338e338a9b0e275c6f88759b0d6df197adf8e141f1222b3e02e539994683f2dd1cf14d9c623c2c12bb8f3f57c38c55e2b4
diff --git a/app-arch/lha/lha-114i_p20210328.ebuild b/app-arch/lha/lha-114i_p20210328.ebuild
index 0537235ed1c5..64f7c730c8ec 100644
--- a/app-arch/lha/lha-114i_p20210328.ebuild
+++ b/app-arch/lha/lha-114i_p20210328.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 MY_COMMIT="26950220c9c7590fd603ecaa54a12a52371affed"
 
@@ -26,6 +26,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	append-cflags -std=gnu17 #bug #943900
+	econf
+}
+
 src_install() {
 	default
 	dodoc olddoc/ChangeLog Hacking_of_LHa
diff --git a/app-arch/lha/lha-114i_p20250112.ebuild b/app-arch/lha/lha-114i_p20250112.ebuild
new file mode 100644
index 000000000000..97bd673d9071
--- /dev/null
+++ b/app-arch/lha/lha-114i_p20250112.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_COMMIT="3cbed06e786aa198cee231960bd4d19cac00c7b8"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://github.com/jca02266/lha https://lha.osdn.jp"
+SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-file-list-from-stdin.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -std=gnu17 #bug #943900
+	econf
+}
+
+src_install() {
+	default
+	dodoc olddoc/ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index c4bb5e177dba..3ddced3f15b3 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,7 +1,4 @@
-DIST lzlib-1.14.tar.gz 131624 BLAKE2B d975fece48d92be354202581a5be5c709b8acdbb41b3782ec0a79939278ada42aa6765bcef7a1cb70bfb7808b8a88d5e6ed48924f13fcc291a4a0d2057f0f4bf SHA512 1582b99149af18ea119f015a9dbf224aa2ebc78240432415b2da20bd5a4e4dc3fdea2489789bc581bdccdba6f4eab13c69c5801e8a43ab9a829c2eb9b801797f
-DIST lzlib-1.14.tar.gz.sig 72 BLAKE2B 104d914d4b85bab0457017ab5663962ac1573dac421e11a94eaa9e77f6338501c96444d45e1e4101e9ea48409c2b30037a7b07c2a188cff6fcf47c6d067d1398 SHA512 852ebd4a460021e642a673a8c6d88b25a2b45dff4a45f7ccfc6bbb531be3c967b8e01308aa35088c843002561c1c4b813a47ff4b0fd4417ebf12f188af8d36be
 DIST lzlib-1.15.tar.gz 115185 BLAKE2B cf952129ea7e4beb08e9c82d2035bf0bb6f25294734d0b882244df210132c4b425e6d6d6e999949cc66a686acb9c59a5bdae25e45cc004e9f2e2e36fd37ce772 SHA512 12dca273b3aa45507495bcca9d260cd0c7fcad0deb32e9b146e24d1cb3d65261e67e67e36da8012689cb0f28e6034e0a4f5129cee7d9c97d4e2c98c270e8bd49
 DIST lzlib-1.15.tar.gz.sig 72 BLAKE2B b5539628be7953b34526ad8806d10f7f9c4754e162b2e9fde10425d832389d1f1770c2966d6c6f99759142c106adbeb0bcb989887993cbe376c0d12e3a15d06b SHA512 fd29d4f8e4996c3df65194a4fac2866e1191a7574d84950a4f68500355ae22276cc8ad1555be9142e32d79b767cfd1eaf4f331b411e01867349559d6834ebd14
-EBUILD lzlib-1.14.ebuild 1122 BLAKE2B 0c77a9f0d8c7ee22581207f84a001f6037dbf4bec668a20c93c93af5325adcc6250c6d9130c6ca84ee3245db1417671c7da2eb6e32732ef96c2f255f2970b888 SHA512 ef10f15782a8ec7df6e4404b303f7e9695a720edd3ca8e7341b0d42531096c6b87d5ced8c55a6a2ceb5e579530f2fd8f2b5e4f4b7bbec424538eb5bcecd3583b
 EBUILD lzlib-1.15-r1.ebuild 1156 BLAKE2B 00eeda232667fd52ebcf87da0eff7dedc89ea3888c48be6e01ca252d4bc81f547b243fd45d09fec4f03f60ed344e2d81c2d5a57843699207b44a49d942b48d90 SHA512 fc6c2fc8fab0c017101c1fad3f72c6244feebe248d699b518dee75992b0ad0386b34858a0b0bb64ec22ee06b14ebdaa57155cded52afcdbced7da35acf3a275a
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzlib/lzlib-1.14.ebuild b/app-arch/lzlib/lzlib-1.14.ebuild
deleted file mode 100644
index d0678ffb8746..000000000000
--- a/app-arch/lzlib/lzlib-1.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="Library for lzip compression"
-HOMEPAGE="https://www.nongnu.org/lzip/lzlib.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/${P/_/-}.tar.gz.sig )"
-
-LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
-
-src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-		--disable-ldconfig
-		--prefix="${EPREFIX}"/usr
-		--libdir='$(prefix)'/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		CPPFLAGS="${CPPFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-
-	# not autotools-based
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-	einstalldocs
-}
diff --git a/app-arch/par2cmdline-turbo/Manifest b/app-arch/par2cmdline-turbo/Manifest
index 06feb7ea99e2..14be97312232 100644
--- a/app-arch/par2cmdline-turbo/Manifest
+++ b/app-arch/par2cmdline-turbo/Manifest
@@ -1,6 +1,4 @@
-DIST par2cmdline-turbo-1.1.1.tar.gz 3937861 BLAKE2B 3c7829bff1148ca4eab2259664827c491b0802cd76b95119f0381f4c8eb1532ff7207293b740a8e5ecd2a515f59f60696ddf0ce7e6b50f637f49495b852912af SHA512 bb919f885134a298ba14551e21cf89a91aee292e437133e6973bef09fb5dee9a9b45e76a59320bfede864438d3ac884699be7ca3f7234896a9da14cb07ffa89d
 DIST par2cmdline-turbo-1.2.0.tar.gz 3952265 BLAKE2B 44b954047a45dc01b2ff7519101c210965c0fd3f82d6f71e8312b0c4482b03ceff6334bf9263ae5dcc16536b8cfcc74e031da0c2a67bad9effce0bae92600f39 SHA512 50b0548574c421899073dd2259d2841c8dd378b94a43b9060660ce9c2c964951ea539661beb24a0aa30b577f710c9b1df9b8c04b47aff41f4cd239413995711f
-EBUILD par2cmdline-turbo-1.1.1.ebuild 609 BLAKE2B 9946ad485161a358bd31770013222c5af5b9f8363b40e32e6a39d75257a2222b74d31b15f9c0a01b4179b7227909777bd28140ff54e6d18dfcae4686d69d2c35 SHA512 3184e70b3b18bd0cdcbc0d12375ddbb8dbbe2d4332db13f3dd5419b4ece92bcd6d148c66d9d0a75a075f166709c4dfa96181a2c8d1e5dca0e626bccb95eb16ad
 EBUILD par2cmdline-turbo-1.2.0.ebuild 595 BLAKE2B d9ce422e9e14a4a5234f60b5b9d0f3498456bddf4635174e754ca4a6ca46475d309597abfd5d0e0fa1e5a27ba3de4ee4fe3981122acdfdf8b4c28af21115d71e SHA512 3a0f8b88a5c4895d4317841d16abb58d30d0231f635af29c2dd85c819b79c6aaa5aa44283213b0252a79d7568f99ff0d40781ac0b948d11cfdc9b5408fe5e462
 EBUILD par2cmdline-turbo-9999.ebuild 595 BLAKE2B d9ce422e9e14a4a5234f60b5b9d0f3498456bddf4635174e754ca4a6ca46475d309597abfd5d0e0fa1e5a27ba3de4ee4fe3981122acdfdf8b4c28af21115d71e SHA512 3a0f8b88a5c4895d4317841d16abb58d30d0231f635af29c2dd85c819b79c6aaa5aa44283213b0252a79d7568f99ff0d40781ac0b948d11cfdc9b5408fe5e462
 MISC metadata.xml 476 BLAKE2B 9cd6a152a7356f4751665cd02eaf931b5dbe879fe1322144196c3910a9b64a98fde06a7baa9825e590e6fd867077019e0c0ccd1fdbde7878b71ee179cfbfd627 SHA512 bd4a201c7bfb4f9c6d4a277355b3f8721e6fe2a8f461b38a07b83921942a2663e397e79e0bd227e33ba191b319f621da7763f875cb2edb71943a0b9b2e4b8963
diff --git a/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild b/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild
deleted file mode 100644
index b696866e2dc9..000000000000
--- a/app-arch/par2cmdline-turbo/par2cmdline-turbo-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/animetosho/par2cmdline-turbo"
-else
-	SRC_URI="https://github.com/animetosho/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="par2cmdline × ParPar: speed focused par2cmdline fork"
-HOMEPAGE="https://github.com/animetosho/par2cmdline-turbo"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="openmp"
-
-RDEPEND="
-	!app-arch/par2cmdline
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 80645f7b1be9..394c15c46d23 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,8 +1,8 @@
-AUX rpm-4.19.0-libdir.patch 578 BLAKE2B 643e4869b5770e98814a4787c66c3de516c0675648598164c4fe6e076e5a5c497ba897353260e5fb780af2d8b9b31693b4189704a145245cc0ee22ae3a6759a7 SHA512 b241e014c642ea70fdec4e12b3af512a00b5c408d9ecdd1c5bcd4aca9bd60f9af49ec8a599fbeb9f4d5a66c24450e082a0f199c27c15554855f3195d394de228
 AUX rpm-4.19.1.1-musl-compat.patch 401 BLAKE2B f1d77f167d0270602394cc145c288cc5c622892044c5f38df803649f9ca300f5dab7e0850e239362652142818c152f54e4de5f718ed42d51928329b0599abe34 SHA512 325d2b417619fd26ed9a2e2036854da5ed0118420640ef843e31add082d4ab3527fe3a6a7ee2d35c5939c75a7b5e17318973cd242e8ba008c54b8a1ad7ede0b8
 AUX rpm-4.20.0-libdir.patch 437 BLAKE2B a1d0d59027fb2e551647be03a6d4eab9fdac544028e7cd8bd4d8d77ce2b30e7b1334bc88ba1c990f23aa0779fc3d426a5576ef275f50daaed768965e148a93c5 SHA512 65fa4a5e653c6620064ef72db37dc21e40874bf21d68274f66fa26dd015f20d329e55bbf58f24a6aeb58a90946ffab3ff6f2ed4df4299066060d718476ddc2ae
-DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d
+AUX rpm-4.20.1-no-hardened.patch 464 BLAKE2B beede4bb772171d96c3bea9230d60e0ccc4d74f607d4b15503ee548c0a6d70a10cb88d536371c1bb351f3695cce516c841b30225ef682ea4159343d06b5f1990 SHA512 8cd25ee1c79c7d3f5dc887139963633b7f2023638bf5e4c05c87ad925694ce77663763c72f3902247752f984403075a42cf6a2a75f01fead868457c96b0ea1c4
 DIST rpm-4.20.0.tar.bz2 5984513 BLAKE2B c809e933cf7eb9ab63fa7693e634f7fcf744f94130199f674c5e76e77ead4de25b583daefdf651bbf0475012d262d1bdca605f19a520e160e90e3deb68c74f18 SHA512 b340c66cfda3abed38e81f91c4a789f2c6c0d3ce408de71d861fef27e180b607ae698e046b6925c7781a7177cde9df4075943714ed2aad7c62645eca348f5544
-EBUILD rpm-4.19.1.1.ebuild 3285 BLAKE2B dc2241a7fa07e0a07f40c40285fe394361a5930aca7a7aec6ee98f683dec1079f907a03f33470d0ee19cc65597fafd72e3e7fbf3980bd8c48457795fb9c648dc SHA512 af29f466e66aab4017b88c0ca7d08ccc35980ce5a23cd07540cee796d79e0760344d77680edd57a5a226c8281c054ab1c06a830fe9b4380144b16d7190f799dd
+DIST rpm-4.20.1.tar.bz2 4534720 BLAKE2B 0d2c553be4cdb5c511c94c5d70a6f5d8ab350fbc7e29b91ea8ce7dd4c1d3f5f2db3a8d46305adc53083c8367b771588db185338cd04a769c54856a425f71bad5 SHA512 77979cb49dec5a8816fc5019cf5d0c817adddec10c0018c8ad9487db8ffc58613557fa21f8e2163b747197b55a6de202c29c88e19b70d1fa6b4c18d3a84bf681
 EBUILD rpm-4.20.0.ebuild 3505 BLAKE2B 819c6b7e21d5f9f43d940958b501e40614942b34093bf63be297efa70a9b87558723152a8a62da13775816d2faef9e3d6db13ade24f938abe7683d9276aa85d8 SHA512 f63f18f20fa145cbdc4120f9d1d81df90fed185423174bbb1ff83c83a67e131cd6325d177e4dafb41287c83a7a889adc83069b56b5668ac2c2f0625dfb436040
+EBUILD rpm-4.20.1.ebuild 3506 BLAKE2B a9af22cc8fdf8975ada0d912a8dbaad46608542f68f04fbcfab997b3889aefc8049b35a65aeafa746c2bfa127c1a90df4029cb85828f5c9078d9cecece57efe5 SHA512 a0177d59f2c5dc652b2db2ce78eb0fef142c0ecb3e43652f0ec538b8e643f4f9adedfd4f0874db3716d5df237190e27269ac90405873cf5196bf7f67f9b049c1
 MISC metadata.xml 616 BLAKE2B f0df64810f4eaf6b3fa7cdb09a892677404fa2d6d3bd36abb9c5f638be56200d1c83dfec4b6a3bd18ad9ae9b56eeaabdbce243eafad366f366c9157ddfb00ad8 SHA512 792c6c2476c7e928b1e1515b56e19ec83e3855aaaebd17aa66407f6a232f4680ba5d90da54c0a5af7d3db829124fa062015070a1ab82ebe91f5f8f2d1ebaff29
diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch
deleted file mode 100644
index 9899827c985e..000000000000
--- a/app-arch/rpm/files/rpm-4.19.0-libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c164e9c52..5738c821f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF)
- option(WITH_IMAEVM "Build with IMA support" OFF)
- option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
- 
--set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home")
-+set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home")
- set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
- 
- # Emulate libtool versioning. Before a public release:
diff --git a/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
new file mode 100644
index 000000000000..ea5135c1dccd
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.20.1-no-hardened.patch
@@ -0,0 +1,12 @@
+Don't override Gentoo's default _FORTIFY_SOURCE.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,7 +426,7 @@ if (ENABLE_ASAN OR ENABLE_UBSAN)
+ endif()
+ 
+ # try to ensure some compiler sanity and hardening options where supported
+-foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
++foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks)
+ 	check_c_compiler_flag(${flag} found)
+ 	if (found)
+ 		add_compile_options(${flag})
diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.20.1.ebuild
index 79412f165585..5e8409c59759 100644
--- a/app-arch/rpm/rpm-4.19.1.1.ebuild
+++ b/app-arch/rpm/rpm-4.20.1.ebuild
@@ -1,55 +1,53 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR=emake
 LUA_COMPAT=( lua5-{3,4} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake lua-single python-single-r1 toolchain-funcs
+inherit cmake flag-o-matic lua-single python-single-r1 toolchain-funcs
 
 DESCRIPTION="The RPM Package Manager"
 HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"
-SRC_URI="
-	https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
-	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
-"
+SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bzip2 caps berkdb doc dbus iconv lzma nls openmp python
+	readline selinux +sequoia +sqlite +zstd"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-# Tests run against a Fedora container image, which needs to be pulled.
+# Tests run against a Fedora container.
 RESTRICT="test"
 
 DEPEND="
 	${LUA_DEPS}
-	>=app-arch/bzip2-1.0.1
 	app-arch/libarchive:=
-	app-arch/xz-utils
-	app-arch/zstd:=
 	>=app-crypt/gnupg-1.2
 	>=dev-lang/perl-5.8.8
 	dev-libs/elfutils
 	>=dev-libs/popt-1.7
 	sys-apps/file
-	sys-libs/readline:=
 	>=sys-libs/zlib-1.2.3-r1
 	acl? ( virtual/acl )
 	audit? ( sys-process/audit )
+	bzip2? ( >=app-arch/bzip2-1.0.1 )
 	caps? ( >=sys-libs/libcap-2.0 )
 	dbus? ( sys-apps/dbus )
+	iconv? ( virtual/libiconv )
+	lzma? ( app-arch/xz-utils )
 	nls? ( virtual/libintl )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:= )
+	selinux? ( sys-libs/libselinux )
 	sequoia? ( app-crypt/rpm-sequoia )
 	!sequoia? ( dev-libs/libgcrypt:= )
 	sqlite? ( dev-db/sqlite:3 )
+	zstd? ( app-arch/zstd:= )
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -62,8 +60,9 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.19.0-libdir.patch
-	"${FILESDIR}"/${P}-musl-compat.patch
+	"${FILESDIR}"/${PN}-4.19.1.1-musl-compat.patch
+	"${FILESDIR}"/${PN}-4.20.0-libdir.patch
+	"${FILESDIR}"/${P}-no-hardened.patch
 )
 
 pkg_pretend() {
@@ -79,30 +78,41 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
-	# rpm no longer supports berkdb, but has readonly support.
-	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
 	local mycmakeargs=(
+		-DENABLE_NDB=ON
 		-DENABLE_TESTSUITE=OFF
+		-DWITH_FSVERITY=OFF
+		-DWITH_IMAEVM=OFF
 		-DWITH_FAPOLICYD=OFF
-		-DWITH_SELINUX=OFF
+		-DWITH_OPENSSL=OFF
+		-DWITH_LIBDW=ON
+		-DWITH_LIBELF=ON
 		-DENABLE_BDB_RO=$(usex berkdb)
 		-DENABLE_NLS=$(usex nls)
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_SQLITE=$(usex sqlite)
-		-DWITH_ACL=$(usex acl)
-		-DWITH_AUDIT=$(usex audit)
 		-DWITH_CAP=$(usex caps)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_SELINUX=$(usex selinux)
 		-DWITH_DBUS=$(usex dbus)
-		-DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON)
+		-DWITH_AUDIT=$(usex audit)
+		-DWITH_SEQUOIA=$(usex sequoia)
 		-DWITH_READLINE=$(usex readline)
-		$(cmake_use_find_package doc Doxygen)
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_ICONV=$(usex iconv)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_LIBLZMA=$(usex lzma)
+		-DWITH_DOXYGEN=$(usex doc)
 	)
+
+	# special handling for ASAN
+	# https://github.com/rpm-software-management/rpm/commit/ca8d1cf3f401d89ad3507aed8d7a70ad37026ca7
+	if is-flagq -fsanitize=address; then
+		mycmakeargs+=( -DENABLE_ASAN=ON )
+	fi
+
 	cmake_src_configure
 }
 
@@ -113,13 +123,13 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	# Remove pre-built API docs.
-	use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die
+	if ! use doc; then
+		# Remove pre-built API docs.
+		rm -r "${ED}/usr/share/doc/${PF}" || die
+	fi
 
 	dodoc CREDITS README
 
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
 	use python && python_optimize
 }
 
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 98b0cb33b83b..e7bcafb57c99 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,7 @@
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
+AUX unadf-0.9.0-make-test-build-conditional.patch 729 BLAKE2B 17ff239f178bb9761f8b0e5b72d30a87cac15574cde1bf21d10b7fe2b58935e82d8e893bfc804e7c1ee049dd408759bc529a40b0d2493784dd0a200f33ed79d6 SHA512 3a12eb286cae7bee3de9cea6d89543f5b0ba370160aad1c517292d15f430af413a095b43ce8f38985326b8372e21db3b03ee79aede641d57acbb7802c4bdc5da
+DIST ADFlib-0.9.0.tar.gz 2262331 BLAKE2B 3bb9a061de6b4a009f3c266cce20d7a2aa826b2fbaf2bd91db5b40f991471922889dfa5cb70f29a6fa8d954b24ec6d8ab63a1d51f08f983daeac4f0fecd47cb8 SHA512 1abd1ba06a1150780397eff48e2334ba4e2d11679847966f9a1ef7bf4b9f16557ac2ec891e8810296c534ab2cf38dfa3e8d780b67cf160b7710aec5075e10846
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
-EBUILD unadf-0.7.12-r2.ebuild 602 BLAKE2B 5f187ac57c6a67b85c20ef19d6ba7b9fdca5d4d5f80fd8f45fd9f89128a179d8f59d233bb43a7750bb5e5ca3b6f94a17a6fadbc970bfb3bdbaee493a7734a0b2 SHA512 122ca98425e2aa1eed5078a590f4f54a9409ad422ec0c84238dfd43f329d3dc7d3e4c173727d67f2ecd6bd8e0e036a552ccaf85fbfc1c7f8d8ca16e4a722005a
-MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
+EBUILD unadf-0.7.12-r2.ebuild 682 BLAKE2B 9a4680a1391df8c62bb6d08cd41575972a171b0bd0c531b12117eb3e643fc9275d12a52e8219c12d6329f14d5bc4db5224707e188ae3ed1c0e5903c7dc21abca SHA512 4d99c35b315239830caee3a4a8e87d53c80e5d3825c67f22015f6b6498fd1277ade95989c1f2dd386ad960c76968e740e07d255972a459905140c1f881546a9a
+EBUILD unadf-0.9.0.ebuild 1295 BLAKE2B 8529faef61b850a7b052da80ed38f21146e2b42e4ef4e1232a0fc704936a06b7b8c24dcedf5320aa995a8423e6f2fa9ff0506cc86425182d608cd7998c62f30b SHA512 acbbeaaf0dd88886cd7b5c28afaab02ac0686f8f297ec69e8d62826456a8c7f408c2705df0a87fc6d79ac880ee22fa68d1dd08023d7f08c76f150c7994381927
+MISC metadata.xml 293 BLAKE2B ea8500c9ac7048cec64040d1de0eba99f75d192b1a1faf1d1fea0e4d25806118cc6c38e65e0ace5935c48e394a0d3600f7125ba6699a699e14bf60e0b41005cf SHA512 1417afa7f122e7d219ff2ea4210039cd0eddb34e0dd5f101593ace7dd9973fb4a3c34c6cf61a46ae0be706a0a65b8c395f3a51cf8842bc824202029f449b36d0
diff --git a/app-arch/unadf/files/unadf-0.9.0-make-test-build-conditional.patch b/app-arch/unadf/files/unadf-0.9.0-make-test-build-conditional.patch
new file mode 100644
index 000000000000..011edd7789ed
--- /dev/null
+++ b/app-arch/unadf/files/unadf-0.9.0-make-test-build-conditional.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index a37d6f7..ec7d410 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,8 +103,14 @@ AC_PROG_INSTALL
+ AM_PROG_AR
+ LT_INIT
+ 
+-# Checks for libraries.
+-PKG_CHECK_MODULES([CHECK], [check >= 0.11.0], [tests=yes], [tests=no])
++AC_ARG_ENABLE([tests],
++              AS_HELP_STRING([--enable-tests], [Build tests]))
++
++AS_IF([test "x$enable_tests" = "xyes"],
++      [PKG_CHECK_MODULES([CHECK], [check >= 0.11.0],
++                         [tests=yes],
++                         [AC_MSG_FAILURE([--enable-tests was given, but dependency check wasn't found])])],
++      [])
+ AM_CONDITIONAL([TESTS], [test x${tests} = xyes])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+
diff --git a/app-arch/unadf/metadata.xml b/app-arch/unadf/metadata.xml
index aaab041e8885..fd410c3a862c 100644
--- a/app-arch/unadf/metadata.xml
+++ b/app-arch/unadf/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<upstream>
+  <remote-id type="github">adflib/ADFlib</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/unadf/unadf-0.7.12-r2.ebuild b/app-arch/unadf/unadf-0.7.12-r2.ebuild
index 5e358f5bf7e8..2ce449df37a8 100644
--- a/app-arch/unadf/unadf-0.7.12-r2.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 MY_PN="adflib"
 
@@ -23,6 +23,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	append-cflags -std=gnu17 #bug #943902
+	econf
+}
+
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
diff --git a/app-arch/unadf/unadf-0.9.0.ebuild b/app-arch/unadf/unadf-0.9.0.ebuild
new file mode 100644
index 000000000000..6e6637346344
--- /dev/null
+++ b/app-arch/unadf/unadf-0.9.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# autotools has automagic test building
+# cmake has half baked installation
+inherit autotools
+
+MY_PN="ADFlib"
+
+DESCRIPTION="Extract files from Amiga adf disk images"
+HOMEPAGE="https://github.com/adflib/ADFlib/"
+SRC_URI="
+	https://github.com/adflib/ADFlib/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_PN}-${PV}.tar.gz
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1+ )"
+SLOT="0/2" # see adflib_lt_version from configure.ac and util/bump_project_version for more details
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/check )"
+
+PATCHES=( "${FILESDIR}"/unadf-0.9.0-make-test-build-conditional.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local detected_libtool_ver
+	detected_libtool_ver="$(sed -n -e 's/m4_define(\[adflib_lt_version\],\[\([0-9]*\):[0-9]*:[0-9]*\])/\1/p' configure.ac)"
+	if [[ "${SLOT}" != "0/${detected_libtool_ver}" ]]; then
+		die "SLOT ${SLOT} doesn't match upstream specified libtool version ${detected_libtool_ver}."
+	fi
+	econf $(use_enable test tests) $(use_enable test regtests)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}