gentoo (leap year) resync : 29.02.2020

18 files changed, 254 insertions, 22 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index ecf5a369f591..86f31415c414 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 7c915ce24453..f5eda985b125 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -16,5 +16,5 @@ EBUILD freeradius-3.0.15.ebuild 6054 BLAKE2B 9b9f62eb1f4a3aa24d9640e6ff82df0b018
 EBUILD freeradius-3.0.17.ebuild 6727 BLAKE2B 0f42808b329fef66e7eb28e6ae5abc32108b138714f5429348bb00373f620b5ea68662812e16bec992d2664ea37adf9a800b07c883fd2d4b978ebace1b56e650 SHA512 c3ed93033d57754f53ea2d5b0d1cab63119561784ae761423c357e5aeea8f1963729f80b19a9a7beb253fd51a601a5e2751f301c55de39ce22a9ab3a27762638
 EBUILD freeradius-3.0.18-r1.ebuild 6874 BLAKE2B b35457da5edffb5679a6baa9af427d5efc8ebd9eec314beae928a20ae7b0be3523914e30bc6225a0bb9e471f2e8fd8b4630113ed3bcc82da7be26d6505cfda73 SHA512 a44785b4c7629c44af02bb29f60a1f6a973b351dded93b0470e39d29a2a2861a68e187ccd7a6f239c38b46c86b833c7fff7e9956a5045d57b949443d9a628a18
 EBUILD freeradius-3.0.19.ebuild 6855 BLAKE2B ff9866d2d69ccfd9b9fd0e9d9689140b8d84f1103dd7d5f85053954d79ecb3189e98c475272dd0c01957e9ca048aea995401a1ca6aeeadf50b4209cbcb6b1556 SHA512 9cf421d3ecc09ba3c40ba6e60bb2111f4587aa2e84a90040c19e040d6b5a1cc6f46e71ca0c2ff5d7e44f41d6502609ead1030cd3ba9d5ca2b4deedbbe3d590d1
-EBUILD freeradius-3.0.20.ebuild 7584 BLAKE2B 9058ed180c90492da0e4b79a2847018c6357faefd31973a5eea4b7aa9b43081ece91029d65c1e09c30b0a3c2d8a3260ff574a4dcbde04178507fb39e7cf33b1d SHA512 5fd71f36f7e6e9246a65700653bdd0eebf7c0d22d2194d421722eb91c03928cf23cdbe8b87789f6de7a4e4aa78090054de1bf1e30657d6a047a3cd333fb99a47
+EBUILD freeradius-3.0.20.ebuild 7582 BLAKE2B d41d8b3d4ddf119c7d9cb0e460c865d27150e8fd1771eb698e42361bada34519ee5868f661848704f42cf3da40ccba4b6670c2f0d66f9e32200aefacef1d242b SHA512 179ce6c0d1c5e19926d391559523e3ca974422219a70669e66fb330583519e7ee2a3af59862cc4f8c915bfd0c5d9d3dd6548f7d70cfd7c0496894e997d0f8586
 MISC metadata.xml 864 BLAKE2B 5df7dfc698cebaaf850dfffedd8bfc9b7f30a947fdc7072b86b6e557bcf0f2548564260fb2ae073ea5adb5d1a37a5363e122691f748588561e26f5e452176934 SHA512 e36f1c6447cc565efb1523b931f670e944a5cd5eac9176bf42be13db907c7afea6d8ab860f77e739beec25f1b74012fe53987da5c48e6a7b928e335614e679cc
