Don't hardcode ppp detection at some phases and try to autodetect on others, fix kmode detection using ArchLinux approach (#364941), rename X USE flag to 'tk' (#349014), drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 45 insertions, 103 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 12574aa548bf..e2213bfd9168 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/rp-pppoe
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.106 2014/08/12 07:57:32 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.107 2015/01/07 12:14:00 pacho Exp $
+
+*rp-pppoe-3.11-r3 (07 Jan 2015)
+
+  07 Jan 2015; Pacho Ramos <pacho@gentoo.org> +files/rp-pppoe-3.11-kmode.patch,
+  +rp-pppoe-3.11-r3.ebuild, -rp-pppoe-3.10-r1.ebuild, -rp-pppoe-3.11-r1.ebuild:
+  Don't hardcode ppp detection at some phases and try to autodetect on others,
+  fix kmode detection using ArchLinux approach (#364941), rename X USE flag to
+  'tk' (#349014), drop old
 
 *rp-pppoe-3.11-r2 (12 Aug 2014)
 
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch
new file mode 100644
index 000000000000..039abd487793
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch
@@ -0,0 +1,10 @@
+--- src/configure.in.old	2015-01-07 13:08:18.929959937 +0100
++++ src/configure.in	2015-01-07 13:08:38.253406302 +0100
+@@ -26,6 +26,7 @@
+ #include<net/ethernet.h>
+ #include<linux/if.h>
+ #include<linux/in.h>
++#include <linux/in6.h>
+ ])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild
deleted file mode 100644
index e857e1bba1b2..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 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.10-r1.ebuild,v 1.2 2010/11/22 02:56:12 vapier Exp $
-
-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_unpack() {
-	unpack ${A} || die "failed to unpack"
-
-	# 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}/${P}-gentoo-netscripts.patch"
-
-	epatch "${FILESDIR}/${P}-username-charset.patch" # bug 82410
-	epatch "${FILESDIR}/${P}-plugin-options.patch"
-	epatch "${FILESDIR}/${P}-autotools.patch"
-	epatch "${FILESDIR}/${P}-session-offset.patch" # bug 204476
-	has_version '<sys-kernel/linux-headers-2.6.35' && \
-		epatch "${FILESDIR}/${P}-linux-headers.patch" #334197
-	epatch "${FILESDIR}/${P}-posix-source-sigaction.patch"
-
-	cd "${S}"/src
-	eautoreconf
-}
-
-src_compile() {
-	addpredict /dev/ppp
-
-	cd "${S}/src"
-	econf --enable-plugin=../../ppp-2.4.4 || die "econf failed"
-	emake || die "emake failed"
-
-	if use X; then
-		make -C "${S}/gui" || die "gui make failed"
-	fi
-}
-
-src_install () {
-	cd "${S}/src"
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install \
-		|| die "install failed"
-
-	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	rm "${D}/etc/ppp/plugins/rp-pppoe.so"
-
-	prepalldocs
-
-	if use X; then
-		emake -C "${S}/gui" DESTDIR="${D}" datadir=/usr/share/doc/${PF}/ install \
-			|| die "gui install failed"
-		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."
-}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
index 97bbd59bf882..d618fbef2ff4 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r1.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r1.ebuild,v 1.1 2014/02/22 09:27:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild,v 1.1 2015/01/07 12:14:00 pacho Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools readme.gentoo
 
-PPP_P="ppp-2.4.6"
+PPP_P="ppp-2.4.7"
 
 DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
 HOMEPAGE="http://www.roaringpenguin.com/pppoe/"
@@ -16,14 +16,25 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="X"
+IUSE="tk"
 
-RDEPEND="net-dialup/ppp
-	X? ( dev-lang/tk )"
+RDEPEND="
+	net-dialup/ppp:=
+	tk? ( dev-lang/tk )
+"
 # see bug #230491
 DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 )
 	${RDEPEND}"
 
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+
+pkg_setup() {
+	# This is needed in multiple phases
+	PPPD_VER=$(best_version net-dialup/ppp)
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
+}
+
 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
@@ -37,6 +48,7 @@ src_prepare() {
 		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"
+	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
 
 	cd "${S}"/src || die
 	eautoreconf
@@ -46,15 +58,15 @@ src_configure() {
 	addpredict /dev/ppp
 
 	cd "${S}/src" || die
-	econf --enable-plugin=../../${PPP_P}
+	econf --enable-plugin=../../ppp-${PPPD_VER}
 }
 
 src_compile() {
 	cd "${S}/src" || die
 	emake
 
-	if use X; then
-		make -C "${S}/gui" || die "gui make failed"
+	if use tk; then
+		emake -C "${S}/gui" || die "gui make failed"
 	fi
 }
 
@@ -68,25 +80,20 @@ src_install () {
 		rm "${pppoe_plugin}" || die
 	fi
 
-	if use X; then
+	if use tk; then
 		emake -C "${S}/gui" \
 			DESTDIR="${D}" \
 			datadir=/usr/share/doc/${PF}/ \
 			install
 		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
 	fi
+
+	readme.gentoo_create_doc
 }
 
 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."
-}