gentoo auto-resync : 22:12:2022 - 01:55:45

24 files changed, 8 insertions, 816 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6d8b4280098d..189995c8f490 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 065434fe3fc2..ef012004c1af 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -310,5 +310,5 @@ DIST xterm-query-0.1.0.crate 5662 BLAKE2B fe75d2e7d4e493a3dfc0105dd61e923910f890
 DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c47a9b49d421bf13b031609505cb39bfe31e0dc64e6a5ab59b1d2de16141e205373eddd1f712c46dbb50004a269 SHA512 672c1a73021b9cec3cf804b1ff3a6bfece8b297bff7f15762e46e842e06b418ee4c1b712ec08cb19756987a3db93c7ef33a1459aa438dc82924aad48065af9ca
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.16.1.ebuild 5434 BLAKE2B fd6abfdbb85bad8a2609108000c037c8cc94900a0bc5308f265da8ff810f59eb149bad0b01c2aac1f40a6b0c71852db227dcbacaf3c06cd449be733a2d4f8aab SHA512 3cd4a8c483c12e4d694d1daeaf6343928ffa33d478d7a29636bc17874d1ee812235cf7dc92a53fd6ea2191d2f07780d749a805b90e883491bf24e801a4f10264
-EBUILD broot-1.16.2.ebuild 5689 BLAKE2B 84f8578f39fd984c6589f6b50c54dea1c028045b1018a41aaacc9ab65f96793f3ef7d797ab2572df78c8ee1ccb445e685db6c33f720c512b666fa4af2f1648e6 SHA512 4f642fcda6703aa05ab92b5203a1b895668f5b09d67839373a4136a57914b622d83d3b3bb4f02454db01f493261cf7f87ae54070a68b0f108c40532cfde88777
+EBUILD broot-1.16.2.ebuild 5688 BLAKE2B ad842e5e38a2c1f37dd950741628ca313bbd32c8b27cd00042070eabb869837b61c9e0cc1459f22784d579d7a07a0d42b1ec83e06446a5d34968393615027188 SHA512 d41b1549907ea1ec7fdc706fb4332b42d32ddcf1f385251b3b491f0866f33671bce2c33e5bba45ea9f855bab823d3a5fbc5d61b769f89d31460ae64dda717b98
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.16.2.ebuild b/app-misc/broot/broot-1.16.2.ebuild
index 06394ed2fb93..8a885817b1e1 100644
--- a/app-misc/broot/broot-1.16.2.ebuild
+++ b/app-misc/broot/broot-1.16.2.ebuild
@@ -263,7 +263,7 @@ SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 0f21edc0b7ab..b962651a4b1e 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,7 +1,4 @@
-AUX 1.0.5-Makefile.patch 1010 BLAKE2B a45e729398432a402296a57a6b82cf994bd91608c3af5ed1aaaaaca399930f7d14220eb932bff6fe89d7989c7a6e3f29bd4652cdfd2e82608217fdabcbc46d4f SHA512 73b43a54e52490ee662cb7af7505d4d0bccbd16851b19010be36e0b309bd0d81636ef855cdb1c49f83c9d7dbac036191eaf8b38396759b1e14588b28a9dd1f17
 AUX 1.0.6-Makefile.patch 728 BLAKE2B e94780600af8855903af12f0ac2b3645d8080bb38753cdc107a04d4ead1c8b2ef26c4c68d230ba4eef3431af8a97852e1871068c90513fb2eb70ec9a34408646 SHA512 0bc5828d6c4b587e508fa01355bef6b3a95918118adfedd4c1502845706534336e20ecacda637c4f42193ccce2b4d20b51d93062002cef4d897e4d65d95defc9
-DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
 DIST countrycodes-1.0.6.tar.gz 18834 BLAKE2B b5e0806618da0dd740a890b9c4d369cf2c44182515ec91aaa08a5e19da447635fb8536611a278ffcc419b506efa07df7e71bf5d520895a059c4aaa6e0cbc9b48 SHA512 be069593f60f785ef4d2e107340b941902a9c45d81ed04f8518a78f2be610ffdd1675da3da1d07271fc7ab736aabdd9f92f060d132e7b7b41310f1b653c53244
-EBUILD countrycodes-1.0.5-r4.ebuild 710 BLAKE2B 049005d915058af95f12a8f2c5c3693206f3386428a1afb3aef62ef92360c073c50996fe312879c3456996387b94f9f18cb4975811c82627468f634821cc6566 SHA512 eb10abc32ee84401560148c65e4e230b4aa8b4d70f5306cec5ddc5d40f5e31cb79e1bafd89059a4550f8b273f8cf36412757b9dd77329e9ffe55bea0ca5b9611
 EBUILD countrycodes-1.0.6.ebuild 648 BLAKE2B ef61640e305089bc8c462b8a4876439feb2e210cd3c26cbda5d4afc86e876a4883b0b7fddef545bbcf340693dfc0f88d955ba98ecfd9ce4a74b2f3a37b155dc7 SHA512 ddfc33e36c0c093ecd976f71736bc4f447cbdf01f9ac2cd91d009ab54a1925c40d2d9ce809c86fd0fd9071dcd84a2fd9f5502739aa4a6c48821316f236e7a906
-MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
+MISC metadata.xml 348 BLAKE2B 2cce9ed106752c09f0be959a0203ea56a6f8a46bbcfc6eea26198ea7d249f1643eddd4bcf4e6eb8d2008fc0fcb6fc7f0e792942f3f0d6ad84fff42cf87c808d9 SHA512 14f1460dfda768aef2ea4677f70f8641a0e957a394face81e35e42161d0e665fbf71124ec5d80db5ad7220fa8d0e458725eecc1c943acb8099457c712a56c04d
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
deleted file mode 100644
index 3515c7e85217..000000000000
--- a/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="An ISO 3166 country code finder"
-HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/"
-SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		mandir="${ED}"/usr/share/man/man1 install
-	dosym iso3166 /usr/bin/countrycodes
-	dosym iso3166.1 /usr/share/man/man1/countrycodes
-	dodoc ../doc/{Changelog,README}
-}
diff --git a/app-misc/countrycodes/files/1.0.5-Makefile.patch b/app-misc/countrycodes/files/1.0.5-Makefile.patch
deleted file mode 100644
index fab4c82019e1..000000000000
--- a/app-misc/countrycodes/files/1.0.5-Makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -26,10 +26,9 @@
- LOGDIRMODE=700
- 
- # Compiler to use
--CC=gcc
- 
- # Compiler warnings
--WARNINGS= -pedantic -Wall
-+CFLAGS += -pedantic -Wall
- 
- # Compiler flags
- CCOPTS = -O2 -fomit-frame-pointer
-@@ -61,7 +60,7 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(ISO3166OBJ)
--	$(CC) $(CCOPTS) $(ISO3166OBJ) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@
- 
- clean:
- 	rm -f $(ISO3166OBJ) core defines.h $(PROGRAM)
-@@ -70,8 +69,10 @@
- 	strip $(PROGRAM)
- 
- install:
--	$(INSTALL) -g root -m $(BINMODE) -o root -s ${srcdir}/$(PROGRAM) ${bindir}
-+	mkdir -p ${bindir}
-+	$(INSTALL) -g root -m $(BINMODE) -o root ${srcdir}/$(PROGRAM) ${bindir}
- 	@echo "Installing man page..."
-+	mkdir -p ${mandir}
- 	@$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1
- 	@chown 0.0 ${mandir}/iso3166.1
- 	@echo
-@@ -80,9 +81,6 @@
- 	rm -f ${bindir}/$(PROGRAM)
- 	rm -f ${mandir}/iso3166.1
- 
--.c.o:
--	$(CC) $(CCOPTS) $(WARNINGS) -c $<
--
- $(ISO3166OBJ): common.h defines.h protos.h tables.h
- 
- defines.h:
diff --git a/app-misc/countrycodes/metadata.xml b/app-misc/countrycodes/metadata.xml
index 6258504e5133..3755461f1aa3 100644
--- a/app-misc/countrycodes/metadata.xml
+++ b/app-misc/countrycodes/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">countrycodes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/cstream/Manifest b/app-misc/cstream/Manifest
index 1c028ecdcc0c..dae3b2b1bd22 100644
--- a/app-misc/cstream/Manifest
+++ b/app-misc/cstream/Manifest
@@ -1,6 +1,4 @@
 AUX cstream-3.2.1-Fix-implicit-function-declaration.patch 639 BLAKE2B 370a895d2a9ea8d4fdfbde19c2a60f60a87491f54adb3f33208515dafb69a4be8c71b42c421bd723f9e3396b85c67f3ead7464d76a1ea8a7c0145621ca1b9e31 SHA512 52355857aaf6e00ba33784b357ab1f234d811e99e80dd8dcf38d4a379d74986f979a95a22b2026413f59d2c441213ad00483275938bc5f5b82f48392ddac7d46
-DIST cstream-3.1.1.tar.gz 96609 BLAKE2B 360183c215e4aaf536d6455393b8e5a27fcfb15dc581205e53c0a160c97d028165cd9c24feea13f9a4ed11de1710ffbd1d548cadaa7fdef912eb1ee932a49ee6 SHA512 8d6364da622711f6888fd221b2f36f5da23d2a562d5a797d58d7ef361415481de8ab9ae55ae856d47c2d0141d570e22a61ab0ce9954c043877196df168f2f43a
 DIST cstream-3.2.1.tar.gz 110388 BLAKE2B 4537f2affd696620f53cfdb08d8f85ba01bdc1b5db8b3d8fa3e373a1ece96f2dc1e88efed20f1278ffde87cd1456b466d87c2c2c05480abdf79af84ca7d629f7 SHA512 f40819f07e27887528d9ff1abe6183e6e97fcefc60eb0b289f20449cdef73567b2cb5f40c52bf66dd3f4c8f869bdfdcbe0faa983659e6f8f427129f75ee1ee70
