Use netscripts patch instead of pidfile patch to integrate with baselayout-1.11.x

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index a23f06f04f2f721646aad7f5868f2253661adfe0..6cb4a07761afbc1e815285f490552456b0c467e0 100644 (file)
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.36 2004/10/17 05:33:36 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.37 2004/10/23 19:55:45 agriffis Exp $
+
+*rp-pppoe-3.5-r3 (23 Oct 2004)
+
+  23 Oct 2004; Aron Griffis <agriffis@gentoo.org> +rp-pppoe-3.5-r3.ebuild:
+  Use netscripts patch instead of pidfile patch to integrate with
+  baselayout-1.11.x
 
   16 Oct 2004; Hardave Riar <hardave@gentoo.org> rp-pppoe-3.5-r2.ebuild:
   Stable on mips, bug #66296.

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 9d716ec5168e5b8839290285ffe3c2bf96c312c9..8d2806408be1b488a7e0e261aa821eb632820922 100644 (file)
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,10 +1,12 @@
 MD5 0f639c9d201201602dd1d3cbcefc8896 rp-pppoe-3.5-r1.ebuild 1598
-MD5 c96a783057ea36e7066457073da18c2c ChangeLog 5016
+MD5 c2c88efb93056a555f92b5d6a90494a0 ChangeLog 5211
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 443cd9158850793019160ef6fd003ffc rp-pppoe-3.5-r2.ebuild 1641
+MD5 369091616bd1b0e298296a46427b50d6 rp-pppoe-3.5-r3.ebuild 1662
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r1 64
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r2 64
 MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
 MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
 MD5 8708f33468c5aeada5ec65d597edec17 files/rp-pppoe-3.5-netscripts.patch 4063
+MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r3 64

diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3
new file mode 100644 (file)
index 0000000..f73d1df
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3
@@ -0,0 +1 @@
+MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild
new file mode 100644 (file)
index 0000000..6b63e72
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 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.5-r3.ebuild,v 1.1 2004/10/23 19:55:45 agriffis Exp $
+
+inherit eutils
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
+HOMEPAGE="http://www.roaringpenguin.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="X"
+
+DEPEND=">=net-dialup/ppp-2.4.1
+       X? ( tcltk? (
+               virtual/x11
+               dev-lang/tcl
+               dev-lang/tk ) )"
+
+src_unpack() {
+       unpack ${A} || die
+       cd ${S} || die
+
+       # Patch to enable integration of adsl-start and adsl-stop with
+       # baselayout-1.11.x so that the pidfile can be found reliably per interface
+       epatch ${FILESDIR}/rp-pppoe-3.5-netscripts.patch
+
+       epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch
+}
+
+src_compile() {
+       addpredict /dev/ppp
+
+       # sanbdox violation workaround
+       cd ${S}/src
+       sed -i -e 's/modprobe/#modprobe/' configure || die "sed failed"
+       econf || die "econf failed"
+       emake || die "emake failed"
+
+       if use X && use tcltk; then
+               make -C ${S}/gui || die "gui make failed"
+       fi
+}
+
+src_install () {
+       cd ${S}/src
+       make RPM_INSTALL_ROOT=${D} docdir=/usr/share/doc/${PF} install \
+               || die "install failed"
+       prepalldocs
+
+       if use X && use tcltk; then
+               make -C ${S}/gui install RPM_INSTALL_ROOT=${D} \
+               datadir=/usr/share/doc/${PF}/ || die "gui install failed"
+               dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
+       fi
+
+       exeinto /etc/init.d ; newexe ${FILESDIR}/rp-pppoe.rc rp-pppoe
+}
+
+pkg_postinst() {
+       einfo "Use adsl-setup to configure your dialup connection"
+}