gentoo resync : 05.12.2021

18 files changed, 190 insertions, 213 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 45836920430d..69147c4cb47f 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/cistronradius/Manifest b/net-dialup/cistronradius/Manifest
deleted file mode 100644
index 7e074bae4241..000000000000
--- a/net-dialup/cistronradius/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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 1152 BLAKE2B 3eccfd5947ac2437bdab69cd6989d40c5259387f40a5c183155e3ab501dd5cc3adb5105b84acbce58ef69af0f9d83f5e9dfe11a3e8546698b81b99d6b64ba0f7 SHA512 5111759a38483e5bdde6e821d139471d0f996cb43a607a0504fbd6c3d726d786b42f0d13dadb536fa8c06c563b92c50c726ed152e436a281f995b791404b114e
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild b/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
deleted file mode 100644
index 4ff41bdc7fcd..000000000000
--- a/net-dialup/cistronradius/cistronradius-1.6.8-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs
-
-DESCRIPTION="Authentication and accounting server for terminal servers using RADIUS"
-HOMEPAGE="http://www.radius.cistron.nl/"
-SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-
-DEPEND="
-	!net-dialup/freeradius
-	!net-dialup/gnuradius"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/radiusd-cistron-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	sed -i -e "s:SHAREDIR/::g" raddb/dictionary || die
-	mv src/checkrad.pl src/checkrad || die
-
-	epatch_user
-}
-
-src_compile() {
-	emake -C src \
-	    CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-	    BINDIR=/usr/bin SBINDIR=/usr/sbin \
-	    MANDIR=/usr/share/man SHAREDIR=/usr/share/radius
-}
-
-src_install() {
-	insinto /etc/raddb
-	doins raddb/*
-	dodoc README doc/{ChangeLog,FAQ.txt,README*}
-	doman doc/{*.1,*.8,*.5rad,*.8rad}
-
-	dosbin src/{checkrad,radiusd,radrelay}
-	dobin src/{radclient,radlast,radtest,radwho,radzap}
-
-	newinitd "${FILESDIR}/cistronradius.rc" cistronradius
-}
diff --git a/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch b/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch
deleted file mode 100644
index 7600df739c7b..000000000000
--- a/net-dialup/cistronradius/files/cistronradius-1.6.8-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru radiusd-cistron-1.6.8.orig/src/radiusd.h radiusd-cistron-1.6.8/src/radiusd.h
---- radiusd-cistron-1.6.8.orig/src/radiusd.h	2003-12-08 18:12:22.000000000 +0200
-+++ radiusd-cistron-1.6.8/src/radiusd.h	2006-09-21 15:33:05.000000000 +0300
-@@ -204,7 +204,6 @@
- extern char		*radwtmp_path;
- extern UINT4		expiration_seconds;
- extern UINT4		warning_seconds;
--extern int		radius_pid;
- extern int		use_dbm;
- extern int		use_dns;
- extern int		use_wtmp;
diff --git a/net-dialup/cistronradius/files/cistronradius.rc b/net-dialup/cistronradius/files/cistronradius.rc
deleted file mode 100644
index 9155ee59b6a5..000000000000
--- a/net-dialup/cistronradius/files/cistronradius.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -x /usr/sbin/radiusd ] ; then
-		eerror "The radius daemon was not found."
-		eerror "Please (re)emerge cistronradius."
-		return 1
-	fi
-
-	if [ ! -e /etc/raddb/clients ] ; then
-		eerror "No /etc/raddb/clients file found."
-		eerror "Please create the file and retry."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting Cistron Radius"
-	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Cistron Radius"
-	start-stop-daemon --stop --quiet --pidfile /var/run/radiusd.pid
-	eend $?
-}
diff --git a/net-dialup/cistronradius/metadata.xml b/net-dialup/cistronradius/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dialup/cistronradius/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dialup/fbgetty/Manifest b/net-dialup/fbgetty/Manifest
deleted file mode 100644
index 31683bd9dd71..000000000000
--- a/net-dialup/fbgetty/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 574 BLAKE2B 2ad32ec434835949284f673928bd8f47319d3160fa0cdac9008efe44b9550f90fd43dede5df858e2ebe86834cdb86c229d86a475e5d1feb422e7ab3f85a3cedd SHA512 3ba4d2b5626bb5a36e8cc54458179651c8c3966e9be0b62200e2af253640b79ebd06dd624ed7720480f88ecf773957e34f517a377f3f7b029b45ae2d94b06e8f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild b/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
deleted file mode 100644
index aaaf230f6da4..000000000000
--- a/net-dialup/fbgetty/fbgetty-0.1.698-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-DESCRIPTION="An extended getty for the framebuffer console"
-HOMEPAGE="http://projects.meuh.org/fbgetty/"
-SRC_URI="http://projects.meuh.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-
-	epatch_user
-}
-
-src_install() {
-	default
-
-	docompress -x "/usr/share/doc/${PF}/examples"
-	insinto "/usr/share/doc/${PF}/examples"
-	doins examples/{issue.*,inittab.*}
-}
diff --git a/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch b/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
deleted file mode 100644
index a9722f12c115..000000000000
--- a/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nru fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk
---- fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk	2001-07-11 23:01:15.000000000 +0300
-+++ fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk	2007-10-27 11:29:50.000000000 +0300
-@@ -45,8 +45,7 @@
-   name = $3;
-   type = $2;
- 
--  printf("#define OFFSET_%s (offsetof(struct fbgetty_options_t, %s))\n", name, name);
--  printf(" %s %s;\n\n", type, name);     
-+  printf(" %s %s;\n", type, name);     
- }
- 
- END {
-diff -Nru fbgetty-0.1.698.orig/src/options.c fbgetty-0.1.698/src/options.c
---- fbgetty-0.1.698.orig/src/options.c	2001-12-17 22:55:42.000000000 +0200
-+++ fbgetty-0.1.698/src/options.c	2007-10-27 11:32:53.000000000 +0300
-@@ -27,7 +27,7 @@
-  */
- 
- #include <fbgetty/global.h>
--
-+#include <stddef.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -141,7 +141,7 @@
- #define ENV_BINARY  0x04
- #define ENV_LEDS    0x08
- 
--#define ENV_ENTRY(name, type, ptr) { name, type, OFFSET_ ## ptr }
-+#define ENV_ENTRY(name, type, ptr) { name, type, offsetof(struct fbgetty_options_t, ptr) }
- 
- static struct env_entry
- {
-@@ -899,20 +899,20 @@
- } 
- merge_option_list[] = 
- {
--  { OFFSET_tty_device ,    MERGE_STR, NULL, -1 },
-+  { offsetof(struct fbgetty_options_t, tty_device) ,    MERGE_STR, NULL, -1 },
- #ifdef USE_FRAME_BUFFER
--  { OFFSET_fb_device,      MERGE_STR, NULL, -1 },
-+  { offsetof(struct fbgetty_options_t, fb_device),      MERGE_STR, NULL, -1 },
- #endif
- 
--  { OFFSET_login_program,  MERGE_STR, LOGIN_PROGRAM, -1 },
--  { OFFSET_login_prompt,   MERGE_STR, LOGIN_PROMPT, -1 },
--  { OFFSET_issue_filename, MERGE_STR, ISSUE_FILE, -1 },
-+  { offsetof(struct fbgetty_options_t, login_program),  MERGE_STR, LOGIN_PROGRAM, -1 },
-+  { offsetof(struct fbgetty_options_t, login_prompt),   MERGE_STR, LOGIN_PROMPT, -1 },
-+  { offsetof(struct fbgetty_options_t, issue_filename), MERGE_STR, ISSUE_FILE, -1 },
- 
--  { OFFSET_login_timeout,  MERGE_INT, NULL, LOGIN_TIMEOUT },
--  { OFFSET_issue_refresh,  MERGE_INT, NULL, ISSUE_REFRESH },
--  { OFFSET_screen_clear,   MERGE_INT, NULL, TRUE },
-+  { offsetof(struct fbgetty_options_t, login_timeout),  MERGE_INT, NULL, LOGIN_TIMEOUT },
-+  { offsetof(struct fbgetty_options_t, issue_refresh),  MERGE_INT, NULL, ISSUE_REFRESH },
-+  { offsetof(struct fbgetty_options_t, screen_clear),   MERGE_INT, NULL, TRUE },
- 
--  { OFFSET_leds,           MERGE_INT, NULL, 0 },
-+  { offsetof(struct fbgetty_options_t, leds),           MERGE_INT, NULL, 0 },
-   { 0, 0, NULL, -1 }
- };
- 
diff --git a/net-dialup/fbgetty/metadata.xml b/net-dialup/fbgetty/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/net-dialup/fbgetty/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dialup/isdn-firmware/Manifest b/net-dialup/isdn-firmware/Manifest
index 6dd94fe23129..ae0a4f10c5bc 100644
--- a/net-dialup/isdn-firmware/Manifest
+++ b/net-dialup/isdn-firmware/Manifest
@@ -1,3 +1,5 @@
 DIST i4lfirm-2005.8.15-2.i586.rpm 2530426 BLAKE2B 9232a64e6c9faa19f8ce3dceabb82e9d19fc9eee76dbc56f21f6bd46c4e711c14feb05f2dd7b37dff085c2b690ed3b6b95830f4a734f7292ef8e3769fe526001 SHA512 fe943d33b38fa4f2d1c87b31cfe0fd1a99fc930660b88b8e5a138ca8be4c8abcfb7f09f7cd39ed7d12da34b61b0b60bec22b84a38818b478a802eba8a2191153
+DIST i4lfirm-2011.8.29-lp152.8.37.x86_64.rpm 1274484 BLAKE2B 63a698adadeb0fe9e11533cf56d2cd026552e599e0e47dbe07694558af07aedfe51d626c4894c6b0cb59d49e85486de6d408405047be39eb1086361b4129f7eb SHA512 fac70bbe8983cfb02f53880c04e317f52a33b2972fd657b5dd375cb4924cf61efe8da8cb35448d39fc628599da35fa24f3b1275a0f76c1421bbaeab1e17713f9
 EBUILD isdn-firmware-2005.8.15.2.ebuild 695 BLAKE2B c3cec6bcc8bb7fef6f458e2ddfcb0df3bde391a6b2ea1049a0d4b5a793c4c8e6c7cffee5c0117355cf893f03a55b898f5e776e75e2dae825b2d12792fae251f5 SHA512 405d1c8a7c31d85996bab0ed76d2137de79012711d4695e63c5264a49c72fea24d70081379e85e704f17ec50ce180fa1aaae502ecb640f9c8efe2e3c275ad2a1
+EBUILD isdn-firmware-2011.8.29.8.37.ebuild 665 BLAKE2B ae0882e99831d7f1e4d598aa59886b960680b614bae1224abbbfd783d005503be36f07d4cad45a6e6413306cae1a719c2b5b8782cf2d612793fa07077f0eb760 SHA512 fe18605b1f4b9e72edd827f9d0d07e7679f5dcb41090a23716acf8bb479bdd1d5375646ff33e233d6180658078aaf761f2f98bff45203d111be9ff84cbdf9fb1
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
new file mode 100644
index 000000000000..20676acec82d
--- /dev/null
+++ b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_PN="i4lfirm"
+MY_PV="$(ver_cut 1-3)"
+MY_PP="lp152.$(ver_cut 4-)"
+MY_P="${MY_PN}-${MY_PV}-${MY_PP}"
+
+DESCRIPTION="ISDN firmware for active ISDN cards (AVM, Eicon, etc.)"
+HOMEPAGE="https://www.isdn4linux.de/"
+SRC_URI="https://rsync.opensuse.org/distribution/leap/15.2/repo/oss/x86_64/${MY_P}.x86_64.rpm"
+
+LICENSE="freedist"		#446158
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Bug #827318
+BDEPEND="app-arch/xz-utils[extra-filters]"
+
+S="${WORKDIR}/lib/firmware/isdn"
+
+src_install() {
+	insinto $(get_libdir)/firmware
+	insopts -m 0644
+	doins *
+}
diff --git a/net-dialup/pppconfig/Manifest b/net-dialup/pppconfig/Manifest
index a6b6dd7c1aa9..49faa778fc56 100644
--- a/net-dialup/pppconfig/Manifest
+++ b/net-dialup/pppconfig/Manifest
@@ -1,4 +1,6 @@
 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 1051 BLAKE2B 0bf27d25d4794a3db7e37cfab6632e169b69f43edb4dacc11f3d3ba1895239c0ed60e34d0ce0b606e2f1c4eb34efa364404c93d3f7be6d50e46f943bf1ca4fff SHA512 1c7a3f4a9908f3cef58e2a07e580c4945a69064a6d099fc810002fdd0fade46c5db37156c4983e6ff500e74da635fd2272fcb417ad8df18a3e79f56b469aa26e
+DIST pppconfig_2.3.25.tar.gz 392316 BLAKE2B 7c30db92cff0c9e80e04e4e7a83ccc22e2c1380831fcbc1ebd36bc4d30044c0b32669546907318be3c43061d1ea9f44b0a471f56847e75b0470f18f1aa10bf7a SHA512 6874b93ae34edb2a0ba06a669d930f5023a3eae38b6d10a78179eb69990a8280d41ebc2049461b54b03bd19904d13d2ebb57997599ed650660d0b34c958ad977
+EBUILD pppconfig-2.3.21.ebuild 1052 BLAKE2B 9c7c177b6fb81fa648f10be54d4eccf63a1728d28412f73660ccb53db3d155320156603f34c436c523415dd261233fbf17a48bf2317abfe0ded19f1f1c97f7f8 SHA512 c5cb821726dc3760de1d6f59fd238b91ce29a2400178a488c279352df67a0e01ee765804c1b17470c1dcda7834530d8232745a2661a0ac74118cbd9d0a8599c4
+EBUILD pppconfig-2.3.25.ebuild 1060 BLAKE2B bce1a83286dbcda0820c55b1d312610907f6eb479387b153a80c4968e3671c0f6e3e0fefbe8af6dbe6ace8814eb220dbc1fc1f2642a49ab2f4200954a107b868 SHA512 e7e76e1445fb1eef0831c83f08d6edc28a79a7ab9fa2ddb3376ff183751fa4ef473decf27e7a8285e89946447e5bf3d7a42ebf9a39f754b7b21ebdf26ef270c8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
index 808ccc0a705e..b2560f286d53 100644
--- a/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
+++ b/net-dialup/pppconfig/pppconfig-2.3.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit strip-linguas
 
@@ -14,15 +14,16 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="net-dialup/ppp
+RDEPEND="
+	net-dialup/ppp
 	dev-util/dialog
 	dev-lang/perl"
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	if use nls; then
-		strip-linguas -i po/
-	fi
+	default
+
+	use nls && strip-linguas -i po/
 }
 
 src_compile() {
diff --git a/net-dialup/pppconfig/pppconfig-2.3.25.ebuild b/net-dialup/pppconfig/pppconfig-2.3.25.ebuild
new file mode 100644
index 000000000000..5816bbea39c4
--- /dev/null
+++ b/net-dialup/pppconfig/pppconfig-2.3.25.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit strip-linguas
+
+DESCRIPTION="A text menu based utility for configuring ppp"
+HOMEPAGE="https://tracker.debian.org/pkg/pppconfig"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${P/-/_}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="net-dialup/ppp
+	dev-util/dialog
+	dev-lang/perl"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	if use nls; then
+		strip-linguas -i po/
+	fi
+}
+
+src_compile() {
+	default
+
+	if use nls; then
+		local lang
+		for lang in ${LINGUAS}; do
+			msgfmt -o po/${lang}.{m,p}o || die
+		done
+	fi
+}
+
+src_install() {
+	keepdir /etc/chatscripts /etc/ppp/resolv
+	dosbin 0dns-down 0dns-up dns-clean
+	newsbin pppconfig pppconfig.real
+	dosbin "${FILESDIR}/pppconfig"
+	doman man/pppconfig.8
+	dodoc debian/{copyright,changelog}
+
+	if use nls; then
+		local lang
+		for lang in ${LINGUAS}; do
+			insinto /usr/share/locale/${lang}/LC_MESSAGES
+			newins po/${lang}.mo pppconfig.mo
+		done
+	fi
+}
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index cdba037335de..dc1983c08a08 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -6,5 +6,6 @@ DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5
 DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 EBUILD rp-pppoe-3.14.ebuild 2299 BLAKE2B 29316862ad0f00dfd719a4af51af39fea06611b6997cf7b13e32b8c6e4a94e82cff73b51b52fcc18effae5a2500990ba87fea3ef8e7686e9465f30e1e186eccc SHA512 3d1a90c6e21f09ac4a4db7de679d12660ab204ee61480dda90a9ee9151c76c2d20f560248335b048724dacd2d3be272682309f2827fdfc885c8dbb13625ccd2e
