diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-01-23 13:51:14 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-01-23 13:51:29 +0100 |
| commit | 60520dc2fe3d68deaa2c519dc67a10af446cbba3 (patch) | |
| tree | 53e5288e1f36cf5a8aef0ad5a37af91f698a4db8 | |
| parent | net-misc/rabbitmq-server: fix dev-lang/elixir dependency version, fixes #645158 (diff) | |
| download | gentoo-60520dc2fe3d68deaa2c519dc67a10af446cbba3.tar.gz gentoo-60520dc2fe3d68deaa2c519dc67a10af446cbba3.tar.bz2 gentoo-60520dc2fe3d68deaa2c519dc67a10af446cbba3.zip | |
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
| -rw-r--r-- | net-dialup/ppp/ppp-2.4.7-r5.ebuild (renamed from net-dialup/ppp/ppp-2.4.7-r4.ebuild) | 24 |
1 files 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 index 06151c548336..d4a55aff1e0d 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() { |