gentoo resync : 22.05.2021

3 files changed, 5 insertions, 239 deletions

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 9dc4c4b4b2ce..01773dc24acc 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,10 +1,7 @@
 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 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-r1.ebuild 7015 BLAKE2B 7a7126901db6011fd17456491e9b06265efdd7fd24a2840def858231676effc5a190495170d2d189cad12629439253ef758a65a76a79bc33c25031339633fd03 SHA512 9aa9ae8f861b7928b21757a1c82129da3a0177d70ce36f5c73f1dd713ba746a9aecb719151b07701034aee98646a3ecb58e23206d4e86a4b43278dfe573e4687
-EBUILD ppp-2.4.9-r2.ebuild 7346 BLAKE2B 502b35a70f9becc6734844853791b45f8bace36b5a51314c93667465ce55a3444b2db1355e9a4b0c8202323b651255d62c9eff78c1d59f32b115fa4d5e0b453b SHA512 73bb88f7d27acdcea9e3cebe521f83c2159e41d0e312bc760b68c7951a153a861a8cb2890e122c3103f899b7652ccf514d645bf2a434f2e133a99d5851cccdb6
+EBUILD ppp-2.4.9-r2.ebuild 7367 BLAKE2B c63ebfeab0a0de84bfe796dbebf5d13910426611156db553de79cb61644956dee4aff9476fc3140cfd2806c1842fc19a71ae0e4316a6e98b68ee889213a613b6 SHA512 59890b24adda02cc49cd74adb7542b6228188d89a64ae851f3bed01605adf1508d7a99cb58c9cda41abeeb0b33b73bd4aa8efab4c9bb768e76508af5c19a62d7
 MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
diff --git a/net-dialup/ppp/ppp-2.4.8-r1.ebuild b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
deleted file mode 100644
index 94962cff0306..000000000000
--- a/net-dialup/ppp/ppp-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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_VER="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/${P}-patches-${PATCH_VER}.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 eap-tls gtk ipv6 pam radius"
-
-DEPEND="
-	activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( sys-libs/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}
-	!<net-misc/netifrc-0.7.1"
-PDEPEND="net-dialup/ppp-scripts"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-	if ! use eap-tls ; then
-		rm "${WORKDIR}"/patches/8?_all_eaptls-* || die
-	fi
-	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 "Enabling IPv6"
-		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
-		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 CC PKG_CONFIG
-	emake 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/rp-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/rp-pppoe/rp-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 rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-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:^pppoe.so:rp-pppoe.so:" "${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."
-}
diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index e09649890def..61bbe8a89062 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info multilib pam toolchain-funcs
+inherit linux-info pam toolchain-funcs
 
 PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
@@ -26,6 +26,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
 PDEPEND="net-dialup/ppp-scripts"
 
 S="${WORKDIR}/${PN}-${P}"
@@ -81,11 +82,11 @@ src_prepare() {
 		pppd/{pathnames.h,pppd.8} || die
 
 	if use radius ; then
-		#set the right paths in radiusclient.conf
+		# 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
+		# 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