add kernel support for PPPoE (#74598)

(Portage version: 2.0.51-r14)

4 files changed, 84 insertions, 15 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 93726a526124..bdfd0d4b178d 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.41 2005/01/22 04:14:10 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.42 2005/01/23 08:52:35 mrness Exp $
+
+*rp-pppoe-3.5-r6 (23 Jan 2005)
+
+  23 Jan 2005; Alin Nastac <mrness@gentoo.org> +rp-pppoe-3.5-r6.ebuild:
+  Add kernel support for PPPoE, thanks to Yuri Karaban <ykar@list.ru> (bug #74598).
 
   22 Jan 2005; Markus Nigbur <pyrania@gentoo.org> rp-pppoe-3.5-r5.ebuild:
   Fixed SRC_URI. Added tcltk to IUSE.
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 568224a3d2fe..bf5153791e36 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bf86ea53ec6ae8d64f72ca032801d729 rp-pppoe-3.5-r2.ebuild 1641
-MD5 051d73a435a89125001ba2163bf0dbc4 ChangeLog 5882
+MD5 683f2f65c8c0bd7b14905c01a8759099 rp-pppoe-3.5-r6.ebuild 2004
 MD5 35206b2bacd1dbc33c8e56f28a7a0f75 rp-pppoe-3.5-r5.ebuild 1930
+MD5 051d73a435a89125001ba2163bf0dbc4 ChangeLog 5882
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
-MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
-MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
+MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r2 64
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r5 64
+MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r6 125
 MD5 8708f33468c5aeada5ec65d597edec17 files/rp-pppoe-3.5-netscripts.patch 4063
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8dMjI7fK2cqeyXkRArWQAJsGGT8bxJyJlNIxcaDCQE7MvPG6wACggENr
-gpRm0Kwn+bPR5rtDUHtaPOg=
-=JeNr
------END PGP SIGNATURE-----
+MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
+MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r6 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r6
new file mode 100644
index 000000000000..e67ec4d3fe8f
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r6
@@ -0,0 +1,2 @@
+MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
+MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r6.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r6.ebuild
new file mode 100644
index 000000000000..14b0173a0297
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2005/01/23 08:52:35 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="http://www.roaringpenguin.com/"
+SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz
+	ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="X tcltk"
+
+DEPEND="net-dialup/ppp
+	X? ( tcltk? (
+		virtual/x11
+		dev-lang/tcl
+		dev-lang/tk ) )"
+
+src_unpack() {
+	unpack ${A} || die "failed to unpack"
+	cd ${S} || die "${S} not found"
+
+	# 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
+	#These 2 patches should be merged some day
+	epatch ${FILESDIR}/rp-pppoe-3.5-gentoo-netscripts.patch
+
+	epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch #66296
+
+	#Avoid "setXid, dynamically linked and using lazy bindings" QA notice
+	sed -i -e 's:\(@CC@\) \(-o pppoe-wrapper wrapper.o\):\1 -Wl,-z,now \2:' gui/Makefile.in
+
+	# sanbdox violation workaround
+	sed -i -e 's/modprobe/#modprobe/' src/configure || die "sed failed"
+}
+
+src_compile() {
+	addpredict /dev/ppp
+
+	cd ${S}/src
+	econf --enable-plugin=../../ppp-2.4.3|| 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"
+}