gentoo auto-resync : 19:10:2024 - 04:04:35

11 files changed, 1 insertions, 593 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 6b112040440f..246464735f6a 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index d42572673402..3b65094869bd 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,9 +1,5 @@
 AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36
 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
-AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fbc9dbb6c423d11b8132607c9bd39517e4e2c830a75ba35b27bba975c245f2e86d08bd9280b4ab0bc184e30db15179118d SHA512 cb16688634e4b6332b728511e0a70f80e7e29fdcc6b0d737745200381cc272daae80ddadd9f5fe4259113453596fd261f52249f80521b63506095a312c5bff33
-AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350d4206c546b89c92f914931db81e07e7997196d86dee6703260e9c603819d6fb72aec518dc5dbcc240f2a074043837d8d17356a483da3 SHA512 0d8faec40b0d3ea1a96a66bb4d96d129c7c0af14e76c222fc997c2eebeba80918a1681929a844d0d17713f124b862364ca1bf7cd70d2d7be46fb37458b3fb62d
-AUX ppp-2.4.9-fix-openssl-sysroot-clang.patch 377 BLAKE2B 9919669d6707394600c2b04f49dab212e220549395f34c52f641e6a87c2133eeaad00992fca5c3a9d84f60d7c17f1078aab78b8579906c93ee5cad4264a2569b SHA512 d816cbf65f1845851f8bd673fbe374987afbe6e3c0eb425455d0cc7269e96f5315caf1e38c320121650b088621c099c36f6b1c8d80ada0dbff07ab4e8151d42b
-AUX ppp-2.4.9-pppol2tp-ipv6.patch 1008 BLAKE2B 7c4ad1ce6ba6277c1d0fa8afa7491bdc3f0afba450c3d2ade39a9d0b555dd35e578abc5df24f7b0b011634bc020292ad6b2510ffbc8f03b1e3eabbf37cdb6e20 SHA512 071ef66e5ab9e08037100f2d6cdbdc452ea30d4a2241ef2abc2a7acc23ce21a5f90e5753a4790af5ed8e21baf976010a340ac4d4368adb8a9f5b42d52b519702
 AUX ppp-2.5.0-openssl-pkgconfig.patch 3183 BLAKE2B c628ab91a1b564b27c50a9cc10dc7d4ba1f62dc280fb25c32f4d7d4857cf2d20eb72f3419a8dd36a86836605ee6c6869155981b2ee17b8d3774e13ae1a595634 SHA512 4c6110541de741bc17906f49df7a89ea9591cc7590f28713b847efc6fdf5deab1bdd30660d3fdb3895e56c19880c5f282e55da7702817abcfa7d0355fa726df0
 AUX ppp-2.5.0-pam-pkgconfig.patch 2754 BLAKE2B ecb36f0e1ca3aebfd8a8c5d4d91a0c1d41ccebf9ee90fdbb842331bdd4d4d43269d12c405872d5d110c614d6410a228983bfa87cb7c0bd1fd48763541ae84be6 SHA512 e962f9c37830b5702ae10d833dc6eadac377b4de66517c5976812927e2b983c75e33a1617622f022a585ac7acfe131cfb12a18fa5d4e90b2afcc9c0e2a9ac731
 AUX ppp-2.5.0-passwordfd-read-early.patch 2423 BLAKE2B e0393149fcd0468be000ab125c8318a4f295c5343525b1cad17ec8eb4f87b2b759bdb898bf1fc56304ed6f06418f1536e15209df18dfe719ff9865a3ff3f02c6 SHA512 52fc5d0e7f2540c7eb01101cd8e10abd5b0eaacde007b3480c27136d439527c70c568f63139590d00cab5450edfa1a63d06b7aac078f7d4ed9d0cddad106bc66
