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

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 53 insertions, 124 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/Manifest b/net-dialup/rp-pppoe/Manifest
index d9b9d1302989..1509878ac2f3 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -9,39 +9,26 @@ AUX rp-pppoe-3.10-posix-source-sigaction.patch 512 SHA256 18ed348ac04cb5823bfe0b
 AUX rp-pppoe-3.10-session-offset.patch 832 SHA256 66499b084aab890c61399c703e21ba00a46d93da1f36e87674a27026b0c2f013 SHA512 20d169a27d7fc52c53e8ed06652c8db22c4b8b7d44a137c6f3beece41a408ca71b6aeb441a3bbcac76275382b40633f4a1c75dc95212402aa3ebf378dc3cb052 WHIRLPOOL b8406150e1fa63f8cca6092de65a323c2bbdb2ebe0a29b77488ac66c7480d0e639e00fd17ecc286036dfe6a7d63954b1ba3996f4dfe9e0f08ffa2b874d73f001
 AUX rp-pppoe-3.10-username-charset.patch 1950 SHA256 1a6df9197e108e310e90ca52f1d8b14b59fb368f59184aed3dc30abb9ca77417 SHA512 849cd9d0b59b844b2def6b49a203f3af0ec551a09235004b13541f14812517a651327e5694502a32f259b0eee7bc4b708800deabd93eaf3a01771bd47dd43e3f WHIRLPOOL 6382ce336a5b4782b5300ce4838088d082529f58e43d9127b50b6357c61eb58b4e7da87f898d94bad90933b920c9a9ec02a1ad008f8786848aca69500cc24cad
 AUX rp-pppoe-3.11-gentoo.patch 333 SHA256 336e22cc8202b572929ee36d8342ad1b4b0feb7a45a8291b6cb1630dd50a5104 SHA512 76a79224e9d2b12c7a580f66e1ccc2ae4f2b655b2e54a10ec791e49d806d5afc6f2e8b6dd9128c1eb6222d3bdc0ed6787ddfd7775f4c3df42d05033e35ae65b1 WHIRLPOOL 9b9071f1ef4083877fb76360484bbbb5e887c592c2344b4a3c0518bfb99c24e4e1c23621a63623fd97b0d272bc546ceda28bd9cb4b182907a157b49b88170f8a
+AUX rp-pppoe-3.11-kmode.patch 304 SHA256 c94fbe01cd9afc748465728067ea2e11e817bda2616267f682ce891bde66fe96 SHA512 acc9f7427cc601fe2cfd03fb297338656baf11a027eba490c2a46471fc7320b64107e48237ab8243f5fbdd2e0316b75d3d78ca09112ceaaf18f074696ce8cde5 WHIRLPOOL e0be7d77875e616d47abf168e8d6069401a2c13139070da33937066f9d1a93e5d59c1df502ac59763972aa5a779a29a2e8024edd8daae7edcfa0a2fa0172d834
 AUX rp-pppoe-3.8-autoheader.patch 1637 SHA256 bdeb7c479af8c84bab1cdcf18b76d8cb141c3919ceedf120a5ece802395bd206 SHA512 b5427bc803f16544bb9ef311f27fa339f131e6654ff2c06bbf783eb889b93c1a8a908f87925110f751bbd4e37743dbd130d8c4a1d7423dbddb5727a86b032771 WHIRLPOOL 5453f56b886e5e5eb05b6d3f31e27fab4426afa1cb0484766b3fe85cf61a6ade4088326dbf037036ac9392ed38cd48a77e02ecc9125d0bde5343dfb7c3d81a8d
 AUX rp-pppoe-3.8-configure.patch 2718 SHA256 746d3581e8c8a31d1848b76cc071ad82a4d4f81c31b79b5e285344eaa3065915 SHA512 1f325dc47ab2b7b6532d0c91f75737cfd89ee242b4254afff07de8520f3ca3a9204d27ba44f0740c253d62216e4ec751f4bdfc0d056a49036092c7cb8f7b448a WHIRLPOOL f888263967889663141e40c36c6c3d2ec11a632c7026dc324e8be6f715c5adbbd8cd91cb1c949630971181a9c609896399ee802e66f5252df4e3eda4b61347fe
 AUX rp-pppoe-3.8-gentoo-netscripts.patch 5218 SHA256 4b1018f1f9d1ed7fb8ef6f63fced3850128536954c82273c10ab660b2daf849c SHA512 71139dc7bdc395a68de34bfadff41cab59167846eda637b0011d8b9d1d49c80ea7cc6a6c2176c04cdd4f816a97b92c43939771149dda72f6924331b20d49a198 WHIRLPOOL 4348f65188b0fd6f2ee0aaae1f674d592a79de7c81c93113af7a2129935d5616d3cce61b4021e628aece2535465962855480a0c4363799e22e853bb95f3aad06
 AUX rp-pppoe-3.8-plugin-options.patch 1364 SHA256 508bedec65a24eb876b2eb2151adce84efd51689e8472383debb01b29b82be13 SHA512 6a9e156f1ae427da43b9cc9f01791966802c87cbb38782f4645b1ad96a7c962f6056ffa03d5a508a25a1b3a163dfddf6c33b44a595b06de311dddcb228aed2d4 WHIRLPOOL 6b93e5d56a974f067bc3f3f3649c4a7877e9ac5d0c8c5ffe61ba1032820188a46f3a89f086bd3c310465690eb97c6c74b3ebc9fe5f6fed4a4ad1648527462dde
 AUX rp-pppoe-3.8-session-offset.patch 828 SHA256 2428f350d6a9d654401e87def8faa7fc12fb3c6d9a7a698590716391efef30c0 SHA512 4fca8f21b978dcb17d9de4445207b78cd5eaf9c3b160b2efefef661c167ee9262e5b6a1397f2b83f8ec0a78653a9323fa58bf7570de0817cc16675374f57ece9 WHIRLPOOL d7503c6a6cb3ab7435feb60f694cdb1564d607a9ef338e8dde979ec0296ebffaf8a9c7d4b8e5122aa095909a37a84adbf9613c88a72e4b93a6fea02fc6f6a7de
 AUX rp-pppoe-3.8-username-charset.patch 1946 SHA256 21209268903d2c359e5eb4547ab6417f0c63d41791fe413728d690ed879c93bd SHA512 763f310f213ad99d9114adafeeebec72d64efca302e51fce615f62b0d33d05a13f731bbd004ff44422c453d12188d5dd55c63764982fe26b7c563382a9b9619e WHIRLPOOL 1e4cf7e735833bac1d12b3674d64f25a549a405dc741e3467abd648e2c2f2297a5ae3bd0ae99a3d14dfa082b8bfc41cd6381a81c25bb906ce73f399e36933f84
