From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8A271382C5 for ; Tue, 23 Jan 2018 12:51:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E204BE0A90; Tue, 23 Jan 2018 12:51:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2A24E0A90 for ; Tue, 23 Jan 2018 12:51:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FF96335C31 for ; Tue, 23 Jan 2018 12:51:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E33DF1B8 for ; Tue, 23 Jan 2018 12:51:32 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1516711889.60520dc2fe3d68deaa2c519dc67a10af446cbba3.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/ppp/ppp-2.4.7-r4.ebuild net-dialup/ppp/ppp-2.4.7-r5.ebuild X-VCS-Directories: net-dialup/ppp/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 60520dc2fe3d68deaa2c519dc67a10af446cbba3 X-VCS-Branch: master Date: Tue, 23 Jan 2018 12:51:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec13947b-6235-4566-aac5-660d14abe31c X-Archives-Hash: dd7ab5f0a423fe7d6928674838087588 commit: 60520dc2fe3d68deaa2c519dc67a10af446cbba3 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 23 12:51:14 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 23 12:51:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60520dc2 net-dialup/ppp: EAPI-6 revbump. Also add "+ipv6" to /etc/ppp/options with USE="ipv6" Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../{ppp-2.4.7-r4.ebuild => ppp-2.4.7-r5.ebuild} | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/net-dialup/ppp/ppp-2.4.7-r4.ebuild b/net-dialup/ppp/ppp-2.4.7-r5.ebuild similarity index 94% rename from net-dialup/ppp/ppp-2.4.7-r4.ebuild rename to net-dialup/ppp/ppp-2.4.7-r5.ebuild index 06151c54833..d4a55aff1e0 100644 --- a/net-dialup/ppp/ppp-2.4.7-r4.ebuild +++ b/net-dialup/ppp/ppp-2.4.7-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils linux-info multilib pam toolchain-funcs +inherit linux-info multilib pam toolchain-funcs PATCH_VER="5" DESCRIPTION="Point-to-Point Protocol (PPP)" @@ -32,9 +32,10 @@ PDEPEND="net-dialup/ppp-scripts" src_prepare() { mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die - use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*" - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patch + if ! use eap-tls ; then + rm "${WORKDIR}"/patch/8?_all_eaptls-* || die + fi + eapply "${WORKDIR}"/patch if use atm ; then einfo "Enabling PPPoATM support" @@ -55,6 +56,7 @@ src_prepare() { 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" @@ -62,9 +64,9 @@ src_prepare() { if use dhcp ; then einfo "Adding ppp-dhcp plugin files" - sed -i \ + sed \ -e '/^SUBDIRS :=/s:$: dhcp:' \ - pppd/plugins/Makefile.linux || die + -i pppd/plugins/Makefile.linux || die fi # Set correct libdir @@ -73,9 +75,9 @@ src_prepare() { if use radius ; then #set the right paths in radiusclient.conf - sed -i -e "s:/usr/local/etc:/etc:" \ + sed -e "s:/usr/local/etc:/etc:" \ -e "s:/usr/local/sbin:/usr/sbin:" \ - pppd/plugins/radius/etc/radiusclient.conf || die + -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} \ @@ -85,7 +87,7 @@ src_prepare() { sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die fi - epatch_user # 549588 + eapply_user #549588 } src_compile() {