@@ -11,13 +7,9 @@ AUX ppp-2.5.0-pidfile.patch 1257 BLAKE2B 220ada7acaf45c2cd614d2ce8883fb91c282d18
 AUX ppp-2.5.0-radius-mppe.patch 5444 BLAKE2B 63b72701d72e1a6508b79c67b68e4ae51b28a4ee4ae77f1b6fdb0565f3dfde7928dada3a87babaa495589d93569091c692ad0985d00a9f057611778f2ebe8950 SHA512 39a1049155eeaa46ef0f2a45121f97a5b6448c86f0190263a26e90fadc213fc29bcaae0e4c0df79b29fa989266167988bf7af3ef4fdf1696aeca59bdc0a25b16
 AUX ppp-2.5.0-radiusclient.conf-parsing.patch 1466 BLAKE2B 48bd7ac24e2988f7346d4d01209ed04f37a82569a4085d7389c139755642515c6f607d3f73d57c4856aab23cba8ee4f1d0fd612be445b610948e3ce3d8dbbe60 SHA512 3f36c68e480600ea590844cd46176e7597a8bba0d8bf977c4aa697269872a493cd9ec3317a32ccc8a76f1b65b208df0deddd18f651b275164c44b052923c448f
 AUX pppd.tmpfiles 45 BLAKE2B 00daff2cb2f359640b41f8e13b08817754fa77e7a743910fb3e3cf100fffc77ea8bc38739c90123ac6bf44b417f25feedd0b2e2c91ead98b7affb7c92d22eed9 SHA512 8cb2aef7c17481f891cef981d47aceb879bbc64fe0766d193f23824484299414f0a576c45215ceaea18d39291b5ffe4c80aa4c00f0c68d88aeb924ace2ad5a8c
-DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
-DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-2.5.1.tar.gz 991639 BLAKE2B e3ece873ea25bde5ddffd0da168ffe6ba890693f20fb9f1d6a48f365331abdb4cf517fd0b3004d26a0c778ad4d750e39e38486544e2771b23223469db13c239c SHA512 57b3bbf918c302dbc621f56b706efa1b35b2fc45b71c3a309c1cfee22c28fcf98d7f8965fbeba9260c124f2afb9e297885007256ee05469adca73fad032902b9
-DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
-EBUILD ppp-2.4.9-r9.ebuild 7860 BLAKE2B 96d3d3a4268c82a13e04b17f6f9989d5472487fde92d4294af996c2eb09e90c84fd97e3a53a5ab64c3fe31e7a365cb25a2fe1e79f427ea4ebf5a6a7e83407fdb SHA512 fb11d547ccbab9901bf16b81f207b104ba1376119c883d5e8081c3d8db49bd0c7c7d227f3a370dc46944afd82b037e420b4eea5335ec29be9bef6e57986ab7f2
 EBUILD ppp-2.5.0-r7.ebuild 4213 BLAKE2B 333a332e338cc45c1cf795162420155474be1dd82a39e70d40f4c3e962e4a806b39a31d7521f32d87eb7886cbf07b848acad10f12b1b71ab06a0a6d519fe0a1c SHA512 c63d15b21fab09cf585045dd52f815b7d7c2e1ce59fbf10a0fed26cbbaf8fbc893f2461e0ede2b88150bfd0d5516262977f8d9c49e9c120032bcd91bf6a00caf
 EBUILD ppp-2.5.1.ebuild 3664 BLAKE2B 05aaf3531ed43f842126ae73ae7fd021ed9ab457a88f846dc3772b37a4b01e32151080fdd3c0a2d725a193899b1a9ff5e8529d1ea739ecdad3ab11aa0373e911 SHA512 5c27d94face53cec9cdce7dfc9a623fb020c12a90e3865cf264b554a87f32c2de3bf398528430e811e6654362b88cb420257750347c68f6db89861c9c2b613f9
-MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
+MISC metadata.xml 638 BLAKE2B 3aa9d6dbab41ecff025de485c52462fc3ccb9b217b95681119b1e8fbe1a4ed9db93842c2696e9f71a275cbb7d1c4593b1ce7b368bea933f6ff727ee9a8d28295 SHA512 cc14adb1ecc6fa636ce86914ef70941e4b1b8ccd9e056ea9c5a2fc3ae75ea718f74fd925fbe40811734762927383ee9edd9728267bc122d2c5b03fce019f0fd8
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch
deleted file mode 100644
index 15a1298ce303..000000000000
--- a/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/ppp-project/ppp/commit/d7e62a8499c4032d79e05afbd8fd3efd51c5b148
-https://bugs.launchpad.net/ubuntu/+source/ppp/+bug/1958196
-
-From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
-Date: Thu, 3 Feb 2022 14:28:22 -0800
-Subject: [PATCH] pppd/eap: Fix bug causing incorrect response length (#334)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Need to update the esp->ea_client.ea_namelen variable. A plugin can override the
-name of the user, and the variable is passed onto the eap_chap2_response generating
-the wrong response length.
-
-Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -2182,6 +2182,7 @@ eap_request(eap_state *esp, u_char *inp, int id, int len)
- 		    eap_send_nak(esp, id, EAPT_SRP);
- 		    break;
- 		}
-+		esp->es_client.ea_namelen = strlen(esp->es_client.ea_name);
- 
- 		/* Create the MSCHAPv2 response (and add to cache) */
- 		unsigned char response[MS_CHAP2_RESPONSE_LEN+1]; // VLEN + VALUE
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch
deleted file mode 100644
index 0a089e95430d..000000000000
--- a/net-dialup/ppp/files/ppp-2.4.9-fix-clang-nested-functions.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://github.com/ppp-project/ppp/commit/6e6a48fe628b76ec368277fd52685428e3dc8766
-https://bugs.gentoo.org/831305
-
-From: =?UTF-8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
-Date: Sun, 11 Jul 2021 14:36:44 -0700
-Subject: [PATCH] Compiling with clang encounters an error in eap-tls.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This moves the inline functions to outside the function and declares them static.
-
-Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---- a/pppd/eap-tls.c
-+++ b/pppd/eap-tls.c
-@@ -285,6 +285,23 @@ ENGINE *eaptls_ssl_load_engine( char *engine_name )
- #endif
- 
- 
-+#ifndef OPENSSL_NO_ENGINE
-+static int eaptls_UI_writer(UI *ui, UI_STRING *uis)
-+{
-+    PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
-+    UI_set_result(ui, uis, cb_data->password);
-+    return 1;
-+}
-+
-+static int eaptls_UI_stub(UI* ui) {
-+    return 1;
-+}
-+
-+static int eaptls_UI_reader(UI *ui, UI_STRING *uis) {
-+    return 1;
-+}
-+#endif
-+
- /*
-  * Initialize the SSL stacks and tests if certificates, key and crl
-  * for client or server use can be loaded.
-@@ -578,20 +595,11 @@ SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, char *capath,
-         {
-             UI_METHOD* transfer_pin = UI_create_method("transfer_pin");
- 
--            int writer (UI *ui, UI_STRING *uis)
--            {
--                PW_CB_DATA* cb_data = (PW_CB_DATA*)UI_get0_user_data(ui);
--                UI_set_result(ui, uis, cb_data->password);
--                return 1;
--            };
--            int stub (UI* ui) {return 1;};
--            int stub_reader (UI *ui, UI_STRING *uis) {return 1;};
--
--            UI_method_set_writer(transfer_pin,  writer);
--            UI_method_set_opener(transfer_pin,  stub);
--            UI_method_set_closer(transfer_pin,  stub);
--            UI_method_set_flusher(transfer_pin, stub);
--            UI_method_set_reader(transfer_pin,  stub_reader);
-+            UI_method_set_writer(transfer_pin,  eaptls_UI_writer);
-+            UI_method_set_opener(transfer_pin,  eaptls_UI_stub);
-+            UI_method_set_closer(transfer_pin,  eaptls_UI_stub);
-+            UI_method_set_flusher(transfer_pin, eaptls_UI_stub);
-+            UI_method_set_reader(transfer_pin,  eaptls_UI_reader);
- 
-             dbglog( "Using our private key URI: '%s' in engine", privkeyfile );
-             pkey = ENGINE_load_private_key(pkey_engine, privkeyfile, transfer_pin, &cb_data);
diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
deleted file mode 100644
index 2bf8c45e9027..000000000000
--- a/net-dialup/ppp/files/ppp-2.4.9-fix-openssl-sysroot-clang.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/831305
-
-Upstream git has merged autotoolsification PR so no need for this.
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -155,7 +155,7 @@ endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
--CFLAGS   += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
-+CFLAGS   += -I$(INSTROOT)/usr/include/openssl
- NEEDCRYPTOLIB = y
- else
- CFLAGS   += -DUSE_CRYPT=1
diff --git a/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch b/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch
deleted file mode 100644
index 40773b2b0d54..000000000000
--- a/net-dialup/ppp/files/ppp-2.4.9-pppol2tp-ipv6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/904740
-https://github.com/ppp-project/ppp/pull/319
-
-From 44a70d6f9eb6d1843868da1d45de382134a03630 Mon Sep 17 00:00:00 2001
-From: str8fast <52187302+str8fast@users.noreply.github.com>
-Date: Thu, 28 Oct 2021 14:55:56 +0000
-Subject: [PATCH] pppol2tp.c add '#ifdef INET6' for optional ipv6
-
-Without it, l2tp daemon can't launch ppp, cuz undefined symbol ipv6_up_notifier.
----
- pppd/plugins/pppol2tp/pppol2tp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
-index ed2d7c79..c9902afe 100644
---- a/pppd/plugins/pppol2tp/pppol2tp.c
-+++ b/pppd/plugins/pppol2tp/pppol2tp.c
-@@ -509,8 +509,10 @@ void plugin_init(void)
- 	 */
- 	add_notifier(&ip_up_notifier, pppol2tp_ip_up, NULL);
- 	add_notifier(&ip_down_notifier, pppol2tp_ip_down, NULL);
-+#ifdef INET6
- 	add_notifier(&ipv6_up_notifier, pppol2tp_ip_up, NULL);
- 	add_notifier(&ipv6_down_notifier, pppol2tp_ip_down, NULL);
-+#endif
- }
- 
- struct channel pppol2tp_channel = {
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 6ac3bc382e5c..f25ad33f97dc 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -7,15 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="activefilter">Enables active filter support</flag>
-		<flag name="dhcp">Installs PPP DHCP client plugin for IP address allocation
-		by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
-		<flag name="eap-tls">Enables support for Extensible Authentication
-		Protocol and Transport Level Security (see
-		http://www.nikhef.nl/~janjust/ppp/index.html)</flag>
 		<flag name="gtk">Installs GTK+ password prompting program that can be used
 		by passprompt.so PPP plugin for reading the password from a X11 input
 		terminal</flag>
-		<flag name="radius">Enables RADIUS support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:samba:ppp</remote-id>
diff --git a/net-dialup/ppp/ppp-2.4.9-r9.ebuild b/net-dialup/ppp/ppp-2.4.9-r9.ebuild
deleted file mode 100644
index c2c2bd0ccbee..000000000000
--- a/net-dialup/ppp/ppp-2.4.9-r9.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info pam toolchain-funcs
-
-PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
-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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
-
-DEPEND="
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	gtk? ( x11-libs/gtk+:2 )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	!<net-misc/netifrc-0.7.1-r2"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="net-dialup/ppp-scripts"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-	eapply "${WORKDIR}"/patches
-	eapply "${FILESDIR}"/${P}-fix-MPPE-sstpc.patch
-	eapply "${FILESDIR}"/${P}-fix-clang-nested-functions.patch
-	eapply "${FILESDIR}"/${P}-fix-openssl-sysroot-clang.patch
-	eapply "${FILESDIR}"/${P}-pppol2tp-ipv6.patch
-
-	#IPX Support is removed in kernel >= 5.15
-	sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die
-
-	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
-
-	if ! use eap-tls ; then
-		einfo "Disabling EAP-TLS pppd auth support"
-		sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die
-		einfo "Disabling EAP-TLS plugin support"
-		sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \
-			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
-
-	if use systemd ; then
-		einfo "Enabling systemd notification"
-		sed '/SYSTEMD=/s@^#@@' -i pppd/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 CC="${CC}" 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/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
-
-	if use pam; then
-		pamd_mimic_system ppp auth account session
-	fi
-
-	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/Manifest b/net-dialup/rp-pppoe/Manifest
index f8cdbad3974b..763b5633c0f5 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,11 +1,7 @@
 AUX pppoe-server.confd 428 BLAKE2B 83e91157082122ff084ed5b36031fa37950d154f22bed9630ca09f5e9ba00b65cbeb6769693f039b649b30b9c5f49051d6177e108bae2d23c58af7412363d5f6 SHA512 2216e972469d1b544d1dc5729a5c8e2520006f8fd1d07e4d2152a1fd6dd00f52cb97a984398058006f7830fbeae8ee1e8088d5d9ea7648acf50510cc19372b16
 AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053375e31e802df5297ad61645439ad76ec28a16b6da672862831de627273dd056021b76e1a37beac1fdbf SHA512 44df1122ae36f56c044c47e94c5dd70d00c060c23d0590f233f6cb6024241c1d1c83832d167c12a45ef4464e94f7d5f5e2ddf04c413ea929e1d398feafa0ec0a
-AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c143ff860e0541856cc2e4296700eff08db81f42562f365da9bb836d8180f8ce8c08042e5fa4fc2466a0864678e46f14df619e324 SHA512 16567d42c4691fa0bee04bcca5dc200385c8749c97e147c4134f4290064ab00fad4e1ad8847aaa0be975d7bc2dea024307adcc91f47d54ae20bb42ae0e8dc18c
 AUX rp-pppoe-4.0-ar_environment.patch 2026 BLAKE2B 73d75afd1cb5b0b59982b7aeabf1997a2e280269e83fbbeabe78ce6a2b193ff4454f63dcc99dbc77ab302ecf900792c7ed3b91d580af553ef74f4fabc08a6e24 SHA512 7c3d6ffbbb9e4c15f62e861874b8a557652911aa89ec3a4769304f7db1ccf1329ffcb24dc8ce75139f15f038e7663caae61ece18dfc177a061576307e4bb444e
-DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
-DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 DIST rp-pppoe-4.0.tar.gz 139539 BLAKE2B ba9f11e547dafdacf6fc4d525488a4ac0279b06d545e0c116e568c92a45eb8ab558ca9112f1debecacde5401cb5974eacdf972b1b4cd813711589b8181e918de SHA512 faebe543988b1ffacd4d9bf55a3ec21f3a541f9232ba6c7b6fa0e8103d6c2b7b1c358e7f7bc8f99bebb24b2f7bdcc2f46ba1ef4c23e6dd34062f8f28114e7aea
-EBUILD rp-pppoe-3.15-r2.ebuild 2270 BLAKE2B 9f238e9e1e3c1d724b53f094d7bd5794717300ec6c869d3f261729848802660a0a1ad4237b125ece1029b84beb11918197838c1fa21bc5a04bdc33f8c35b9b44 SHA512 a252c432d70299d34fc74eb2b9b4caeb1d540e0d72243408ef6e35fe28fb19bb194c58a869a4e37c1d2708851a597c09dc799784088aed60711c90de2a2978e2
 EBUILD rp-pppoe-4.0.ebuild 1571 BLAKE2B 645ef274421728a49b563164a5a86a6a48037e1cbde2edc9496a88b7253899ba2a804c2912eff5a76acb2de7f974356633e73383b93ef2b107e573c95242521b SHA512 e025770aab0f231290f2e3381a42a6ee2099f13e5fd516c0a56d0b8fb9b2836266bb32d38b8bde472c5fe1630a8aad00452d82acb19b60ebdbdfb43125d98903
 EBUILD rp-pppoe-9999.ebuild 1516 BLAKE2B a15ba1687b94f59c3643f371201b19858925279f7ade237c754eb4543da3c1e3772a59d5b6f9267c27664d47241b6772a8cfc43ba74672748b2c6b24fe123c52 SHA512 01ea4cb53c47b208eaeaaf05e555d54ae7f7a0bbbebd38f9135abd6febfb7ee6ffd04958c278b5164cc2c3bbb9b3cca1b75fbc296434cb2b0984c881a1034ca2
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch
deleted file mode 100644
index ecf70f09ddc6..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-pppoe-server: MAX_INTERFACES 64 is a problem for ULS.
-
-We currently require 77 interfaces, this code just lifts the limit entirely and
-will keep adding interfaces for as much RAM as you have to store an array as
-required.
-
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
-
-diff -rau rp-pppoe-3.15/src.o/pppoe-server.c rp-pppoe-3.15/src/pppoe-server.c
---- rp-pppoe-3.15.o/src/pppoe-server.c	2021-05-07 15:18:00.000000000 +0200
-+++ rp-pppoe-3.15/src/pppoe-server.c	2021-12-07 21:53:46.755693003 +0200
-@@ -115,8 +115,9 @@
- ClientSession *BusySessions = NULL;
- 
- /* Interfaces we're listening on */
--Interface interfaces[MAX_INTERFACES];
-+Interface *interfaces = NULL;
- int NumInterfaces = 0;
-+int MaxInterfaces = 0;
- 
- /* The number of session slots */
- size_t NumSessionSlots;
-@@ -1235,11 +1236,16 @@
- 	exit(1);
-     }
- 
--    memset(interfaces, 0, sizeof(interfaces));
--
-     /* Initialize syslog */
-     openlog("pppoe-server", LOG_PID, LOG_DAEMON);
- 
-+    MaxInterfaces = INIT_INTERFACES;
-+    interfaces = malloc(sizeof(*interfaces) * INIT_INTERFACES);
-+    if (!interfaces) {
-+	fprintf(stderr, "Out of memory allocating initial interfaces.\n");
-+	exit(1);
-+    }
-+
-     /* Default number of session slots */
-     NumSessionSlots = DEFAULT_MAX_SESSIONS;
-     MaxSessionsPerMac = 0; /* No limit */
-@@ -1406,10 +1412,14 @@
- 	    break;
- 
- 	case 'I':
--	    if (NumInterfaces >= MAX_INTERFACES) {
--		fprintf(stderr, "Too many -I options (max %d)\n",
--			MAX_INTERFACES);
--		exit(EXIT_FAILURE);
-+	    if (NumInterfaces >= MaxInterfaces) {
-+		MaxInterfaces *= 2;
-+		interfaces = realloc(interfaces, sizeof(*interfaces) * MaxInterfaces);
-+		if (!interfaces) {
-+		    fprintf(stderr, "Memory allocation failure trying to increase MaxInterfaces to %d\n",
-+			    MaxInterfaces);
-+		    exit(EXIT_FAILURE);
-+		}
- 	    }
- 	    found = 0;
- 	    for (i=0; i<NumInterfaces; i++) {
-@@ -1419,6 +1429,7 @@
- 		}
- 	    }
- 	    if (!found) {
-+		memset(&interfaces[NumInterfaces], 0, sizeof(*interfaces));
- 		strncpy(interfaces[NumInterfaces].name, optarg, IFNAMSIZ);
- 		NumInterfaces++;
- 	    }
-diff -rau rp-pppoe-3.15/src.o/pppoe-server.h rp-pppoe-3.15/src/pppoe-server.h
---- rp-pppoe-3.15/src.o/pppoe-server.h	2021-05-07 15:18:00.000000000 +0200
-+++ rp-pppoe-3.15/src/pppoe-server.h	2021-12-07 21:44:09.945578094 +0200
-@@ -97,8 +97,8 @@
- /* Hack for daemonizing */
- #define CLOSEFD 64
- 
--/* Max. number of interfaces to listen on */
--#define MAX_INTERFACES 64
-+/* Initial Max. number of interfaces to listen on */
-+#define INIT_INTERFACES 8
- 
- /* Max. 64 sessions by default */
- #define DEFAULT_MAX_SESSIONS 64
-@@ -107,7 +107,7 @@
- extern ClientSession *Sessions;
- 
- /* Interfaces we're listening on */
--extern Interface interfaces[MAX_INTERFACES];
-+extern Interface *interfaces;
- extern int NumInterfaces;
- 
- /* The number of session slots */
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
deleted file mode 100644
index b893af0a1d57..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 toolchain-funcs
-
-PATCHSET="${PN}-3.14-patches-01"
-PATCHES=(
-	"${FILESDIR}/rp-pppoe-3.15-no_max_interfaces.patch"
-)
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
-SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="tk"
-
-RDEPEND="
-	<net-dialup/ppp-2.5:=
-	sys-apps/iproute2
-	tk? ( dev-lang/tk:= )
-"
-DEPEND=">=sys-kernel/linux-headers-2.6.25
-	elibc_musl? ( net-libs/ppp-defs )
-	${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 "${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
-}