gentoo auto-resync : 24:10:2023 - 08:38:03

4 files changed, 2 insertions, 116 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 59d7e478b4f3..8579243ae4c8 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 8c86a0b5b43b..f15d22ba6a09 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -14,8 +14,7 @@ DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd5
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 DIST pppgetpass.8 450 BLAKE2B 4e9805cfecb4d07c302682c1ced42cc5d247d18fae904b909e126874af962cf48bb703cd75b0cefce4e19404f2e757602d3b57f187567fc23d4b93d9598d1486 SHA512 21f6dda908cf73ee27bfa39d2b50e7f76b371e50bd7d5a0586174b30129c119accbd260d7f9e0e6aa6aabfa5ba11a13ba560588a99672c9dd4e9f33254f88836
 EBUILD ppp-2.4.9-r9.ebuild 7866 BLAKE2B e2f6012eb93f27271c775b75fa52e0d1307adee4afdcb09bf8ae78e1ddefe451bd7782c4f5412ef264366c8db4e20bb3621c4c032c1261166c70473a94552880 SHA512 a3931bedeac10a6facc0fe354eee0e26e6c237f21f9e4d69196d657d388d1624e4bf8054c670568c0ba689d859bca87a21410da08f35baf33fc12d39cfe2263e
-EBUILD ppp-2.5.0-r2.ebuild 3452 BLAKE2B 59ae8469e5a95a2c68364a7a487e45e9e101cb342456e7a60c4abcb5db0e4f5207a2227a88ad9ae6438f1c655668294e58a9d8c821e52b03dc9e2a0200ba29d8 SHA512 bad4912c44bde1a66351d8e17e0c48cf6c1e0b800f6205e107ee78b49a84fc24bbe98356c0dffbd59af81abd08e0571d113aad50e4864fc1062a47e58d5effe4
 EBUILD ppp-2.5.0-r3.ebuild 3489 BLAKE2B 3a0eab803000ef507d175ae4c5d1d2b04028b5bd8083678d15f3856b426b91b716b7887c8c5c8e7c783ddece5db026b2727666b34e85ad4a30554b35b12e8ec7 SHA512 7ae193c9392ba7127e001725fa991f01fafd06bc01f2a099a1507d308e938e0fb0692f7f92f3c8a7895e52dc126b26d1526dee2480900fe7029390ccf3fa1551
 EBUILD ppp-2.5.0-r4.ebuild 3550 BLAKE2B 1de650e0ee621f7f6f241ed5bb874201c91ee1502dd1e16481737204d22dcf0add58f87dc1096a7ee4896da429fbb43a683f4ff1549feac622309ff8dd848ec6 SHA512 92b82b0d9a363a50806fac3647d63bd6144a185e2845ddd5174ab6296cf72143b395e16b9a5170b3d9ae7d0affacd25ef3c284398d7b7b71fac18536c68efa25
-EBUILD ppp-2.5.0-r5.ebuild 4040 BLAKE2B d77bb2bb8c383ec2beb0a48a85b5a2be4eb1f38337a1ac1a3cc23364fce6b8dae9f69a68d649207352b8a4d6b4b4c28c9817534b2bce26842145e0ec33d2ca24 SHA512 7dddc6ccc1cffa69ca421e245de6c55a946da8efd6d13e8a58caffaaf1eb52017fb4b8794775bb89c503a54a180f48c806151535b1659b4ec120b2bbe0ce608d
+EBUILD ppp-2.5.0-r6.ebuild 4061 BLAKE2B f468cb4bf5a101e5ce6c3d343b9c547c72f2a6fa11139fe191420b2b840d84149079f8109ea291fe33d2018dda053b8e59759a111e4cb5f81455315be09395e1 SHA512 b40cc9847f4578d215d86cbbe380927a538b11d8bb7f2c12ebc92e0730f88de6e2ed98739644f46c3a5afae05e059e820478bcf7e4f3666f2d2bc23552bc4d4d
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/ppp-2.5.0-r2.ebuild b/net-dialup/ppp/ppp-2.5.0-r2.ebuild
deleted file mode 100644
index f2d110d039b4..000000000000
--- a/net-dialup/ppp/ppp-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info pam tmpfiles
-
-PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
-	https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="activefilter atm gtk pam 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"
-
-PATCHES=(
-	"${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch
-)
-
-pkg_setup() {
-	local 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"
-	ERROR_PPP_ASYNC+=" (optional, but highly recommended)"
-	local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline"
-	WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)"
-	if use activefilter ; then
-		CONFIG_CHECK+=" ~PPP_FILTER"
-		local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-	fi
-	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+=" ~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 plugin)"
-	if use atm ; then
-		CONFIG_CHECK+=" ~PPPOATM"
-		local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	local args=(
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		$(use_enable systemd)
-		$(use_with atm)
-		$(use_with pam)
-		$(use_with activefilter pcap)
-		$(use_with gtk)
-		--enable-cbcp
-	)
-	econf "${args[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if use pam; then
-		pamd_mimic_system ppp auth account session
-	fi
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dosbin scripts/p{on,off,log}
-	doman scripts/pon.1
-	dosym pon.1 /usr/share/man/man1/poff.1
-	dosym pon.1 /usr/share/man/man1/plog.1
-
-	# Adding misc. specialized scripts to doc dir
-	dodoc -r scripts
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-
-	newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf
-
-	# Missing from upstream tarball
-	# https://github.com/ppp-project/ppp/pull/412
-	#doman contrib/pppgetpass/pppgetpass.8
-	doman "${DISTDIR}/pppgetpass.8"
-}
-
-pkg_postinst() {
-	tmpfiles_process pppd.conf
-}
diff --git a/net-dialup/ppp/ppp-2.5.0-r5.ebuild b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
index a97d33222c22..17550d021c06 100644
--- a/net-dialup/ppp/ppp-2.5.0-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.5.0-r6.ebuild
@@ -89,6 +89,7 @@ src_configure() {
 		$(use_with activefilter pcap)
 		$(use_with gtk)
 		--enable-cbcp
+		--enable-multilink
 	)
 	econf "${args[@]}"
 }