gentoo resync : 28.04.2021

40 files changed, 226 insertions, 266 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 101b2280a338..36dd86deb579 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/cistronradius/Manifest b/net-dialup/cistronradius/Manifest
index 85494d685f2b..77910a021fed 100644
--- a/net-dialup/cistronradius/Manifest
+++ b/net-dialup/cistronradius/Manifest
@@ -1,5 +1,5 @@
 AUX cistronradius-1.6.8-gcc41.patch 452 BLAKE2B 04fba1ec6c17ce64af916563e06cd970163da64099576df19b81f485e4283c16984d310b36a6a7d6eb2b5a39a751ab772f3cb81ffd13ac63ff296a53b4b40c74 SHA512 c99ecdaa8bb9e1152c58f8a5cce79e3af058825de1b6818679e059b1c98e0ed72640dc5cdcf6c66a7b5f91792208bd1b0d4ede2c753f5f8dacc1ed4c64091f37
 AUX cistronradius.rc 716 BLAKE2B 3bbc2458da0a7d05df9ef72e41baf5c4b53c15f5c658acfbfc806b94e91d96912ee26dc5e718c03bc8234274cda34b03c58786854f21bf5ca8280c211c5259fe SHA512 d86029f75b922f2b382f34e219462f898ffb1ca8d0517d7a57b33b239396906a89da8afa5667257995aa7bac2f3f7eda4e5284672682405d131d2cdb79491fc3
 DIST radiusd-cistron-1.6.8.tar.gz 199459 BLAKE2B 5cd40915597e8d02c4624c0ea9161ee50a09c85137f9cf2d84f99504af1581a58c52d99aab473a034ef557beefd1fc7753757b4a04c1bd460871d37a6c7479da SHA512 9d42ec39eaa78f0c35ca036cf891d45a99c38af03416e4bca2d9d883a9aac818a0da1a52b5c1d4e54a1bdb108b237ed92c16309b61b7aa24f8782d0d0e0f8de5
-EBUILD cistronradius-1.6.8-r2.ebuild 1155 BLAKE2B 1cd68bbfdd422f06eda622a5d5eca68c37f3f23cfd093c60d1ea850cac6381ad31979c0c47967531115ded51740115dbd9b258627dbfc3d5bb3979f865babf95 SHA512 3a292d873b36eb0faa0d95314816cbcbb6f585603be3b506c82bebe2912e80e3b47b955aee2d86cf4b60d6824c7b9ad0d1695b04d746fcd79e56f5acaba20360
+EBUILD cistronradius-1.6.8-r2.ebuild 1152 BLAKE2B 3eccfd5947ac2437bdab69cd6989d40c5259387f40a5c183155e3ab501dd5cc3adb5105b84acbce58ef69af0f9d83f5e9dfe11a3e8546698b81b99d6b64ba0f7 SHA512 5111759a38483e5bdde6e821d139471d0f996cb43a607a0504fbd6c3d726d786b42f0d13dadb536fa8c06c563b92c50c726ed152e436a281f995b791404b114e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild b/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
index 7937bca89361..4ff41bdc7fcd 100644
--- a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
+++ b/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="Authentication and accounting server for terminal servers using RADIUS"
 HOMEPAGE="http://www.radius.cistron.nl/"
diff --git a/net-dialup/fbgetty/Manifest b/net-dialup/fbgetty/Manifest
index e78c6d3301f2..7e27378c15b8 100644
--- a/net-dialup/fbgetty/Manifest
+++ b/net-dialup/fbgetty/Manifest
@@ -1,4 +1,4 @@
 AUX fbgetty-0.1.698-gcc41.patch 2549 BLAKE2B 58f22e170ac7df28c5876e8afc90af66b2f8e18e4280dc21fa8bace24794a722833d36dea2648b8cde6e1694705d96d73f18a2cf93d84d41c40628cf7bd4eec9 SHA512 a53e5f9e2880362d023d6fc017bd49d519c25ea3395f606f5dafccc52a72d80e18bf6cd345a732733e4f252c9e5fddbbf02dd63a2d4c6ee808073fc895be5a9f
 DIST fbgetty-0.1.698.tar.gz 279751 BLAKE2B 5e378f563b1d8bf70145aadbecd46a9ad2228c3e5fc95cb91dc12a6682bce40ddc4a3aa0d81e27c0abe7122c5ac3a62e94946122aeceb3ab66ad891df26cc4db SHA512 942304ac00ecfaad59419a0994331e59d91269ee015e3bd38faa85db0b205e6e88e1958b65e503f59b81f050a1e110aeea6534eecb3ba010096a6b5173fd1ac5
-EBUILD fbgetty-0.1.698-r1.ebuild 577 BLAKE2B 315c54100d711adb620a9c5dc54e85f218449667112bee60b6a9988678323327cb49388e057a48cd6d30c94d4850b723c776209b10b8277d64521755a53dae9f SHA512 86dace92cff3f9b81a5880fa0d175003335e00b4385cf685322e8e9fc49be3eac3ef9f386be16fab4ff8072bc9b143b421db7670799b06e7470e1de958485e64
+EBUILD fbgetty-0.1.698-r1.ebuild 574 BLAKE2B 2ad32ec434835949284f673928bd8f47319d3160fa0cdac9008efe44b9550f90fd43dede5df858e2ebe86834cdb86c229d86a475e5d1feb422e7ab3f85a3cedd SHA512 3ba4d2b5626bb5a36e8cc54458179651c8c3966e9be0b62200e2af253640b79ebd06dd624ed7720480f88ecf773957e34f517a377f3f7b029b45ae2d94b06e8f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild b/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
index ad131bc4778c..aaaf230f6da4 100644
--- a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
+++ b/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="An extended getty for the framebuffer console"
 HOMEPAGE="http://projects.meuh.org/fbgetty/"
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 91fd17fea61a..69e71f2f789e 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,5 +1,5 @@
 AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113
 AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff
 DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
