diff options
| -rw-r--r-- | net-dialup/rp-pppoe/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog index c2609bb4d4f8..1d54b2e8a33a 100644 --- a/net-dialup/rp-pppoe/ChangeLog +++ b/net-dialup/rp-pppoe/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dialup/rp-pppoe # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.85 2007/01/05 10:18:43 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.86 2007/03/10 14:22:46 mrness Exp $ + + 10 Mar 2007; Alin Năstac <mrness@gentoo.org> rp-pppoe-3.8.ebuild: + Remove references to $ROOT from src_install (#168039). 05 Jan 2007; Alin Năstac <mrness@gentoo.org> rp-pppoe-3.8.ebuild: Remove obsolete setup & postinst messages. Fix bug #160167. diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild index 7ac295cf7648..4fa55a24e974 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild,v 1.13 2007/01/05 10:18:43 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild,v 1.14 2007/03/10 14:22:46 mrness Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -56,14 +56,8 @@ src_install () { make RPM_INSTALL_ROOT="${D}" docdir=/usr/share/doc/${PF} install \ || die "install failed" - #Don't use compiled rp-pppoe plugin; use it from the current version of pppd + #Don't use compiled rp-pppoe plugin - see pkg_preinst below rm "${D}/etc/ppp/plugins/rp-pppoe.so" - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} - if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then - dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so - fi prepalldocs @@ -74,6 +68,16 @@ src_install () { fi } +pkg_preinst() { + # Use the rp-pppoe plugin that comes with net-dialup/pppd + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} + if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then + dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so + fi +} + pkg_postinst() { einfo "Use pppoe-setup to configure your dialup connection." } |