-EBUILD cstream-3.1.1-r1.ebuild 455 BLAKE2B a2885f659ddf5f8d7e47bf2d2757e05e9749c0822d0a6afd7e5b8047409c7b4f81b31bd12477020dd4b2d773c416c2638c32c637eef7c2031b081f00801aa802 SHA512 5d1b2608e8eede8e810d042c47101b149a6fd8b8b97b231cd63a7d2db46a9cb3e13ff1b7a11c046ec3858faff24e91bc06c40270e9c8efc6b214fcd9edaf7bbe
 EBUILD cstream-3.2.1-r1.ebuild 537 BLAKE2B e8751f1aac61df2269fbba88d5a7fa3edeb1bc5afb19996b3119bf00de1e1e03ab90106efd84633b431373387ff4456e0609aa7d2cf39af01929650443b03b96 SHA512 a5331c28466586e09698ae4b4c80b9495042b77766479f1e51b9dd7ffae5de63d1ecda5aa00621fa80f8f2e89d3cc4f945f78d7942132047a52225dfb5970398
 MISC metadata.xml 1734 BLAKE2B bccb6fccda0a99fc2c9e475acdfd2261c9bd3201236857ab21d5f5b42c8b1c18fe849c3b9fa1cb8e291511c90907a92f4c80a8322ff7b286ecae3cfd25fac471 SHA512 aff51f76be1d6b5c5c279c68301e5a7a3cf49f8417b4a6f7ccfe1dddd66129b9703169c6decdf6b7c394e18c986834abe1c3bda6e21c99600e0f267964dd90da
diff --git a/app-misc/cstream/cstream-3.1.1-r1.ebuild b/app-misc/cstream/cstream-3.1.1-r1.ebuild
deleted file mode 100644
index dc7409c52f67..000000000000
--- a/app-misc/cstream/cstream-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="general-purpose stream-handling tool like UNIX dd"
-HOMEPAGE="http://www.cons.org/cracauer/cstream.html"
-SRC_URI="http://www.cons.org/cracauer/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	default
-	rm auxdir/missing || die 'failed to remove auxdir/missing'
-	eautoreconf
-}
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 5a50651a83fe..144ecf2a1f16 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -4,6 +4,6 @@ AUX dvtm-9999-gentoo.patch 512 BLAKE2B 6672d5ed032b7f9f04db143cd820946bb11477575
 AUX dvtm-9999-stop-installing-terminfo.patch 322 BLAKE2B 30866f5fe749d9e948f6aef26614fba58506d5181447076e6a96d93e4253a7d55d6dac1fb065006607dbd80c52d4f4aededafd8e26cf920b7da8420e56d657c5 SHA512 f9d868847d6639b8019edef56f17eea0705f7c65fcc5f63bcf45b45e6f89ed14a3809a4ea3e98184b4de046c2c882d207498f2cfc50c8f4fc22970b9397068e2
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.15-r5.ebuild 1271 BLAKE2B d5008f85fb49301a6b4187d5ab813507d6dd5b9eaf75715b45ac5736500b1905ded91a1c5a82c1b272427a17f2e76bb19cd067bcdcac2548f22f77a3040fd9cc SHA512 97a1028e436c95a99137656acd8f83f47e926174d4e0dc20c2520ca4bb1b7e232f92abd4aef4e0765c9d8ef2a1bb8883d5294a86401660e45f94b2368d992245
-EBUILD dvtm-0.15-r6.ebuild 1272 BLAKE2B f98557cc80d42f9c27dc86db35b5bfc10f2474668504df643358d7b6968f3c6a5c82d4de8ec3c597e58c3a1ab4ed807a797b28128167e1a6206fd61ec22f3c83 SHA512 55ca7b34827367f8e61b08375a1d0ad6f55f339ca3a948e967038f19ebd9eeb9dc1e3ed74603f07e9f96fdf132029c40b930be69528b3e7f126c1f43ad69b164
+EBUILD dvtm-0.15-r6.ebuild 1271 BLAKE2B 4ccf12cb74ba0545ff85fcd41c7624bc3fcad94e2c99d8828641a644728679767c19803b6da01aca37d72266b7213c8f3d8e5bea890a88fcca0ade8c038d28de SHA512 4da77eedeb3347dc0df0cf0d8b213037c30a6156c53e76f6dbdaed5e9791df0f74ab6b5b7829a739b60b57e045ef8aaaac8513f90f04ace4b34b7e7ab7cc33e2
 EBUILD dvtm-9999.ebuild 1275 BLAKE2B 709f793ac519b377138359e5a38b4d7f86c619d76e983285ae1ad13eb5ec002d18a88d6856fda67ae21ef9ff06ccd2a61a865bc058d9bda519f44c7c1b161169 SHA512 44fa3f2e1ad88b7d51d15e0d153704802e8dc65e47a8465479b040e482e739ad925ddbdcf492a2467f182d0c9932581fa523afeaf46ec83cc192d1a300859ada
 MISC metadata.xml 402 BLAKE2B 25c815ab5188e07d7455f6ae10f61e4a50b84f901759e3c7b3146f1837b85744965751723092cd893a534e24e95ad538184bdbbb5a1b035684106c789f91beff SHA512 4dfffd70f4ed7534fee720e3afb636c6756bf3fa912232879f398ed9d44357e8bf24dd7b081ffe0d7fbe64bc87b58a6834981fb6af5b0c3a91c1641c09a890ef
