From bbcfbace52820bdb503e8c9aaa57b89d7ab8d8bf Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 12 Aug 2014 07:57:33 +0000
Subject: Use latest ppp version

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
---
 net-dialup/rp-pppoe/ChangeLog               |  7 ++-
 net-dialup/rp-pppoe/Manifest                | 32 +++++-----
 net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild | 92 +++++++++++++++++++++++++++++
 3 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild

(limited to 'net-dialup')

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 317600b402de..12574aa548bf 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,11 @@
 # 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.105 2014/02/22 09:27:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.106 2014/08/12 07:57:32 polynomial-c Exp $
+
+*rp-pppoe-3.11-r2 (12 Aug 2014)
+
+  12 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> +rp-pppoe-3.11-r2.ebuild:
+  Use latest ppp version.
 
 *rp-pppoe-3.11-r1 (22 Feb 2014)
 
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index dab55b960d28..d9b9d1302989 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -18,28 +18,30 @@ AUX rp-pppoe-3.8-username-charset.patch 1946 SHA256 21209268903d2c359e5eb4547ab6
 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.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
+EBUILD rp-pppoe-3.11-r2.ebuild 2650 SHA256 5c09ac8154cff009ccd84578499e07ba31d59f7fa421af2f9b88a6f3e74bfd14 SHA512 00b62e3bbcdb266038402511c3ad9d57ff947ca062b24b5eba7287e4858e81ac56fd15ae3a851f5972107539c20a228de0a77e532d1ca270b245b9ce26bb6d57 WHIRLPOOL 6d55bfafded1ae20bc5bf4d27affa2388ffc2fe4cb606888196e082f6e6f0629bd787ba641f8e416bf894d0752c02e36a4de4ab2d71641f7a91b6e0688133b61
 EBUILD rp-pppoe-3.8-r2.ebuild 2408 SHA256 b6b023abc9ae69b1da9fc71852980bb2557cf1afff3f8292361e3fc9b6b6613c SHA512 73bb7bb86abccfb876c73aa003a83bf971c7deab90da10c9b0104cb11bf9ab5a129cd5d2bb4aff3bcaf0e78690a41bc3a8d4f7f7c3a548c897a37c14c2d33146 WHIRLPOOL 688d3b63bd97db619411856c25d683585a8d137d27b3b36499496414b9f9ddef7466262e14e703b289af6667b14868c92aaf09742785c13cfb4b8c39995e3c84
-MISC ChangeLog 16197 SHA256 da037d86ace68eb9272d75229962d2ec5910c7686b55422f30649f176e7cfdcf SHA512 415a6d928b385f6bf7046f65d0e992cbc6fc4f87939ab02eaecc30a6b9c3780fd41ec8e7da95dae9b9f65e6f53f044ce8b5697d2dff9b27ae7291e7e16678f5c WHIRLPOOL f6fd893dfb839037e851fc4a230cc07d2f38f358e0eee03aa874e6f185fa9110d27d33ca9f42fb11c4c589eff3eea0558802444e9d55e6c778fc61e97e8d9519
+MISC ChangeLog 16337 SHA256 822c0f2dfcf18f7e41f77307ebbdeecdc269cd6099e5bfe73001798a968f4473 SHA512 f7c2d95b40cac903a63762016b45a830407ad919d643146767b25af6d711949c27aaea3a668c24a0529c661305d9b029b54cd40373fd4e95237a7662ebb60a24 WHIRLPOOL 0a27b9c37e7ddd929f3cbf0411d7467c21bfa8580338b123c5e9543f47e80074f1f0e38e44695da456f9070bc476d65e12056089a94ad15a0008cb9213af2248
 MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTCG2cAAoJEPiazRVxLXTFZuYP/RHu/7qsrGCHFdb4D/7Q3z1I
-PLMaqSv8fhkRPifRuxoB7pRPUfQt8H+x2k29mmsHsnmBabrHI/OtI59w9pziFezP
-7oWkqoeLqs7E78qidYawJ5qo4VcbLiXsv9byDahIB2G9T0peuWIsbxFxUq3p8zjq
-cbZCxb6MUXc1qpVfLK6ZkEOkwS/1q8WUBO8nd3t9MPt1vcvORErlEZmYyR9ylOOP
-MIWv3tCte4Twx8crdonv+f+blDINsqJSt1yXn6HfrL78vpG9voqb9UeTgnPMsw6o
-lRUOBYa50ehXWnY57UizLgQAmqunic9TU795TmO9yUYPksBXC5JDRqceyAKAxSP9
-5D5MxED5T98rpttkPG6AWD2YiU5mTRfxwPNMJHeZmwLwuXpB1arMpzQi5sX5FR/m
-T3SXkiKL3zBaFPr1hkfflkq0LapLhVAk1C2QpVMf8RUr4b3/6d65Wn/SgYuXK7OE
-LQB2b9bewjmetrtyMf5CjDnjFT3GK7M2/i4KAIUFGeuDcf1NqXzh7eBPWafENpC7
-lGgOJnQAJVNjf7qJ1mMjUgS/oDuI8OW6WBYSIMRgyvkRuFKqEFzT8TBfRFLqrbx/
-9vj+5QZZ8UPhSW+qMkE9eaCWD+3pB9pfW2H2mmEKvdyitg0wBcwNhZMaNtz7ZqY+
-UtvZBoGtCbt6SKksoEiM
-=2IGm
+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
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild
new file mode 100644
index 000000000000..9dedc7a3ceb4
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/08/12 07:57:32 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+PPP_P="ppp-2.4.7"
+
+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_P}.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_P}
+}
+
+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."
+}
-- 
cgit v1.2.3-65-gdbad