gentoo auto-resync : 01:08:2022 - 03:14:32

69 files changed, 524 insertions, 470 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d077ed799a36..b668a9789332 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/birthday/Manifest b/app-misc/birthday/Manifest
index ba8bae5ff965..667a0641bbd7 100644
--- a/app-misc/birthday/Manifest
+++ b/app-misc/birthday/Manifest
@@ -1,3 +1,4 @@
+AUX birthday-1.6.2-makefile.patch 1194 BLAKE2B e8a78b51ace48de9cfdea9b9e91530e6a30fa99d607fc65affc397738bc66d039c0a27532e84b0d6728fd51979d868357d1c28981959f3b2959135ef28240d32 SHA512 76043caa8cadbcd205e840408ff8e827f3ac9f0ea41229acf7ae4d16510113945edc66ebe7318f2af6418ce14c1d8ceb3b94d19d0fdb0f95c667370817a98540
 DIST birthday-1.6.2.tar.bz2 85617 BLAKE2B bb922b4dbec35e967f5b0060a13b5429fe01478159ab930e2924dc0d397c47c265384f71dac63bb0f3bb609a0c98099529680c8d097b747d857086d885d9bb4b SHA512 5081cd9f875260758d209165803715d3eb19e2256344172cb3ea01f87f859215ce68e29174c22eec467bdb6eebc11627a71674321bb9b96db9562d13cdc80882
-EBUILD birthday-1.6.2-r1.ebuild 705 BLAKE2B e7af77b60d5c2ac3b460170ccf9c8a39f903f42e3d089f3ae22049295e5ea09c5fb436f9e918656d3337281d03d5f2c5befe9c6130b6e69bacfed49e24471707 SHA512 9d377776db6ef3f0df6d7f6d975ef86d9982b69530e8586dd2bf677dbe1fc65d78181ec382ac6c25cadb8bf4c3e003941a3e8806f2d34c11010db62ee5bfdeed
+EBUILD birthday-1.6.2-r2.ebuild 459 BLAKE2B 0203360b59e8e72b2767d1d596ac0ec7932f0e8e893c9793328975e52b01d792feddbb81bdea2e5d1228a479c202a1f8ccac3865b1a5842923b84a5c920e2bb1 SHA512 58be71ede93a6222e20c86b1f7df99265deba98810a233cb96cd8be68d977ba89729092b0cc67b7554d36d3023f1f10652411194e1c50c80d8471243acca4448
 MISC metadata.xml 344 BLAKE2B eaa132e66b7d38bde12ab05545fd99a62dd86bee5448d4326dbad994cb015ce3fc1de2e5495a7fd5af2091b000c3c2e03643373492013fe66c8c89ecb712d0bf SHA512 d29a2fd3b7c82afd5a8f14b94bd1fbac2f238c3846f22d3d95f1789adc980fcc70f416ebb75ff4cb2c37aa452c2be7a268f2a458c465494114c6b148b8df8931
diff --git a/app-misc/birthday/birthday-1.6.2-r1.ebuild b/app-misc/birthday/birthday-1.6.2-r2.ebuild
index 4d2088dc58c5..53041e6b6378 100644
--- a/app-misc/birthday/birthday-1.6.2-r1.ebuild
+++ b/app-misc/birthday/birthday-1.6.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,20 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-src_prepare() {
-	# Don't strip, install in correct share dir and respect CFLAGS
-	sed \
-		-e "s@install -s@install@g" \
-		-e "s@#SHARE@SHARE@g" \
-		-e "s@-O2@${CFLAGS}@g" \
-		-i Makefile || die
-	sed \
-		-e 's@grep -v@grep --binary-files=text -v@g' \
-		-i runtest.sh || die
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
diff --git a/app-misc/birthday/files/birthday-1.6.2-makefile.patch b/app-misc/birthday/files/birthday-1.6.2-makefile.patch
new file mode 100644
index 000000000000..f48102d929b7
--- /dev/null
+++ b/app-misc/birthday/files/birthday-1.6.2-makefile.patch
@@ -0,0 +1,44 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@
+ else
+ OSCFLAGS=-Wall -Wstrict-prototypes
+ endif
+-CFLAGS=-O2 $(DEBUG) -D$(OS) $(OSCFLAGS)
++CFLAGS += $(DEBUG) -D$(OS) $(OSCFLAGS)
+ 
+ # engine
+ ENGSRC=bdengine.c xmalloc.c
+@@ -48,16 +48,15 @@
+ 
+ else
+ birthday: $(CMDOBJ)
+-	$(CC) $(LDFLAGS) $(CMDOBJ) -o $@
++	$(CC) $(LDFLAGS) $(CMDOBJ) -o $@ $(LIBS)
+ 
+ # you can override this to use the new FHS locations.
+-SHARE=
+-#SHARE=/share
++SHARE=/share
+ 
+ install: birthday birthday.man
+-	install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr$(SHARE)/man/man1
+-	install -s birthday $(DESTDIR)/usr/bin/birthday
+-	install -m 0644 birthday.man $(DESTDIR)/usr$(SHARE)/man/man1/birthday.1
++	install -d $(DESTDIR)$(EPREFIX)/usr/bin $(DESTDIR)$(EPREFIX)/usr$(SHARE)/man/man1
++	install birthday $(DESTDIR)$(EPREFIX)/usr/bin/birthday
++	install -m 0644 birthday.man $(DESTDIR)$(EPREFIX)/usr$(SHARE)/man/man1/birthday.1
+ 
+ test: birthday
+ 	sh runtest.sh -exec `pwd`/birthday test/*.t
+--- a/runtest.sh
++++ b/runtest.sh
+@@ -7,7 +7,7 @@
+ unset PASSED FAILED TAKEN KEEP
+ 
+ extract_section() {
+-  sed -ne "/^\\*$1/,/^\\*/p" "$2" | grep -v '^*'
++  sed -ne "/^\\*$1/,/^\\*/p" "$2" | grep --binary-files=text -v '^*'
+ }
+ 
+ runtest() {
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
index 72cfed59ccce..a43edf49cc1b 100644
--- a/app-misc/cadubi/Manifest
+++ b/app-misc/cadubi/Manifest
@@ -1,6 +1,6 @@
 AUX cadubi-1.3-helpfile.patch 351 BLAKE2B 1dae10ad3b58bfc21b0c1ffcccbaec6c41de3433fad5657ed02273fb0f91e3e0ad3c15292c8bc5cca5850cbd0ad41d3fed8705f50f22431908565f5f66e27da6 SHA512 36c2af2d77a58d5091b7171495a8d788e219e65a664fe0bfd55800a2aacaac04db5e2d249c6bc8737336c43e2852687f7fee7da4510597d64b40abe4843cdac3
 DIST cadubi-1.3.4.tar.gz 65661 BLAKE2B 239cedfe50fba79bcfe250a2b646f851ef06bdae18260aeab2d10b8889dcc0d9d086f3edc8b594b3199aaa23f85ab3bd3393d63428ea545893f41a723063c9a0 SHA512 02a8e6d49f4892294d0c8fdffa7b6032ed7529bf0869681e9b760ed5c227905cca829d1f4e049400789d69c1251f4df714bf36d5c42dc778ac37e89cf753b45a
 DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
-EBUILD cadubi-1.3.4.ebuild 646 BLAKE2B c3510e82c16cace0c0c6405e815567065f7e7b064a953de0afe1b6656b15deb4d39b2130bb95581f5bb5ebac3f5c88763839fd2c0a8f13660f95d75ca874d871 SHA512 e88557bced88d4dab9b25f83e17390c7c31ded7eeb3c962745bd7c4974a3303f372c5f183f88745d2cabd7352ab20748f864656890e0c46f05ea09dbfb3b9ecc
+EBUILD cadubi-1.3.4.ebuild 644 BLAKE2B 53b769e0ec44fb4af4b7f62a5b099966ad01fbefe0cc6b51a0734abee7fe84224a8a81a6d7d033e5419cb23c7059438329921e8013db050c11f5084cea3874a6 SHA512 8b0f1c0ff9672dab4b9302bdc362d7bdadf9762efb110a586887d8f892635ef51f2de274ea2d9e6270071fffea66256bfd4b5136f35c8e078ee018b93c621332
 EBUILD cadubi-1.3.ebuild 574 BLAKE2B 690a332da44371b7fab741801b9cc0465962db1d5a6b2e51e53688a06f3a3c4ebfd70a4282921aa174839de0de3c05cbc81864b91d6f59fbd6d82dbb3a4342ba SHA512 804928407e3d0e042b1b1395720f373992a21c2037066771d1480b3cc3079c38e22ecad4101b55124f2c2a277e16e9f24bf741bb0df32f146d509b78bb303be0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/cadubi/cadubi-1.3.4.ebuild b/app-misc/cadubi/cadubi-1.3.4.ebuild
index 2cf1358ee321..18411e59d8d4 100644
--- a/app-misc/cadubi/cadubi-1.3.4.ebuild
+++ b/app-misc/cadubi/cadubi-1.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/statico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 
 RDEPEND="dev-lang/perl
 	>=dev-perl/TermReadKey-2.21"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index e3b7a3d4d4de..90261f45f82a 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 636 BLAKE2B 7d1d5a6eeb09d0223a4e251719fde6a0df43022caf9eae4fa1ac6947c5adf5a186c64431b12fdbeda94cde2921323911d48aba356a092ceceac05dcf675305df SHA512 b1e89c17a47fc13d1033cacea9708b8c2dd41ccfc8c23fe6a7709f4e3680817f7b256374f3cc41c75faba4cad66061daa100bfc7d4d00fbbea504cf1e2a0db66
+EBUILD calendar-0.9.1-r2.ebuild 567 BLAKE2B 8d4a7c329c7b97fdf8dadf1589ed2f6aaede0b4cb2f4daa6c51fa76e1b336dd2a0993ab1325b57b33b26eb426ce2ca7c066466d0dbea40c15ac323964dfeaca6 SHA512 a56e2687ef76fcb0f553a7d89cdcfa4866e935a4476caa0938f02cb644619286aee2931b293bf480b53edbb08c612c8d3e29c2a17896dbb68b4d4937b9854609
 MISC metadata.xml 347 BLAKE2B 1fda66e3713f393b3b2cd1a2e413276e9e8fab7a2e925a5639937aa2d61c3e35678551ff053247fd207de1df877b104183941c5bb01798e53795f4fc04e7baf4 SHA512 73051fc5cf102c755f5e20aca7e91994562d5847de91f15e4f7458b8e6c891cefb09a7d4b3c28894657ffcebe58dc65192cb3cf258761b970ac46e38b211a3d4
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r2.ebuild
index 24ec92d9935d..bf33a89f4bd4 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,21 +13,16 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
-DOCS=( README )
-
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-
-	insinto "/usr/share"
-	doins -r "${PN}s"
+	dobin calendar
+	doman calendar.1
 
-	mv "${D}/usr/share/${PN}s" "${D}/usr/share/${PN}" || die
+	insinto /usr/share/calendar
+	doins -r calendars/.
 
 	einstalldocs
 }
