gentoo resync : 08.01.2021

12 files changed, 279 insertions, 203 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 636315ecbd38..fbdb48a7f762 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/kpnadsl4linux/Manifest b/net-dialup/kpnadsl4linux/Manifest
index 1868c46020ee..386c43d3e786 100644
--- a/net-dialup/kpnadsl4linux/Manifest
+++ b/net-dialup/kpnadsl4linux/Manifest
@@ -1,5 +1,6 @@
-AUX kpnadsl4linux-1.11-Makefile.patch 637 BLAKE2B 1d980cfe80d302330d3d651b6b329f1d55b99b60f6135ec9b122e859b3f0f58a8bf3b9efab259eec1dd22d62b52aec3423aaa8f606020c83db60651ad3d86184 SHA512 011a541cd696670871f950f53cd8b11f6c91006bf2806500e610fcc8320143401aaa5c7c976b8df1b3ccc84d29e79e3ff1bfe10735784c5646cda02d5623bbe1
+AUX kpnadsl4linux-1.11-Makefile.patch 604 BLAKE2B a08bbcbefe390ff7ec12c60aec09b9637a03bf9bdde55c82749d71ceed0d7101e6c61ac7dc742d44f9e6e0021f270cc57116fec8557fa33aee7d395bca1059f4 SHA512 dba59f48074c55863cf5114d84616df712190e1b14d9f6a0079b36df74ca8674fc26fdc95765d4cf165e82e90bd51edafd37a26388c22d8fb6e05e3d24e2ecee
+AUX kpnadsl4linux-1.11-fno-common.patch 415 BLAKE2B 8cfbd57d50df13b9aacaf3f65d33ec0a243a37c9d027f03e36fa05739a9d63692475a828ef0ade3caf08b25ba72e9e2e6a1f5d8ed234578abdd9c9077afd5b22 SHA512 641671e70c053981d9a833abc3aaf9cbc6a754f7c3ff2353350b7da8b2a009115ba9ddd2f26d278c7cc87de6c4675ba0f8b4b54e0ca0298d0a074858b1776317
 AUX kpnadsl4linux-config 3773 BLAKE2B bfc568a6e6c2dc6a09c99b3a251ecd1cb03f3420fea502cca10bab3041e5cdfb6d469941f0d88f6bdee7c735ac8c22594a7fd98a2bc10c59aa9e435d16a15f9e SHA512 6f2fa43a33b111aadad0253aceafafff3850a46dba05d00752f72215dc2f37fa825337b20292a3f1d17af1a967dcbf425ce4ba4dfea7b84a3d01ede2f035d99a
 DIST kpnadsl4linux-1.11.tar.gz 15068 BLAKE2B 2199414df46df750ce5df12f44eadee29114e3b8211283a39bca26b0d2f697609aeaf3f022679fa165971b1182e175e8e15c17e7afd0315feca75a3302252e5a SHA512 050c879aff115169e6cb0f0bf081a8172a3f4735f7231d1e5d1f245b34a1b522691e7640d146eac3c894a17c2901e59f1f942f7be5a2eed5ce1eb8c96bfef201
-EBUILD kpnadsl4linux-1.11.ebuild 1129 BLAKE2B d5def33a48948040374a21579e277b66ad4d83d507a62213c876b5de7fbfc485d97c657b94b288b287933eccd4ee7274a96bddc7b5c2299fab71696472d848cc SHA512 d1f4c3f4947a6db876ed919a7d97ecaf920d5540244d8bcd5fbb7bf4e70e6b05ad11ba49393298bba5114ecc0e0ca8e9c21d52e71132882a14eeaa68f91b56d3
+EBUILD kpnadsl4linux-1.11.ebuild 1110 BLAKE2B b7dba250a84d6dcde4b154d43ff96c9166ffd770a3125fd5155c4a93665a4cc6b5f44537e17b0aa3b709f31b1cbc683ec9b502a88700f96bd112f2eaacead411 SHA512 59fcc2afdbb8f51f9f7b9ef221ba81e1959825b76869e71734ee524804f9cc5710642c891a9e6995d005c8d392e98fc3b0175fc1b42beca927d23b6775115acb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch
index f7d20bf348a6..051dffe47fc5 100644
--- a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch
+++ b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-04-14 16:50:26.676698258 +0400
-+++ Makefile	2013-04-14 16:51:14.107695809 +0400
+--- a/Makefile
++++ b/Makefile
 @@ -1,18 +1,18 @@
  # Makefile for ADSL4Linux 1.11 Gentoo Edition
  