-EBUILD linux-atm-2.5.2.ebuild 956 BLAKE2B 55df512aca25e10b667b3d6ee4a02bf603b55172bcdba9871657182456877f5063c247cd34d84060968748af0e11cff1d7ed3e72b6a2e640f85b31e86849db38 SHA512 61892ba6abe8dea3068c1dbd113c9828983e91d927902571e5b7d7bda31347187e76a3ed87a33de625e55e094337f3c22fabaa45322e13a406750bf2124b14dd
+EBUILD linux-atm-2.5.2.ebuild 957 BLAKE2B 49f73fbeda0ede2e455bfeae5f1e6eea5eab6d7966c8fe8afceab67c25225fb9de916616309f8c2e2ae5979ec8936c234727d28a57fef837ef8111926ac0553f SHA512 38b4deb482f6b55b5aa359608b763b0edbc82f96236ff318372d4ef2c932d3367e6aabc374c3762fb4ac26829f674cfc0bcb8c28ff2984a87ebfd3f6d1202c51
 MISC metadata.xml 251 BLAKE2B 2cb2469d547d2f3ca552692a021dbd5259b7402d2cea686916d73ecb7ce7bb520cfb55da0478e85dbed91b69f87a9cac89dda5be9736e2ccf77aaca392f82d7b SHA512 5e556ac292e2a0cb07531af98ac9da974e97534c1cf510e77daa2bf59c5e40bc445501f587e266fe694bf445ffd99219a0077dd66e4c3d4776372a84f6743efd
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index d8ce786426d4..83246f38d04f 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic libtool linux-info ltprune
+inherit epatch flag-o-matic libtool linux-info ltprune
 
 DESCRIPTION="Tools for ATM"
 HOMEPAGE="http://linux-atm.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 29dddf575767..7dc8368ca194 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -5,5 +5,5 @@ AUX lrzsz-0.12.20-gettext-0.20.patch 850 BLAKE2B f3d810b7335c33f1e28247cd7a68d50
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r4.ebuild 1585 BLAKE2B 2d7ff8d0c6109f36d96670ee3240739292c02c3c7ab8dff894f140916ccf3ee864b269fdfd22a03cfdfa09d8b542615bdeff8dc740cf4393df64f1c232050c68 SHA512 bfd0470bbe8a11f603e379987150c0c5a78e6920406cb05e98e6aa50e4ced79084a4fbc9ecf28c40f509231e331128a078e351fdbca3b086da22c1b391e5865e
+EBUILD lrzsz-0.12.20-r4.ebuild 1586 BLAKE2B 906e13fd5c38487ced02fbb88e3bd29c4ca02526690c7dcfc73049e78619f6d172aecdbf064f0ef9f6804d3bc405c233b37a6e1ebb86de9e49c823a921bf5cfa SHA512 22ea526e72c100258ddd016553816942c4ce3610352e8010796ed35f004dce3ece1cd6655686ae0b42c2b4e821def00bc1933f43a72d10d1c5ff1d250f93d043
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 55083572fc97..b5461864bb7c 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 9a4c2463e95e..4eed143940b2 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -7,6 +7,5 @@ AUX mgetty-1.2.1-aarch64.patch 400 BLAKE2B 07d2d0f1bbadd487fb5a8531584af45d25047
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
 AUX mgetty.service 203 BLAKE2B d7bd55ab0f1acc02541cb19ed372faeb2ba1b88dae1d1114677ef955cc91006c7ff5e78f71d8ba3da1aecde111f9bbc4ae916c5c19df20061200731eaab038ac SHA512 c766385d101005980fd992d2e721ffb90a7b756afbd4ea24a55e828f39bd6106a0722461b581736816685c6d5dc3fbc4ebe5fca3faf1c1373d7e0c6658c80a8d
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
-EBUILD mgetty-1.2.1-r1.ebuild 4656 BLAKE2B e131a9d0f25e609c085ebd9bdd51350dc3fa51739f6896a9aeed7aa1da1c859dbdd6e787d2eb2a9f030c132ffd57b85c8a01825addadbe04b77b6f0f655fe90a SHA512 3bad236122066579870835c607ddeb04db6de179180c110cc8adb08e51ca6bf718a83ed314da81cca4889985b34f2e2af7239089c007143bfb08e1834d22a397
-EBUILD mgetty-1.2.1-r3.ebuild 4763 BLAKE2B 273ce499fb0f364584e1681f37f763bc2c798f705ac558d318a9384bd5dfb2c3a0c3bb2558eaf212dab09df55d227c4b606802b63315d62b73261228da6de157 SHA512 519564b5d18a0a0bad79686e1c228c82696f91a7f3c5014c83c786226ca68cf7a11ed7da9e42f23cd74985936f7066b2789509660e32fb09305f29e4daf412f0
+EBUILD mgetty-1.2.1-r3.ebuild 4756 BLAKE2B 857451129ab79391dcd5802048d2f4d0dd3f6e1bc6932f0b462be6467ee0ee11d353a41c6a7cf3685507d5b3026b0bbe7c1da0f18f22fcc14668f27b1590c3df SHA512 b596711801b8c0b9ec6622a93352639407ea629edb286884857c1d17811fff506ee18e7a6600c4d3a9e14cd54c390ac869af3672b721c48e2a9c03eddda051db
 MISC metadata.xml 589 BLAKE2B 0875f489eba8df017139195c3873035116e951ad018d86f00d36717f2f274d4e95d4f57fbde8640a6468fd09a819c240fab9e9656c0e931c3857fab37aad8a3b SHA512 8fec8828741b63bdf1e3364dc10ca8069846498905ef3966f8712bbe254a4197f50f73065fb4aec7b6e74e36bb53e47a03cec0dbff994f2b9f02133bfddc636e
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
deleted file mode 100644
index 7ebadecad3d3..000000000000
--- a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs user
-
-DESCRIPTION="fax and voice modem programs"
-HOMEPAGE="http://mgetty.greenie.net/"
-SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.2/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/perl
-	sys-apps/groff
-	sys-apps/texinfo
-	virtual/awk
-	fax? (
-		!net-misc/efax
-		!net-misc/hylafax
-	)
-"
-RDEPEND="${DEPEND}
-	fax? ( media-libs/netpbm app-text/ghostscript-gpl )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="+fax fidonet split-usr"
-
-pkg_setup() {
-	enewgroup fax
-	enewuser fax -1 -1 /dev/null fax
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.36-callback.patch
-	"${FILESDIR}"/${PN}-1.1.36-tmpfile.patch
-	"${FILESDIR}"/${PN}-1.1.37-qa-fixes.patch
-	"${FILESDIR}"/${PN}-1.2.1-Lucent.c.patch
-	"${FILESDIR}"/${PN}-1.2.1-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	chmod +x mkidirs || die
-
-	# don't install fax related files - bug #195467
-	use fax || eapply "${FILESDIR}/${PN}-1.1.37-nofax.patch"
-
-	sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config || die 'changing mgetty config dir failed'
-	sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules || die 'changing g3cat path failed'
-
-	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
-		-i doc/Makefile || die 'first sed on doc/Makefile failed'
-
-	sed -i \
-		-e 's:^CC=:CC?=:g' \
-		-e 's:^CFLAGS=:CFLAGS?=:g' \
-		{,*/}Makefile || die
-	sed -i \
-		-e 's:^AR=:AR?=:g' \
-		-e 's:^CFLAGS=:CFLAGS+= -I..:g' \
-		-e 's:^RANLIB=:RANLIB?=:g' \
-		*/Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	use fidonet && append-cppflags "-DFIDO"
-	append-cppflags "-DAUTO_PPP"
-
-	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
-		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
-		-e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
-		-e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
-		policy.h-dist > policy.h || die 'creating policy.h failed'
-
-	sed -i \
-		-e "s/\$(CFLAGS) -o newslock/${CFLAGS} ${LDFLAGS} -Wall -o newslock/" \
-		-e "s/\$(LDLAGS)/${LDFLAGS}/" \
-		{,fax/}Makefile || die
-}
-
-src_compile() {
-	local target
-	for target in mgetty sedscript all vgetty;do
-		VARTEXFONTS="${T}"/fonts emake prefix=/usr \
-			CONFDIR=/etc/mgetty+sendfax \
-			CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			${target}
-	done
-}
-
-src_install() {
-	# parallelization issue: vgetty-install target fails if install target
-	#                        isn't finished
-	local target
-	for target in install "vgetty-install install-callback"; do
-		emake prefix="${D}/usr" \
-			INFODIR="${D}/usr/share/info" \
-			CONFDIR="${D}/etc/mgetty+sendfax" \
-			MAN1DIR="${D}/usr/share/man/man1" \
-			MAN4DIR="${D}/usr/share/man/man4" \
-			MAN5DIR="${D}/usr/share/man/man5" \
-			MAN8DIR="${D}/usr/share/man/man8" \
-			SBINDIR="${D}/usr/sbin" \
-			BINDIR="${D}/usr/bin" \
-			VOICE_DIR="${D}/var/spool/voice" \
-			PHONE_GROUP=fax \
-			PHONE_PERMS=755 \
-			spool="${D}/var/spool" \
-			${target}
-	done
-
-	keepdir /var/log/mgetty
-
-	#Install mgetty into /sbin (#119078)
-	if use split-usr; then
-		dodir /sbin
-		mv "${D}"/usr/sbin/mgetty "${D}"/sbin || die
-		dosym ../../sbin/mgetty /usr/sbin/mgetty
-	fi
-
-	#Don't install ct (#106337)
-	rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
-
-	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
-		doc/*.txt doc/modems.db
-	doinfo doc/mgetty.info
-
-	docinto vgetty
-	dodoc voice/{Readme,Announce,ChangeLog,Credits}
-
-	docinto vgetty/doc
-	dodoc voice/doc/*
-
-	if use fax; then
-		mv samples/new_fax.all samples_new_fax.all || die "move failed."
-		docinto samples
-		dodoc samples/*
-
-		docinto samples/new_fax
-		dodoc samples_new_fax.all/*
-	fi
-
-	if ! use fax; then
-		insinto /usr/share/${PN}/frontends
-		doins -r frontends/{voice,network}
-	else
-		insinto /usr/share/${PN}
-		doins -r frontends
-	fi
-	insinto /usr/share/${PN}
-	doins -r patches
-	insinto /usr/share/${PN}/voice
-	doins -r voice/{contrib,Perl,scripts}
-
-	diropts -m 0750 -o fax -g fax
-	dodir /var/spool/voice
-	keepdir /var/spool/voice/incoming
-	keepdir /var/spool/voice/messages
-	if use fax; then
-		dodir /var/spool/fax
-		dodir /var/spool/fax/outgoing
-		keepdir /var/spool/fax/outgoing/locks
-		keepdir /var/spool/fax/incoming
-	fi
-}
-
-pkg_postinst() {
-	elog "Users who wish to use the fax or voicemail capabilities must be members"
-	elog "of the group fax in order to access files"
-	elog
-	elog "If you want to grab voice messages from a remote location, you must save"
-	elog "the password in /var/spool/voice/.code file"
-}
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
index 4f812a8d3984..a02a5ad1b864 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+fax fidonet split-usr"
 
 PATCHES=(
diff --git a/net-dialup/mingetty/Manifest b/net-dialup/mingetty/Manifest
index 76d9b786294d..1bd0db51d1f1 100644
--- a/net-dialup/mingetty/Manifest
+++ b/net-dialup/mingetty/Manifest
@@ -1,5 +1,5 @@
 AUX mingetty-1.08-check_chroot_chdir_nice.patch 1148 BLAKE2B 80695e0444f51dea56543e4bc1e3afaaea33796e3556c32ab37e0679189076e04ddf031745de698edf3f47235c277921fa0e187540c3aee6d3b9188733c90f61 SHA512 b296b8618218014bbe02b0d449d7e478a098d23e224ded632ea2e2f9ee95252930f31657adecb971e9e5d984491f6763295a0d269f3d6d59926e1f86ed49e0b2
 AUX mingetty-1.08-utf8.patch 4203 BLAKE2B d15273a937405c6c562ac69c7a399b2d9e11f134c1ae4d78ba19d5b3fcb784c809b1756cae652ffd1bce07dfae42a92a28c6f50ceda93e846ac920469529eabe SHA512 157ee0f38ad2175a3a5c1fd40a419e963c7310c2e1e7d8e8879ee17cca1283f2ea7ba39a0a67381347e75d5b691becf56f92c9ae2e5f65ca400687cb565ca31a
 DIST mingetty-1.08.tar.gz 13476 BLAKE2B a6a1e2fd84cc3c1b7a26919989d79268818cf0ee50b544f92d700e31e42bd527ec8caf97df8aa04486190a8e6c3ac379ec0507ce1488c1a1ffb4a53359233727 SHA512 d2c050a412af81d4635cbaa5610dfa2cf2addce0d3116fa53f73eb15cd6b53d476165a0509ae630a151de07a5bdc82cba1b5da0ab78d0313b200adece3c8872b
-EBUILD mingetty-1.08-r1.ebuild 753 BLAKE2B d6ea618febfdff4944130e4e2ad6173d4d99f4a92781599cdcc0e30c1ef427c9c1c5df1da5e2a741277da41521d644ecd262d68de7b8fd28bb0965787cf84b64 SHA512 d61287eaf49af6972b8c750106cbb933adaf2010d0b428d74f216ebfed4e5d25c11bf5771ec7770a790f2d746a77621cd4a66b980ee4be37fb38bb241ec4b6f0
+EBUILD mingetty-1.08-r1.ebuild 746 BLAKE2B 39f0c401d5e221fae625aca0f360e9a73afaf926c5febc8ad784ebcb71e2873d4d0af135ba375d79b3e457512021e2e38a1d4aa0cb117e86d2ed7fbc68bfd731 SHA512 873c66295a9fae6a5cf7388262b680f6d4559d3d46d06d21d85534d30f8add75f7cc49dc4395d4489bd0fc3afeaa06d47dcdb2730209d9cf1be3d5e74774450c
 MISC metadata.xml 674 BLAKE2B 3081183b804d044049024b05caa1c2f1353dc95b4e36b62c36a253e25c3309427782101171287645206aede1fb4fd9276c7b6c746c4da2adfc3e7b328be4a68d SHA512 0d35b42494edd2c4f8e7f2ad51463c2f9730f52d032adf6e3ea3156b05f090b0eaaaec95c4fc4db02e3ebc76cf7848571398bdccf3735adf5511ff1959431201
diff --git a/net-dialup/mingetty/mingetty-1.08-r1.ebuild b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
index 05ccf45f094a..a981600d9c12 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A compact getty program for virtual consoles only"
 HOMEPAGE="https://sourceforge.net/projects/mingetty"
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 7f6d9450ac06..f42a7613d44e 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,7 +1,12 @@
 AUX minicom-2.3-gentoo-runscript.patch 2382 BLAKE2B 358b5472a57d9e95b41fbde79eba8b56dc2302f5181c43d2489516c23538378b6281959753d61aa3b749d761ac345bf9fedba799282adf5f9e601681f6e9a55b SHA512 f88a54d5d64bec288930eb7d34332d3f4cdf879a90a694c4e538cc92ec213f15816ea9fa1225ea1122b3ee00b69b365cd69a17ec09369f4498b437374d425b5f
 AUX minicom-2.7-lockdir.patch 535 BLAKE2B dfdd70268877e4eaa959fc3262342be3c0b89aa3e62ab75c58e9987e03f758249712ac639bbffda7dc377eb69ec544dbd5b48fdfd01278fad3f91ffd77cf8f2d SHA512 7e555046cd58a796f01473e064cbf289bfd467b0ceefbdc49734d5a9ee3c8f41480378cd456e0b30e94bb892b3329959c4c38ecc942e35d3890bc6da515e1f59
 AUX minicom-2.7.1-gcc-10.patch 1403 BLAKE2B 5cafe5bd426eec0d5a03c1fe81d93ce703b03f23f7e8e9c4b3a22fdc3cb9932ca777bee65b016379c706d41a9b0a5a132c1f3efcae05e0f589d2e73eb96c6fe3 SHA512 23cbc8f971932bcfa0369d3e9ca39fd9cba4d3cea7cf9079f672b9f27bf05ee0d512ec745ed8bf14ddb2f5888ae58ca381a7f8bf03280a25294194e268a786f9
+AUX minicom-2.7.1-musl.patch 470 BLAKE2B 0486dccc1b30840b7e299808872caf81e6533574f0c0b9b80809f3bda4f410c344c63f190cee7f71f395fa78cf2e76fcffe2c57394aa7955dfe5b87c0e1df7c8 SHA512 43848451ba395f37307e7066edfc8013eddadf3003070272bf29fe9bdd5813019c885e7f53d29b922f69401f67cf1401cc86b5c5495470b252dad63e6f447a11
+AUX minicom-2.8-gentoo-runscript.patch 1331 BLAKE2B 6e9ee88bec01054710bd60163fe35a2655d81e0dcba96c813ee89be3dde1a9826cf91e54b72148f019ee69463ddebe991f80c75c2908be6e2a6255c53613cb1a SHA512 e16fb76fad87ac87eb679e46a6068314f71f6e7571562a7ae80190b7814c4e3422532046329a68f1d6cda40090114b51c05a5c5cd7306d5dc91141245009bf55
+AUX minicom-2.8-lockdir.patch 431 BLAKE2B 536586d955557d8250b76f7cec1571d7c0f4f31d10eb713fe4ebc624ca90e88fef56ed3bbabb15be2ac35d60b4948e1bb641dac0b61c4ca4bad807cb5dd2c836 SHA512 765eabe70368475d323f898cf3c9f3d817f25b039a225d5284450600a895a284e92d7589b678b39010c429435ced00fb3f57506063242aa094c7c2551c533fcf
 AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d3c334825f05d89e75d9a613ac1c40a44bd1605cae8765d24a259212767e62fe3a6f8779b57 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
-EBUILD minicom-2.7.1.ebuild 1307 BLAKE2B c9efc739b52e65ea0089d5c139f2c08634db7332ee93f131ca77422d403e3455086cf91cf3f2d83d9c46d1cf7c42e0a761c42edaf86facd134e1bf3f63f72903 SHA512 6eb1ee47662339d40eb54fbdf137a95a54a81766549306262f5ca97cfbec9e200f30864b53cabf3aca5d1eb63e3120137af3813c447e85318f5b42d05fe84e86
-MISC metadata.xml 552 BLAKE2B 08dc7635a7842cd0e8a601a303a05fafbc141ddfd3c8ab505a7dd2f83773fdd933b23d11eb2bc02762da4ab9d0f38636dcaacb42c7fdc2bc4085ffd4fa1ba352 SHA512 da0850a93f06da092c90434b64be1776b7357c099c8ca4f87d37aa7f07dc985fa4539793c446c1fb6774c55ba0b56d2e445cf5446d6d02abe6386b488040a9e8
+DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
+EBUILD minicom-2.7.1.ebuild 1346 BLAKE2B e90609e4c0ace7d210b644e2c02deaaf60686dd779e6df1ca3a2b724e33f8a707a230aaff594ff0e6dc295d89546bf2e2e27d9174334b852327b5e8b4f747cf3 SHA512 caf7634c4d8e11d209d9a18130f4c40be955aa98c62b9352ad8ef6b0cd2ba433985e970820b4591a8f5ee67348af21c460e6d7e0edb6400fb23ed6629caddbea
+EBUILD minicom-2.8.ebuild 1145 BLAKE2B 2eeddbed0a202a568c155d2eeced18bc5a34ec241e55cca075f47d56ed0e3f41eae252d6528a73c9305735b1a46e78ea581590239d8967174f1875119be0c3e2 SHA512 5157a5c2a8fb8778197cf1a6f92c73c750883ac78314078ecbbd250a9fa18fb611e3ffb613037fd43cfea10aba6698ef6b96eb9bb09df857ccbda568f4f956e5
+MISC metadata.xml 528 BLAKE2B 27054d12adea950b06487f94202ee6d3857d72e3e26c2472108d54f77dafa6d96db09da30cc45f7acb76e00c420557b6dcde2c151ec60215cb730b6e19d38b0e SHA512 aaf1eb74fb2f17818d2d0ce41ecb7411689a0724dbe4849c73c6effac38f98070d19ba38a139c7f45f0ffccb8943853a6570fc36061b00230931d192b3bedf72
diff --git a/net-dialup/minicom/files/minicom-2.7.1-musl.patch b/net-dialup/minicom/files/minicom-2.7.1-musl.patch
new file mode 100644
index 000000000000..da4ce13d0b8f
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.7.1-musl.patch
@@ -0,0 +1,24 @@
+--- a/src/dial.c
++++ b/src/dial.c
+@@ -39,11 +39,9 @@
+ #include "intl.h"
+ 
+ #ifdef VC_MUSIC
+-#  if defined(__GLIBC__)
+ #    include <sys/ioctl.h>
+ #    include <sys/kd.h>
+ #    include <sys/time.h>
+-#  endif
+ #endif
+ 
+ enum { CURRENT_VERSION = 6 };
+--- a/src/getsdir.h
++++ b/src/getsdir.h
+@@ -22,6 +22,7 @@
+  *	and licensing conditions.  See the source, Luke.
+  */
+ 
++#include <sys/param.h>
+ #include <dirent.h>
+ 
+ typedef struct dirEntry {		/* structure of data item */
diff --git a/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch
new file mode 100644
index 000000000000..97c53e91c8ef
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch
@@ -0,0 +1,42 @@
+--- a/man/minicom.1
++++ b/man/minicom.1
+@@ -469,7 +469,7 @@
+ .TP 0.5i
+ .B D - Script program
+ Which program to use as the script interpreter. Defaults to the
+-program "runscript", but if you want to use something else (eg,
++program "/usr/bin/runscript", but if you want to use something else (eg,
+ /bin/sh or "expect") it is possible.  Stdin and stdout are connected
+ to the modem, stderr to the screen.
+ .RS 0.5i
+--- a/man/runscript.1
++++ b/man/runscript.1
+@@ -5,7 +5,7 @@
+ .\" for conditions under which this file may be redistributed.
+ .TH RUNSCRIPT 1 "$Date: 2007-10-07 18:13:51 $" "User's Manual"
+ .SH NAME
+-runscript \- script interpreter for minicom
++/usr/bin/runscript \- script interpreter for minicom
+ .SH SYNOPSIS
+ .B runscript
+ .RI "scriptname [logfile [homedir]]"
+--- a/src/rwconf.c
++++ b/src/rwconf.c
+@@ -105,7 +105,7 @@
+   { N_("No"),		0,  "kermreal" },
+   { "3",		0,   "colusage" },
+   /* The script program */
+-  { "runscript",	0,   "scriptprog" },
++  { "/usr/bin/runscript",	0,   "scriptprog" },
+   /* Modem parameters */
+   { "",                 0,   "minit" },
+   { "",                 0,   "mreset" },
+@@ -245,7 +245,7 @@
+   int matched;
+ 
+   if (conftype == CONFIG_GLOBAL)
+-    strcpy(P_SCRIPTPROG, "runscript");
++    strcpy(P_SCRIPTPROG, "/usr/bin/runscript");
+ 
+   line = malloc(line_size);
+   if (!line) {
diff --git a/net-dialup/minicom/files/minicom-2.8-lockdir.patch b/net-dialup/minicom/files/minicom-2.8-lockdir.patch
new file mode 100644
index 000000000000..17fb635cd9bc
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.8-lockdir.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -219,7 +219,10 @@
+ 
+ if test "x$UUCPLOCK" != x
+ then
+-	if test -d $UUCPLOCK
++	dnl If a lock directory was manually specified, do not test it actually,
++	dnl as that might not be true during a chroot build, and the
++	dnl packager is responsible for making sure it exists at runtime.
++	if true
+ 	then
+ 		AC_MSG_RESULT($UUCPLOCK)
+ 		AC_DEFINE_UNQUOTED(UUCPLOCK, "$UUCPLOCK", [Lock directory])
diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index acd06db32225..51d4c88904c7 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>embedded@gentoo.org</email>
-    <name>Embedded Gentoo</name>
-  </maintainer>
-  <longdescription lang="en">
-    Minicom is a menu driven communications program. It emulates ANSI and VT102
-    terminals. It has a dialing directory and auto zmodem download.
-  </longdescription>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<longdescription>
+		Minicom is a menu driven communications program.
+		It emulates ANSI and VT102 terminals and
+		has a dialing directory and auto zmodem download.
+	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
index 0397e7a41fc8..4ae4c38c5c6f 100644
--- a/net-dialup/minicom/minicom-2.7.1.ebuild
+++ b/net-dialup/minicom/minicom-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/minicom/Source/${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 COMMON_DEPEND="sys-libs/ncurses:="
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch
 	"${FILESDIR}"/${PN}-2.7-lockdir.patch
 	"${FILESDIR}"/${PN}-2.7.1-gcc-10.patch
+	"${FILESDIR}"/${PN}-2.7.1-musl.patch
 )
 
 src_prepare() {
diff --git a/net-dialup/minicom/minicom-2.8.ebuild b/net-dialup/minicom/minicom-2.8.ebuild
new file mode 100644
index 000000000000..dad212bacba1
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Serial Communication Program"
+HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DEPEND="sys-libs/ncurses:="
+
+RDEPEND="
+	${DEPEND}
+	net-dialup/lrzsz
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch
+	"${FILESDIR}"/${PN}-2.8-lockdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Lockdir must exist if not manually specified.
+	# '/var/lock' is created by OpenRC.
+	local myeconfargs=(
+		--disable-rpath
+		--enable-lock-dir="/var/lock"
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/minicom
+	doins "${FILESDIR}"/minirc.dfl
+}
+
+pkg_preinst() {
+	[[ -s "${EROOT}"/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
+}
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index edb8c805b671..e741262942f1 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,5 +1,5 @@
-DIST moserial-3.0.12.tar.xz 1123184 BLAKE2B a8ac7ad422325853f354e1c5c7cd59ca0bf1a2249fb58886fdf104975fe458cc3befe041810cff9b97c941188a757a5929acb0507e8eb4518cb034c2cdc14b87 SHA512 e5ee3776cfa63585290fe7ffb9cab562082b19b505d630c6842d09b4783fadf5438243816c433157ad6360e2a4902cb0e0ada07b61972d3c8119509ca4f520ad
 DIST moserial-3.0.15.tar.xz 1169728 BLAKE2B a4520ff493c86f13e8c6dc7969d630bbc9690215527a70f68d948869b64347cb4145f19a12b166945faa1d243a1f323491c2f4873eed208188761248c0e00714 SHA512 e5410243a26afbfbb7a52dd3f52a99ced099b26ce43f9be8ed85874a02a361ef99cea74663e243eecc31ca0ac3f51de7ebc7abfc7fc0f48eedbd7a8fc42f9b5d
-EBUILD moserial-3.0.12.ebuild 483 BLAKE2B 881d3c1e204cb0789e1390f2a723d1c781bab92254b21f3f68367792f682546aefeead9a61ad077a65af419d4b91d6283d1466e731afeef8f66887bb5161708a SHA512 b59c105395f2dff688c4859f1753578bf5f533647f405c06057814f7d34a1e4d7edb4ee599b9f629d8f81fbcd610aebca4c90a68ac9873ee4082899ee16d1aaa
-EBUILD moserial-3.0.15.ebuild 495 BLAKE2B 9c4038e3c679cd1da1e2830a13786483051523ea5b1317c82d960b01ae2b6ff34200b7fd509854a79ccab3cfbbaf0ca191a33d3251c8f5f27420569ceda9d81d SHA512 a18357ab22ced24e0ec3f4eac9f11954411d09e5b83a948aadb41db697d2d921894aeca2a63a2bdc1f4c1081998c18cf2e1b801d38621f03cf2c4d6642769e51
+DIST moserial-3.0.16.tar.xz 1170976 BLAKE2B dd761019bf559112262bb92ec3a08aa9bcce5e73b03ca10a13547a0496729a229f8bd92c6e67c6661c69d07cf0cc573d885c3668703ecc2b5b594eebe73ea8cb SHA512 2101b5eef61c396f2511d08afad0c44caae63e274412ab26f2f6c9e5ff4c1bb1c1b447cabb66ab25530d5b9881a3e09cd6d9d264aa571c0e5ee48012c1917f7b
+EBUILD moserial-3.0.15.ebuild 478 BLAKE2B 9da5ea7b8105932cdf1be9b9bb64eb4348909a412c17e69e7b205ffd3e5df8847213619cda3faac882036d342901fd0e6f76e3a2cc6a954ed0c8b95f9afc777d SHA512 548c942e6175389455f608c04ba2f5cd520604cc9d1f1727fb1f59ea443ad9f49b83625ac1447f3f2996386ef45876754b14d5d4532cfe907dc9d921758ade1d
+EBUILD moserial-3.0.16.ebuild 488 BLAKE2B f59a9e07b72e5485dff7cecc730cdda52c3a1e1eca7238fe4f07c38c43afb8425c699da62493c4861d1817a1d05f015b0b2415ef1a7f8486b181bd7a109a1933 SHA512 a73e568d5f8e5c22768666924785b2b47371d2037a21c601460f4cc1ec62d3d12b2e31108679e89efcfbd04d8fbee3d99d73d1d7de24cdfd62869f7cd5443835
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-dialup/moserial/moserial-3.0.15.ebuild b/net-dialup/moserial/moserial-3.0.15.ebuild
index 5fcfa102b065..722a6f845baf 100644
--- a/net-dialup/moserial/moserial-3.0.15.ebuild
+++ b/net-dialup/moserial/moserial-3.0.15.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gnome2
 
 DESCRIPTION="A clean and friendly gtk-based serial terminal"
@@ -9,16 +10,15 @@ HOMEPAGE="https://wiki.gnome.org/moserial"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.16:2[dbus]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.2.0:3
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	>=dev-util/intltool-0.35
 	dev-util/itstool
 	virtual/pkgconfig
diff --git a/net-dialup/moserial/moserial-3.0.12.ebuild b/net-dialup/moserial/moserial-3.0.16.ebuild
index 014374c9fe9a..13d13b38fccd 100644
--- a/net-dialup/moserial/moserial-3.0.12.ebuild
+++ b/net-dialup/moserial/moserial-3.0.16.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome2
 
 DESCRIPTION="A clean and friendly gtk-based serial terminal"
@@ -9,15 +9,15 @@ HOMEPAGE="https://wiki.gnome.org/moserial"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.16:2[dbus]
 	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gtk+-3.2.0:3
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.35
 	dev-util/itstool
 	virtual/pkgconfig
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index d42b3f2e5e24..a9d1ba5fb7d1 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -6,5 +6,5 @@ DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abd
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 EBUILD ppp-2.4.8-r1.ebuild 7074 BLAKE2B 9558373d9c3085d467129a7db9e5cd71e4152db277bee60f2fed3e38fb5984161f3376d0984784780cd5f2b655cb3010f49e48bcb51f50ba1a75f4b5a79c84ce SHA512 417915cce1745ced30a0a1c0e443b42069b1fee3949ddd55e88bab5540d74ce4db08d8aac02c43d32db23b6d38886410c478262a1f16c3731037710305024b5d
-EBUILD ppp-2.4.9-r2.ebuild 7412 BLAKE2B e414432ee46a96722a72c18e6689c83089f583b62bf8ba005e1d160b46d6f51e9462f2e2d7f4d249383b3a37e27c485cf3de92c74716e0e485ce8b57452f0f29 SHA512 9400a860e516bd9e93001b46794b984b9fa16d47d14a503b5b90d5164a533e13762171317406a13c0b2712c96ac7912c42d0f326e6a386fad69e534a2d675cad
+EBUILD ppp-2.4.9-r2.ebuild 7405 BLAKE2B 4e379cd4066dc2a1997e9f3374bb44b204877d7d8eefe95314b9b0ed7fc5e2f3aab93c6431e99e2348e680b916fe585cc8c0b75833557ce540ed2e54a42087f2 SHA512 62158924481e240d27133d488911bac39f57323fa92e5d01d3b0c62f30390a1093266103e18f9a6018f9c3c4224735c004fae506dd8e08eb56c7e6f8acdb374c
 MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index 6a3902fbd723..a1bdb87aefff 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
 
 DEPEND="
diff --git a/net-dialup/pppconfig/Manifest b/net-dialup/pppconfig/Manifest
index b76927037868..86f5cf379cc1 100644
--- a/net-dialup/pppconfig/Manifest
+++ b/net-dialup/pppconfig/Manifest
@@ -1,4 +1,4 @@
 AUX pppconfig 219 BLAKE2B 2772adf47e4360af993e4011e3c4e51cc000cb891d624c44494cff400a89768f05c384b69d786f73df0c0bc710417d1ec583d71b3c390d153285f4bce08d3c49 SHA512 1fce4236bc67ff9f9c5d5d273794863504dd93f75c6383ac921028ed255b3b7830ae4dd7182cf0f93241e350a7ef0619ad9f8bd38c50d20b4baf86421bc075d9
 DIST pppconfig_2.3.21.tar.gz 397243 BLAKE2B 5816d9b1e832bd0e694718960ea45c0996fa7a459f3a38e03b0021d20549b81e5a74111c03f7f485bd4dbd408b2859864a69c55858cb0a4f70283971a64192bb SHA512 e6297a6834eb806d591aee44343c6e64536e260ea8e637f3a4d4b5a752e26ae90d467ca12dd83022e071f7c2c4f111660418a6b953c4a02f5618fc54a89c2893
-EBUILD pppconfig-2.3.21.ebuild 1044 BLAKE2B 746dcda2cf184c410a5642098d3a25174ad32899c5cf90f625aface2a7b33e8aefa220d729c0b5afa298fd3672be76e2122ab05df10bba32d2b566ccc6371700 SHA512 0ef1e057ebd3dca53bcc5d9735e30b84051417ae2eba578e00116e88b710dac5de2004f18becbb4515f3e25a749cfc76f441a11666d93c95eceb2f53998791e8
+EBUILD pppconfig-2.3.21.ebuild 1042 BLAKE2B cdc224ab8861aebe8bed928d6671ac86473d7b0df2734925731d9b9e06ee6c25346b5edfc6c3e064a8158d6c6e6763424231be756f7374bdce34b7ec325a0639 SHA512 e6ef452e540c112402850e05604d871a742f86b961bef24aef68ccfc6ac7f832d9f0b160548380a6a609b7899cdb6df755080bf8dfab1b8d01c4af56bc2cf8a9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
index aee64ac9fa4c..31aecde1b0f5 100644
--- a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
+++ b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit l10n
 
 DESCRIPTION="A text menu based utility for configuring ppp"
 HOMEPAGE="https://packages.qa.debian.org/p/pppconfig.html"
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 234ef338caa5..5b6d520ddc20 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -18,7 +18,7 @@ DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6
 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29
-EBUILD rp-pppoe-3.12-r1.ebuild 2635 BLAKE2B 91e529173e27fe8ad1159b603e61348765774b8c0c4bcce17ddec16a8230956683d6ba125275383318602ccae20eba0063b8789743d48df82ddea9f4efba2ffa SHA512 c03973175231a6825d1a35402df867bd20270bfe6ace114690cfd055b3c14a92d9f443aeafd63efbadf95f0b40225c00e71812744f84bc12a4beac798e5d1a1e
+EBUILD rp-pppoe-3.12-r1.ebuild 2628 BLAKE2B 0912e916aaa4eaa3fcd1c61a10150cd4b6afb52e21cfb8ebe42f9ed2cebdc9a5f1378a57b6e67b118b660e4553629b5bb5cfaf862dcf3781e1d93a365840dd6b SHA512 9c1eeb5bc9b7e30e89d6467fb7519e308e3d70dc1c09b1bbdb5fd5edee5e1a39fedd557677efcae7e39e7cd55b2847ff4468064d628496e750123d7aa5d189ce
 EBUILD rp-pppoe-3.13.ebuild 2901 BLAKE2B 1dfcb9aed579522e18c5c776e6679e902958e387772122517f9a80d852956b6c06efd5fa821555110901de69e4d72073e9ddcaaee7d6502a2fe74ece0cf52b8e SHA512 0679726862627bccb3027c6182de44948946d876c0ce1be9ce765f53ee23f52920b9e5dffe4bbeb1584047ad30a8f3c6691966a1d31707b392faa1a8e65fcd85
 EBUILD rp-pppoe-3.14.ebuild 2319 BLAKE2B 86abf4dc3464a88e97bdb13ac8090a62180b4207c4448af5df213b90a55bb1f381645ea722786b5fd9657219177e37b601fe8ee0df7746d8b23b8fb132402fcc SHA512 a7f6f0d5ad247db53aa92aeb0a5ef0d7237f200ccb140516243bd79f750e3b4cd46196f0f46c1863ee45af3a98671df8aea3a302d81361f54b1c9c06145d6b70
 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
index d8618a8207d2..46194906ccf2 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic autotools readme.gentoo-r1
+inherit flag-o-matic autotools readme.gentoo-r1
 
 PPP_P="ppp-2.4.7"
 
diff --git a/net-dialup/sendpage/Manifest b/net-dialup/sendpage/Manifest
index 464932987b29..3e1d17c9390e 100644
--- a/net-dialup/sendpage/Manifest
+++ b/net-dialup/sendpage/Manifest
@@ -1,5 +1,5 @@
 AUX 1.1.0-makefile.patch 369 BLAKE2B 4e2e5378e7816d4eaa33befd3df60915ee984792185b476fee7e045f4869d4443e514de6ff6515377ddf0f81284a0ec81110938dbc9edba0a9a09e8618568cd7 SHA512 35d177ce5a3bc0f559204fdbe320c1fe338d057faa9c100785e11b406cfdb06049784fdd434b4760f8dc852460192fdda4ce1cbad4ff35ad553cd748dd693f10
 AUX sendpage.initd 407 BLAKE2B 1f0ace1ce3a81e5bd1f74230384a68414b92b82a12a332dc861b89bfe76cef011444001786ca51ef5e64638fe00dfd5789ac43133b122bdbd6e75f503539a189 SHA512 35fcf9afdc289bbd7034733e3a49a4d6891745bbecce8fabf8642ae160a221fbc0e6d795403d8f01399c250c41973bab86e22a9aea307d7e42ffa9ce18f53e9b
 DIST sendpage-1.001.tar.gz 127130 BLAKE2B a90ff3334fd1f3c112bf852f2858caa2264659c195b11542fb1e67047f19298982b767af555da5aadbb621ed9765dd5d9d80449df445222b2eec20b1fb66366b SHA512 694f7eb8afd3a73d1322d51140b5eb473a3d697613a88d1b90fb0368e9eb25ec4cee8ed018841076fcd8370420d6c9f437f84af873b31cccb36c16f91a01cb3d
-EBUILD sendpage-1.1.0-r3.ebuild 1085 BLAKE2B 2ed619807dde07f664a30a03b27f8d97173bfe337d17a85ea4c7ad2039d6f944371c1cffe1d1d128041620ec70130fccd8049a4b92bbe3d3dde539ae938ba583 SHA512 2a8a639b2c234d6098884008b0a83a857148059ef84f05180b7b752a84a355686e4923f734d59c03883ddad30d463ffc9438b9bd34d10565b233f02863686f00
+EBUILD sendpage-1.1.0-r4.ebuild 845 BLAKE2B f78ec0b303b876bdc8dfe1cdc4eac999346bd93a66c06f3b8081c6b2ad63d9872c30369489cead90a07a3674d9c74e7c5edb55f4599fcbf0ac9b34b888bc045b SHA512 185ababf87425a82ffb7af2d63674d42b523c91608ef208c97ed8e444a4765e2e888fd33afeae563a1298eeb377274f9d40493a846c3970eafb19b087fdc7e9c
 MISC metadata.xml 643 BLAKE2B cf4db7d4b665e9998380d160be6692b88487b8a249d32cdbab60c6b5bf47f75cc14dbbb88c521b0cceba69ea5ee81def0a96e73dd7ecb3a386b833f649a90964 SHA512 76f748530bdcf74ef12f246ef954f2d334ae8ebab3923752e9fb02c5cb6b5475442c15275b91909555d3f9515a98d1f134b8c16ab3d9e73ac7d61b1cbcb71e83
diff --git a/net-dialup/sendpage/sendpage-1.1.0-r3.ebuild b/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild
index 821ae2e5942f..d64a0d18100e 100644
--- a/net-dialup/sendpage/sendpage-1.1.0-r3.ebuild
+++ b/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit perl-module eutils user
+inherit perl-module
 
 MY_P=${PN}-1.001
+
 DESCRIPTION="Dialup alphapaging software"
 HOMEPAGE="https://www.sendpage.org/"
 SRC_URI="https://www.sendpage.org/download/${MY_P}.tar.gz"
@@ -14,23 +15,17 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-# This package warrants IUSE doc
-IUSE=""
-
-DEPEND="!net-misc/hylafax
-	>=dev-perl/Device-SerialPort-0.13
-	>=dev-perl/MailTools-1.44
-	>=virtual/perl-libnet-1.11
-	>=dev-perl/Net-SNPP-1.13
-	dev-perl/DBI"
-RDEPEND="${DEPEND}"
-
-mydoc="FEATURES email2page.conf sendpage.cf snpp.conf"
 
-pkg_setup() {
-	enewgroup sms
-	enewuser sendpage -1 -1 /var/spool/sendpage sms
-}
+DEPEND="
+	acct-group/sms
+	acct-user/sendpage
+	dev-perl/DBI
+	dev-perl/Device-SerialPort
+	dev-perl/MailTools
+	dev-perl/Net-SNPP
+	virtual/perl-libnet
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PV}-makefile.patch )
 
@@ -41,7 +36,6 @@ src_install() {
 	newinitd "${FILESDIR}"/sendpage.initd sendpage
 	diropts -o sendpage -g sms -m0770
 	keepdir /var/spool/sendpage
-	# Separate docs/ content from ${mydoc[@]}
 	docompress -x /usr/share/doc/${PF}/text/
 	docinto text/
 	dodoc docs/*
diff --git a/net-dialup/sercd/Manifest b/net-dialup/sercd/Manifest
index 31368feccab6..1c9444445091 100644
--- a/net-dialup/sercd/Manifest
+++ b/net-dialup/sercd/Manifest
@@ -2,5 +2,5 @@ AUX sercd.confd 499 BLAKE2B f6ce0c2b0eeda588ce927b5dac9d15ec4a93b12978d925bd196e
 AUX sercd.initd 623 BLAKE2B af05f4ad84ddd7a0d8c2c31565efc4633a5007cf1d68bdaceec36b2caa818bc724240a58cc04e46ae030fb9ab5078760287f2ffd93f7f42840d2e0b5289a4501 SHA512 639712dcdd6d44f8b34f24b11b78a85379c5733df5dc7958f4e9cc854d9397395298671be37d7ffe8a3ef9589225e192f02c2bcfb6d4f329ad31070f8f03e861
 AUX sercd.xinetd 312 BLAKE2B 88aadf70a6be5a6eded36e301b94a54a33132eef13f9ba7fd4dc2dec104179a48ba4e89cbc771ccb188dd901ae9db446c8222ee211f0318f5c94df44aaff2b6f SHA512 c4abd1c8ac3ceeb1ca86f20ced68b4709da53fbd1b80031bcf6c58df8e64c5dccc0ddb62fc72da3e439219bd9d66c27d2e4383195d3ee6c683a69db74a22cbd2
 DIST sercd-3.0.0.tar.gz 116284 BLAKE2B 9988a877d2897a2c6142e17e7a570dfa54d4ac9bee459654ca4d3bd11332639c20d292d04bcb3412b2165517bf397d99f045d9a06d0902b2496bf502744ca166 SHA512 5b9539466a26ceb7e84738347de2dcc0504462a551599c9d8b6a9b3b4bf8b4759ea9ad378c3073ef5d861effb7584e4bb4871bcd981f80ff2c8542f23952b61f
-EBUILD sercd-3.0.0-r2.ebuild 652 BLAKE2B 6894ae9b522e1b74b572e3e880060a4e158430beda06b94d7be36a7bffb21fc0b4f85a0b36f175694da6562af16d0b27c457c1093648803f2c79e768022b86da SHA512 0a8c3a73b07d4b22a7cdf06cf81909c53947156cd44fa5956b62c7978ebf5d0ffe93a46490b4897f78266182cd102e5b4546600b456a7d6cc97934be984b5978
+EBUILD sercd-3.0.0-r2.ebuild 636 BLAKE2B 7ded91b7c8ff6abf6c38726e7b6b6c2387cfc5adbd62ac2f7c592634d8dafde1ac1a86f933affaccf898205fb28f7e69b37face5dbc35711fbb4ff39217da2d1 SHA512 97f946261cd648c22a6dec4892e4717cecd615cb3e0e61809cf8e9aaa4b2bf250911c529208fd9c3336be6199782b413a8277fe8984331e12473879a8e1cd88c
 MISC metadata.xml 382 BLAKE2B da273673c3b39864ce096ddadd4f2461925faa714ddbcff8282a1e9a0535965ebcb30dc36b5a5e10652b1707e672ebab15013509f1cf9fa9b9099d5ed348f28f SHA512 a1471081712fa44bad7dac6c6241a9aa51f40cd366b71b51948f0dbd2a32a7288b8d4ac46b6cecdca9fef69c552f0305a39f6425edbe4c3f1b4ef5b2da566d21
diff --git a/net-dialup/sercd/sercd-3.0.0-r2.ebuild b/net-dialup/sercd/sercd-3.0.0-r2.ebuild
index e881ddbc2b3e..434c8604631b 100644
--- a/net-dialup/sercd/sercd-3.0.0-r2.ebuild
+++ b/net-dialup/sercd/sercd-3.0.0-r2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="RFC2217-compliant serial port redirector"
 HOMEPAGE="https://sourceforge.net/projects/sercd"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
diff --git a/net-dialup/speedtouch-usb/Manifest b/net-dialup/speedtouch-usb/Manifest
index 86d41e5f0d64..a952fa43dc53 100644
--- a/net-dialup/speedtouch-usb/Manifest
+++ b/net-dialup/speedtouch-usb/Manifest
@@ -1,4 +1,4 @@
 AUX README 9246 BLAKE2B 177c2863d5149bacac3b058851f7719b0651adeebc445fc825ef33cd567f28904bc89f521573b03cd70ee84d7ee495d303beebccddfd1a4bbc7a3d584e9e6bac SHA512 5b08cc8323de5bf0c0e528266e18a85c28e13bfaa462b3abeda9a2abaa0063b9872153bc97b2be88e489c949ddabd65f7d19a39600f9c0d2375e40d511c0ee2a
 DIST SpeedTouch330_firmware_3012.zip 769125 BLAKE2B 4f7569ab3d123837f3854af02aaf53972dca6a031fcbb7c1bd965f6b389509ff588de78488ad19a5b7f58997aaa9f53462713a7df0b0d7a05d8e77a2562ee0af SHA512 d4ec1b609eb58b15b0c569fc2c96e453517f6a8141c706f342549093c2c7bbdc09bbc3f05ecf75f3018e54f03a974b84e625fb9401f02d4f4143b721eee0b3c3
-EBUILD speedtouch-usb-3.0.1.2-r3.ebuild 3092 BLAKE2B 9fff723c30ce0191329eba708569d9512ba592f2325e9528d809b87eb669fff5019f44009868b79705165c58b9f9bce26b6e0b54a1a02128051aa58f759721b3 SHA512 d4a316bca29c6d9c6ad3c3f109eb19c1cd951a001245b229cfd88ab586b559d8e27999656ee2663056cb6602a598f6775b52cccd93d9da7f88021f3f011283a6
+EBUILD speedtouch-usb-3.0.1.2-r3.ebuild 3082 BLAKE2B be49950732ef1394079bd2c55149678dd19715f0aa89bcb94624a321f831844a372f180e709e618103ae0d99ada09d6c375a80fc014a35c4c1a31b23013d7dc4 SHA512 a7703b978b78d159a9b668443c15eee6f4996969738d5798df83c97890d498c5ea96ccca48f76cff4dab45cb296ed8842ffa5c1e3fd75d3b0d6edc038f8fbc78
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
index 4cbf0542da62..f4147e2b58e7 100644
--- a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
+++ b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils linux-info
+inherit linux-info
 
 DESCRIPTION="Firmware and configuration instructions for Alcatel SpeedTouch USB modems"
 HOMEPAGE="http://www.speedtouch.com/"
diff --git a/net-dialup/xc/Manifest b/net-dialup/xc/Manifest
index 8f76ac72f9e1..c6bfbc53d63a 100644
--- a/net-dialup/xc/Manifest
+++ b/net-dialup/xc/Manifest
@@ -3,5 +3,5 @@ AUX xc-4.3.2-fix-set_bps-overflow.patch 418 BLAKE2B 15f4bdd51a42a6501ab2953f5076
 AUX xc-4.3.2-gentoo.patch 3222 BLAKE2B 43b119862c643f480548cba7822c8d45b6a87ba4c140e5baf23363cd63e82c46cf85d5b2dc797a643831acacf8a54190b282ea2022a84b4d3b6fd8f7b70fdd56 SHA512 543d21ff9b6f37bcfcaf9b7d8e700761cc9e3e92cc229d500275c92d7377640293648b48e8d424716bbc0b7b08ec416a75244e6a661b3d54cee68cbd5d838efc
 AUX xc-4.3.2-implicit-decl.patch 434 BLAKE2B 7397c9e2e308093c99454eb22ffaa7f8fc7939500e419c809bfb14ef5369ab6ffcbf4385aa2e2cac141db62fc1d017959d827610307351058bca232fffefc299 SHA512 5c470a0b936576a3c90ca84317f4b1237855e475a5c63b62e94f55f2dc7f1c5561fa512ae1a46fa5b9d9df146abd1e58f04399b6b04c6fadf2a12cd6665855a6
 DIST xc-4.3.2.tar.gz 162098 BLAKE2B d3ce005bea46cff7673d8c9c4c288356cf340a04658917934a3553705f0554ffcc433379a8fdbbe2cb8a456cf15a73c5bcdd1719c0f9f3b7d41623b535b45ee6 SHA512 89de05a82f54ffd89a6950f9cb4aea732573ac1b15a27aaba4e25293a5d0b763052287700e4499f7f2adf9acc952ecea572239c8403c86c5871efd363d68710a
-EBUILD xc-4.3.2-r4.ebuild 1050 BLAKE2B 3659c8d0830e4512fe5c6609306373031fad08d87d89e90e59a30680e1b75989494ca496f8618a5f40e62e550d3f61ebe0c1807e3a8ba1caa14d6d752e135402 SHA512 6be6426d5944d9db01cec408675ffb77591f44ed3c899483e814e4a63a5813762c52e33b99030effeaec9f725961a37bcc9a0b5bd4c54a28ac5e6a0fb8d7d0d5
+EBUILD xc-4.3.2-r4.ebuild 1047 BLAKE2B 04c41505d467fe3534a49da1b0d191d12ea7546681163cc246e95e8b1d4802dc2f0adcae45380fb4a08a69b0282bbd0e2e283a80681456ea333a3b41ac18e636 SHA512 e6dc0c4335e0955633ecb3e1b068c02023596bd2cc14a092ff62e38deef4bbd07995a9585193cfb6aab8c5db528ff0e0bb54dd48e4f55ab87ff3ac94d3d24855
 MISC metadata.xml 358 BLAKE2B 3d76b6b9d649f45a1b31f5e1ec3238ed9ef233539d3fefdb07829b4b2845ba67f24ad34987912b92bd93c0566317b6cc381ec3b68f11b7025488b4fc0409d455 SHA512 4d695e92ba66886be964c96cabd894ef44cc93d62f053422f14909b953bf7bcf9321fcb745c33d5af716308f61df3154c1eadb78ce306439463cd2ee6528f6f0
diff --git a/net-dialup/xc/xc-4.3.2-r4.ebuild b/net-dialup/xc/xc-4.3.2-r4.ebuild
index abb2ee2a085e..7b2b3daae753 100644
--- a/net-dialup/xc/xc-4.3.2-r4.ebuild
+++ b/net-dialup/xc/xc-4.3.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit epatch flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Modem dialout & serial terminal program"
 HOMEPAGE="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/"
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 1501d1b23972..617d9f5ac9ac 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -4,5 +4,5 @@ AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b
 DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
 DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
 EBUILD xl2tpd-1.3.15.ebuild 1074 BLAKE2B 1f6fad5624a8c3376a9d40dfcdd89510473dfef6634b27233cd6cee363be7a366aadfdccc12d7e74db4efaf290577feba9eb4235e1623d151b223047a563917c SHA512 0b13197b0842a9dbd1c126e7b14cb08f1c249a2d0b89d2c65ab0e84bbcdc76c0da3b4e4fe51309ccf52812b9b68ff5704b33879c24acc5d879d9540b51b8ea30
-EBUILD xl2tpd-1.3.16.ebuild 1078 BLAKE2B 2fde8bf80db10114656e361546c0b92588002ac207b7be819bdda2ec28171a1efcabb499789f41bc1b00d9a6962e20d10d3aedfc39048959a7c936597463b17a SHA512 147419d02f47afc597a128e86890a30102ec601af107d6864cb5b78e37a54e0b5dd4427fbc3926a4b7fa9129fab7385b88d7cd72b94a1383bbe59741fb87be26
+EBUILD xl2tpd-1.3.16.ebuild 1074 BLAKE2B 1f6fad5624a8c3376a9d40dfcdd89510473dfef6634b27233cd6cee363be7a366aadfdccc12d7e74db4efaf290577feba9eb4235e1623d151b223047a563917c SHA512 0b13197b0842a9dbd1c126e7b14cb08f1c249a2d0b89d2c65ab0e84bbcdc76c0da3b4e4fe51309ccf52812b9b68ff5704b33879c24acc5d879d9540b51b8ea30
 MISC metadata.xml 658 BLAKE2B 0234424bd64d54ff71bce404044a874c90c32f7af4857941f9fb1014619da53e97ae925f9f91f4b0d53576a2af2d84d624c4462b104882a6ca3b716a1915e9ff SHA512 38c8247a784afe819a63194373dd04600ac73d38d5a53e6a40ae1cabfb3070f0b8c72669f9aaef2702cbe98b6ecb47aa88a5f63772302e55a2177f17e191e296
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
index e20c5ce6dfa5..43814cccdc9c 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
 IUSE="+kernel"
 
 DEPEND="