diff --git a/net-dialup/freeradius/freeradius-3.0.20.ebuild b/net-dialup/freeradius/freeradius-3.0.20.ebuild
index 5d43f28c636d..b7bb8b13efc1 100644
--- a/net-dialup/freeradius/freeradius-3.0.20.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 "
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 0b0091114a07..a71088e5ff47 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -6,6 +6,6 @@ AUX mgetty-1.1.37-qa-fixes.patch 6029 BLAKE2B d8ceb364913f1d133d77b29711ff31d24c
 AUX mgetty-1.2.1-Lucent.c.patch 622 BLAKE2B 63ffcfddfb13fe07037c5d845b60ceb91710f195d9bf9c5e8480faa8e98e460dd9e61ac4facd2dda22a4b10c578ccb06fe54a6c1bd3b1a936597dae18c995b48 SHA512 0913fc876897d630949ab1175eccda42ef8504ee772a835a03b4d61f31c2b1eaaabf9976ae121bb7105805ae382f0241fa7d42710b0660b7f4d9a4e24d377296
 AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069ba0ed6a2be93a952010f6a91bb2383948b62a407c37aa738be70aaaaf4715e578f51a9115837f3944c65f39f9d7 SHA512 24c3d98e43d8f573e395f65a500ea6379e6b27c020db81e00f4c3ea5d203d4ad344a29b6540575fd94c9462fdf51ecadff13a703568d51de3dc4fd815e462143
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
-EBUILD mgetty-1.2.1-r1.ebuild 4668 BLAKE2B b2fa76ef755ad5ba47e19dbe4d61632246a854f8aeb43f47397703bd654d15bee0fc28755e520365e25cdc43e5d41c5a2a8b61080606952bd1db8d5ebd855919 SHA512 119f44fcef46e779f7b49ebbde90e96708765b824c36a3a0c9976066e509f577f870bd4f67acce0e429dac5d6013aa837cf7c4a13045b8fa4a0b63f809a584a5
-EBUILD mgetty-1.2.1.ebuild 4627 BLAKE2B 68280b15937cae278d77c585bdbafe4d8517222208bcccc166432d3627cff016116341dddaffd8617d1be1ce468ebd0e033abd2742642bcc5dea8f28b44eff03 SHA512 aba6a82b9c6eed00693d1366551334a2618d305b61e9c13304bc6ac6a8bd3517e2b3b1a3edbdb8bbe2c9d3b933bf1aabe7f0387f7818b8393b914531fa0d4266
+EBUILD mgetty-1.2.1-r1.ebuild 4667 BLAKE2B 7edfff3c13d8f2a4bd7ff7b5263423ed4a4b3e47eda8be2617da80b8300ad02b39f5c217a9c7c1febdd942c606b754868f4d5b0a9b6141d1903e32e2a588d479 SHA512 54a9a7a3aa33374f4d55828b1f2005dc1da32a940a134cf7c794ca6b2a4e1cd1d8f1936aabf6afb817e4ed4b608166d76ccd919e96674ed440e11ab20e9480c8
+EBUILD mgetty-1.2.1.ebuild 4626 BLAKE2B f169d7897a61da38df2debece60e5e4294965ce39453920c82411a49d6665bbd91d6ee706437fda86fba55ec0cbc3db66d9de88278a54a3e552f4fb6c132d412 SHA512 7696175af7f23bbc4365df0118167dacc217ecf0c39e96ec2f9f221c7a505287b2f890ed1d30ca7072e74d9dd5743079e6b9ee3cce8f31b2259e3d65b7658712
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
index a188806c1cfd..e045c3315e9b 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -93,7 +93,7 @@ src_compile() {
 	done
 }
 
