Updating liguros repo21.1.2

19 files changed, 402 insertions, 210 deletions

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
new file mode 100644
index 000000000000..ad920ce827f9
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake flag-o-matic linux-info linux-mod lua-single
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
+
+RDEPEND="lua? ( ${LUA_DEPS} )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	valgrind? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua TRUE FALSE)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	keepdir /var/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 3f8aec7348a9..bea35b07fd93 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} luajit )
+
 EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod
+inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -15,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
-RDEPEND="lua? ( dev-lang/lua:0 )
+RDEPEND="lua? ( ${LUA_DEPS} )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
@@ -28,7 +30,8 @@ DOCS=( README )
 
 CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 
-REQUIRED_USE="valgrind? ( debug )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	valgrind? ( debug )"
 
 pkg_setup() {
 	if use ipoe; then
@@ -37,6 +40,7 @@ pkg_setup() {
 	else
 		linux-info_pkg_setup
 	fi
+	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index dc28008b1396..bcb5f884f0e1 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="scp shadow static-libs"
 
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 2aa6f6650144..b95a9e472846 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="https://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/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index d9e9007c4c34..15b9538a8fd6 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -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/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 3657ff1bc3a5..55083572fc97 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -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/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
index 5022018e35c1..7f743aa9c153 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 936a2a7e2667..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="https://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/mingetty/mingetty-1.08-r1.ebuild b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
index 010c51111ce1..05ccf45f094a 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="unicode"
 
 PATCHES=(
diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
index 697ef69aed2e..0397e7a41fc8 100644
--- a/net-dialup/minicom/minicom-2.7.1.ebuild
+++ b/net-dialup/minicom/minicom-2.7.1.ebuild
@@ -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:="
diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index 61c340d124f8..9299c2d744b8 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 
 DEPEND="!<net-dialup/ppp-2.4.7-r1"
 RDEPEND="${DEPEND}"
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 7ecead42b4f5..636a3c9114b4 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,5 @@
-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
diff --git a/net-dialup/ppp/ppp-2.4.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild
index e7476c887589..e0bd7d646d70 100644
--- a/net-dialup/ppp/ppp-2.4.8.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8.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/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/rp-pppoe/rp-pppoe-3.12-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
index 794d3432c0d7..d8618a8207d2 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/net-dialup/wvdial/wvdial-1.61.ebuild b/net-dialup/wvdial/wvdial-1.61.ebuild
index 2580dab104a6..2d5386b307d0 100644
--- a/net-dialup/wvdial/wvdial-1.61.ebuild
+++ b/net-dialup/wvdial/wvdial-1.61.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE=""
 
 COMMON_DEPEND=">=net-libs/wvstreams-4.4"
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="