diff options
| -rw-r--r-- | net-dialup/rp-pppoe/ChangeLog | 8 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch | 11 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild | 90 |
3 files changed, 108 insertions, 1 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog index fd51f7f46560..a2296c9dfd00 100644 --- a/net-dialup/rp-pppoe/ChangeLog +++ b/net-dialup/rp-pppoe/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dialup/rp-pppoe # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.103 2013/05/12 04:00:43 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.104 2013/12/29 23:02:19 polynomial-c Exp $ + +*rp-pppoe-3.11 (29 Dec 2013) + + 29 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +rp-pppoe-3.11.ebuild, + +files/rp-pppoe-3.11-gentoo.patch: + Version bump. 12 May 2013; Patrick Lauer <patrick@gentoo.org> rp-pppoe-3.8-r2.ebuild: Remove redundant WANT_AUTOMAKE diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch new file mode 100644 index 000000000000..9f03a0cf8b1f --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch @@ -0,0 +1,11 @@ +--- rp-pppoe-3.11/gui/Makefile.in ++++ rp-pppoe-3.11/gui/Makefile.in +@@ -37,7 +37,7 @@ + @echo "Type 'make install' as root to install the software." + + pppoe-wrapper: wrapper.o +- @CC@ -o pppoe-wrapper wrapper.o ++ @CC@ $(CFLAGS) $(LDFLAGS) -o pppoe-wrapper wrapper.o + + wrapper.o: wrapper.c + @CC@ $(CFLAGS) -c -o wrapper.o wrapper.c diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild new file mode 100644 index 000000000000..f5ae760f3cbf --- /dev/null +++ b/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2013 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.11.ebuild,v 1.1 2013/12/29 23:02:19 polynomial-c Exp $ + +EAPI=5 + +inherit eutils flag-o-matic autotools + +DESCRIPTION="A user-mode PPPoE client and server suite for Linux" +HOMEPAGE="http://www.roaringpenguin.com/pppoe/" +SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz + ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="X" + +RDEPEND="net-dialup/ppp + X? ( dev-lang/tk )" +# see bug #230491 +DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) + ${RDEPEND}" + +src_prepare() { + # Patch to enable integration of pppoe-start and pppoe-stop with + # baselayout-1.11.x so that the pidfile can be found reliably per interface + epatch "${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch" + + epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410 + epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch" + epatch "${FILESDIR}/${PN}-3.10-autotools.patch" + epatch "${FILESDIR}/${PN}-3.10-session-offset.patch" # bug 204476 + has_version '<sys-kernel/linux-headers-2.6.35' && \ + epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197 + epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch" + epatch "${FILESDIR}/${PN}-3.11-gentoo.patch" + + cd "${S}"/src || die + eautoreconf +} + +src_configure() { + addpredict /dev/ppp + + cd "${S}/src" || die + econf --enable-plugin=../../ppp-2.4.4 +} + +src_compile() { + cd "${S}/src" || die + emake + + if use X; then + make -C "${S}/gui" || die "gui make failed" + fi +} + +src_install () { + cd "${S}/src" || die + emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install + + #Don't use compiled rp-pppoe plugin - see pkg_preinst below + local pppoe_plugin="${D}/etc/ppp/plugins/rp-pppoe.so" + if [ -f "${pppoe_plugin}" ] ; then + rm "${pppoe_plugin}" || die + fi + + if use X; then + emake -C "${S}/gui" \ + DESTDIR="${D}" \ + datadir=/usr/share/doc/${PF}/ \ + install + dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe + 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() { + elog "Use pppoe-setup to configure your dialup connection." +} |