-src_install () {
+src_install() {
 	# parallelization issue: vgetty-install target fails if install target
 	#                        isn't finished
 	local target
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index 1e2c85eca543..69a228ee58aa 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild
@@ -94,7 +94,7 @@ src_compile() {
 	done
 }
 
-src_install () {
+src_install() {
 	# parallelization issue: vgetty-install target fails if install target
 	#                        isn't finished
 	local target
diff --git a/net-dialup/mingetty/Manifest b/net-dialup/mingetty/Manifest
index e72403dde7b1..3f0e6382dde3 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 752 BLAKE2B b232734ca4c3aa35773febb634638c06b16baeed811eaf3189af2b2c74dc9a059a74792f63ead4b04910b34ff669b25e96f362dc1bdc349e69004f099cb5c93f SHA512 2ab55e25d629f63a9372c028b971c38deadd84a8fca63be9440c9aaeeeaf3f0e909ba4b51e86474180d1473302a33ac0bbabf6e325450da5f49cc50df27b999b
+EBUILD mingetty-1.08-r1.ebuild 751 BLAKE2B 164c0feb24af62e6d4a043ff8dcfb81808bcf033ef50580ad1644807745e33cca50a52d89874f0f34183ca13518dfe608bb8c5f81ceea2d3727a25eb64840c65 SHA512 e7cef08081f3b54163e164636367d6e26d659071e9c0fe4d35f679bb54be4906f631476811403519bd1a713bd6a180b2be1b30f8f293cc05e188774019513c4f
 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 c4f90f98cbc4..e82c8c597b4b 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -27,7 +27,7 @@ src_compile() {
 	emake CFLAGS="${CFLAGS} -Wall -W -pipe -D_GNU_SOURCE" CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	dodir /sbin /usr/share/man/man8
 	emake DESTDIR="${D}" install
 }
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index ff31ffa35bff..2a02a0110d55 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -2,6 +2,9 @@ AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313
 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
 DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac SHA512 9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
+DIST ppp-2.4.8-patches-02.tar.xz 39700 BLAKE2B 8e03ecf306ff415370a96ba2eca4ecdb9daed2eaa569cabbd49b94ff279dc04081cbf6749463556ba42832f4baf6f8f4cbdc0c79d6419f57080b14f3214ca992 SHA512 4f2c08a8c1d659d79c18471b41aac2d18383f86ac22231993609b548f899ee32d1ea3cc25952f00b85d1357e53bad6cf93842c49a59ecf29ed20be3020378e78
+DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 EBUILD ppp-2.4.7-r7.ebuild 7076 BLAKE2B 5c5a518b9b561fa3d3ab7c707a803609868bbe2c98ca110be6108011aa7d12efd31413d5f17acd1fc74d894bc474da776acf3d64f1624452c44ab34af5be96f4 SHA512 8f5b9ca16afa9dd5d04c1e450295afd25069d554becc34b48dd50a28ec5e5c1a8cc92c0b1209a1b90d8e23ed9bef34183a36b4af377f346a6b0458419ddcd2ad
-MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
+EBUILD ppp-2.4.8.ebuild 7062 BLAKE2B cc349a42eb6595b442b4684992e25c733023ae46ae3999e73112dc601871a508f2dd39c36201c30a24bb6fd97bd65a9e0b432bf7f1fa052e0fd1fa61d3408dcc SHA512 e53c90310a0a95bf79f867d5ea5b7bf4908ab9350c92b6d06f133748bf51efa21a9ef576ca3e468c313c14842b1e2d55d6125158d76c33f9a04d8d467e22ef0c
+MISC metadata.xml 1383 BLAKE2B 446bbb4679748003bef81dfea623121504d8e6384cc79baa25c58ddeb6d91c0437b744241d9a7b53e2857cdec55c8021affd202329d4af664e4f7bc76386be23 SHA512 3ed22fd5382f9c8e6d9a529c4f66a606ac2a952e355e92c594452325310ddf68e2f625df4d72f6fb017a1a164b845bcc27336ac859e1c2ffe4c2cd702afe6d73
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 291e09f93cd4..bca37ed11ed2 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -24,8 +24,6 @@
     by passprompt.so PPP plugin for reading the password from a X11 input
     terminal</flag>
     <flag name="ipv6">Enables support for IP version 6</flag>
-    <flag name="pam">Enables PAM (Pluggable Authentication Modules)
-    support</flag>
     <flag name="radius">Enables RADIUS support</flag>
   </use>
   <upstream>
diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
new file mode 100644
index 000000000000..9ebf2bc0d491
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.8.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info multilib pam toolchain-funcs
+
+PATCH_VER="02"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/"
+SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
+
+DEPEND="
+	activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( sys-libs/pam )
+	gtk? ( x11-libs/gtk+:2 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+RDEPEND="${DEPEND}
+	!<net-misc/netifrc-0.7.1"
+PDEPEND="net-dialup/ppp-scripts"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	if ! use eap-tls ; then
+		rm "${WORKDIR}"/patches/8?_all_eaptls-* || die
+	fi
+	eapply "${WORKDIR}"/patches
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+		echo "+ipv6" >> etc.ppp/options || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+			-i pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8} || die
+
+	if use radius ; then
+		#set the right paths in radiusclient.conf
+		sed -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" \
+			-i pppd/plugins/radius/etc/radiusclient.conf || die
+		#set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/* || die
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
+	fi
+
+	# Respect our pkg-config settings.
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		contrib/pppgetpass/Makefile.linux || die
+	sed -i \
+		-e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
+		pppd/Makefile.linux || die
+
+	eapply_user #549588
+}
+
+src_compile() {
+	tc-export AR CC PKG_CONFIG
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats ; do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+
+	pamd_mimic_system ppp auth account session
+
+	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/ppp/radius
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodoc -r scripts
+	docinto scripts
+	dodoc -r scripts/chatchat
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	# create *-secrets files if not exists
+	[[ -f "${EROOT}/etc/ppp/pap-secrets" ]] || \
+		cp -pP "${EROOT}/etc/ppp/pap-secrets.example" "${EROOT}/etc/ppp/pap-secrets"
+	[[ -f "${EROOT}/etc/ppp/chap-secrets" ]] || \
+		cp -pP "${EROOT}/etc/ppp/chap-secrets.example" "${EROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${EROOT}/etc/ppp/options" || die
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-dialup/pppconfig/Manifest b/net-dialup/pppconfig/Manifest
index 50b195dec242..b76927037868 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 1048 BLAKE2B b5c2af2513d2ecb37dd32f830c595411f2394c00e5fabbae9616d91c6d81f4e8ec65d192f8a1396a72e4b5393e3f0a94cc33dfad9c40d235a8e3fa2ec5dd6b46 SHA512 6a68b90aae289e25f7b05bb6fd8713f0fc191cb35506415982c9b5649dd93dd79e0ed98e86e8f1af6b38faf08124233656402953bab7f8c544caab81d96a5515
+EBUILD pppconfig-2.3.21.ebuild 1044 BLAKE2B 746dcda2cf184c410a5642098d3a25174ad32899c5cf90f625aface2a7b33e8aefa220d729c0b5afa298fd3672be76e2122ab05df10bba32d2b566ccc6371700 SHA512 0ef1e057ebd3dca53bcc5d9735e30b84051417ae2eba578e00116e88b710dac5de2004f18becbb4515f3e25a749cfc76f441a11666d93c95eceb2f53998791e8
 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 85b063a1b96b..aee64ac9fa4c 100644
--- a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
+++ b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,7 +36,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	dodir /etc/chatscripts /etc/ppp/resolv
 	dosbin 0dns-down 0dns-up dns-clean
 	newsbin pppconfig pppconfig.real
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 29b317b7237c..88c45568ce94 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -15,6 +15,6 @@ AUX rp-pppoe-3.13-linux-headers.patch 608 BLAKE2B 22ea43655b50eb38e2ae0e9ceca190
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1
 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36
-EBUILD rp-pppoe-3.12-r1.ebuild 2639 BLAKE2B 45990f3969b5bdb48b2f7ef41a8e88a21d298af4bc5da00397069fc64d87a97bbc05b0c9c59a5bd5f87fb62332483b9bc39be7b6e43b3697f5f3a730d0df5daf SHA512 5129e8c3ed7e7543d53c8aedf50cf918c462f4e0faecc09ca27f3da30cadbe5ae26878e84eaa0b83df4a14fb68d84fb31664e33325696d094623fb7ec3eb5fdc
-EBUILD rp-pppoe-3.13.ebuild 2906 BLAKE2B 7f71b6a400373626225b1b906a43eb02d2e8d3fff3f2e84ec5d8a35ccb7c81e8474aafc2bc29e943e6322435471554a71ff3f5d4b53c864804a3177e6ecfc228 SHA512 9a41987db1d47feb78e2c8bbcc3fbc30257a737a4c916b19e45454023fe57fbbea7a75b2e4e9e7318808a07fc814af51e135559526f7cf32aed68ffc977d8a54
+EBUILD rp-pppoe-3.12-r1.ebuild 2638 BLAKE2B eb4a9c7f5be426ce5fb594ff25669eead87251a90b836fc07921c54f76185c11792c2fda2f5e18745b14dd16d2b18ff5cb01de048babec1b19a9271440defa97 SHA512 44f11224ef5ec9ca3e880bca059e5fdb4ac15ee610a19a151d44c07190eeb5e607ff8453f9bc63cc927b1ad84573157081fde45508522cbb9b4408e975142cc5
+EBUILD rp-pppoe-3.13.ebuild 2905 BLAKE2B 2c3f2dc18be170d7c64317d4ef529c67657047dfd7a371656441ac9d9ace108d30059a7e8ed2e9f875645bbe397045ad503ba50bf49ae0b5449e0506db417393 SHA512 92820b7c8b8b335b128cf3b2b8114575e9c1d21b276da9651a588298dfe9080ffd4e9cd314bc6aa883be520efae14eca6bd197b73abb9205144a45e97138fffa
 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 e0a49a868866..a39d8543be1b 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -77,7 +77,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	cd "${S}/src" || die
 	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
 
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
index 760e025984be..988fa7c8d815 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
@@ -79,7 +79,7 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	cd "${S}/src" || die
 	emake DESTDIR="${D}" install #docdir=/usr/share/doc/${PF} install
 
diff --git a/net-dialup/sercd/Manifest b/net-dialup/sercd/Manifest
index 2aa28c1e7fc5..31368feccab6 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 656 BLAKE2B 77c55509095b28cf731ecb35dca06d5f055a9426a913115fef17f4ac1b814899d87ba0135e56a2c55ef8b3d7c44b2b66decf4c965f7a35df11c31d178bc2b0a6 SHA512 e1d039c172bb468b930e4a6f096805be5a584cffde038f7a527405c7f8297bb078bf01adfe9498fd6407635b1c5a7f148df511a8fcf6cda4dbec59e6f8ba0dc6
+EBUILD sercd-3.0.0-r2.ebuild 652 BLAKE2B 6894ae9b522e1b74b572e3e880060a4e158430beda06b94d7be36a7bffb21fc0b4f85a0b36f175694da6562af16d0b27c457c1093648803f2c79e768022b86da SHA512 0a8c3a73b07d4b22a7cdf06cf81909c53947156cd44fa5956b62c7978ebf5d0ffe93a46490b4897f78266182cd102e5b4546600b456a7d6cc97934be984b5978
 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 7bdbc3d3ffda..e881ddbc2b3e 100644
--- a/net-dialup/sercd/sercd-3.0.0-r2.ebuild
+++ b/net-dialup/sercd/sercd-3.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ src_prepare() {
 	eapply_user
 }
 
-src_install () {
+src_install() {
 	default
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"