diff --git a/app-misc/dvtm/dvtm-0.15-r6.ebuild b/app-misc/dvtm/dvtm-0.15-r6.ebuild
index 9c14c1fc4250..234251c24cbf 100644
--- a/app-misc/dvtm/dvtm-0.15-r6.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	"
 else
 	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index b9e72486b996..644a2ebcb4ad 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,8 +1,4 @@
-DIST fdupes-2.1.2.tar.gz 142266 BLAKE2B caf949b87baf0fecc87fef58f512d0a99e1219b57bc167992b0e40841ce67e5ddcf5307de7fc9c70f173e75aab4a12eb86abef0084084b5119f95326509ea665 SHA512 9c3761e7ce34f2d9d1b5ee49ebc3bf665e3d45e4146231bc77d7416801fbfa70415e80c81c64962897766ee068d1a103609895d783f20a765c351d4cd433323d
-DIST fdupes-2.2.0.tar.gz 144763 BLAKE2B 26a6f003b6e1b536d02da1f4b5e9051c3da19ae67c6cbdfb3cf2060ae68288b9ebdf64ca911e60126a6646895f6a6d7158c23b28c20b415ee341a8dd29820aaf SHA512 83f7bb9c3dc44ef5356c02b1db7f7f0e5698f2b73dfbb8ea1176e9a7399167a7ffd8d416036792ede1ba106dfb221d72708f7e483ce96fb7faf6c23a4f43128b
 DIST fdupes-2.2.1.tar.gz 144719 BLAKE2B 904fd70650847e48e135e47ef77e244ee847151f6ff88ccda2aeba5158038de8507b2ea23a7172e9c1fcd634ae38601c66da225014b9cfd65fd506ce77e7d408 SHA512 4911d2f776480691e7bd7045c181d49159add5b479188b05f0878a7af365cee0e430093e71ff172c04b876c58efc3be0f24c9d25f0cdebf1c869931175bc8608
-EBUILD fdupes-2.1.2.ebuild 783 BLAKE2B 4fc90a4e2178f2483e6b64075a0d930a540893257a0753aebe9d822febb3b2ee01500f6d728d923b4ba74ad35c0a7d08eaaac11a4bcaaedabed649493c803845 SHA512 674992c3955962e5e37cce751aba9f2e13caf9ce72661d5daca47459d09dfff90b4101aa68466863d4116bc3dfd37b1f1df1c5157e16ec6bc8989be1ab6b833c
-EBUILD fdupes-2.2.0.ebuild 986 BLAKE2B bed740b4937ce26cdac0a55c8579f0c36341a67fd4bb494dfc95ea9e2a0b3d27f3164ffb116156e22e1ee8dec29e3ffbc3ac312b2108bed01b895b685269e7fd SHA512 9b188308540dc189d5187adc79de5605e8eb2317fec25fe6923bdb1c49c5439649d1e586a19db9453dae88861cc723a2f95dc7c1d5bd57ad65486a1c15e6d84a
 EBUILD fdupes-2.2.1.ebuild 979 BLAKE2B ec70ea2153408cecdf91a59addde66b115faf0d4297d7477b56435b9593c8e23d1ec82ead42f846f4e78f891c8cdf5fe74a1d4a8a2dbcfc35974f67ecdd1f063 SHA512 e3718eb7f61cc03a6efcaf91a12641cb58682dd3e9826de032d25fc56ac04bc2d2d38245c7feb170f5686816e494a3850106dc70d68f7d7112b0464f59676f97
 EBUILD fdupes-9999.ebuild 986 BLAKE2B bed740b4937ce26cdac0a55c8579f0c36341a67fd4bb494dfc95ea9e2a0b3d27f3164ffb116156e22e1ee8dec29e3ffbc3ac312b2108bed01b895b685269e7fd SHA512 9b188308540dc189d5187adc79de5605e8eb2317fec25fe6923bdb1c49c5439649d1e586a19db9453dae88861cc723a2f95dc7c1d5bd57ad65486a1c15e6d84a
 MISC metadata.xml 354 BLAKE2B 1856a8a97481585a4c2df78ed004e7f560a9ab5433ca73a55f7895078d166c4f94a21bdb099cecc79ef6fda4ac7a68f5a9a5c50f3a8ddac5f4b1e5e42e1d9470 SHA512 5a21ed62cd9553f55ffb9ca06e904a2ec4540a9656934e2e4c47b85f5a63667afbce639851cd9b6b2123a41611fa1dc71c71793163f44dddc12c7019c6dce871
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
deleted file mode 100644
index e21038f7eeb8..000000000000
--- a/app-misc/fdupes/fdupes-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Identify/delete duplicate files residing within specified directories"
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+ncurses"
-
-RDEPEND="
-	dev-libs/libpcre2[pcre32]
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README )
-
-src_configure() {
-	econf $(use_with ncurses)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-misc/fdupes/fdupes-2.2.0.ebuild b/app-misc/fdupes/fdupes-2.2.0.ebuild
deleted file mode 100644
index 3578fdc09788..000000000000
--- a/app-misc/fdupes/fdupes-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Identify/delete duplicate files residing within specified directories"
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+ncurses"
-
-RDEPEND="
-	dev-libs/libpcre2[pcre32]
-	ncurses? ( sys-libs/ncurses:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README )
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ncurses)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index 059fa55f2aaa..c806c55dc5a3 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,6 +1,3 @@
-AUX reptyr-0.8.0-riscv64-support.patch 4120 BLAKE2B d7bd33368e97083e2c213be23440bff3f5823a6bc9176c45047ef9db6754c94167e00669837c6060e8a4ee2a5e741b37e70fcf58481aa31f8abbe37d42fe2cb7 SHA512 c281d654bebb3d1c1450ffcca2992c0aceff04daf6d06a1c91ccb886aadb6c0091e0156b04c20139492b2a9c077e194b0f4091f685641b1c6089c2dbc2f82c11
-DIST reptyr-0.8.0.tar.gz 32239 BLAKE2B eb3d966c06df710ea27a421bceaca0c91e342cb981567eedc9125e5dd2dc937be294dc212ed9b3021d5e5d75e1011fa4a39eaf93c152c24ef7c5098f8edd9018 SHA512 880d899a2b6df3c33909dc70ce0a58f413b2e2eec2e212abc709348345d48294cf2e39f5891ab4b1fa24e69b54effe99c1b8ab03b448bfd7097e20498e7e85dc
 DIST reptyr-0.9.0.tar.gz 32589 BLAKE2B 2673128d90f302a5591466314446257b654f727efce24e2c1a68a2f876a7b385905acb5a4648945ce15e90e2419b4aee5a8a88377dd8229f3b130ba5ba858e46 SHA512 a59670449cb597657dbb244228fd4246142190615ce1a6369f11b8c99cb12d8e2bedb4efd7cdc301a4f7c18d29e8799eea8f14d062a8ad7b7c025034cba66ac7