-DIST ppp-2.4.3.tar.gz 688092 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
-DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
-DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
+DIST ppp-2.4.3.tar.gz 688092 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 SHA512 221f0925ec8bb73df740cd563a34f387ce8bf2417d2797e7f360563d8de6524e1cdf058c185eaefc9cb3703828d32c6f1b74595916683e08168ce792c5f8333e WHIRLPOOL c6a7538f107adca4f7fcdfccec5aef4ebba248958c05b94badcf0f1a2ebde667cf55f9adf3bd8eae8c0e6a37ed54c1f836117412d1135363bdfa279197981c6e
 DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
-DIST rp-pppoe-3.10.tar.gz 215288 SHA256 709ca7402594acc1d80b99c20219112b5c00e6ac48ae6049fc626fbaf4ce49f6
 DIST rp-pppoe-3.11.tar.gz 223234 SHA256 86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720 SHA512 cb9579ad94f6b6cfd709e8061aacac0a007f1f58ffd50bd0603f5a2b612c0cf4831febdbfeee290b97932fd30f8ae7f707d532a291124c4aeae2333131d53905 WHIRLPOOL 5e0580b469973726696adc8754f4490877b748e04395873b63a7f6b87b682e0fe4d75f53b1cab674932fe7dcf4d7c99458979926f74589e6d4e15b07505720f6
-DIST rp-pppoe-3.8.tar.gz 212931 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479
-EBUILD rp-pppoe-3.10-r1.ebuild 2523 SHA256 da4953c4e8a9bd1cc9e58b9e6f44c588181502b35ecce4522ea88875d45fedd6 SHA512 d2ab995a1b74e652ec9f6608ae7006808a7724324af2df0a7f96c3d34cd51f24bfe3e71e140f77c23a25607b84adfa1f9b8cc713f8f98059baa27ee981ca7c4b WHIRLPOOL 8ba1396041482b24cfc3925f49fa74af9c8d5b2f1f218b2087564a0a601a3cf1254c9c0fd8f88ee967b870d8b9545f7af0dd18aa024e8bf040332480cd434d03
-EBUILD rp-pppoe-3.11-r1.ebuild 2650 SHA256 c99e25b05b0b0f7b1c36f4afcfd57417efa8d3068413f3f9686eed1b0d46d067 SHA512 e842c93bf150689cf65489132af5a422de73ecc0664f6f5f715a83ea40d13505c620082735ada710a2242364c745bfb8582923b5131357def870e85cb98df862 WHIRLPOOL 40d10af6788cab7cbfa81dd0493e77d366f2cc390514ae5dfd977a4b69572bb89a333e4b81d5a930ea6e1bf2bef671c7c09a535700c518d9289992bc285d46d4
+DIST rp-pppoe-3.8.tar.gz 212931 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479 SHA512 fd929978790645639800164ad1855862f2b2ec4597a2c4c76ea7691aafd7f6ab5797fc64034eefb574dcf6dd51c51eda91c461f70bf4f557d46fee656143effc WHIRLPOOL 048789a83cfcd50d95779c2eb5f31553500288138e70c6daa511e91edcf4010e17d9d106e8f1338741b1be7b5a9bf058a6bfafea0ff27665d2e53667d5bf3427
 EBUILD rp-pppoe-3.11-r2.ebuild 2650 SHA256 5c09ac8154cff009ccd84578499e07ba31d59f7fa421af2f9b88a6f3e74bfd14 SHA512 00b62e3bbcdb266038402511c3ad9d57ff947ca062b24b5eba7287e4858e81ac56fd15ae3a851f5972107539c20a228de0a77e532d1ca270b245b9ce26bb6d57 WHIRLPOOL 6d55bfafded1ae20bc5bf4d27affa2388ffc2fe4cb606888196e082f6e6f0629bd787ba641f8e416bf894d0752c02e36a4de4ab2d71641f7a91b6e0688133b61
