diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-18 14:10:16 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-08-18 14:10:16 +0000 |
| commit | 37513261eb023636f377a01c8b042f831de5a6a2 (patch) | |
| tree | c2fa643c8d74ce1ca4bbde0c4a05d4592f38c5ec /net-dialup/ppp | |
| parent | Initial import. Ebuilds written by me. (diff) | |
| download | gentoo-2-37513261eb023636f377a01c8b042f831de5a6a2.tar.gz gentoo-2-37513261eb023636f377a01c8b042f831de5a6a2.tar.bz2 gentoo-2-37513261eb023636f377a01c8b042f831de5a6a2.zip | |
Make patch apply. Fixes bug#430830. Patch by Andrey Volkov.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup/ppp')
| -rw-r--r-- | net-dialup/ppp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dialup/ppp/ppp-2.4.5-r3.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 55321491144a..da7719f55e90 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dialup/ppp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.279 2012/08/10 04:12:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.280 2012/08/18 14:10:16 scarabeus Exp $ + + 18 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> ppp-2.4.5-r3.ebuild: + Make patch apply. Fixes bug#430830. Patch by Andrey Volkov. *ppp-2.4.5-r3 (10 Aug 2012) diff --git a/net-dialup/ppp/ppp-2.4.5-r3.ebuild b/net-dialup/ppp/ppp-2.4.5-r3.ebuild index 2b85d46a43a4..08c24dcb0ae1 100644 --- a/net-dialup/ppp/ppp-2.4.5-r3.ebuild +++ b/net-dialup/ppp/ppp-2.4.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r3.ebuild,v 1.1 2012/08/10 04:12:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r3.ebuild,v 1.2 2012/08/18 14:10:16 scarabeus Exp $ EAPI="4" @@ -29,6 +29,15 @@ src_prepare() { # Use the headers from the kernel #427684 rm include/linux/if_pppol2tp.h || die + if use dhcp ; then + # copy the ppp-dhcp plugin files + einfo "Adding ppp-dhcp plugin files" + mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die + sed -i \ + -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \ + pppd/plugins/Makefile.linux || die + fi + use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*" use dhcp || EPATCH_EXCLUDE+=" 8?_all_dhcp-*" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch @@ -56,15 +65,6 @@ src_prepare() { einfo "Enabling CBCP" sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux - if use dhcp ; then - # copy the ppp-dhcp plugin files - einfo "Adding ppp-dhcp plugin files" - mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die - sed -i \ - -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \ - pppd/plugins/Makefile.linux || die - fi - # Set correct libdir sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ pppd/{pathnames.h,pppd.8} |