-EBUILD reptyr-0.8.0.ebuild 876 BLAKE2B 67dbdb76e704f87adef46cb7d7bc5e111e34194965473e4a5bc98b463284ce28187e5fa95c8e7142e6f7958cf007476294e686091eec2d4ee10128f3387eda95 SHA512 307eafc1b4372138576c1595c3a6da6cfe618a9f522b59faa6cee482bd21b3ec02683c4227de2b50e00130adc16bcdc467b39260ca4f4c537bf05d7216336720
 EBUILD reptyr-0.9.0.ebuild 785 BLAKE2B 4b333037570dc132b6ec94afd9b63e633de15d66b034b0be3af3d1290ebd45bb663ca3958e7eef8c5a8c32a817c25efe6482bc47daba8ed650d820458c0962eb SHA512 3db41ba83f56d0a55ae3180ba4b15547fe7e8592f8671604e87ecea7c342312fdc310e328661fb5fdf1222e0d22490acc00e49208087180d70c891963772bf4d
 MISC metadata.xml 355 BLAKE2B 67047538548ad5ef407f8c888726911621e53b66e826e5256cfec97a6b13b99f71bf7e902e9c8f83bfc20311451a3fbb921bcaed594c43736ca6a4bde59c078f SHA512 6b153c764391595c74666a82569d1fb16ab33731d258a5b73ae6e537c3c5228b29802902a2e18b5a271a0195f8e42a45df558aae6e5e548e8f6cec5efffd8b31