diff --git a/app-misc/cbview/Manifest b/app-misc/cbview/Manifest
index bd268d94d979..220574b2df63 100644
--- a/app-misc/cbview/Manifest
+++ b/app-misc/cbview/Manifest
@@ -1,3 +1,3 @@
 DIST cbview-0.06.tar.gz 16351 BLAKE2B 5e343eb00250d470b7e64d717b06ea1d048aace755ada2348c656443759a12c6912b7f766f066d0b2c2e7b6926ccb46472051f636646dddc288f64b66e752684 SHA512 4a680243a8c31fafad8826d1ead6d21fcce3642beef9ed82b19a7a75d78e7af32cd8d7800de15bd2b9a59241f81a295b7da8f7a80fa482b41fb589a274bfea06
-EBUILD cbview-0.06-r1.ebuild 537 BLAKE2B f1916cc5465b3a6870ea0625fcd7fdba2e9499233fc05860b8bd3881ded7623a117511270b4e2ede6de22a800fe73e0490b31dbf4c8fe51a738be5f07a53953b SHA512 c8aeadefc65a9c3423d3c5f38ebddfc2f344e328b78c05770cea1f11faee5b979891d428d05cd819d34168b690e539164d8e64891815cdf0a98b1b655dfddc2e
+EBUILD cbview-0.06-r2.ebuild 504 BLAKE2B 3ca7215fce69477d5215740c4988fb53f885265648a3e6389a47bc0f2d255b26ba1b3ba2837644a431ac1a04079da036a457baf15ab960abc867ec34375ccb39 SHA512 b43869dc4eb2ddc3d45581968312db9d1a58d8a6d86d0ddbf4ea211d16cc23f11efd6acb83adfab0caadc3d7f44e28eb7e22286fd8bdb128b74dc84a62b0c2d5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/cbview/cbview-0.06-r1.ebuild b/app-misc/cbview/cbview-0.06-r2.ebuild
index 8a9d8e740af2..c1d5fbab3465 100644
--- a/app-misc/cbview/cbview-0.06-r1.ebuild
+++ b/app-misc/cbview/cbview-0.06-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="viewer/converter for CBR/CBZ comic book archives"
 HOMEPAGE="https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/"
@@ -10,10 +10,8 @@ SRC_URI="http://elvine.org/code/cbview/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
+RDEPEND="
 	dev-perl/Gtk2
 	dev-perl/String-ShellQuote
 	app-arch/unrar
@@ -21,5 +19,5 @@ DEPEND="${RDEPEND}
 
 src_install() {
 	dobin cbview
-	dodoc README TODO
+	einstalldocs
 }
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 00ffc07b0771..47350d04938b 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,4 +1,4 @@
-AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b677ef454e674e79bcb71ef2a28679f523785ad4eceab767fb976cc4a2388cbecca5e715aa21f6f5a9ae245aa SHA512 a0416ee6b6b7416d9f0f1d379b2b4a86fb0b0ca6df2dd5f0bf3d4e54ba1fa3213da1561a38b1757d2f98b4cf96df1ff74cdea1b7e05587c7250d77353f522832
+AUX 1.0.5-Makefile.patch 1010 BLAKE2B a45e729398432a402296a57a6b82cf994bd91608c3af5ed1aaaaaca399930f7d14220eb932bff6fe89d7989c7a6e3f29bd4652cdfd2e82608217fdabcbc46d4f SHA512 73b43a54e52490ee662cb7af7505d4d0bccbd16851b19010be36e0b309bd0d81636ef855cdb1c49f83c9d7dbac036191eaf8b38396759b1e14588b28a9dd1f17
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
-EBUILD countrycodes-1.0.5-r3.ebuild 716 BLAKE2B c22a0689bb19edb2bbe52c5d2e7e67013be3a617a34968e0584d7ad4bc2147ebcbe7c4d6871bc3ee43d1402b06e63451ff6d2b2783385e497b90e80b57129c85 SHA512 de9bfd9fab4f3afe5504167c0b90f64455c907c281df18a6504f1d6875e6d356d48eacaaba2d0fe8d094e4c65bcfb6211ef36177efc2e42a63e8309de7b8c4a3
+EBUILD countrycodes-1.0.5-r4.ebuild 710 BLAKE2B 049005d915058af95f12a8f2c5c3693206f3386428a1afb3aef62ef92360c073c50996fe312879c3456996387b94f9f18cb4975811c82627468f634821cc6566 SHA512 eb10abc32ee84401560148c65e4e230b4aa8b4d70f5306cec5ddc5d40f5e31cb79e1bafd89059a4550f8b273f8cf36412757b9dd77329e9ffe55bea0ca5b9611
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
index 01d51733774f..3515c7e85217 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
@@ -1,31 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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"
 
-S="${WORKDIR}"/${P}/src
+PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
 
