Version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 132 insertions, 2 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index fd51f7f46560..a2296c9dfd00 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.103 2013/05/12 04:00:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.104 2013/12/29 23:02:19 polynomial-c Exp $
+
+*rp-pppoe-3.11 (29 Dec 2013)
+
+  29 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +rp-pppoe-3.11.ebuild,
+  +files/rp-pppoe-3.11-gentoo.patch:
+  Version bump.
 
   12 May 2013; Patrick Lauer <patrick@gentoo.org> rp-pppoe-3.8-r2.ebuild:
   Remove redundant WANT_AUTOMAKE
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 010b91d17195..967e0fea7b63 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rp-pppoe-3.10-autotools.patch 4176 SHA256 3bfa24576369a0223067d45af8671188893fbd84cb80f3f64f7a7f0d7787f77a SHA512 8ed33569d97f1f4716fdabf96b693b8d2148488e5e322867b15201bf483eb23b16b4f4a1cc495ba2e14d0b2568cbbc6324bb0275eafd2392d0e06c8f593b3b1c WHIRLPOOL 9d33591021420bf826887a930f414d9338ba887ed9796b3944b67ddfcb34e69ecf90bb1576ac5a24b6f8bfa08ec306871c6b4f6bb205a818c2cdaa6bc430ae8f
 AUX rp-pppoe-3.10-gentoo-netscripts.patch 5238 SHA256 c9c4997c3db1d0d350d285f371575b12cb15f15dfeac920b2fe573bff85754dc SHA512 b479de56886e30c40cf707ed9edcef5ff3bc08448d8084c7f96b26fc20594ed2a5a61a9706d992fb1ddab5f7d6b4d68ce90b9a1dee606bf9b02843322eaa451f WHIRLPOOL 766283107d9ac2c2f3fbb3c03e28fca60802da4b694d0aa9c11ad4b29a4316d3e9f4ecaa664a4fd2fd2c2812812ec6a32e30291f965c8edf47c1fb184b7d347d
 AUX rp-pppoe-3.10-linux-headers.patch 823 SHA256 39c854283b6a3d4ef382fb8aa1339b6a64be42c0922fa48ecc9b0c19e2a103e6 SHA512 f4cdbeb16af670c3674cf965c3fb43bed1e7716e6ff737b2592a8aa33453adc9dfff0466805bb8c84b6395adaa4c47e2b145cb073c0fb109456c27fd35bf0a96 WHIRLPOOL d6121e14c8b7ff029c9d41977bdcd7e7580381f4710f5b9cf8fc1c17a198580eb7127f13412ab1837a9e60baa674269ff6e947f600e1f079f4ed5601131d5e1a
@@ -5,6 +8,7 @@ AUX rp-pppoe-3.10-plugin-options.patch 1491 SHA256 dc3fe5aa64c1880a701940e563696
 AUX rp-pppoe-3.10-posix-source-sigaction.patch 512 SHA256 18ed348ac04cb5823bfe0b97aef89afaad0cb30ff821b8b78834d4c5cea40962 SHA512 a697a778db1b8cc5f588d13e47560e80026e477e29d6822a63ca768ae744a94586f69f946ed27dcc37b6d674774a4a7075104f0209f5c2c5f9db61c43b6bad2b WHIRLPOOL 3d96d4ae46f443a814c567a1fe13490f153b3c00d1ea55b434f2e5e79a45f7fd424c4e67978a672863e7e94bcc533249eab71714539c08a20596331bae5c0261
 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.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
@@ -14,8 +18,27 @@ 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 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.ebuild 2630 SHA256 3de582df49169feb30e46c742ff9e3d42682711b81db9dcd4623a9d57763e10a SHA512 9b3162168d4e7aa73c1c94342d488b59a25e5439aa1b2da784a18ed66f70a75c52cd0ae72d3174445bd13773fb50f26cf0dcc549ca6dd216612a2dbdb8b5d370 WHIRLPOOL c96aa19efecf61693b219a38bd3cb34ae92037f162fba92e77a7e74e4a696e45fb40c9aa97fd06828d5e2ae35741e054cea2cbe2269dea2e197a34f605c2051c
 EBUILD rp-pppoe-3.8-r2.ebuild 2408 SHA256 b6b023abc9ae69b1da9fc71852980bb2557cf1afff3f8292361e3fc9b6b6613c SHA512 73bb7bb86abccfb876c73aa003a83bf971c7deab90da10c9b0104cb11bf9ab5a129cd5d2bb4aff3bcaf0e78690a41bc3a8d4f7f7c3a548c897a37c14c2d33146 WHIRLPOOL 688d3b63bd97db619411856c25d683585a8d137d27b3b36499496414b9f9ddef7466262e14e703b289af6667b14868c92aaf09742785c13cfb4b8c39995e3c84