+EBUILD rp-pppoe-3.11-r3.ebuild 2789 SHA256 fd42edb3fe6bd149b7da1468f41b203aef485999e948a635cfc1968e6a97db25 SHA512 f19801055261097fcd17125ab3710491cd18783509b223bc6e1410e75f887c6c280f7c4b454185110b2b1f6fdb397921646969f4e8aaab9a58b865278aadc42f WHIRLPOOL f32f1f9173f56452eef17c44a7ee630dd54fae6ee54f675c0d12696da9dfbf88564dbae5bce662eb61762e9981347108ebe02b69c7ba1e73da694676ce0e895f
 EBUILD rp-pppoe-3.8-r2.ebuild 2408 SHA256 b6b023abc9ae69b1da9fc71852980bb2557cf1afff3f8292361e3fc9b6b6613c SHA512 73bb7bb86abccfb876c73aa003a83bf971c7deab90da10c9b0104cb11bf9ab5a129cd5d2bb4aff3bcaf0e78690a41bc3a8d4f7f7c3a548c897a37c14c2d33146 WHIRLPOOL 688d3b63bd97db619411856c25d683585a8d137d27b3b36499496414b9f9ddef7466262e14e703b289af6667b14868c92aaf09742785c13cfb4b8c39995e3c84
-MISC ChangeLog 16337 SHA256 822c0f2dfcf18f7e41f77307ebbdeecdc269cd6099e5bfe73001798a968f4473 SHA512 f7c2d95b40cac903a63762016b45a830407ad919d643146767b25af6d711949c27aaea3a668c24a0529c661305d9b029b54cd40373fd4e95237a7662ebb60a24 WHIRLPOOL 0a27b9c37e7ddd929f3cbf0411d7467c21bfa8580338b123c5e9543f47e80074f1f0e38e44695da456f9070bc476d65e12056089a94ad15a0008cb9213af2248
+MISC ChangeLog 16709 SHA256 5a7d671c7b2da551217ab0f4b1c6c0c4ebcda31d20f855b068f11e0dc52046fe SHA512 7da3b6494dc60f2ede675f40ec13db395841b32bbaf70f2f99653137873222259baa508462fd2d06edd5a1e02ab2ea8a87ec70b1a5e0bb656d7c7bfe2ba87abb WHIRLPOOL 9b204085cb1d5897b0b93000e217cc72ee29d9139fcf31200aede258f6a0f0c6a34b3a2fc85ad6c777be7645b3e2017e3b700d24827f0860b91bbbdb0799eeda
 MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT6cjtAAoJEPiazRVxLXTFvysQAL/o21J5uk9uv5OV45HSSFHq
-TTCRY8QEKJNazf4XOfyNbV9w4FnrUdbOcECKRPsuxoFtck7Tqd9AAAl2sbxjln1u
-7KYBMJq9ye9hMd0aKW04nwjTwLOIIysWaSA9JqfoklxDSDj7KTfyvu/qZg5RY5xX
-d3+OpcZIEYLcfg5zO2O1QV8vGRpf+Rhsnt6PdNL+y3rXoeK0u6vWnPi69edzQYc7
-+wQgAeyY4F0kNgbNynFQAHn8OorPZRWLxVxO4rBzcpEAty1VGhE7f/CkMgbUK6Jm
-5DLqgzR51zLiExITqwGxARWslS919Mf23RVEH1flpTKnoQ5rSb9JjJQoB60EP5/s
-1aibQvyYUxNo6+va9XWvdDKUzJWRQG9240+nX7UJzGDVsETUEgwS9oD3HLvyDPZP
-b+rTdgteQ7bTUCVBSbgsiOLpCSwo34fflKNtj1z4YTxdJ+YspdA8sPuSWf/XdL3K
-b/Ux7WmBjvMemtRzhGgTmInqs5VWMR+BgGQyEdyO6cBs1F5XdajWyMZ6RGkix/cM
-oC/MyfeweKaUu4U8KiHKuF25jkq9whlzJbrhCq9rpQokafe8WRGFWurpGkE9Bd6v
-gT8bWra8DVlWh3yVEIWMRBMy2YjIPB3WPMobKede4rEtjr/oJ53i8AAvUNRgY31h
-Vp7yBcO2dfuitHUuegh6
-=R5Bp
+iEYEAREIAAYFAlStIwkACgkQCaWpQKGI+9R+ZgCfTl2KsULgb1zpXNd0PxoEaV1j
+JpoAnA+nzC1HQ0Z3LW59T5BG7U5YvR+Z
+=cDvS
 -----END PGP SIGNATURE-----
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."
-}