@@ -7,19 +7,19 @@
  
  adsl: adsl.o adslstatus.o adslstatus.h adsl.h
 -	gcc adsl.o adslstatus.o -o adsl
-+	$(CC) $(LDFLAGS) adsl.o adslstatus.o -o adsl
++	$(CC) $(LDFLAGS) adsl.o adslstatus.o -o adsl $(LIBS)
  
  adsl.o: adsl.c adsl.h
 -	gcc -c adsl.c
-+	$(CC) $(CFLAGS) -c adsl.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c adsl.c
  
  adslstatus: adslstatus.o adslstatus.h adsl.h
 -	gcc adslstatus.o -o adslstatus
-+	$(CC) $(LDFLAGS) adslstatus.o -o adslstatus
++	$(CC) $(LDFLAGS) adslstatus.o -o adslstatus $(LIBS)
  
  adslstatus.o: adslstatus.c adslstatus.h adsl.h
 -	gcc -c adslstatus.c
-+	$(CC) $(CFLAGS) -c adslstatus.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c adslstatus.c
  
  clean:
  	rm adsl *.o
diff --git a/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch
new file mode 100644
index 000000000000..586b517822fe
--- /dev/null
+++ b/net-dialup/kpnadsl4linux/files/kpnadsl4linux-1.11-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/adslstatus.c
++++ b/adslstatus.c
+@@ -40,8 +40,8 @@ version 0.13 moved logging to /var/log/kpnadsl4linux (by Sam Besselink <sambesse
+ #define FOURGB 4294967296.0
+ 
+ /* global variables */
+-time_t    tmNow;
+-uid_t     uid;
++extern time_t    tmNow;
++extern uid_t     uid;
+ char pppBuf[256];	/* textbuffer containing ppp0 info */
+ struct stat st;		/* contains filestatus of STATFILE */
+ double    received, sent ;
diff --git a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
index 658aea979dcf..988a1e9b2bee 100644
--- a/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
+++ b/net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ADSL4Linux, a PPTP start/stop/etc. program especially for Dutch users"
 HOMEPAGE="http://www.adsl4linux.nl/"
@@ -14,18 +14,21 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND=">=net-dialup/pptpclient-1.7.0
-	>=net-dialup/ppp-2.4.2"
+RDEPEND="
+	net-dialup/ppp
+	net-dialup/pptpclient"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	# Respect CC, CFLAGS and LDFLAGS. Bug #336109
-	epatch "${FILESDIR}/${P}-Makefile.patch"
 	tc-export CC
+	default
 
-	# Fix a typo
-	sed -i -e 's:* at first:/\0:' adslstatus.c || die 'sed on adslstatuc.c failed'
-
-	epatch_user
+	sed -i -e 's:* at first:/\0:' adslstatus.c || die
+	sed -i -e 's/runscript/openrc-run/g' init.d.adsl || die
 }
 
 src_install() {
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 38a1d57f3a41..a5f137e2c5f6 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -6,6 +6,5 @@ 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 4663 BLAKE2B 61aaa5dd6ab8ca8a1bb4117208eec21239bef6fab00af8d72e8a34affc25ce620aa4e1ab5101bf1e38bb90bab87185e21a424ef13fb655c03d21d0f97a1a5b71 SHA512 e3361a46a773db41533a36a39ea0553dbac3589599d514a343dd908932c405f68c90ca4031761c2276ffce1869e1d881ae268612e8f03be29061bba46f5c356b
-EBUILD mgetty-1.2.1.ebuild 4625 BLAKE2B 93a4320ed4961c2cbb407038739849fa75a0438d5405abfb83d69fd97995eed684b6b5939bccc8fcfe4a4de4e32130056d248a4a5e84acb1d070301fb2070328 SHA512 466448c42d29ff217b6ffa5d4fff45b44be18a56e34e1db2cb61c6f826b01846566bf92b85320bf7fbfa2192c9cdd48f8875858efffb9d8650310b2c63adc65b
+EBUILD mgetty-1.2.1-r1.ebuild 4656 BLAKE2B e131a9d0f25e609c085ebd9bdd51350dc3fa51739f6896a9aeed7aa1da1c859dbdd6e787d2eb2a9f030c132ffd57b85c8a01825addadbe04b77b6f0f655fe90a SHA512 3bad236122066579870835c607ddeb04db6de179180c110cc8adb08e51ca6bf718a83ed314da81cca4889985b34f2e2af7239089c007143bfb08e1834d22a397
 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 48a806daa72e..7ebadecad3d3 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="+fax fidonet split-usr"
 
 pkg_setup() {
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
deleted file mode 100644
index d577aeb14a34..000000000000
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 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="
-	>=sys-apps/sed-4
-	sys-apps/groff
-	dev-lang/perl
-	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"
-
-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
-
-	# 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)
-	dodir /sbin && \
-		mv "${D}"/usr/sbin/mgetty "${D}"/sbin && \
-		dosym /sbin/mgetty /usr/sbin/mgetty
-	#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/ppp/Manifest b/net-dialup/ppp/Manifest
index f243ae88afd0..775ac085ead7 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,7 +1,10 @@
 AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36
 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
-DIST ppp-2.4.8-patches-02.tar.xz 39700 BLAKE2B 8e03ecf306ff415370a96ba2eca4ecdb9daed2eaa569cabbd49b94ff279dc04081cbf6749463556ba42832f4baf6f8f4cbdc0c79d6419f57080b14f3214ca992 SHA512 4f2c08a8c1d659d79c18471b41aac2d18383f86ac22231993609b548f899ee32d1ea3cc25952f00b85d1357e53bad6cf93842c49a59ecf29ed20be3020378e78
+DIST ppp-2.4.8-patches-02.tar.xz 39868 BLAKE2B b933bbdabb7ace06cb20b77012a21621f2be7b78c2bf6a57c99e4feef0e22828406ea46046f7f7c80a52821105da45f65b1d82d7bb98f6431946b3f3eaca99f7 SHA512 f987d755bb9d10b2ce7f9bc7ee9242af46dae24c5d964ec9b130d56ab818940ed5f45fa25e3323ec2eefad7d3a487d8dc49406b7534738952430cb8c4a409591
 DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
+DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c SHA512 5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
+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.ebuild 7051 BLAKE2B c366a86fb0509ba9634d3ecd8011018042850cb7b29af4cd5c0343c6842fb52a20d9cd1b7b814ab4070f755d82e589d22923b2f103c0b60816db7d9ae200fa0a SHA512 4a3c9dbb47efa18342a7231b510d569a7489ec33d6140d8ae6248e4ddc2127c83a079ce32e8a3f5a21be7c9bdc95edd780e2ad1ee11d91f048ca77bad17db604
+EBUILD ppp-2.4.9-r1.ebuild 7116 BLAKE2B 925471d85a4529c5daee4e7ac91f1662ae7b4f931b28a13e5f878cc58c2f53a98c8281adc02bf1fa52a7a0aec3b497b2944d6b12ba777b384e898a7f17970e73 SHA512 c4da72cbad3d110e7c259f9fb3cfb7aa249119cff1d88cef977e6f6e80adfd8afa1e88abd663cceb332b692e57679a3c9816f8ce4fbbbc99c44d76eaf1647787
 MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
diff --git a/net-dialup/ppp/ppp-2.4.9-r1.ebuild b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
new file mode 100644
index 000000000000..89627e1475da
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info multilib pam toolchain-funcs
+
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-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/${PATCH_TARBALL_NAME}.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 ~sparc ~x86"
+IUSE="activefilter atm dhcp 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-r2"
+PDEPEND="net-dialup/ppp-scripts"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	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 "Disabling IPv6"
+		sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die
+	else
+		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 PKG_CONFIG
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
+
+	# 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/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/pppoe/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 pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by 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:^rp-\(pppoe.so\):\1:" "${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."
+
+	if [[ -n ${REPLACING_VERSIONS} ]] ; then
+		ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"'
+	fi
+}
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 1305bfa136e4..f61968fb4796 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -11,5 +11,5 @@ EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B 7a913a770cc5feed9b201f6bc7d54402fd246fe
 EBUILD xl2tpd-1.3.11.ebuild 1428 BLAKE2B 58651df441e16d91d8581a802392328a15350101f2d866b2c31205054779648fd1372520200140392e9078b2e32d0b1b2f061d5c71b1046369e772220ed6734f SHA512 9cee0c5c5b4d36ef43f65347ddcf1b8f6dc7d317f1f300fea2b6634f23ae656ba535674ba3b186bb725adf73f64bdf251e53a03b7c02b8235e99d87392fdb8ae
 EBUILD xl2tpd-1.3.12.ebuild 1004 BLAKE2B a796ad76184d12a65580ae78f74d7d9b1441218575e9ba0251f12c3a455d3a08a842788d3ab5a1ea8b3bbd0f31f844ef3d5bd9b1d3caf58752102b5dbfb9dc3d SHA512 f71ebce1cbb0c62164433a1a17685d1c38c5b359b49bec046e10c9fbb9d4eff0b2878f2aae0fa1630b9126ddb7bf5888beb5ddf78bfc764b7116f75743239ea4
 EBUILD xl2tpd-1.3.13.ebuild 1082 BLAKE2B 0e4c91d30eb35658079bbeb69c49083f16f6becebd87d3c8ccdda183ec6f4652749a49d0d6384ffc9bbbd34af02e4b03f8b3eda36f91065dc58d464bca52617a SHA512 385303dfab5bce3b618a7234592670b6d6048d85be8c8b180bf515bc5992085a67606dcef5baa04a8339af1571b866724031ffba58b4f7477e8f2d4a15bd4a2c
-EBUILD xl2tpd-1.3.15.ebuild 1078 BLAKE2B 701c040f2d4aa71272e4242d5a05cdb05f235de41c383361028cffc37ccefa813ba58babf95fa725998e6da0cc05f133d4ce3b87312efa98ff6bc3ff5ce026dd SHA512 f0ef85a4c019c11dc678e1ba9d29bee5520eb804a8890827a6ab9f9c6e776354c5488da0a4058a7411e22bed8ee8c81915044120032f9567e7d09ffb879d1fb8
+EBUILD xl2tpd-1.3.15.ebuild 1074 BLAKE2B d6709fc634ef6e45c5ffe80ff547ce34baa40a50077dcad4b5cef1c036452204d7c1b16695443786d719c5570b73b7bd18a073c9ecccbef54df30cdbf8b96cee SHA512 ddaa707f0d47c8ee6332d1f9f1d40b44a49e078a3d2cdcf858ad90b454f491d78a12d4fb84cc9011c116407bd6ee93927352a9a868e3e6998c8272a1fe945d8e
 MISC metadata.xml 748 BLAKE2B 54984b3f195d776bab05dea5407a0efbc1e98075ef43260013359f78268cfbc3500ffc1ad816d0790c0bef77a44ad2326c28f43ce52254cdd301ee6e0709e1dc SHA512 a7a28c1454d6cafff7d70abed1b57fbddf3929f85e947f7f87654aecdfaf7bad89daf11f40002b9115dd284449b30d172d5762bca0c8c053dd538139c7e8431f
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
index a0c41af7ca21..0374ece638ea 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.15.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://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="