diff --git a/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch b/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch
deleted file mode 100644
index 6cedd3a55c5d..000000000000
--- a/app-misc/reptyr/files/reptyr-0.8.0-riscv64-support.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Taken from https://github.com/nelhage/reptyr/commit/e26724cc1ae5fe7af0c9fb6369f6cf09d1d12900
-
-From ae0b4ec014c1a01b1c3409e5404cf0fa0102c349 Mon Sep 17 00:00:00 2001
-From: Ast-x64 <Ast-x64@protonmail.com>
-Date: Wed, 10 Nov 2021 09:39:45 +0800
-Subject: [PATCH] Support riscv64 on Linux.
-
----
- platform/linux/arch/riscv64.h | 68 +++++++++++++++++++++++++++++++++++
- platform/linux/linux_ptrace.c |  2 ++
- ptrace.h                      |  3 ++
- 3 files changed, 73 insertions(+)
- create mode 100644 platform/linux/arch/riscv64.h
-
-diff --git a/platform/linux/arch/riscv64.h b/platform/linux/arch/riscv64.h
-new file mode 100644
-index 0000000..96221c3
---- /dev/null
-+++ b/platform/linux/arch/riscv64.h
-@@ -0,0 +1,68 @@
-+/*
-+ * Copyright (C) 2021 by Ast-x64
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+static struct ptrace_personality arch_personality[1] = {
-+    {
-+        offsetof(struct user_regs_struct, a0),
-+        offsetof(struct user_regs_struct, a0),
-+        offsetof(struct user_regs_struct, a1),
-+        offsetof(struct user_regs_struct, a2),
-+        offsetof(struct user_regs_struct, a3),
-+        offsetof(struct user_regs_struct, a4),
-+        offsetof(struct user_regs_struct, a5),
-+        offsetof(struct user_regs_struct, pc),
-+    }
-+};
-+
-+static inline void arch_fixup_regs(struct ptrace_child *child) {
-+    child->regs.pc -= 4;
-+}
-+
-+static inline int arch_set_syscall(struct ptrace_child *child,
-+                                   unsigned long sysno) {
-+    unsigned long x_reg[18];
-+    struct iovec reg_iovec = {
-+        .iov_base = x_reg,
-+        .iov_len = sizeof(x_reg)
-+    };
-+    if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, &reg_iovec) < 0)
-+        return -1;
-+
-+    x_reg[17] = sysno;
-+    return ptrace_command(child, PTRACE_SETREGSET, NT_PRSTATUS, &reg_iovec);
-+}
-+
-+static inline int arch_save_syscall(struct ptrace_child *child) {
-+    unsigned long x_reg[18];
-+    struct iovec reg_iovec = {
-+        .iov_base = x_reg,
-+        .iov_len = sizeof(x_reg)
-+    };
-+    if (ptrace_command(child, PTRACE_GETREGSET, NT_PRSTATUS, &reg_iovec) < 0)
-+        return -1;
-+
-+    child->saved_syscall = x_reg[17];
-+    return 0;
-+}
-+
-+static inline int arch_restore_syscall(struct ptrace_child *child) {
-+    return arch_set_syscall(child, child->saved_syscall);
-+}
-diff --git a/platform/linux/linux_ptrace.c b/platform/linux/linux_ptrace.c
-index d065199..bcbe600 100644
---- a/platform/linux/linux_ptrace.c
-+++ b/platform/linux/linux_ptrace.c
-@@ -84,6 +84,8 @@ static struct ptrace_personality *personality(struct ptrace_child *child);
- #include "arch/aarch64.h"
- #elif defined(__powerpc__)
- #include "arch/powerpc.h"
-+#elif defined(__riscv) && __riscv_xlen == 64
-+#include "arch/riscv64.h"
- #else
- #error Unsupported architecture.
- #endif
-diff --git a/ptrace.h b/ptrace.h
-index ee05bd7..8e3a7f4 100644
---- a/ptrace.h
-+++ b/ptrace.h
-@@ -25,6 +25,9 @@
- #ifdef __powerpc__
- #include <asm/ptrace.h>
- #endif
-+#ifdef __riscv
-+#include <asm/ptrace.h>
-+#endif
- #include <sys/ptrace.h>
- #include <sys/types.h>
- #include <sys/user.h>
diff --git a/app-misc/reptyr/reptyr-0.8.0.ebuild b/app-misc/reptyr/reptyr-0.8.0.ebuild
deleted file mode 100644
index 6bfa5e3f6049..000000000000
--- a/app-misc/reptyr/reptyr-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="A utility to attach a running program to a new terminal"
-HOMEPAGE="https://github.com/nelhage/reptyr"
-SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-PATCHES=(
-	# drop on next version bump
-	"${FILESDIR}"/${PN}-0.8.0-riscv64-support.patch
-)
-
-src_prepare() {
-	default
-	# respect CFLAGS
-	sed -i '/^override/d' Makefile || die
-}
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc ChangeLog NOTES README.md
-	newbashcomp reptyr{.bash,}
-}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index f40337ed0d3a..361e4e504c11 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -2,12 +2,8 @@ AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screen-4.9.0-configure-implicit-function-decls.patch 16667 BLAKE2B 6079042dae21c51b81176aadf27314cf0502fcee995bd9668102bc114ac0c2fdb6587fe2c647cbd92d994cb9b6fdba9e259a1f0a6bd7cf7d7905c3f7e36e8aff SHA512 c9ff18fccba0a0ed19e64509ea128b91bbb6fac405e8395ce724435f1af2f2015f645342aa1fc1b4cb023927412db6e1c242c8060a81deab2a8c064523dedd4d
 AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2
-AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
-DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
-EBUILD screen-4.8.0-r3.ebuild 3849 BLAKE2B 0f76a8163c66406bfbfbc677b8b5028a45b10379ae4f8f25ca73de35355feb1110c1d3cee74048781c1fdcf324c5e5ee2c490930c74a907e3185160af16eb1aa SHA512 693e79718dcbc75f7c0d390847a5cfa2d818ce79ca22b1c0cc15fe3c8b8c61855f09efa5662cf3f07da4da6a646b272352010580bc98e7e31da4a4925045598c
 EBUILD screen-4.9.0-r1.ebuild 3844 BLAKE2B f67c6e7bfc92895c9779d7eec02b93ce2a1972f08c4ed9815754dbc0ed89bfabde982b717d3902d8d3aee1dd11b5dca3818c07b967fd5555b14f94d154b5825b SHA512 7572fd371099225b3493097c9f2486c14ac37481a241bc1f60297fd75799e5279ccf944be0f341b13ebbaca52bb1bd92d393cd50f0760f74bf1af2ce0c387f45
-EBUILD screen-4.9.0.ebuild 3777 BLAKE2B 0121296dec6aee6e152eaa7ea8b3ec87e1900930ced1564dcfb002797b081e4049c5a472d350975aa9d9c52fa9ba5353341e0c21d3fb914d9dcb044e7758c2b7 SHA512 ba2a51b3b00c6cd85e4a20b489d94ccb48b5f55cc14d8769c2ffe5d771258456fd398dce04d4f64ba191bab1c47dbe8ba1a23ac978abbb24af1e05866c4d51d7
 EBUILD screen-9999.ebuild 3782 BLAKE2B 2606ed8495e3531a41bf65489b2dc5af681ff9c5893b12c1de22da9bc246f1d4cb5b1213ce05d8d0fc29878b7bba67e57cf6f9013afc8e9c19141e11755ac01f SHA512 f1d7fb1eca56373b91da540f8097be1b499a8be13315ad980c05c87dbd026bf19865eccf1fb9aa5ebd60c0362db8dc033cebede55c9067b6b63b02cc8936421e
 MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca
diff --git a/app-misc/screen/files/screen-CVE-2021-26937.patch b/app-misc/screen/files/screen-CVE-2021-26937.patch
deleted file mode 100644
index 9556278274e8..000000000000
--- a/app-misc/screen/files/screen-CVE-2021-26937.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- encoding.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git i/encoding.c w/encoding.c
-index e5db3e7..79f5d14 100644
---- i/encoding.c
-+++ w/encoding.c
-@@ -43,7 +43,7 @@ static int  encmatch __P((char *, char *));
- # ifdef UTF8
- static int   recode_char __P((int, int, int));
- static int   recode_char_to_encoding __P((int, int));
--static void  comb_tofront __P((int, int));
-+static void  comb_tofront __P((int));
- #  ifdef DW_CHARS
- static int   recode_char_dw __P((int, int *, int, int));
- static int   recode_char_dw_to_encoding __P((int, int *, int));
-@@ -1263,6 +1263,8 @@ int c;
-     {0x30000, 0x3FFFD},
-   };
- 
-+  if (c >= 0xdf00 && c <= 0xdfff)
-+    return 1;          /* dw combining sequence */
-   return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
-           (cjkwidth &&
-            bisearch(c, ambiguous,
-@@ -1330,11 +1332,12 @@ int c;
- }
- 
- static void
--comb_tofront(root, i)
--int root, i;
-+comb_tofront(i)
-+int i;
- {
-   for (;;)
-     {
-+      int root = i >= 0x700 ? 0x801 : 0x800;
-       debug1("bring to front: %x\n", i);
-       combchars[combchars[i]->prev]->next = combchars[i]->next;
-       combchars[combchars[i]->next]->prev = combchars[i]->prev;
-@@ -1396,9 +1399,9 @@ struct mchar *mc;
-     {
-       /* full, recycle old entry */
-       if (c1 >= 0xd800 && c1 < 0xe000)
--        comb_tofront(root, c1 - 0xd800);
-+        comb_tofront(c1 - 0xd800);
-       i = combchars[root]->prev;
--      if (c1 == i + 0xd800)
-+      if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
- 	{
- 	  /* completely full, can't recycle */
- 	  debug("utf8_handle_comp: completely full!\n");
-@@ -1422,7 +1425,7 @@ struct mchar *mc;
-   mc->font  = (i >> 8) + 0xd8;
-   mc->fontx = 0;
-   debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
--  comb_tofront(root, i);
-+  comb_tofront(i);
- }
- 
- #else /* !UTF8 */
diff --git a/app-misc/screen/screen-4.8.0-r3.ebuild b/app-misc/screen/screen-4.8.0-r3.ebuild
deleted file mode 100644
index 6807a8d7e80a..000000000000
--- a/app-misc/screen/screen-4.8.0-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
-	"${FILESDIR}"/${PN}-CVE-2021-26937.patch
-)
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 || die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
-		--with-pty-mode=0620
-		--with-pty-group=5
-		--enable-rxvt_osc
-		--enable-telnet
-		--enable-colors256
-		$(use_enable pam)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN="${P}" install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix ; then
-		fperms 4755 /usr/bin/${P}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/${P}
-		fperms 2755 /usr/bin/${P}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/${PN}
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	if use pam; then
-		pamd_mimic_system screen auth
-	fi
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	tmpfiles_process screen.conf
-
-	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
-}
diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild
deleted file mode 100644
index ea3531d913a6..000000000000
--- a/app-misc/screen/screen-4.9.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
-BDEPEND="sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
-)
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 || die
-
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	local myeconfargs=(
-		--with-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
-		--with-pty-mode=0620
-		--with-pty-group=5
-		--enable-rxvt_osc
-		--enable-telnet
-		--enable-colors256
-		$(use_enable pam)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	emake DESTDIR="${D}" SCREEN="${P}" install
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix ; then
-		fperms 4755 /usr/bin/${P}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/${P}
-		fperms 2755 /usr/bin/${P}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
-
-	insinto /usr/share/${PN}
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	if use pam; then
-		pamd_mimic_system screen auth
-	fi
-
-	dodoc "${DOCS[@]}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	tmpfiles_process screen.conf
-
-	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
-}
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index b03f0d392768..eb8d4f64751f 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,8 +1,5 @@
-AUX wcd-6.0.2-gentoo.patch 1466 BLAKE2B 2e6834d2f8f742b1582667c0ee3b0ca974600dc26a1e270bb1ea7be39ac266c019c8464f61d332c2919a5543581c9b07000ef8bdcbece7684d1046b808af920a SHA512 33ed7d9812676b5cd478351fecc31e12dce29c8e4c5b28d44b3580ac01074b631906fcd0bcea0ad66a6fcb72ace3cf13004f492c96d8a5533af7c8500ea5e703
 AUX wcd-6.0.3-doc-path.patch 480 BLAKE2B 75645e76a417f580f42411fe8a7f3155b1d9917edf5e03c6bd7111233b370f30c4c77213851435e7bd4b5417f94c7e414bf70d38caec6715d7d4ebc165c3a9ff SHA512 452aa5969438c8b929cceb35dd57148a9f2c2fe2014ead0524e6edb4dc20692f639a09ee68170fc2b6fd6e64b3406b5a4087aa020f223e53599ab1ebd408df4f
 AUX wcd-6.0.4-gentoo.patch 2645 BLAKE2B a9ff626ec885a639e82d19af9849312054a5b2c83cc1d37e59a029b388eab0d015eace2b4f67e53b800e463ab40708f25bec4251cea4c2cb1ae617ecf97c88f5 SHA512 798b7fa40d594795c0324487106f369562eae1214de2d23876615fb35ca773c735cd652a347f786625b27650dd8b762007c73dcabbcef4023ec8dfb20ff6fbb4
-DIST wcd-6.0.3.tar.gz 813763 BLAKE2B 2e215c427914705213590d7c5182bebf39becbf24238bd71c5fdd12f7e63894b2ad571793f6d25833edd3f7cd4f3acbb07bbc821880c22d7a5d4f373cd972055 SHA512 b48a6f8a196725b4b570701813cf8a96e13e4fd6289b6c779218acc20ea1ea841e5f8648f717bb389976b715b95856e91bad3ffb20f8d80961d75eae8eacfbe8
 DIST wcd-6.0.4.tar.gz 935815 BLAKE2B 00ec281890fe363258e0c847460ad9067f1c14409e64dfde239340ecf4f711af2047a8a1da226d4d17797e2b7452a4cd5aa65a0fcedcc2c172378d35a18a4a20 SHA512 afec27c0ca4cf7c7d24399f1f23c69ee765d57b449179696be5da82bcd6b146156254d9d1264e9c1f4905d5c117c7ac935a372aea25fa539b76c9bc866640daa
-EBUILD wcd-6.0.3-r2.ebuild 1016 BLAKE2B 643575b1e0a3593f40eae46ad2bbd1572658202dd0785d79e81c1c09fbbcd3f438fba3ae70c4067a7f167bc6f3df69e8687aac1e9485c0337bab5dbbb21b94e8 SHA512 829499dc8ac746423f0a959d498b5ab7a453bca5b792932c9ec4999b2e4eab393c9d5c583a75aa583a03fceafaae5897ad15f54ecae6f45a357996b7ad57482e
 EBUILD wcd-6.0.4.ebuild 995 BLAKE2B 15aa2a84af102682497e440199cb7210f5ec53d7f27ffa444d3ace45caeb09246fcac5b73577d699b9a97e453fef2cee49beeda079363445d3920b0c4b97a4de SHA512 52877815631e3e3e9739ce90c39308f86b0c8fa29eeeca6a41f2c4251521be617627fe05b153bc33b116ce9ebf38540334a0791525bd250580bd2b3b194547ff
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
deleted file mode 100644
index eddeee89e046..000000000000
--- a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -45,12 +45,12 @@
- 
- CC              ?= gcc
- STATIC          =
--STRIP           = strip
-+STRIP           =
- 
- ENABLE_NLS = 1
- 
- PACKAGE         = wcd
--EXT             = .exe
-+EXT             =
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN             = $(PROGRAM)
- 
-@@ -328,9 +328,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--        CURSES = ncursesw
-+        CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
- else
--        CURSES = ncurses
-+        CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
- endif
- 
- 
-@@ -360,7 +360,7 @@
- 
- ifneq (,$(CURSES))
-         DEFS_CURSES = -DWCD_USECURSES
--        LIB_CURSES  = -l$(CURSES)
-+        LIB_CURSES  = $(CURSES)
- ifeq (os/2,$(OS))
-         LIB_CURSES  += -ltinfo
- endif
-@@ -458,15 +458,15 @@
- 
- LDFLAGS_USER   =
- LDFLAGS ?=
--LDFLAGS += $(RPM_LD_FLAGS) \
-+LIBS 	 = $(RPM_LD_FLAGS) \
-            $(LDFLAGS_EXTRA) \
-            $(NLFLAG) \
-            $(LDFLAG_STATIC) \
-            $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+        $(LIB_UNISTRING) \
-+        $(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS            = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -523,7 +523,7 @@
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/wcd-6.0.3-r2.ebuild b/app-misc/wcd/wcd-6.0.3-r2.ebuild
deleted file mode 100644
index 49160e18f56e..000000000000
--- a/app-misc/wcd/wcd-6.0.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	unicode? ( dev-libs/libunistring:= )"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-text/ghostscript-gpl
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
-	eapply -p2 "${FILESDIR}"/${P}-doc-path.patch
-	eapply_user
-	tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile+=" ENABLE_NLS="
-	use unicode && mycompile+=" UCS=1 UNINORM=1"
-	emake ${mycompile}
-}
-
-src_install() {
-	local DOCS=( ../README.txt )
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}