summaryrefslogtreecommitdiff
path: root/net-dialup/ppp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-26 15:48:02 +0000
commit38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree6fce284d5bfddaf597a490ac66069d16c6a485db /net-dialup/ppp
parent0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
gentoo resync : 25.01.2018
Diffstat (limited to 'net-dialup/ppp')
-rw-r--r--net-dialup/ppp/Manifest2
-rw-r--r--net-dialup/ppp/ppp-2.4.7-r5.ebuild (renamed from net-dialup/ppp/ppp-2.4.7-r4.ebuild)24
2 files changed, 14 insertions, 12 deletions
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a3521f15637d..9c8f2e6fcf39 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,5 +5,5 @@ DIST ppp-2.4.7-patches-5.tar.xz 38680 BLAKE2B 56e4d3a5bc2486144791adf6ffb8a6cf07
DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
EBUILD ppp-2.4.7-r3.ebuild 6801 BLAKE2B dbd9ede10dbfd48f8cadd08a49fbad552711438c936940fe55257181d718162822345fa397cfcf808dca2251b15ebe95aa8776bb94ba0d0a4cc4b2a278630188 SHA512 5b688e6be27e555e27021dd971aaaca3278fe5f301eadc8ac1dcee0d006b8afe587911ec913c8b51efaecb05d895e9f9a5225add0710def0692214f895bb7e48
-EBUILD ppp-2.4.7-r4.ebuild 6811 BLAKE2B 9775a52a7df42939294f82e9e490e822e35d5cea2be3d4bef9993a61558970a03620572ad1cb5efcedfff2a62a53537cf71dd7b633950561e5ea15a3c2411c49 SHA512 c49aa2614d0de78a4b9c90a7bc1ea1d279a09b090d9d53b1d0dfedc33de5faf31dbe22260a25d9e40de200821ed6f846a94a30eab76dba8bd2f4e79f49acfc69
+EBUILD ppp-2.4.7-r5.ebuild 6842 BLAKE2B f26e980aa3a1ca698058990c53864d78650a6804178f3e905a72dc1f7b366248f8ed65346c0720b5e5bf643cd7ccadb01d11fe998a12c74f18a5a25d8a7d2c8d SHA512 d91756f0ae964e1b82406f9234669dabae266b7e916841d71cd658f7413b6cf4ca978013a3b4bb7b45e46c1d31a43aaeba198e939dd0f7220a50c270ef2b1ca4
MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
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() {