-MISC ChangeLog 15861 SHA256 343021f796ba7d1c350d8a3c2d6f0e739d5efda63cc51b584ab5590b07bf1dd2 SHA512 e0d9c53be4e327df3fe350e60cd3202d565e6046b952095505b9dbd010b3e1bce579da3425f956d3b66927096abaedd63d36618d30c5f74f7214aeff51b42c41 WHIRLPOOL 63d9eb2d5abc16b117de42a9fbe094bf0946187f550d8976db5d4a7b705a5ee77aca78d1e2ec088c864d3758a59875cac806311cc95051d81dd4106aa55e8db1
+MISC ChangeLog 16027 SHA256 e3d62ca407ce6b40d7f9bdd6baa7839ac071adee1fc531add95b5f4a80272692 SHA512 42c77fad2f7e715f2cc69a08f3f901a56be5b04be5b878ea80dabca3d23d2681818d3e7ddbf25238470549a5934bcdd6d4b49024f22c3aa6a8fbbd93fbfa817b WHIRLPOOL 45b6197cccf1c4579236f5dc9fcc8d386c54f0aba10105a11a6d4dc1b803fae79adfdabce1558b0b947f00527378dd4cc08f8db538a84c600e0b1432f80e038a
 MISC metadata.xml 163 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 SHA512 275566c067e365604d523694db8e2417e0ccf91227d1204a104912d46841d193d1cb0a39e31663f30bfb92bda09523277b61661093bfb80ca9a9e70b20ea91f0 WHIRLPOOL f02b3040d2c474daa9d38e7d17ee7d138245e06be8c26403efd656d03f54495e344157c23245bc925a0f5319f507d30a68924997ac9880e32593855d0ac0fad7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSwKn8AAoJEPiazRVxLXTF/jsQAJee9fRUZIk3rWrx3uXtgRBC
+XSqUja1v5WCjM7GPBEu53GYofyrFNPR3KkENC3J4HKVKrXomMILBvMdbnGgELN3Y
+2h+maySxdeeS1+QUytfqqt5vxinv8/b8aRGmlxyPOnVJUFVv+6EBBLavBDd5e6Rj
+f/A0tkLiPKpbNrL4Py40AgKLEvWHQVLoQc+pY6zyBoubzeZVjsgeisk4f7TkiVx8
+qkyV9FFfpoSiBqevKNaa2NEoTnug4mUU75Ieq6o6V6YyNB2g1zGtSbqeTioJ+VzI
+Rm1hGvgeRiNzCG4FQclGUgStm9lNEZv6g9ndLdnG5jisZTQeiyKNAsbrs8P2YQDR
+sj0SCLmgMJ4hKMT1ABn+SkmIeMY+qfIeqwHfPnuyHBn+UvESvrkCEWGuEAnXFSdm
+S4b7k3Jzl9h1cmBqc88Q5BoJSMAsy/0CGFmv9JWiUuRxGBEicXVUhZz2QnCSbBuu
+jAluCu1cmzsXdaV0OKLna6TtGwSNV2F4lp+kNOK40e65K5cmSyjibUj9GXZ4Lbh6
+lmNA+AS7ohBg//PLqyNqcHeICJNWONv3iQ1+/mr6rxus61GH7P0T73m5XOoeyybW
+E5e03ryonuH6tOtgS8nhrYt72KwkbEqFlnuMl9XqSiRVeZWYVIV02YyKIrffzgdO
+nb8lHDD2RRRYGv+JvBjx
+=HxKa
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch
new file mode 100644
index 000000000000..9f03a0cf8b1f
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-gentoo.patch
@@ -0,0 +1,11 @@
+--- rp-pppoe-3.11/gui/Makefile.in
++++ rp-pppoe-3.11/gui/Makefile.in
+@@ -37,7 +37,7 @@
+ 	@echo "Type 'make install' as root to install the software."
+ 
+ pppoe-wrapper: wrapper.o
+-	@CC@ -o pppoe-wrapper wrapper.o
++	@CC@ $(CFLAGS) $(LDFLAGS) -o pppoe-wrapper wrapper.o
+ 
+ wrapper.o: wrapper.c
+ 	@CC@ $(CFLAGS) -c -o wrapper.o wrapper.c
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild
new file mode 100644
index 000000000000..f5ae760f3cbf
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/12/29 23:02:19 polynomial-c Exp $
+
+EAPI=5
+
+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_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-2.4.4
+}
+
+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."
+}