-PATCHES=( "${FILESDIR}/${PV}-Makefile.patch" )
-
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
 }
 
 src_install() {
 	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man/man1" install
+		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
index 677e59acc5c0..fab4c82019e1 100644
--- a/app-misc/countrycodes/files/1.0.5-Makefile.patch
+++ b/app-misc/countrycodes/files/1.0.5-Makefile.patch
@@ -1,34 +1,27 @@
-diff --git a/Makefile b/Makefile
-index 9330578..3ff7319 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -26,13 +26,13 @@ BINMODE=755
+@@ -26,10 +26,9 @@
  LOGDIRMODE=700
  
  # Compiler to use
 -CC=gcc
-+CC ?= gcc
  
  # Compiler warnings
 -WARNINGS= -pedantic -Wall
-+WARNINGS= 
++CFLAGS += -pedantic -Wall
  
  # Compiler flags
--CCOPTS = -O2 -fomit-frame-pointer
-+CCOPTS = ${CFLAGS}
- 
- # The makefile standards document I read says that I have to put it here...
- SHELL = /bin/sh
-@@ -61,7 +61,7 @@ PROGRAM = iso3166
+ CCOPTS = -O2 -fomit-frame-pointer
+@@ -61,7 +60,7 @@
  all: $(PROGRAM)
  
  $(PROGRAM): $(ISO3166OBJ)
 -	$(CC) $(CCOPTS) $(ISO3166OBJ) -o $@
-+	$(CC) $(CCOPTS) $(LDFLAGS) $(ISO3166OBJ) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@
  
  clean:
  	rm -f $(ISO3166OBJ) core defines.h $(PROGRAM)
-@@ -70,8 +70,10 @@ strip:
+@@ -70,8 +69,10 @@
  	strip $(PROGRAM)
  
  install:
@@ -40,3 +33,13 @@ index 9330578..3ff7319 100644
  	@$(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/cpipe/Manifest b/app-misc/cpipe/Manifest
index e40f39877e4d..8e32347ee09f 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,4 @@
+AUX cpipe-3.0.3-makefile.patch 740 BLAKE2B f8d06251e55a628dbf8c350add2fe06847ac9fea43f3b2270518c694adcf7e31a2acf7e91efcc9208cc6d4435c014f60db78eb9e43cd38584ff187625186ded9 SHA512 59ffd761f78fb22cf635797ed569bed96a396360ecadebe90ba922d241f3ecc94a033b6c7d6be8922845e872fbee07168699a5cdc831cc4351c27589cc2f16cb
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 644 BLAKE2B c29c211536ec43791fcad22570821d96e1bd57900e9c7fbd2037cf331246d877f19fb5acbe760029fc28f5190984288dd49372f8750ff5bfbc8d658471d379ab SHA512 dc9b5aa72edc885a9c904a86dc56a7dc17c22e861334ed0632a52fc54ca808bab8e0b054550f66c5a8aa1f50d99ea15cb82c890dddbe1656d0e416c08cf3c54a
+EBUILD cpipe-3.0.3-r1.ebuild 518 BLAKE2B 6828572e1c6d5507bd6a84f4e695c995b282bdb55a6c947695f7a2d70b47adbb3dacf84b3241de3088d72c7c561d071dd9380907cc6834c30a40b4f37cde571c SHA512 91a5a9a1d4b708f0882e5bc4c2ab7a9ff13d639efd57b0dc4e929cba03ace72edb66ab68972e5ac0b83e9e21f4054366daea66ca788215714a11417163a7d14e
 MISC metadata.xml 331 BLAKE2B ad015a065c62101a0484d3a6842fe16f056d7cff573cb5ab42a5ff3f92482ddc2058dc02a62b43c760795789e15468e5f0d5086ac89220c1d7bca694e140566f SHA512 edd33297ae9253a468754eb98612a3a6c23dec70d877aafc414549cac534e33e51b1659c085eeb4554a30f0555d9930d655a0c7a29b87e5efa990c0ad85a9e47
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3-r1.ebuild
index ff2b6594a3f6..e1798e5b3092 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,20 +13,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-src_prepare() {
-	default
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-	sed -i \
-		-e "s/CFLAGS =/CFLAGS =${CFLAGS} /" \
-		-e "s/-lm/-lm ${LDFLAGS}/" \
-		-e "s/744/644/" makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
+	dobin cpipe
+
+	einstalldocs
+	doman cpipe.1
 }
diff --git a/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch b/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch
new file mode 100644
index 000000000000..d68bb56f2967
--- /dev/null
+++ b/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch
@@ -0,0 +1,29 @@
+--- a/makefile
++++ b/makefile
+@@ -15,14 +15,14 @@
+ MANDIR=$(prefix)/man/man1
+ 
+ ## Your favorite compiler flags.
+-CFLAGS = -O2 -W -Wall -pedantic
++CFLAGS += -W -Wall -pedantic
++LDLIBS = -lm
+ 
+ VERSION=$(shell cat .version)
+ ########################################################################
+ all: cpipe cpipe.1
+ 
+-cpipe: cpipe.o cmdline.o
+-	$(CC) -o $@ cpipe.o cmdline.o -lm
++cpipe: cmdline.o
+ 
+ cpipe.1: cpipe.1.in
+ 	sed -e "s/|VERSION|/${VERSION}/g" <cpipe.1.in >cpipe.1
+@@ -37,7 +37,7 @@
+ install: cpipe cpipe.1
+ 	mkdir -p $(BINDIR) $(MANDIR)
+ 	cp cpipe $(BINDIR); chmod 755 $(BINDIR)/cpipe
+-	cp cpipe.1 $(MANDIR); chmod 744 $(MANDIR)/cpipe.1
++	cp cpipe.1 $(MANDIR); chmod 644 $(MANDIR)/cpipe.1
+ 
+ uninstall:
+ 	-rm $(BINDIR)/cpipe
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 3bcda1c01f09..5f0d2c4fc4ec 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,3 +1,3 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
-EBUILD dailystrips-1.0.28-r3.ebuild 746 BLAKE2B 97ee50dff5ddcd0ecae1f4070b8e8a9cf4695ac4af43de6c07b3bd37635cc34a49612df19c2e0e79f82a2bdd9be006331e6579664c8ff2786e482ad4ef1874a6 SHA512 32767fa827a293e1b95841abfd1e7da354ff4cb9d568dc6403121027ed99c750f75a81885f52353d3210f9112c51344d0236a3abb424f9818b30194aa84b8711
+EBUILD dailystrips-1.0.28-r4.ebuild 743 BLAKE2B 7f2cb51243da884820fc6e31149881d8883ca1c78faa2c50eee75baa549421d54c7a342b1c72f6ebab1c7de3f3df697b477cd123eab1f18f94a7df6738b38512 SHA512 636f8ba552cb584d73f45ade57bb7c63210e779d2b32cd76c4ca41cf6c8a4e9fc2881907a6c91aaa9710634fa800ad01e6333fb9c47781b6a7ee7579bbae07c8
 MISC metadata.xml 249 BLAKE2B e763bb24b50720970f2b2bed892b07f8c115103fc402b1ebaca8ded992bc6d84b54950dcb9620e4b1b00b18f563b820fcc09e95895be242445e9964d9ee02f25 SHA512 4bc619c4c9a37554df094b2a61408af92ad120940154d7cdf562904b8189ada7cc415916672d1306a911284b10b1f0f8499fbdda16f9de46b8a9f7cbf6cbbbbd
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r4.ebuild
index 133d6c65a418..b37ba7ee67b9 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="dailystrips automatically downloads your favorite online comics from the web"
 HOMEPAGE="http://dailystrips.sourceforge.net/"
@@ -10,16 +10,16 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
 
-RDEPEND=">=dev-perl/libwww-perl-5.50
+RDEPEND="
+	dev-perl/libwww-perl
 	dev-perl/DateTime
 	dev-perl/TimeDate"
 
 src_prepare() {
-	sed -i -e "s:/usr/share/dailystrips/strips.def:/etc/strips.def:" \
-		dailystrips || die "sed dailystrips failed"
 	default
+	sed -i -e "s:/usr/share/dailystrips/strips.def:${EPREFIX}/etc/strips.def:" \
+		dailystrips || die "sed dailystrips failed"
 }
 
 src_install() {
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index dbec4832c931..db589e0263ef 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -1,5 +1,5 @@
 AUX delay-1.6-headers.patch 156 BLAKE2B fa056fbf65029060d1d5291d78be65b8821d5fe4ef5f2e2b09abddd4dc0e28f35de97e8d7a01651c8c7eacc810cb093730b9a1ac81d0e784c26ebf0828ff6527 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1
 AUX delay-1.6-tinfo.patch 352 BLAKE2B 9ca59090f3d6483201a8133b204fc5948f7584285050787737a2cb23444ceff6d223fa1eb7c6a6d5712b95dc457c080efe930f041d1d03e55e3a393c27cfc484 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2
 DIST delay-1.6.tar.gz 69860 BLAKE2B f1823ff114279987c6ff2e7bb15634b27f0875fede7f879dfd69f6efee7f08f76f06673ad66853ea2e1e257174dde267455f92aadf2395dd5dd5aa731590aa51 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43
-EBUILD delay-1.6-r2.ebuild 704 BLAKE2B 966aec59b024f80731cc096717e02ee391b908132d8a3fe0c0f4f30175f516013c1554656d91baa9b3b8c7378cbf980a1e02d77942ddb3ee6ae4ed6e72646872 SHA512 c6bd714c667be35035dc99ffc5e10b94152bb1079d61f570179a895bb36d2dfaa9f1ce321fc4681b8284e67f23f1f09fa1db1187e4a9979ff5ac43604f3caf64
+EBUILD delay-1.6-r3.ebuild 669 BLAKE2B 8fd41f8597bde03a61c27ecec051f366dca4584541975cd7107aba04fe1da44dd97b1fb942c8a6c94fda39ab803ffd4f10a37295cf14262750ad24b9dd7118e7 SHA512 f13a3305f49d41cd3258938c71be36a469288fe1020065526a8647279434224de389301f2cc8907ca90a720a7cc45ce7302b7023aafa968bb06469810170b4a6
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r3.ebuild
index 963d1384a19b..403d03af2144 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,19 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/${P}-headers.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-
-	mv configure.in configure.ac || die
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
 
+src_prepare() {
 	default
 	eautoreconf
 }
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index db7bc0638eef..0b4bf6bb8f2d 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,6 +1,4 @@
 AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
-DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
 EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f
-EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
-MISC metadata.xml 704 BLAKE2B 605242d690a156e4b0bccb2114e76b8c9d6578e6c12a5bdfe87479df2703001d9d20d8996548505f60382086d4f8dfbe78b66f54f654e196f50af46c8ee1b774 SHA512 c38ba5cde4e76e557ff6d63746b1488a1669910865b629fa222bc63cb9974e68dfc2b7467f421beac7dd893bd0f8230dcb74f5bf22162c73ac4251c8d8999de6
+MISC metadata.xml 722 BLAKE2B 37cae352305296b27699d3259b62de49d3e418e3d10edd854ff9f8ad8eb1aef245242bdf386e300d0426d21f184c8c5d64fe4eec7ffa7de4a6e156b5d0b0294f SHA512 07d6b9a618776747b6cdaa0d80abd0e8ad2d7dee3314ef16609aea1bfad9cc98acfa86879b02b53e98a1f3adf87b8a8790563761d39d0899d377a699f89588e1
diff --git a/app-misc/detachtty/detachtty-9-r1.ebuild b/app-misc/detachtty/detachtty-9-r1.ebuild
deleted file mode 100644
index 889f3998d57b..000000000000
--- a/app-misc/detachtty/detachtty-9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="Attach/detach from interactive processes across the network"
-HOMEPAGE="https://packages.debian.org/unstable/admin/detachtty"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin "${PN}" attachtty
-	doman "${PN}.1"
-	dosym detachtty.1 /usr/share/man/man1/attachtty.1
-	einstalldocs
-}
diff --git a/app-misc/detachtty/metadata.xml b/app-misc/detachtty/metadata.xml
index 0cd8556150e9..42ebc5a05cc5 100644
--- a/app-misc/detachtty/metadata.xml
+++ b/app-misc/detachtty/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>shell-tools@gentoo.org</email>
-	<name>Gentoo Shell Tools Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>common-lisp@gentoo.org</email>
-	<name>Gentoo Common Lisp Project</name>
-</maintainer>
-<longdescription>
-detachtty is a utility that lets you run interactive programs non-interactively.
-Reattaching can be done locally or over the network.  detachtty is similar in
-concept to GNU Screen but is better suited toward scrolling interfaces (not
-full-screen, random-access based applications).
-</longdescription>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<longdescription>
+		detachtty is a utility that lets you run interactive programs non-interactively.
+		Reattaching can be done locally or over the network.  detachtty is similar in
+		concept to GNU Screen but is better suited toward scrolling interfaces (not
+		full-screen, random-access based applications).
+	</longdescription>
 </pkgmetadata>
diff --git a/app-misc/interceptty/Manifest b/app-misc/interceptty/Manifest
index 2522c4f41517..f763c3cd3ad7 100644
--- a/app-misc/interceptty/Manifest
+++ b/app-misc/interceptty/Manifest
@@ -1,3 +1,3 @@
 DIST interceptty-0.6.tar.gz 95911 BLAKE2B 61f96b9e0f65296e29ea851b975307fc88f79346ba78d88657f5844f15bc0ba3184fcabda37ce452fe9651d70616e260a86b5f55151f4f8c487d8184f9791fe8 SHA512 0aab17a3f0462d738befae62ffc78c9b72042fd9e9234ce55731b3b7bcef763684c46992cc8b814e982824964963bb1aba14111e0a49c43d3ca6b43e4b9f1095
-EBUILD interceptty-0.6-r1.ebuild 522 BLAKE2B 94f5a7dc08f105fb4dfa13e16afa694eb19be40a24b9b22bbe828173b826184053416ccb83176857fa61c137c992e84ad5b1da69eeae3a916a6f546926f82014 SHA512 2b7b325b1b77fd3576470f24018891b8652c5a2a815b47897ec8aa9dc0a4652c6b633b8666aa62baf631f26a9b5bb59e625cf5ea57833990ebac500d5b0ffa00
+EBUILD interceptty-0.6-r2.ebuild 362 BLAKE2B 94185a580d91a4a80348d03ca74bcb5dbedc151ecf515920b77df549d5f820f4d0b8d31c9f05bbe3115bbdc04c0b37c2371e4d4a7d51c1aa21aa6956bd35321d SHA512 fbb43ea7f768c46da5bcfb46825174b390a1580f7f4d55d0c305617904913fdd1c6a942cddc21a6a4f41d38bb2b5fe94fb3af989edda8b4a284247552cc2e00b
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-misc/interceptty/interceptty-0.6-r1.ebuild b/app-misc/interceptty/interceptty-0.6-r2.ebuild
index c5ad585cc5e0..18e316366f4c 100644
--- a/app-misc/interceptty/interceptty-0.6-r1.ebuild
+++ b/app-misc/interceptty/interceptty-0.6-r2.ebuild
@@ -1,22 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="a program that can sit between a serial port and an application"
-HOMEPAGE="http://www.suspectclass.com/~sgifford/interceptty/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://www.suspectclass.com/~sgifford/${PN}/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-src_install() {
-	default
-	dobin "${PN}" "${PN}-nicedump"
-	doman "${PN}.1"
-	doman interceptty.1
-	einstalldocs
-}
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index 3d2e38e42fc6..92ceda75565b 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,3 +1,3 @@
 DIST joy2key-1.6.3.tar.bz2 70545 BLAKE2B 6e2d14f5a348cdd684e947685ca73735d4c6580d49296486ee79bc68c5f5d08d07c42f79370a75b5cf629001a5c89c6d334a6f6ed7e845209ac1d8f008e66b1c SHA512 33767058cb32aa18a418d37f48d80200a99ce12b765ec758bde7efdda575ffc78af3039584fe3ef267baaacc3724b3203d858017c945824cc949b9cd6fe97bec
-EBUILD joy2key-1.6.3-r1.ebuild 602 BLAKE2B a23dfc88a1dfeeebf0b2d26f2774df9081e69d0a3af7bf87df23cecd35ea5db8bbd63061d2973f515c132ed1a23bd37cd677658fc6cd8aac2ee20c505158f885 SHA512 eb1a5ef3b33aaab45c95ad986e85724f6064ac6a8971b5c7665eef8eff7b811e6783c72dad70d5cc50ef2de2e715fdb7fa34df7341cdc52e27db539af281caf1
+EBUILD joy2key-1.6.3-r2.ebuild 573 BLAKE2B 41d735ab2fb6a6120756ccb2c8b9cf58078c387f4f1d9f3566755d5ded658f41d219c175cf91cb7bc40c4dfb3c98bc26695731237db99f9e8c326eff3a2d73db SHA512 c6d3159834fe12f240946bedea51f4785a93c018f157d8ddc165c62105a7c8a57778c247889ce7b5598dc65d5caebd35bbce21393a183d8a30f32d4ee3ad6979
 MISC metadata.xml 245 BLAKE2B 1280aec8b0a7024708d98ec09033c131ac9463b0b3c9defba828904b65e3ce9e734919f08664c26e627d51a54c1147d67f20771299b6787fa6fc8ae92cfd8637 SHA512 044a304d32101db555ecb09f2c2d826a9df77d95bd1dc3789170a63183db5454a9b26ff2b95b20d85e2f49b616c17303300a0ec888cd465a917f4a870df755a3
diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r2.ebuild
index ecdf4fe1429b..3a354447b149 100644
--- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="An application that translates joystick events to keyboard events"
 HOMEPAGE="https://sourceforge.net/projects/joy2key"
@@ -13,18 +13,19 @@ KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
 RDEPEND="
-	X? ( x11-libs/libX11
-	x11-apps/xwininfo )"
+	X? (
+		x11-libs/libX11
+		x11-apps/xwininfo
+	)"
 DEPEND="
 	${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
-DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
-
 src_configure() {
 	econf $(use_enable X)
 }
 
 src_install() {
 	default
+	dodoc joy2keyrc.sample rawscancodes
 }
diff --git a/app-misc/leave/Manifest b/app-misc/leave/Manifest
index 0630e82769fb..1728cea27f92 100644
--- a/app-misc/leave/Manifest
+++ b/app-misc/leave/Manifest
@@ -1,5 +1,6 @@
 AUX README 455 BLAKE2B 5fbc04499c0fd5b636edf37f54e64025c5ad0bbd13d4639559020f11887c45598343e383206e916eb73f59b581f5c78cdc05fa350be59cbc388002b1c639079b SHA512 86135607b70026c849d0851fe4c9aeadc2385eebe2be93949d519f566810916d26388a191c16a88d451d653cb2f6f6ce896948e9f07b9f994c02403898f28242
-AUX leave-fix-makefile.diff 453 BLAKE2B b3252ac7d1bcd41268dc525469b9a35624a0ad34dc4645ce122e59ef08275dba297960f3497a19570b35af7ccefc65454f697be748964da4b44043aad7fb4241 SHA512 a13da158f33c672c28e9e1b5fd169db9c7fcec55f533874ee237c529a4da21b9c68e400ff0f9a3e604c8b487d0548ed6a8693ebaa50b12b660a989f50b60d83a
+AUX leave-20100918-makefile.patch 101 BLAKE2B 68716b07dbd17003a230290000dd9beac7a953c7aa2b73a8db257ef096ba24108ee9eacc422b99416841da0826d9faf8b77e97b1fa1786201848c55c5c7f34c5 SHA512 05d17b59318b065abf267c7ad22603fc3d29ed88f3310f1159b83f71198a1f980b8389e1fd744eb0f5095300be44f30d068f9c82616f4c8d98656cfa1563ce8f
+AUX leave-20100918-posix.patch 1069 BLAKE2B eaf8d81b3f29143cb8a0c17a090f7b1ffca4c73140674eb905addddbb3ecc28c1b7cc66ab07582d50d2c5d343922ed4500666cb82517d8490485ea835c7e1096 SHA512 d9e0f74bfa6bb15c2f1fe411829cfafd4062821e42570b6a8093ba5d04e4bdbaab872cd14a45cf3d2c8ffab295788c2526f61552eab127d221ba4e8ec3a37f0d
 DIST leave-20100918.tar.gz 3477 BLAKE2B 2a709c653f2f853d50822fe83bb4f7894aea57ad3d0c15fb4ca4b5c3abccf63f0cd3344f379691e7721915e2bb5f6f1c61506f265e9cd6d74175ae4657e72376 SHA512 69df594800159bc80baeb3945aad144ceabe21bdac22ed2cd706b0ec610895dc82e58bae59ed0230eb97e909812bc90237b7c70e965125e7fa6767972a6259d1
-EBUILD leave-20100918-r1.ebuild 622 BLAKE2B 59509c209b25c9417556ae3a5d15e05dc1ee928b4593c179728107a91ee48cdf4ce081fb2988a613dd7a6e05958eaa2c0be102ee4b1bcdb0f270840dac1d4aea SHA512 84ad71cc3eee6df07ef37a19786a6833c02f137e5013ce552638ba50ce32e748ea1a98d7fab73fbee9c0d71149ce39d43038d54e0c71e0c52a29978534306f86
+EBUILD leave-20100918-r2.ebuild 563 BLAKE2B 633e76071c80ce2a8363346bf0925ceb1fa07ec82592d81f79f92c7f54c08f95e7e0e91dafa04e9346cdf59b59b18784528f61e85f54b169a264d66d585e788e SHA512 447c602b25fae36290e92c3e7a85345389bd42dfefcb9edec343247605c43c8022c67c573e621c6e4ea24676a8fe1706f7972d87f2ee5f20b90574dbad99a2f1
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/leave/files/leave-20100918-makefile.patch b/app-misc/leave/files/leave-20100918-makefile.patch
new file mode 100644
index 000000000000..464795a2732b
--- /dev/null
+++ b/app-misc/leave/files/leave-20100918-makefile.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,4 +3,4 @@
+ 
+ PROG=	leave
+ 
+-.include <bsd.prog.mk>
++all: $(PROG)
diff --git a/app-misc/leave/files/leave-20100918-posix.patch b/app-misc/leave/files/leave-20100918-posix.patch
new file mode 100644
index 000000000000..3ce788d86343
--- /dev/null
+++ b/app-misc/leave/files/leave-20100918-posix.patch
@@ -0,0 +1,55 @@
+--- a/leave.c
++++ b/leave.c
+@@ -42,7 +42,6 @@
+ static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
+ #endif
+ #endif /* not lint */
+-#include <sys/cdefs.h>
+ 
+ #include <err.h>
+ #include <ctype.h>
+@@ -52,7 +51,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-void doalarm(u_int);
++void doalarm(unsigned);
+ static void usage(void);
+ 
+ /*
+@@ -65,7 +64,7 @@
+ int
+ main(int argc, char **argv)
+ {
+-	u_int secs;
++	unsigned secs;
+ 	int hours, minutes;
+ 	char c, *cp = NULL;
+ 	struct tm *t;
+@@ -136,7 +135,7 @@
+ }
+ 
+ void
+-doalarm(u_int secs)
++doalarm(unsigned secs)
+ {
+ 	int bother;
+ 	time_t daytime;
+@@ -150,7 +149,7 @@
+ 		printf("Alarm set for %s. (pid %d)\n", tb, pid);
+ 		exit(0);
+ 	}
+-	sleep((u_int)2);		/* let parent print set message */
++	sleep((unsigned)2);		/* let parent print set message */
+ 	if (secs >= 2)
+ 		secs -= 2;
+ 
+@@ -177,7 +176,7 @@
+ 
+ #define	MSG4	"\07\07Time to leave!\n"
+ 	for (bother = 10; bother--;) {
+-		sleep((u_int)ONEMIN);
++		sleep((unsigned)ONEMIN);
+ 		if (write(STDOUT_FILENO, MSG4, sizeof(MSG4) - 1) != sizeof(MSG4) - 1)
+ 			exit(0);
+ 	}
diff --git a/app-misc/leave/files/leave-fix-makefile.diff b/app-misc/leave/files/leave-fix-makefile.diff
deleted file mode 100644
index 772add57d6fb..000000000000
--- a/app-misc/leave/files/leave-fix-makefile.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.orig	2004-10-16 23:04:50.144563171 -0400
-+++ b/Makefile	2004-10-16 23:57:27.639495962 -0400
-@@ -2,5 +2,16 @@
- # $FreeBSD: /repoman/r/ncvs/src/usr.bin/leave/Makefile,v 1.5 2002/02/08 22:31:41 markm Exp $
- 
- PROG=	leave
-+CC ?= gcc
-+CFLAGS=
-+LDFLAGS=
- 
--.include <bsd.prog.mk>
-+#.include <bsd.prog.mk>
-+
-+all: $(PROG)
-+$(PROG): leave.o
-+	$(CC) $(LDFLAGS) leave.o -o $(PROG)
-+leave.o:
-+	$(CC) $(CFLAGS) -c leave.c
-+clean:
-+	rm -f $(PROG) *.o
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r2.ebuild
index b5046a2f965a..d8ba499f34ee 100644
--- a/app-misc/leave/leave-20100918-r1.ebuild
+++ b/app-misc/leave/leave-20100918-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -14,19 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-makefile.diff"
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-posix.patch
 )
 
-src_compile() {
-	cp -v "${FILESDIR}/README" . || die
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
+	dobin leave
+	doman leave.1
+	dodoc "${FILESDIR}"/README
 }
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index 15df8f774ead..457d17482828 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,4 +1,5 @@
-AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
+AUX mepl-0.45-gcc433.patch 1072 BLAKE2B f0eb8c38648d27e93abe577e00bc4f0f75bcb7bb60425a1b955dc18f15526c6a6ec8a93ac68333d5ccbac124fdf9aecee9ffcee8683eaa444053a16cf90bc948 SHA512 3d61b9a1e2008ec54af9e44dc29da1be6012d01cd1644cd844316b93b8107cd8f05fa19d6043a1f8edad291c0f2696f4688bc82523053fdc8f6d0dcbfdf2772b
+AUX mepl-0.45-makefile.patch 563 BLAKE2B c19b12f06fd242e8877983d875198632fc1c0b865599b7a3f85c784f8bf4eb96c148b2c6604b54908dd0b41851a0576ff3b8e2d57b530ffaa1ca99abe1de7c13 SHA512 0b7d5bc35538aa00da09e2f8e31a41fd92e288c7ce0d38acd3dfc712236d89f8b1605c2b1dd04d5dfe580ef1ca06cb67bc4c1d5de5bfd5af6a1128b2c9d7bddc
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 701 BLAKE2B b19b056179fffb66034fd1220844505a1d4b364691e1594f0834184937658b19ae428b58034710a2c24952d3fdee0729a1f20a9362262b6ab6a28de10d995a34 SHA512 ab07d182efc4103b760f5ba26ddefccf4e038f38e3e1ac91f1143fdb3a12ed630a1ba5a541ddee00e32b3c9e145101b0aa9ded597c02ffa507e1e60b7cf56add
+EBUILD mepl-0.45-r2.ebuild 641 BLAKE2B e310423f8142cc624b848e57ec4268be9aed4fa7f4c4869a2bcc98f47e687957df076473ef290b3d4a0dbb6a8e7d5cd3d21fc2c59fbe050236e2d81618ce8d63 SHA512 9244f7e8c31171d19782f2e126e745b0dfa2dd9419f5e74563751040cd68802ad123f789cf560ce125d1e52269f54448bf0f425fa51bdbf27302925d80edf74a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mepl/files/mepl-0.45-gcc433.patch b/app-misc/mepl/files/mepl-0.45-gcc433.patch
index 0fd857a9ae30..baf26c03c4f4 100644
--- a/app-misc/mepl/files/mepl-0.45-gcc433.patch
+++ b/app-misc/mepl/files/mepl-0.45-gcc433.patch
@@ -1,11 +1,34 @@
---- a/mepl.c	2009-04-07 21:17:32.000000000 +0200
-+++ b/mepl.c	2009-04-07 21:16:48.000000000 +0200
+--- a/mepl.c
++++ b/mepl.c
 @@ -1,3 +1,4 @@
 +#include <stdlib.h>
  #define VERSION "0.45 Don Nov 25 19:13:58 CET 1999"
  /*  Version: @(#) mepl.c 0.45
-     Autor: Frank Holtz <frank@hof-berlin.de>--- mepl.c	2009-04-07 21:08:18.000000000 +0200
-@@ -347,7 +347,7 @@
+     Autor: Frank Holtz <frank@hof-berlin.de>
+@@ -18,11 +19,12 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ #include <fcntl.h>
+-// #include <signal.h> #If you have problems to compile remove the "//"
++#include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
+@@ -93,7 +95,7 @@
+ int hex(unsigned char *);
+ int fget(int);
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+  int   i,z,j,k,error,errz,ic,resin,resout,n,pid,opt;
+  struct termios oldtio,newtio;
+@@ -346,7 +348,7 @@
   errz=0; 
   do {
   error=0;
diff --git a/app-misc/mepl/files/mepl-0.45-makefile.patch b/app-misc/mepl/files/mepl-0.45-makefile.patch
new file mode 100644
index 000000000000..cbd89103719a
--- /dev/null
+++ b/app-misc/mepl/files/mepl-0.45-makefile.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,14 +13,9 @@
+ initdir = /etc/rc.d/init.d
+ initdir2 = /etc/init.d
+ 
+-CC	= gcc
+-CFLAGS	= -DMEPLCONFIG=\"$(CONFIGFILE)\"
++CPPFLAGS += -DMEPLCONFIG=\"$(CONFIGFILE)\"
+ 
+-en:	mepl.c
+-	@echo "Type \"make de\" or \"make installde\" for german version."
+-	@echo "Taper \"make fr\" ou \"make installfr\" pour la version française."
+-	@echo "Scrivi \"make it\" or \"make installit\" per la versione italiana."
+-	$(CC) $(CFLAGS) -o mepl mepl.c 
++en:	mepl
+ 
+ de:	mepl.c
+ 	@echo "Type \"make en\" or \"make installen\" for english version."
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r2.ebuild
index 260918797539..7a9c8a94b754 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-r2.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
 HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
 SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-gcc433.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-gcc433.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DMEPLCONFIG=\\\"/etc/mepl.conf\\\" ${LDFLAGS}" en
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}" "${PN}mail"
+	dobin mepl meplmail
 	insinto /etc
-	doins "${PN}.conf"
-	newman "${PN}.en" "${PN}.7"
+	doins mepl.conf
+	newman mepl.en mepl.7
 }
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index e1ed1abd6d19..bbbe562d82b4 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -1,5 +1,5 @@
-AUX mvcase-0.1-flags.patch 531 BLAKE2B be56f4ebf49427f3d6202ca78bf76d40419055235bb85f0a0f3856928a8f62d68600da7daedcb8d32497e06ec66c723c51c93b36ce2d84049caf3330ffde3398 SHA512 1731eacbd22438e4e888750ba5550b5d95365e2f396e3a59326c86d3cd8c20dc7a46490fd116ade13e6191a86966ebb77df4a5a2e10fb2961f45a0f9664a4b77
+AUX mvcase-0.1-flags.patch 471 BLAKE2B 8e2dbcee41ad34b5ef89672e77864630a9164b4fe8cafcd7b7751dd9dff69ec60f8e5c17fcf079947ba95745743b8d3cb70f52e4cf050016115da416a8f509cc SHA512 43198dfaaf6e709c3174c41ce53bc53bf7dceee0ae18e47f1d5e940d2fc60560aa0e14dd0c6ec52a940f1fde57da604cd056b0459fcb248ee19c4979a20b35eb
 AUX mvcase-0.1-includes.patch 526 BLAKE2B 1ae38fd8c03a82694fd57c9af033443d3e0a09a794686ca87419167dfd16697addb57a2f73923a8435c88fd82c5555b0715bc541f2eb377aa9f2e6389b14d311 SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f
 DIST mvcase-0.1.tar.gz 9467 BLAKE2B 4f73908cb549af143582f2f046096b5ffc82bd68a7be9d599bcea159d2182a52d37b9afb7e6e5e3fcb2ad01fd647c3649dae56ed47258166884a20e81b00d40b SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c
-EBUILD mvcase-0.1-r2.ebuild 632 BLAKE2B 24a519e114871103ed9aeba1d1423aa058709395e4ae610611af675bb052852772a21fc6674f894937f3efe54406fd32036757373ea573419293ecb9489fcfca SHA512 e949a96e15c1722ee09aae57a3670e1d236734265e9793bc435535333a49905f57713fefc2828014a3d601b31dac7cac1b0c91d4d1e46a0b3ceca7e0c332a24d
+EBUILD mvcase-0.1-r3.ebuild 633 BLAKE2B a212f19ddbd170def397fac891a5be5c76657e993268d46efbb10ac303a12865a0e2fff61743102459eba39221ce61ded5a9277d77793c3336c9f3a11b2b61be SHA512 694749b244382674bd757ec5e2bef5fcd8574f2b439172e5969df825d3e530a43367fba7834cd13b34e266a9acf368698ce818dee09a5a0fa2ca6bd8233599b9
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/mvcase/files/mvcase-0.1-flags.patch b/app-misc/mvcase/files/mvcase-0.1-flags.patch
index e0a9e99160f8..1c86a53e9c04 100644
--- a/app-misc/mvcase/files/mvcase-0.1-flags.patch
+++ b/app-misc/mvcase/files/mvcase-0.1-flags.patch
@@ -2,24 +2,24 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Wed Nov 14 23:22:15 UTC 2012
 Subject: build system
 
-	respect CC, CFLAGS and LDFLAGS
+	respect CC, CFLAGS, CPPFLAGS and LDFLAGS
 
---- mvcase-0.1/Makefile
-+++ mvcase-0.1/Makefile
-@@ -6,14 +6,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -6,15 +6,11 @@
  MANPATH=/usr/man
  COMPILE=gcc
  ROFF=groff
 -CFLAGS=
 -CLIBS=-lshhopt
-+LIBS=-lshhopt
++LDLIBS=-lshhopt
  INSTALL=install
  
  all:	mvcase mvcase.1.gz
  
- mvcase: mvcase.c
+-mvcase: mvcase.c
 -	$(COMPILE) $(CFLAGS) mvcase.c -o mvcase $(CLIBS)
-+	$(CC) $(CFLAGS) mvcase.c -o mvcase $(LDFLAGS) $(LIBS)
- 
+-
  mvcase.1.gz: mvcase.1
  	$(ROFF) -man -Tascii mvcase.1 | gzip > mvcase.1.gz
+ 
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r3.ebuild
index bf500a12a138..866c9116d34c 100644
--- a/app-misc/mvcase/mvcase-0.1-r2.ebuild
+++ b/app-misc/mvcase/mvcase-0.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -15,18 +15,18 @@ KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-libs/shhopt"
 RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/groff"
 
 PATCHES=(
-	"${FILESDIR}/${P}-includes.patch"
-	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-flags.patch
 )
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
+	dobin mvcase
+	doman mvcase.1
 }
diff --git a/app-misc/nullmodem/Manifest b/app-misc/nullmodem/Manifest
index f9559594c783..80fd0f438676 100644
--- a/app-misc/nullmodem/Manifest
+++ b/app-misc/nullmodem/Manifest
@@ -1,3 +1,3 @@
 DIST nullmodem-0.0.6.tar.gz 350584 BLAKE2B 16b535256d7cd961fc42c2447770bac3898d5eb386b1d3b456c9876383970bd4e82f2653ec8a6a47e92dab1e7e5052ae070b98ac494e3a205f8891db5f95be68 SHA512 d87c4ceaaa16f67c4ddc42d86f8ed81f0e14e1180b25e9000868f715b2f553d0cc165812d1f945a83486cf1c356c1303682eb17fb12632252d28bcb84edeec7c
-EBUILD nullmodem-0.0.6-r1.ebuild 365 BLAKE2B 2b3750363edc7cd9f7a78ff8ebab311ed103d1cee74d4b4947d8198db0d340b317f533f1df0d0f87beea78629497b135df8781de948eb1384e48f0bb72148b0a SHA512 3ca4d671a850cf6a85a81278292c2f9c8905eeeea257b213fe62bdbfecfa7fe7dceb7cf564fa9ecf5c03dbe9e7fb2f425b37aad133adcd7bd0605cc4411d657b
+EBUILD nullmodem-0.0.6-r2.ebuild 362 BLAKE2B 8d589fe8bc827629dbb94939b442ded70636c521aa4076877b7e93337e22d24073e411af88a68d1c8032eee523b8dc51a50db613dc088c911c76f02eac4641c0 SHA512 569930ea4775b93d11b5f5d614a44784cea8b2f4a45dc44e606d5a98516c0fa9bc3c54e0a306a16d4f65259f5210091a914d01140183b5aa3581d06ecc903f50
 MISC metadata.xml 1055 BLAKE2B 3c69a9fd1b87443a62df835b46ec75b2d2bc081ef9442b946e7e0d61e993a312f031d2bb97d57cec2d9ae10d328909fdea8a3a6cd46903614870ad7902e68627 SHA512 b2dc95a3b4fde927d2f824bce3cbd4237f8a5f9c2a1d370e0f3225de5957d39cce2f46ea296513814438140987061d68a586b5c84f6af542379fbc990178e77b
diff --git a/app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild b/app-misc/nullmodem/nullmodem-0.0.6-r2.ebuild
index 25b0bf4a624f..232911fe785f 100644
--- a/app-misc/nullmodem/nullmodem-0.0.6-r1.ebuild
+++ b/app-misc/nullmodem/nullmodem-0.0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A Utility to loopback Pseudo-Terminals"
 HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/nullmodem/"
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
index 4f8d927872f7..43d2bcd0f4b8 100644
--- a/app-misc/pipeworks/Manifest
+++ b/app-misc/pipeworks/Manifest
@@ -1,3 +1,4 @@
+AUX pipeworks-0.4-makefile.patch 680 BLAKE2B 11460e4d0f1b571382bdc6b70da7283c4647ef0909e3109fe1b5f2c9fcabdde712b0c5f355890ab89bc7f02d969fd9ef33df0f6ef810f8841eec53e4493d5b9f SHA512 43b74343817fb773d1c58d4f7476817c686bd0806ddc068a62337eabe95bd1bd50ccfdbf6b5908e35f6613dbf97a6d5e159092d9870ab30369fb270e0cf99af9
 DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
-EBUILD pipeworks-0.4-r1.ebuild 585 BLAKE2B c79b30c4d364983309fc8c4f918c6080972222f6640a34ca4f5fed9f4aea28f8265f817e7473161b7f16aa00064023039f38558586590c70d2525267df48884b SHA512 5b80795cd23c8cefab68a23b3f6728159312e2b28413c6b951fdba8a0f51069a86da5280b8ff8f3550801ee88815b7e0d33a07cb996dfdb0702843ac7eb29ab6
+EBUILD pipeworks-0.4-r2.ebuild 563 BLAKE2B 6a8dfe30092cdbd04e65d4e3fcde09832a2c65817e657e7c9db513d08f874cf81dacd72af8a7063bc91fa862380b708eac1fa8d0f6816964a859530201e33976 SHA512 290eb875228967b2173f35561bd4cabb5a4a05241718722bc2364663bacac54a7549755e8b62d82c3f1b482e0efc2b27405bdc20a7a6480a438ae1dc821dac90
 MISC metadata.xml 521 BLAKE2B ea598bd7cb8b9e9bc6ba9da992721a28ef435bbb056666d2cecc169c94f523e07f6d12008d335898ce4a251028b0f946067a8b79c80864777f4295ee9a673500 SHA512 96ef55e452a24baeb824b0b19b025b7397794feb6f7c1330cfb819de33a48c1f6cfbc01cd31bff2bd04c9021bf8467d6e9778d812b0bcd68ca8818ec0f3a5022
diff --git a/app-misc/pipeworks/files/pipeworks-0.4-makefile.patch b/app-misc/pipeworks/files/pipeworks-0.4-makefile.patch
new file mode 100644
index 000000000000..8a52d158b0e4
--- /dev/null
+++ b/app-misc/pipeworks/files/pipeworks-0.4-makefile.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,21 +18,11 @@
+ #    along with pipeworks; if not, write to the Free Software
+ #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-CC= gcc -Wall
++CFLAGS += -Wall
+ 
+ all:  pipeworks
+ 
+-filesize.o:  Makefile filesize.h filesize.c
+-	$(CC) -c -o filesize.o filesize.c
+-
+-timemanip.o:  Makefile timemanip.h timemanip.c
+-	$(CC) -c -o timemanip.o timemanip.c
+-
+-pipeworks.o:  Makefile pipeworks.c filesize.h
+-	$(CC) -c -o pipeworks.o pipeworks.c
+-
+-pipeworks:  pipeworks.o filesize.o timemanip.o
+-	$(CC) -o pipeworks pipeworks.o filesize.o timemanip.o
++pipeworks: filesize.o timemanip.o
+ 
+ clean:
+ 	rm -f *.o *~ pipeworks
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r2.ebuild
index 28c0a7a154e0..bcef6fb41379 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,13 +12,11 @@ SRC_URI="mirror://sourceforge/pipeworks/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-misc/rl/Manifest b/app-misc/rl/Manifest
index d8055bc8901d..aa395d19c5de 100644
--- a/app-misc/rl/Manifest
+++ b/app-misc/rl/Manifest
@@ -1,3 +1,3 @@
 DIST rl-0.2.7.tar.gz 131028 BLAKE2B 06db6d6e9c2dd88bce3145d0436544b5f5b848bc2e985db64ccc2146cf61be1b76b02bfe071169f6e346ad4f5ff9b9089c940ecf02e3c68efcfa2f74a9fe131a SHA512 c9db8564832494148ed8e60df844a2a383e52b9d293564cf46b393e57a88f773b7307a1dd749d4e5e2daef1632b5350de00ab2585478ff3c18bffa1c5c573f8d
-EBUILD rl-0.2.7-r1.ebuild 665 BLAKE2B 721f97fb86b3b9bf385644f5c5f494ee88ca783020155496ddf072a7d6d5ccf3430384ea9f87551ea463db605c0cdbdaa1069124e363cf1c6eb34a4e1061acc6 SHA512 cb81f4940575f12179c8a0dea4abb5bdc820cdb6d778de013f6436ed8326e4fb0d47249ce97129b579ad34a7a8069c46a65cc0968e38514f4ce68dd90c40a74a
-MISC metadata.xml 346 BLAKE2B 8316abe4c6d3b5144ba5ffaede9352f20e1f78ecd9471de149251ff0a925e666786caac2883f0111f096beb0153316b2a8d272dd84028cf21e49587230b49465 SHA512 9bb1c2c49620d97271b3b1f0f7b94548e7b10568ee0d3ee4cb968d879c2f18da74e33a53fc95aa2ca0dae16ee7fba5b31fde8efb80b782e0b1c2c80b94eeed85
+EBUILD rl-0.2.7-r2.ebuild 332 BLAKE2B 6e937ac6f7782763ade8102099daeb2f1e6825bb6f522609c1ea857688c5431adea11952920f3644f745b15c2fcc2636cfacf5f78b2d03c282c5ca39ea6cefa6 SHA512 df3203cc025940f87ebf922f7d5194fce7dfc3141789b1fcda0c482d9d3702ed194f914450913abae5b9cc1db60cd8a712090e50049463a4e04ec5a01641e72a
+MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index 71f7bbb38ec1..6258504e5133 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>swegener@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
deleted file mode 100644
index 1f1c47f2ee0f..000000000000
--- a/app-misc/rl/rl-0.2.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Randomize lines from text files or stdin"
-HOMEPAGE="https://arthurdejong.org/rl"
-SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc ~s390 sparc x86"
-IUSE="debug"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
-
-multilib_src_configure() {
-	local myeconfargs=()
-	use debug && myeconfargs+=(--enable-debug)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-}
-
-src_install() {
-	multilib-minimal_src_install
-}
diff --git a/app-misc/rl/rl-0.2.7-r2.ebuild b/app-misc/rl/rl-0.2.7-r2.ebuild
new file mode 100644
index 000000000000..b30a56e03f5f
--- /dev/null
+++ b/app-misc/rl/rl-0.2.7-r2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Randomize lines from text files or stdin"
+HOMEPAGE="https://arthurdejong.org/rl"
+SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~mips ppc ~s390 sparc x86"
diff --git a/app-misc/selecta/Manifest b/app-misc/selecta/Manifest
index 199475b76110..5819932a6e61 100644
--- a/app-misc/selecta/Manifest
+++ b/app-misc/selecta/Manifest
@@ -1,4 +1,3 @@
 DIST selecta-0.0.7.tar.gz 116987 BLAKE2B dda7f21ad939780a1d631086eb669f4824277c9b9bc4a762fa56e201fca3202ee8fab63ea1328dfabf868f4c430456969be99ec1520afcb8c509518f589a3a6a SHA512 7db8fefa51411c6b9996bd1e19889902e807471bb76309bbcace16dcfae70cdb71bdd7abd2c1a96b99d2fe1f9ecbdb1972e95485a2d06b3e3258303a0fef2018
-EBUILD selecta-0.0.7.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
-EBUILD selecta-9999.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+EBUILD selecta-0.0.7-r1.ebuild 571 BLAKE2B 497d87d6501d004ac73b4a393eb594ee8ceda8090fddd901a0d91099f8c2369810224d8b7a43c96ad1d8da9c1e4b3454eb640ee2166988c64c846ebdf9268131 SHA512 d81428b61bc8c4a38b8a94885d6099ddbd133c787a49e549375bff4a5ab9663b245300ea349437f59eb92bb7982220790423f47edbc587640df996016985ccf4
 MISC metadata.xml 395 BLAKE2B 33f528b302e014c10806a2aaedcf1ce7a512d85e7b69fec656ee4fbdc2b1f55c6d033d543be518f6d3eb14e6782a93faa2166fdab959798b10e9ff3a6fdafd9d SHA512 37b5a72e8b04358fbb44e822cc740f738333039a94c772c94a99c5f90deb059c465684c7dd78be5564eb7dee039ec2d03369f57bd13a5947ff65416fd57299a7
diff --git a/app-misc/selecta/selecta-0.0.7.ebuild b/app-misc/selecta/selecta-0.0.7-r1.ebuild
index 102d07f58dd5..014c6d49dd5b 100644
--- a/app-misc/selecta/selecta-0.0.7.ebuild
+++ b/app-misc/selecta/selecta-0.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
 else
@@ -16,11 +16,8 @@ HOMEPAGE="https://github.com/garybernhardt/selecta"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/ruby-1.9.3"
+RDEPEND="dev-lang/ruby"
 
 src_install() {
 	dobin selecta
diff --git a/app-misc/selecta/selecta-9999.ebuild b/app-misc/selecta/selecta-9999.ebuild
deleted file mode 100644
index 102d07f58dd5..000000000000
--- a/app-misc/selecta/selecta-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
-else
-	SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
-HOMEPAGE="https://github.com/garybernhardt/selecta"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/ruby-1.9.3"
-
-src_install() {
-	dobin selecta
-	einstalldocs
-}
diff --git a/app-misc/siglo/Manifest b/app-misc/siglo/Manifest
deleted file mode 100644
index 904eb81f80b3..000000000000
--- a/app-misc/siglo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST siglo-0.9.6.tar.gz 38606 BLAKE2B 68a65eaa0a8ba9efdf9c72acc02a9ea41be1d3e05eff50df1a171e01138d421f9e6e75ca385a434883a176f6f82a8ca689ddc2097489997de3798fa042f9c81d SHA512 14b74cb25db1f5676203dbfae8b668888d3cfd493ea53267d8c0956a7e96f1cfe5457b7ce802dadcbe563d6810ac64f8f2cb49f59b579146659af28601d52681
-EBUILD siglo-0.9.6.ebuild 1136 BLAKE2B 4497ab1ba7779d3efc6dbaec16aed89227697fbb91c9aebdfabf5a076c13f00c4bb5d5ed28e1b8b9074c4abf191523123cc8a8eb4a2f9202084a8fbd5888eb5f SHA512 dfce7f6714ab5070770ab6f27a07c09bc614a5e94488b8c7213984e5aceb879efa23bb2135dd7a45a4e828095598654e957ae7c4377942c9a30af9abc5a374f8
-MISC metadata.xml 261 BLAKE2B 36ef7307b8c913ceda7118a783c7f0c263e94e804f7c75e34007573f82dcddf62cfd202716bf5fb6e0adcad28a5a453d516f4caf4d2ca2eed6d076c6f7824afb SHA512 c24567fd3f715c867c52662d520fbf423d407a2a364d4ea9e5e66610cabb3728b494610106110abfac2b36554c4ad4b63f640e92f8d1b22bdea512037e461602
diff --git a/app-misc/siglo/metadata.xml b/app-misc/siglo/metadata.xml
deleted file mode 100644
index 382e03b1550d..000000000000
--- a/app-misc/siglo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina (Zero_Chaos)</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-misc/siglo/siglo-0.9.6.ebuild b/app-misc/siglo/siglo-0.9.6.ebuild
deleted file mode 100644
index 689f3cd80be8..000000000000
--- a/app-misc/siglo/siglo-0.9.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-inherit gnome2-utils python-single-r1 meson xdg
-
-DESCRIPTION="GTK app to sync InfiniTime watch with PinePhone"
-HOMEPAGE="https://github.com/alexr4535/siglo"
-SRC_URI="https://github.com/alexr4535/siglo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND=""
-RDEPEND="${DEPEND}
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/gatt-python[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		')"
-BDEPEND="${PYTHON_DEPS}"
-
-#tests seem to fail
-RESTRICT="test"
-
-src_configure() {
-	python_setup
-	sed -i "s#python.find_installation('python3').path()#\'${EPYTHON}\'#" src/meson.build
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}/usr/bin"
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index d84df1be62f5..cb6169e4a136 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,7 +1,3 @@
-DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
-DIST supercat-0.5.6.tar.gz 150193 BLAKE2B a289beceabee0bff8c25b3430803032c1192c470bd9b3ff188cd117dd60b58102ea070c7baa65bd3d5b05dc9ed9e7460fe92812c35de33ae7bed0bee1cf2cf28 SHA512 028c5935290a1e11520928b71024c29b0db437a6737c5f63d0a58dab3d855834b0ce2895fd86f6b5166cc25fe5a87845136fe3d6cf05df333cfbe5713cbd5f50
 DIST supercat-0.5.7.tar.gz 154020 BLAKE2B 8b3852d174863a1249bd71345049791827e2dba41e2d9d3426bdd2f98c395b01e804337813492efc46cd9c0950526aa26cc909f056b2f1f7c2dbdecb8129da63 SHA512 36b9d1e24edc8b83f0e87a401a99188ac53ab8b69c3ba2b196c5dd6d21b034c9522f729e4805238ce6cd28622f78c1e4dfbee93acd23ed2faa87da8e41d5647d
-EBUILD supercat-0.5.5-r2.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
-EBUILD supercat-0.5.6.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
 EBUILD supercat-0.5.7.ebuild 464 BLAKE2B 460bb1c2bb6054db9b1d1732168253600d7dbb2077857632f6b8049dd6b75ac50c65917ea691e6dcdbee02133a7e2c6d8667202156f461aeb02ed8b2640dd3a7 SHA512 775de98ed1661fef819d86ae9a9d03e3d3027a0f742ce7e9c84ed046ab7def44770fe5cd73638cfe2b529e9fe957b286b73a1111fd658f4fff98db90afa640a9
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
deleted file mode 100644
index 2a8cb2b56f5b..000000000000
--- a/app-misc/supercat/supercat-0.5.5-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A text file colorizer using powerful regular expressions"
-HOMEPAGE="http://supercat.nosredna.net"
-SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf --with-system-directory="${EPREFIX}/etc/supercat"
-}
-
-src_install() {
-	default
-}
diff --git a/app-misc/supercat/supercat-0.5.6.ebuild b/app-misc/supercat/supercat-0.5.6.ebuild
deleted file mode 100644
index 2a8cb2b56f5b..000000000000
--- a/app-misc/supercat/supercat-0.5.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A text file colorizer using powerful regular expressions"
-HOMEPAGE="http://supercat.nosredna.net"
-SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf --with-system-directory="${EPREFIX}/etc/supercat"
-}
-
-src_install() {
-	default
-}
diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest
index 7eec98cd0b00..d0d0bf68d96c 100644
--- a/app-misc/timestamp/Manifest
+++ b/app-misc/timestamp/Manifest
@@ -1,3 +1,3 @@
 DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
-EBUILD timestamp-1.1-r1.ebuild 484 BLAKE2B 1076e54410064f16fc82ada6daf163229ca03645ae1ae82d70a7974a3afdc00cf52349e2659d7e39a4d15eadc322d3c678c8615cc5704f9deccc3714eb52a1bf SHA512 94eebdcfca66816fb907fdbb10755283178495270e2b6e867a9800a15d03826d7ac1e6d127f5c66a233d5bcdde9fa8e95d1702d24a5043fbc94b33e2e7f7bf05
+EBUILD timestamp-1.1-r2.ebuild 379 BLAKE2B ae19dc59d25a21257ef1a8a6a483a31ce117c5d844385f2a8419214cbaef8b5fc1022557fe065622a7740b7bde1374a9e3f59588b59a10cdac1462725de27fea SHA512 8af02a043ae14148910eba0526bcc0dd78c0f6ef62d05f7a6ed77b51640ebac04362ac55aed901e2d980a1e1d0030e62a74c5c89477bf793b2f7030db89a94e1
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/timestamp/timestamp-1.1-r1.ebuild b/app-misc/timestamp/timestamp-1.1-r2.ebuild
index b0cd6f1496f3..07b66665a018 100644
--- a/app-misc/timestamp/timestamp-1.1-r1.ebuild
+++ b/app-misc/timestamp/timestamp-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A text filtering pipe that marks each line with a timestamp"
 HOMEPAGE="http://math.smsu.edu/~erik/software.php?id=95"
@@ -11,12 +11,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="!sys-apps/moreutils"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
+RDEPEND="!sys-apps/moreutils"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 3f9773e11094..0438d8f81b5b 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -6,6 +6,6 @@ DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1638 BLAKE2B 0ab8033ed5e3093c794c163f0434e02b15fb8a03e0eec333048bc1a1ea845065cb93de1edbc40f05b3d2c39e842ca5e0037d992846021a0d5e8f82f241dbb48c SHA512 c0bb3466cf8087fdd1bc2bafa298f21fdc44792a1d2c60ec0075fe51a86eaa15913b685d5be26aca949c993023a66d2d1fca9d06c25ee3a9fbab8e7612da464a
 EBUILD tmux-3.2a.ebuild 1713 BLAKE2B eaf841e39eddde547d854a7cf96f7637417ec4084a225cff2769598b75c405a101e4005696dc0278d6c84558096b3d3a00ec9e8cb917a9ad862f4a978115f1f1 SHA512 ea9760475aaba6362b185736af49810d421dc18eeba7a1ef9b0afed706a7d78ac6465165e5e0e11586bdd7dc739d03faf8059e1991e065164648cb35f26b06ac
-EBUILD tmux-3.3a.ebuild 1889 BLAKE2B 6d106b4d1eb7c68fef33017448d27dedae1e2a49af18a930877a70f60fcee1c2632153fe4ece0d31bb22f7ee1d90f959a54e31c2c4b6a422653018d3aca3cdd1 SHA512 088fc8d6406d2db6a2b21f613f41f9eccdaac260a3f1bfafc17bca6fb4b54d4e8c06e28c9d122ccd24c2ce6e68a0de5ef03e3e1bc145b2b734ad73c9249bce2e
+EBUILD tmux-3.3a.ebuild 1886 BLAKE2B 9370968b04b0bec34bc50f4221a85fef3fcf958cf56076009eb3282c193d8db4eac12fe5a8a1a4676ddd87ce69d03ac8bde0c5698c8cc5406e486877caa27a41 SHA512 f5590fe9b6d9fd598b61652a2becc69ad3ceb0e050a5430cccd1517faf3ce3d2b7812d5942e1cdf74cd45ec02172bd9f47473bf607cfd0153507b118d4665af3
 EBUILD tmux-9999.ebuild 1890 BLAKE2B 121d47cc10af25dd799086368f95609885412e8f8934d7db5fb4f3b98048aacce85f8bbdd0980e3e7c1816c2e643393760e190645153862fe1dc1835671980c2 SHA512 2bb0f8b9e52967e7a81e8623d11b023cec05d49e93c1f508ad960b804175480e836708b44292acb7cdbabbc780c2665f97dbed0bb16562a828002149e956bdb9
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/tmux-3.3a.ebuild b/app-misc/tmux/tmux-3.3a.ebuild
index 9507a82a05ab..047d13c3b5c0 100644
--- a/app-misc/tmux/tmux-3.3a.ebuild
+++ b/app-misc/tmux/tmux-3.3a.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+		KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	fi
 	S="${WORKDIR}/${P/_/-}"
 fi
diff --git a/app-misc/tpipe/Manifest b/app-misc/tpipe/Manifest
index 283cbd3d9449..3f84449561c2 100644
--- a/app-misc/tpipe/Manifest
+++ b/app-misc/tpipe/Manifest
@@ -1,3 +1,5 @@
+AUX tpipe-1.6-Wimplicit-function-declaration.patch 406 BLAKE2B 886ad30347ec83e2b1f346b41fc80377731e6a2e25d06203253395b2bd89b23d91a8e50fe11ffa0f0094de5c1588cd5d32edda55299c37a6fe60cac1ab8941f4 SHA512 c94647e626c1b4d3820326dfd62287b1e6fa1eece598fd461cadbcd10840bdf98ad147f628b7fceb6404d86aaf6b7dc96f370dac66e491732c06d7d805e4cb59
+AUX tpipe-1.6-makefile.patch 621 BLAKE2B e7bf677de284cabaf4efdc325d8413492882e9ef2135b586bce59052be3e766488d67069e92d61665918cb432ad0e343616ade7050cab35229894fe208b0a188 SHA512 1ab97858e76782c38eea25968cf66b32bc46a739bfab734ca7d3d548ef83e18e160000032d4bf3e9bb43f6b380c1f3e888e9ed5be975e25bb9385264a6242118
 DIST tpipe-1.6.tar.gz 12425 BLAKE2B 858af3a98efa0f27fd07aa49ad99928326ff8d458c6eddd790bcc487bdda26971a031d3bc539b07e8a031ec5190fd089d5bcd8490da1c26c1df480b3367d5f05 SHA512 3429a7ee0711f47e87ed2c46009c43dd7c3fa378a98083da58f22d1cd0a87cbbe7a900e98abc05d1375ffe8cfe56e02d25991f53a42bca1825556b07983bbb8d
-EBUILD tpipe-1.6-r1.ebuild 593 BLAKE2B fc82932596282b8beb6bdad096c834d30d4287c36bf15799c3562dc56d4f0485ebcf2629a247845496aed26a10f76578e7e0e6d7e6edaa00f404b51b0cefa2eb SHA512 945b18bf06a9f1c7dc44f310c093c94505ea0cff40aa171d6fcd886ae4923cac4c62396ecfbf6944ff915aa6aa324c2ca06d3c00f8624a204da8f8d096d51f3e
+EBUILD tpipe-1.6-r2.ebuild 580 BLAKE2B a08ff39a8b7a681764715427d746c3d4b985cc552eb26c03d20900144feb75c89a83d5ab47900a9dfb93c87348a9435102309d889a24fc0426e793c76db16b69 SHA512 e2a82ec9420de039ba633cc9ac75bf0a0ee5418cb58ec9671ad5b36f74ea7e3b7a545b942e743ef92ed21dd66814fbfc71585231966d4f427de49cdf20c45ef0
 MISC metadata.xml 341 BLAKE2B 36cc2fe3b5d134609b3b7317a6d6591fd601c8442545770979e26c2b99e531112522703df6aea42f8e9fd871baa617428a3ac34376931a710468f75e5e622637 SHA512 e51e4016e2e1bd296dc1c9d9f58a2ef0af5d34ecdddcf556d07e646fee90d992fd4bd8dc74571fff0877e66898ed90c39eb978d74200cdff1278bafdbc12e39f
diff --git a/app-misc/tpipe/files/tpipe-1.6-Wimplicit-function-declaration.patch b/app-misc/tpipe/files/tpipe-1.6-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..9a8a094f06b7
--- /dev/null
+++ b/app-misc/tpipe/files/tpipe-1.6-Wimplicit-function-declaration.patch
@@ -0,0 +1,21 @@
+--- a/tap.c
++++ b/tap.c
+@@ -94,7 +94,7 @@
+ 	else
+ 		n = strtoul(argv[1],NULL,0);
+ 
+-	if (!(n)&&(argv[1] != '\0')) {
++	if (!(n)&&(*argv[1] != '\0')) {
+ 		fprintf (stderr, "%s: Unreadable integer arg.; Assuming 1.\n",argv[0]);
+ 		n = 1;
+ 	}
+--- a/tpipe.c
++++ b/tpipe.c
+@@ -41,6 +41,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>	/* strcmp() */
++#include <stdlib.h>
+ 
+ #ifndef VERSION
+ #define VERSION "1.6"
diff --git a/app-misc/tpipe/files/tpipe-1.6-makefile.patch b/app-misc/tpipe/files/tpipe-1.6-makefile.patch
new file mode 100644
index 000000000000..7ec3566b107f
--- /dev/null
+++ b/app-misc/tpipe/files/tpipe-1.6-makefile.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,27 +1,16 @@
+ # Change values of variables to adapt.
+-CC = gcc
+ PRG1 = tpipe
+ OBJS1 = $(PRG1).o
+ PRG2 = tap
+ OBJS2 =$(PRG2).o
+-OPTFLAGS= -ansi -pedantic -O4
+-CFLAGS = -Wall $(OPTFLAGS)
+-LDFLAGS = -L.
++OPTFLAGS= -pedantic
++CFLAGS += -Wall $(OPTFLAGS)
+ PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/man/man1
+ 
+ all:	$(PRG1) $(PRG2)
+ 
+-.c.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+-
+-$(PRG1):	$(OBJS1)
+-	$(CC) $(CFLAGS) -o $(PRG1) $(OBJS1) $(LDFLAGS) $(LIBS)
+-
+-$(PRG2):	$(OBJS2)
+-	$(CC) $(CFLAGS) -o $(PRG2) $(OBJS2) $(LDFLAGS) $(LIBS)
+-
+ clean:
+ 	rm -f *~ *.o $(PRG1) $(PRG2)
+ 
diff --git a/app-misc/tpipe/tpipe-1.6-r1.ebuild b/app-misc/tpipe/tpipe-1.6-r2.ebuild
index 034575fcdaa3..8b37b96a2605 100644
--- a/app-misc/tpipe/tpipe-1.6-r1.ebuild
+++ b/app-misc/tpipe/tpipe-1.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,17 +13,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DOCS=( README.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	emake OPTFLAGS="-ansi -pedantic ${CFLAGS}" \
-		PREFIX=/usr \
-		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
+	dobin tpipe
 	einstalldocs
+	doman tpipe.1
 }
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index ec3535bd0b10..08ba40d91463 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,5 +1,5 @@
-AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
-AUX ttyrec-1.0.8-glibc-2.30.patch 695 BLAKE2B 4ecc457b74f9fd5ec1df2db0d99dacc09a9ab5b5a6d3ac6b2ee4a1acea98102662b473a95e316d49d245508cecb238b1603e35784435079e34551a0c32b3d75f SHA512 ba57f0b388c5fb686f54669e7e1dcebb83b4cd40e7f70003c6798fd2e62cc4c0089f0674a6b6a21e916a57c573e2c558be4fb26aba9f8314079fc9733bfe72c0
+AUX ttyrec-1.0.8-flags.patch 456 BLAKE2B 5664a6153997974d429bd4dabfda9152ff20f9ff78f9633b15e62de5b3429b0a92dfb9b5ea51860c241b0cfc377f2a726ef061abcebc58f745cc95e7ffb21424 SHA512 1586238ad0bab568b26a5a9a664b144f6ba4d4f08c71c1442fcd7798dbd19e0764fbfc7a11a027df150d9cff99c03225da2b52d2d47c55f7957aa6e41e351b05
+AUX ttyrec-1.0.8-glibc-2.30.patch 1470 BLAKE2B 623f5cf46c04fa7867685441526945a0b1bb38f64a3c4ca0290b0de8a1bbcda02c3ac0ee2edf83d94fd886682aa125f301c50703f7e1634912071cd45396f020 SHA512 80f191c3b5e9b4d7a04977359f2e6679e638e02f968d1d42d0ea05f23a83525a64c63d6d4680487c3561f78e41baed9fbfa3ab4cacf4c4006a70d26d0977b2dd
 DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
-EBUILD ttyrec-1.0.8-r2.ebuild 712 BLAKE2B 3f88b009d82b8996a6f7c1777c4537922f00a273b2fafd217348760810fc8f2b11c34d23bc3311b621b51c9095a97658c61d751453512d81567fb433916702f9 SHA512 16a4340fa7a1dfb4b062bf9e7cae2c8ffd22d9cbe1361b433c1a3fa6bcac5311a053a24163b6e74bebe96c67a0558ea075cbee1553f8ee869eadc74dc79d57d3
+EBUILD ttyrec-1.0.8-r3.ebuild 686 BLAKE2B 44fbb10e71371915ae7fc79845893437acb95953ee96c8d13bf49218219c6268e8d766df163fa177b10b332a305d12637fe8da2a4a356894600039c33c4d0242 SHA512 d52112d87d299b722578f2a659a5e89bdf3820a9165e3264ec9606330b1000e919619a5a6e6e4315158d5370c60043bb5db10681dca355c5861e40bf2f82e0c8
 MISC metadata.xml 576 BLAKE2B 0147e62945df0ef5560e32800cb9f94296090f6244634a3a83c9e4606f5a3af3fcc27629b651f24c5acb7c9c7e6a46775af191e51ebaa6e0634479441b52f2f7 SHA512 0eb739882db1c86ff34feafbed79c610f82d9e7df5a6b7dc6359ee7cc852ca789d10762c1eae12d496bad2d0d30030eb6d29daf0442f9757b788de418587e02d
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
index 34687d9b8b7a..28d7841fbd6f 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-flags.patch
@@ -1,19 +1,26 @@
---- a/Makefile	2017-08-26 11:47:02.981266309 +0200
-+++ b/Makefile	2017-08-26 14:33:47.161600445 +0200
-@@ -10,13 +10,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,3 @@
+-CC = gcc
+-CFLAGS = -O2
+ VERSION = 1.0.8
+ 
+ TARGET = ttyrec ttyplay ttytime
+@@ -9,14 +7,11 @@
+ 
  all: $(TARGET)
  
- ttyrec: ttyrec.o io.o
+-ttyrec: ttyrec.o io.o
 -	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
++ttyrec: io.o
  
- ttyplay: ttyplay.o io.o
+-ttyplay: ttyplay.o io.o
 -	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
++ttyplay: io.o
  
- ttytime: ttytime.o io.o
+-ttytime: ttytime.o io.o
 -	$(CC) $(CFLAGS) -o ttytime ttytime.o io.o
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
++ttytime: io.o
  
  clean:
  	rm -f *.o $(TARGET) ttyrecord *~
diff --git a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
index 174fc7786e19..79a024ac734b 100644
--- a/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
+++ b/app-misc/ttyrec/files/ttyrec-1.0.8-glibc-2.30.patch
@@ -1,8 +1,36 @@
-diff --git a/ttyrec.c b/ttyrec.c
-index 3392f70..86a59ee 100644
+--- a/io.h
++++ b/io.h
+@@ -9,5 +9,6 @@
+ int     edup            (int oldfd);
+ int     edup2           (int oldfd, int newfd);
+ FILE*   efdopen         (int fd, const char *mode);
++void    set_progname    (const char *name);
+ 
+ #endif
 --- a/ttyrec.c
 +++ b/ttyrec.c
-@@ -57,7 +57,9 @@
+@@ -42,13 +42,19 @@
+ /*
+  * script
+  */
++
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <termios.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/file.h>
+-#include <sys/signal.h>
++#include <sys/wait.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include <unistd.h>
+@@ -57,7 +63,9 @@
  
  #if defined(SVR4)
  #include <fcntl.h>
@@ -12,7 +40,16 @@ index 3392f70..86a59ee 100644
  #endif /* SVR4 */
  
  #include <sys/time.h>
-@@ -449,6 +451,7 @@ getslave()
+@@ -341,7 +349,7 @@
+ 	rtt = tt;
+ #if defined(SVR4)
+ 	rtt.c_iflag = 0;
+-	rtt.c_lflag &= ~(ISIG|ICANON|XCASE|ECHO|ECHOE|ECHOK|ECHONL);
++	rtt.c_lflag &= ~(ISIG|ICANON|ECHO|ECHOE|ECHOK|ECHONL);
+ 	rtt.c_oflag = OPOST;
+ 	rtt.c_cc[VINTR] = CDEL;
+ 	rtt.c_cc[VQUIT] = CDEL;
+@@ -449,6 +457,7 @@
  		perror("open(fd, O_RDWR)");
  		fail();
  	}
@@ -20,7 +57,7 @@ index 3392f70..86a59ee 100644
  	if (isastream(slave)) {
  		if (ioctl(slave, I_PUSH, "ptem") < 0) {
  			perror("ioctl(fd, I_PUSH, ptem)");
-@@ -466,6 +469,7 @@ getslave()
+@@ -466,6 +475,7 @@
  #endif
  		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
  	}
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
index 87546d44a9f8..2973ae3eff7e 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,15 +12,16 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
 PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-	"${FILESDIR}/${P}-glibc-2.30.patch"
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-glibc-2.30.patch
 )
 
-src_compile() {
+src_configure() {
 	# Bug 106530
 	[[ ${CHOST} != *-darwin* ]] && append-cppflags -DSVR4 -D_XOPEN_SOURCE=500
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	tc-export CC
 }
 
 src_install() {