+EBUILD rp-pppoe-3.15-r1.ebuild 2097 BLAKE2B 2f1401057ba53f1b7f290417bb7580291e8e7943e3d854c4a33ea1d6b03cf2d5bbe697066b1379959d97e5a4d2f7462cc6129bd250be6889554ceadf74830703 SHA512 489a1de583cc0b531ae6b01557f9b8af16f96e38e4677ceb0c18ddf991727f773435a54c3e1917d225af90d0ab4ec40f7fa5ed2d976e405ece8e1f0d958e6270
 EBUILD rp-pppoe-3.15.ebuild 2402 BLAKE2B 0927239e5671eb28539a35fb10211bfc75312bbddcf625138d9fef777df5591bd576af8bb19cb412ad13e9e90c65ea2298add89791f66948202c4be00745a6e1 SHA512 b3db89aca89fd82e7ea619f3166d890b2e42319b222d8557ca9dbbdcaeb2f452a60458a7625df07bd1fd32ce2a79038b97838f84a8388244b9e25ce33320c0de
-MISC metadata.xml 371 BLAKE2B 60134b3b3a2886cbb5dccfb9c2e9f35b609220a8c766217980aca98aaafce029b86425700d3e2f9c0c502209914bcbe2a31833b2dcd08c13674b63e74ef1a648 SHA512 6c6529ca3ae8df19f2e102f95994f58889616abb5c2e1bf99cc8ab013ed922d40deaaac61ef53eefa5c2b075baf6138d102ef5eda440f07b9dcc7db998ef2052
+MISC metadata.xml 370 BLAKE2B 04fa2afd30bf660d7c2ac948a09fc1fc9d40f44f0eda79432b4f0be7741dd9f4e0f104db474f94d5515f62a37363df06fb169ca246822d1d01a8980b7f393c7d SHA512 09289baac97746fb9c641bfe3be9ab9dae7f5f2f445a1e2364e89ccb4d2c81c75b70d331ccc6b23b25396e36f27ef06aa92652665ad4aedc3290d6617a4e2b17
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml
index 77a87ef4abda..6bde8ba5af3b 100644
--- a/net-dialup/rp-pppoe/metadata.xml
+++ b/net-dialup/rp-pppoe/metadata.xml
@@ -9,4 +9,4 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild
new file mode 100644
index 000000000000..dba2eeb9b98f
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 toolchain-funcs
+
+PATCHES="${PN}-3.14-patches-01"
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
+SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tk"
+
+RDEPEND="
+	net-dialup/ppp:=
+	sys-apps/iproute2
+	tk? ( dev-lang/tk:= )
+"
+DEPEND=">=sys-kernel/linux-headers-2.6.25
+	${RDEPEND}"
+
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+
+pkg_setup() {
+	# This is needed in multiple phases
+	PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR}
+	PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV}
+
+	PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+}
+
+src_prepare() {
+	if ! use elibc_musl ; then
+		rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die
+	fi
+
+	rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die
+
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	cd "${S}"/src || die
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /dev/ppp
+
+	cd src || die
+
+	econf --enable-plugin=/usr/include/pppd
+}
+
+src_compile() {
+	cd src || die
+	emake AR="$(tc-getAR)" PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
+
+	if use tk ; then
+		emake -C "${S}/gui"
+	fi
+}
+
+src_install() {
+	cd src || die
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install
+
+	# We don't need this README file here.
+	rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation"
+
+	if use tk ; then
+		emake -C "${S}/gui" \
+			DESTDIR="${D}" \
+			datadir=/usr/share/doc/${PF}/ \
+			install
+		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
+	fi
+
+	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
+	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
+
+	readme.gentoo_create_doc
+}