Remove obsolete versions.

Package-Manager: portage-2.1.1

13 files changed, 14 insertions, 860 deletions

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 04d70cff9b41..d1c475f0a2ed 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,35 +1,6 @@
-AUX rp-pppoe-3.5-dsa-557.patch 5581 RMD160 282029c6428d276419bf7088ae5ef9562625549f SHA1 9558efe6ffabca44a685cf8fb940d5a22ae880c3 SHA256 13c0324b84d17a41409f0d530cec85f0ae6ed2f72fba9fc2ca732babb4484d8a
-MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
-RMD160 282029c6428d276419bf7088ae5ef9562625549f files/rp-pppoe-3.5-dsa-557.patch 5581
-SHA256 13c0324b84d17a41409f0d530cec85f0ae6ed2f72fba9fc2ca732babb4484d8a files/rp-pppoe-3.5-dsa-557.patch 5581
-AUX rp-pppoe-3.5-gentoo-netscripts.patch 5180 RMD160 5dd98dddb75a3464633f1335b1be8691dca26443 SHA1 a0098beac6988b42ed12e5ce9859b5d6459b0973 SHA256 60ef54dbb18d285faa6104f782fea318d2e42d6385352697bf89b74c23942d1b
-MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
-RMD160 5dd98dddb75a3464633f1335b1be8691dca26443 files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
-SHA256 60ef54dbb18d285faa6104f782fea318d2e42d6385352697bf89b74c23942d1b files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
-AUX rp-pppoe-3.5-on-demand-with-plugin.patch 1058 RMD160 dfa230ac0b7d6d50eb92ff1dd820780254219eef SHA1 1d6ae82a00b004e181971343267b72aeb5b4933c SHA256 f817e9afa1b571f8b2c87ea2598f8eba5e3a3df040951888134550fe306c5a46
-MD5 d6678e5d124fa519195709326558af27 files/rp-pppoe-3.5-on-demand-with-plugin.patch 1058
-RMD160 dfa230ac0b7d6d50eb92ff1dd820780254219eef files/rp-pppoe-3.5-on-demand-with-plugin.patch 1058
-SHA256 f817e9afa1b571f8b2c87ea2598f8eba5e3a3df040951888134550fe306c5a46 files/rp-pppoe-3.5-on-demand-with-plugin.patch 1058
-AUX rp-pppoe-3.5-username-charset.patch 1991 RMD160 4fdad76eccedf01ca83b61da0a60661021d2e1b1 SHA1 ed0a15071d405a12aa5ec053cf91411278c43814 SHA256 2d4103aa289a3215277afe51f90b73e404808b69dcbf3f65c37781bf7cfff058
-MD5 fa756506d5f5af4fbd15dac93d9a1e69 files/rp-pppoe-3.5-username-charset.patch 1991
-RMD160 4fdad76eccedf01ca83b61da0a60661021d2e1b1 files/rp-pppoe-3.5-username-charset.patch 1991
-SHA256 2d4103aa289a3215277afe51f90b73e404808b69dcbf3f65c37781bf7cfff058 files/rp-pppoe-3.5-username-charset.patch 1991
-AUX rp-pppoe-3.7-gentoo-netscripts.patch 5218 RMD160 65f79efbf018d2deb98345041d4c7fdf39df5fba SHA1 7e3f4593b24af6b89e09f9810e2c8f2735173de4 SHA256 22e1dc000286a3d22c42163c85b49bbf7e9fb154aaf4becabb7b42dd777403c3
-MD5 1136fc6ab8a39846868abeecc59addfc files/rp-pppoe-3.7-gentoo-netscripts.patch 5218
-RMD160 65f79efbf018d2deb98345041d4c7fdf39df5fba files/rp-pppoe-3.7-gentoo-netscripts.patch 5218
-SHA256 22e1dc000286a3d22c42163c85b49bbf7e9fb154aaf4becabb7b42dd777403c3 files/rp-pppoe-3.7-gentoo-netscripts.patch 5218
-AUX rp-pppoe-3.7-on-demand-with-plugin.patch 1062 RMD160 18f124f6c794e7c93c6b0da13658aaf41df9d5ab SHA1 79d05febb6c8e4a54d75f01ba2a2b1fa938e2faa SHA256 58e0802f67e190a30ffaf2e791a0a2b4dfa68151b105b3c8e852ea80d2973b63
-MD5 10c9907b8295cb2bde533dc839be54dd files/rp-pppoe-3.7-on-demand-with-plugin.patch 1062
-RMD160 18f124f6c794e7c93c6b0da13658aaf41df9d5ab files/rp-pppoe-3.7-on-demand-with-plugin.patch 1062
-SHA256 58e0802f67e190a30ffaf2e791a0a2b4dfa68151b105b3c8e852ea80d2973b63 files/rp-pppoe-3.7-on-demand-with-plugin.patch 1062
-AUX rp-pppoe-3.7-plugin-options.patch 554 RMD160 a8dc4289950889713c93a3999124f78c1a343bc9 SHA1 cad5f83a3c0ef3567b25cf52306a61cc903a928e SHA256 43af25e72723d569a7b9f6684aa1f62816af538d7aec2797bcb36d73add1d37c
-MD5 d33f0962a5a8171533812f5701181421 files/rp-pppoe-3.7-plugin-options.patch 554
-RMD160 a8dc4289950889713c93a3999124f78c1a343bc9 files/rp-pppoe-3.7-plugin-options.patch 554
-SHA256 43af25e72723d569a7b9f6684aa1f62816af538d7aec2797bcb36d73add1d37c files/rp-pppoe-3.7-plugin-options.patch 554
-AUX rp-pppoe-3.7-username-charset.patch 1946 RMD160 347798d851b13f1e01f12805cb7f996d8c7c7310 SHA1 e2ccc9e44af650cc07e13b4d74f6ccb87dda4114 SHA256 641bffa798cdf97942e8f9794b87ed3c53d67994533670a501c0a8dd14a9b7e1
-MD5 161308d48042efd0ade491fd5429e4bc files/rp-pppoe-3.7-username-charset.patch 1946
-RMD160 347798d851b13f1e01f12805cb7f996d8c7c7310 files/rp-pppoe-3.7-username-charset.patch 1946
-SHA256 641bffa798cdf97942e8f9794b87ed3c53d67994533670a501c0a8dd14a9b7e1 files/rp-pppoe-3.7-username-charset.patch 1946
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rp-pppoe-3.8-gentoo-netscripts.patch 5218 RMD160 9ba899b3282ce0bae119e35c5d610c697f11565a SHA1 b04de3b2417b4f0bfba1cea22d27bbb0456d7bce SHA256 4b1018f1f9d1ed7fb8ef6f63fced3850128536954c82273c10ab660b2daf849c
 MD5 338e60715ff505051dc5b3549936124f files/rp-pppoe-3.8-gentoo-netscripts.patch 5218
 RMD160 9ba899b3282ce0bae119e35c5d610c697f11565a files/rp-pppoe-3.8-gentoo-netscripts.patch 5218
@@ -43,35 +14,26 @@ MD5 1d75436eae3217598ce13b690f101978 files/rp-pppoe-3.8-username-charset.patch 1
 RMD160 9aa18182f5a611f54041162976b4f33740439443 files/rp-pppoe-3.8-username-charset.patch 1946
 SHA256 21209268903d2c359e5eb4547ab6417f0c63d41791fe413728d690ed879c93bd files/rp-pppoe-3.8-username-charset.patch 1946
 DIST ppp-2.4.3.tar.gz 688092 RMD160 845821496bacb07d93bb7572a171854853ef722b SHA1 5e2789f4dedc81943fa9f94c840cccc2407056f7 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
-DIST rp-pppoe-3.5.tar.gz 189321
-DIST rp-pppoe-3.7.tar.gz 212326 RMD160 c4700c4871b85d38010d362fab5483329828ccdd SHA1 dc62480b11b48694ac32b851121a67d5082650f0 SHA256 6647e36d5164268ee469c771ee24f3f5fc84112396510d1f79be994b2d125de7
 DIST rp-pppoe-3.8.tar.gz 212931 RMD160 039798154acae9e7a066172f23904d766ba68a9a SHA1 d9a4346701e580b4a6049a940557b38533f9e8f7 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479
-EBUILD rp-pppoe-3.5-r11.ebuild 2404 RMD160 778fbfc594e0d96f5e60016161abdd0188a4f9c4 SHA1 4c80efef7827ae0161edf8ae194b99aac1dfda97 SHA256 6b8a34f44463f4501fd1f7c3ff26516ab012960b100e1982034bfd6e32e6e070
-MD5 d728978d28ed0d7042bac5857e5f62ff rp-pppoe-3.5-r11.ebuild 2404
-RMD160 778fbfc594e0d96f5e60016161abdd0188a4f9c4 rp-pppoe-3.5-r11.ebuild 2404
-SHA256 6b8a34f44463f4501fd1f7c3ff26516ab012960b100e1982034bfd6e32e6e070 rp-pppoe-3.5-r11.ebuild 2404
-EBUILD rp-pppoe-3.7.ebuild 3087 RMD160 086a80a6c07a7dcc25a69a89a5c68b4caba030bc SHA1 952a6e4ceee843324bf251199dddfc3f074f4eea SHA256 b0de30dbafb4684ae4e65bb1f51a0bc5c7ff8bd82b516b5c560e62140bb03e11
-MD5 8bdaf7efabc8d32ad8e4c0b0684904b2 rp-pppoe-3.7.ebuild 3087
-RMD160 086a80a6c07a7dcc25a69a89a5c68b4caba030bc rp-pppoe-3.7.ebuild 3087
-SHA256 b0de30dbafb4684ae4e65bb1f51a0bc5c7ff8bd82b516b5c560e62140bb03e11 rp-pppoe-3.7.ebuild 3087
 EBUILD rp-pppoe-3.8.ebuild 2934 RMD160 6bcc2468b2f2f7a9cf276e1d5ca6f53c867c7b80 SHA1 89f79088ab13d3af4356c03ce30cd3152de3cd71 SHA256 868945eddc40ce2793e9fc065c8df09f00833d0fd8ede3a404e5e6f5a2c2caa7
 MD5 c35e5eed7db7f061a592b2e8078e7ae9 rp-pppoe-3.8.ebuild 2934
 RMD160 6bcc2468b2f2f7a9cf276e1d5ca6f53c867c7b80 rp-pppoe-3.8.ebuild 2934
 SHA256 868945eddc40ce2793e9fc065c8df09f00833d0fd8ede3a404e5e6f5a2c2caa7 rp-pppoe-3.8.ebuild 2934
-MISC ChangeLog 11869 RMD160 35721fcb874ee37484ef97e5c07def25a71cd75f SHA1 568cd348ce90ba2893dc8aa2306aaf1c9ddf6e2c SHA256 af740366837a2daf150455ca29c50a2b37c84efbb83c5b9c2106264522df10c3
-MD5 2807d403498be5d02078a504e3f929f4 ChangeLog 11869
-RMD160 35721fcb874ee37484ef97e5c07def25a71cd75f ChangeLog 11869
-SHA256 af740366837a2daf150455ca29c50a2b37c84efbb83c5b9c2106264522df10c3 ChangeLog 11869
+MISC ChangeLog 12365 RMD160 b1888fa4e21128c9aa84c89c2a4385a3b0821f56 SHA1 b6b9be546edc9990fb5172f4d08ce29292f3d580 SHA256 170698c6d39d2321a9c97712c5f8967992d5fb98321d339ecd96134bbb100d4b
+MD5 1026daca8b5ae96142649c2677e2de4b ChangeLog 12365
+RMD160 b1888fa4e21128c9aa84c89c2a4385a3b0821f56 ChangeLog 12365
+SHA256 170698c6d39d2321a9c97712c5f8967992d5fb98321d339ecd96134bbb100d4b ChangeLog 12365
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 c82407d680d0e14d384f30bf412eddc2 files/digest-rp-pppoe-3.5-r11 293
-RMD160 3747d518b53df1234dba3df0efa8abb49abe437f files/digest-rp-pppoe-3.5-r11 293
-SHA256 1180e73f30d516f3cdc1f7c0ae5888635c553eb749a55a4b0ea2199b71be1f6a files/digest-rp-pppoe-3.5-r11 293
-MD5 0f199889bf87a81f63b3f99cd7954d21 files/digest-rp-pppoe-3.7 467
-RMD160 d90ed138a08ca1c99f0c00853bfc98970ab2708c files/digest-rp-pppoe-3.7 467
-SHA256 07d7a65c3bcaff1e95d3bdbccbebb0a8a24a7fee61353f0c694e4b65190a9ab8 files/digest-rp-pppoe-3.7 467
 MD5 c345665140f7ae9908f3256aee68a72f files/digest-rp-pppoe-3.8 467
 RMD160 7b4162f713393d8f869d7436d009f2ebe2d5c38a files/digest-rp-pppoe-3.8 467
 SHA256 9f689e517bfc64f62e853de28c0b87a95e877d2ecf076ec4d556663820303ebe files/digest-rp-pppoe-3.8 467
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFBbd3sf9c6kjmR8RAmUTAJ9iLHYk4GWfA56zwRpy46wuqljsCgCcDnhq
+qSAYcEneLWMmZeAsSpdDJxE=
+=pYIQ
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11
deleted file mode 100644
index aabdde764fd6..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-RMD160 845821496bacb07d93bb7572a171854853ef722b ppp-2.4.3.tar.gz 688092
-SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 ppp-2.4.3.tar.gz 688092
-MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.7 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.7
deleted file mode 100644
index 7c46635e1369..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-RMD160 845821496bacb07d93bb7572a171854853ef722b ppp-2.4.3.tar.gz 688092
-SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 ppp-2.4.3.tar.gz 688092
-MD5 32c34455ccdfd9610304479e1beac3ff rp-pppoe-3.7.tar.gz 212326
-RMD160 c4700c4871b85d38010d362fab5483329828ccdd rp-pppoe-3.7.tar.gz 212326
-SHA256 6647e36d5164268ee469c771ee24f3f5fc84112396510d1f79be994b2d125de7 rp-pppoe-3.7.tar.gz 212326
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-dsa-557.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-dsa-557.patch
deleted file mode 100644
index 9dcc0ed35438..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-dsa-557.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Nru rp-pppoe-3.5.orig/man/pppoe-relay.8 rp-pppoe-3.5/man/pppoe-relay.8
---- rp-pppoe-3.5.orig/man/pppoe-relay.8	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/man/pppoe-relay.8	2004-10-05 19:06:26.000000000 +0300
-@@ -120,6 +120,5 @@
- The \fBpppoe\fR home page is \fIhttp://www.roaringpenguin.com/pppoe/\fR.
- 
- .SH SEE ALSO
--adsl-start(8), adsl-stop(8), adsl-connect(8), pppd(8), pppoe.conf(5),
--pppoe(8), adsl-setup(8), adsl-status(8), pppoe-sniff(8), pppoe-server(8)
-+pppd(8), pppoe(8), pppoe-sniff(8), pppoe-relay(8), /usr/share/doc/pppoe/README.Debian
- 
-diff -Nru rp-pppoe-3.5.orig/man/pppoe-server.8 rp-pppoe-3.5/man/pppoe-server.8
---- rp-pppoe-3.5.orig/man/pppoe-server.8	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/man/pppoe-server.8	2004-10-05 19:06:26.000000000 +0300
-@@ -168,6 +168,5 @@
- The \fBpppoe\fR home page is \fIhttp://www.roaringpenguin.com/pppoe/\fR.
- 
- .SH SEE ALSO
--adsl-start(8), adsl-stop(8), adsl-connect(8), pppd(8), pppoe.conf(5),
--pppoe(8), adsl-setup(8), adsl-status(8), pppoe-sniff(8), pppoe-relay(8)
-+pppd(8), pppoe(8), pppoe-sniff(8), pppoe-relay(8), /usr/share/doc/pppoe/README.Debian
- 
-diff -Nru rp-pppoe-3.5.orig/man/pppoe-sniff.8 rp-pppoe-3.5/man/pppoe-sniff.8
---- rp-pppoe-3.5.orig/man/pppoe-sniff.8	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/man/pppoe-sniff.8	2004-10-05 19:06:26.000000000 +0300
-@@ -73,6 +73,5 @@
- The \fBpppoe\fR home page is \fIhttp://www.roaringpenguin.com/pppoe/\fR.
- 
- .SH SEE ALSO
--adsl-start(8), adsl-stop(8), adsl-connect(8), pppd(8), pppoe.conf(5),
--pppoe(8), adsl-setup(8), adsl-status(8), pppoe-server(8), pppoe-relay(8)
-+pppd(8), pppoe(8), pppoe-sniff(8), pppoe-relay(8), /usr/share/doc/pppoe/README.Debian
- 
-diff -Nru rp-pppoe-3.5.orig/man/pppoe.8 rp-pppoe-3.5/man/pppoe.8
---- rp-pppoe-3.5.orig/man/pppoe.8	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/man/pppoe.8	2004-10-05 19:06:26.000000000 +0300
-@@ -233,5 +233,4 @@
- The \fBpppoe\fR home page is \fIhttp://www.roaringpenguin.com/pppoe/\fR.
- 
- .SH SEE ALSO
--adsl-start(8), adsl-stop(8), adsl-connect(8), pppd(8), pppoe.conf(5), adsl-setup(8), adsl-status(8), pppoe-sniff(8), pppoe-server(8), pppoe-relay(8)
--
-+pppd(8), pppoe-sniff(8), pppoe-server(8), pppoe-relay(8), /usr/share/doc/pppoe/README.Debian
-diff -Nru rp-pppoe-3.5.orig/src/Makefile.in rp-pppoe-3.5/src/Makefile.in
---- rp-pppoe-3.5.orig/src/Makefile.in	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/src/Makefile.in	2004-10-05 19:06:26.000000000 +0300
-@@ -79,7 +79,7 @@
- 	@CC@ -o pppoe-relay relay.o if.o debug.o common.o
- 
- pppoe.o: pppoe.c pppoe.h
--	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c
-+	@CC@ $(CFLAGS) -DAUTO_IFUP '-DVERSION="$(VERSION)"' -c -o pppoe.o pppoe.c
- 
- discovery.o: discovery.c pppoe.h
- 	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o discovery.c
-diff -Nru rp-pppoe-3.5.orig/src/pppoe.c rp-pppoe-3.5/src/pppoe.c
---- rp-pppoe-3.5.orig/src/pppoe.c	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/src/pppoe.c	2004-10-05 19:08:49.000000000 +0300
-@@ -67,6 +67,48 @@
- 				   USED FOR STRESS-TESTING ONLY.  DO NOT
- 				   USE THE -F OPTION AGAINST A REAL ISP */
- 
-+#ifdef AUTO_IFUP
-+/* for interface activation, based on stripped down source source of ifconfig*/
-+#include <linux/if.h>
-+/*#include <sys/socket.h> */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include "config.h"
-+int skfd = -1;			/* generic raw socket desc.     */
-+int sockets_open(int family)
-+{
-+  int sfd = -1;
-+  sfd = socket(AF_INET, SOCK_DGRAM, 0);
-+  return sfd;
-+}
-+/* Like strncpy but make sure the resulting string is always 0 terminated.
-+ * Ripped from util.c (net-tools package) */  
-+char *safe_strncpy(char *dst, const char *src, size_t size)
-+{   
-+    dst[size-1] = '\0';
-+    return strncpy(dst,src,size-1);   
-+}
-+/* Set a certain interface flag. Ripped from ifconfig.c */
-+static int set_flag(char *ifname, short flag)
-+{
-+    struct ifreq ifr;
-+
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
-+	fprintf(stderr, "%s: unknown interface: %s\n", 
-+		ifname,	strerror(errno));
-+	return (-1);
-+    }
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    ifr.ifr_flags |= flag;
-+    if (ioctl(skfd, SIOCSIFFLAGS, &ifr) < 0) {
-+	perror("SIOCSIFFLAGS");
-+	return -1;
-+    }
-+    return (0);
-+}
-+#endif
-+
- PPPoEConnection *Connection = NULL; /* Must be global -- used
- 				       in signal handler */
- /***********************************************************************
-@@ -474,11 +516,13 @@
- 	    break;
- 
- 	case 'p':
-+	  if (getuid() == 0) {
- 	    pidfile = fopen(optarg, "w");
- 	    if (pidfile) {
- 		fprintf(pidfile, "%lu\n", (unsigned long) getpid());
- 		fclose(pidfile);
- 	    }
-+	  }
- 	    break;
- 	case 'S':
- 	    SET_STRING(conn.serviceName, optarg);
-@@ -493,6 +537,7 @@
- 	    conn.useHostUniq = 1;
- 	    break;
- 	case 'D':
-+	  if (getuid() == 0) {
- 	    conn.debugFile = fopen(optarg, "w");
- 	    if (!conn.debugFile) {
- 		fprintf(stderr, "Could not open %s: %s\n",
-@@ -501,6 +546,7 @@
- 	    }
- 	    fprintf(conn.debugFile, "rp-pppoe-%s\n", VERSION);
- 	    fflush(conn.debugFile);
-+	  }
- 	    break;
- 	case 'T':
- 	    optInactivityTimeout = (int) strtol(optarg, NULL, 10);
-@@ -546,6 +592,16 @@
- #endif
-     }
- 
-+#ifdef AUTO_IFUP    
-+    /* Create a channel to the NET kernel. */
-+    if ((skfd = sockets_open(0)) < 0) {
-+	perror("socket");
-+	exit(1);
-+    }
-+
-+    set_flag(conn.ifName, (IFF_UP | IFF_RUNNING));
-+#endif
-+
-     /* Set signal handlers: send PADT on HUP; ignore TERM and INT */
-     if (!conn.printACNames) {
- 	signal(SIGTERM, SIG_IGN);
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch
deleted file mode 100644
index f2d537d053e4..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur rp-pppoe-3.5/configs/pppoe.conf rp-pppoe-3.5.patched/configs/pppoe.conf
---- rp-pppoe-3.5/configs/pppoe.conf	2002-07-08 16:38:24.000000000 +0200
-+++ rp-pppoe-3.5.patched/configs/pppoe.conf	2004-10-31 20:59:11.716686192 +0100
-@@ -21,6 +21,9 @@
- # When you configure a variable, DO NOT leave spaces around the "=" sign.
- 
- # Ethernet card connected to ADSL modem
-+#
-+# NB: Gentoo overrides ETH when adsl-start is called from the
-+# networking scripts.  This setting has no effect in that case.
- ETH=eth1
- 
- # ADSL user name.  You may have to supply "@provider.com"  Sympatico
-@@ -86,8 +89,10 @@
- #   $PIDFILE       contains PID of adsl-connect script
- #   $PIDFILE.pppoe contains PID of pppoe process
- #   $PIDFILE.pppd  contains PID of pppd process
--CF_BASE=`basename $CONFIG`
--PIDFILE="/var/run/$CF_BASE-adsl.pid"
-+#
-+# NB: Gentoo overrides PIDFILE when adsl-start is run from the
-+# networking scripts.  This setting has no effect in that case.
-+PIDFILE="/var/run/adsl.pid"
- 
- # Do you want to use synchronous PPP?  "yes" or "no".  "yes" is much
- # easier on CPU usage, but may not work for you.  It is safer to use
-diff -Naur rp-pppoe-3.5/scripts/adsl-connect.in rp-pppoe-3.5.patched/scripts/adsl-connect.in
---- rp-pppoe-3.5/scripts/adsl-connect.in	2002-07-08 16:38:24.000000000 +0200
-+++ rp-pppoe-3.5.patched/scripts/adsl-connect.in	2004-10-31 17:57:26.934465072 +0100
-@@ -62,12 +62,18 @@
-     ;;
- esac
- 
--if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if test ! -r "$CONFIG" ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Naur rp-pppoe-3.5/scripts/adsl-start.in rp-pppoe-3.5.patched/scripts/adsl-start.in
---- rp-pppoe-3.5/scripts/adsl-start.in	2002-07-08 16:38:24.000000000 +0200
-+++ rp-pppoe-3.5.patched/scripts/adsl-start.in	2004-10-31 17:56:18.546861568 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # @configure_input@
- #***********************************************************************
- #
-@@ -113,12 +113,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- # Check for command-line overriding of ETH and USER
- case "$#" in
-@@ -145,11 +150,11 @@
- 
- # Start the connection in the background unless we're debugging
- if [ "$DEBUG" != "" ] ; then
--    $CONNECT "$@"
-+    $CONNECT <(echo "$CONFREAD")
-     exit 0
- fi
- 
--$CONNECT "$@" > /dev/null 2>&1 &
-+$CONNECT <(echo "$CONFREAD") >/dev/null 2>&1 &
- CONNECT_PID=$!
- 
- if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then
-@@ -164,7 +169,7 @@
- # Monitor connection
- TIME=0
- while [ true ] ; do
--    @sbindir@/adsl-status $CONFIG > /dev/null 2>&1
-+    @sbindir@/adsl-status <(echo "$CONFREAD") >/dev/null 2>&1
- 
-     # Looks like the interface came up
-     if [ $? = 0 ] ; then
-diff -Naur rp-pppoe-3.5/scripts/adsl-status rp-pppoe-3.5.patched/scripts/adsl-status
---- rp-pppoe-3.5/scripts/adsl-status	2002-07-08 16:38:24.000000000 +0200
-+++ rp-pppoe-3.5.patched/scripts/adsl-status	2004-10-31 17:59:41.785964528 +0100
-@@ -28,12 +28,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Naur rp-pppoe-3.5/scripts/adsl-stop.in rp-pppoe-3.5.patched/scripts/adsl-stop.in
---- rp-pppoe-3.5/scripts/adsl-stop.in	2002-07-08 16:38:24.000000000 +0200
-+++ rp-pppoe-3.5.patched/scripts/adsl-stop.in	2004-10-31 18:00:07.958985624 +0100
-@@ -31,12 +31,17 @@
-     CONFIG=/etc/ppp/pppoe.conf
- fi
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch
deleted file mode 100644
index 886257b901cf..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru rp-pppoe-3.5.orig/configs/pppoe.conf rp-pppoe-3.5/configs/pppoe.conf
---- rp-pppoe-3.5.orig/configs/pppoe.conf	2005-05-06 00:30:17.000000000 +0300
-+++ rp-pppoe-3.5/configs/pppoe.conf	2005-05-06 00:32:32.181250632 +0300
-@@ -120,7 +120,7 @@
- FIREWALL=NONE
- 
- # Linux kernel-mode plugin for pppd.  If you want to try the kernel-mode
--# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
-+# plugin, use LINUX_PLUGIN=rp-pppoe.so
- LINUX_PLUGIN=
- 
- # Any extra arguments to pass to pppoe.  Normally, use a blank string
-diff -Nru rp-pppoe-3.5.orig/scripts/adsl-connect.in rp-pppoe-3.5/scripts/adsl-connect.in
---- rp-pppoe-3.5.orig/scripts/adsl-connect.in	2005-05-06 00:22:37.000000000 +0300
-+++ rp-pppoe-3.5/scripts/adsl-connect.in	2005-05-06 00:23:27.110114040 +0300
-@@ -301,7 +301,7 @@
- 	$SETSID $OVERRIDE_PPPD_COMMAND &
- 	echo "$!" > $PPPD_PIDFILE
-     elif test "$LINUX_PLUGIN" != "" ; then
--	$SETSID $PPPD $PPP_STD_OPTIONS $DEMAND &
-+	$SETSID $PPPD $DEMAND $PPP_STD_OPTIONS &
- 	echo "$!" > $PPPD_PIDFILE
-     else
- 	$SETSID $PPPD pty "$PPPOE_CMD" \
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch
deleted file mode 100644
index 6cf7c5e12a6d..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nru rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-setup.in
---- rp-pppoe-3.5.orig/scripts/adsl-setup.in	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/scripts/adsl-setup.in	2005-04-25 17:06:59.000000000 +0300
-@@ -86,12 +86,14 @@
-     $ECHO "USER NAME"
-     $ECHO ""
-     $ECHO -n ">>> Enter your PPPoE user name (default $USER): "
--    read U
--
--    if [ "$U" = "" ] ; then
--	U="$USER"
-+    read Uu
-+ 
-+    if [ "$Uu" = "" ] ; then
-+	Uu="$USER"
-     fi
- 
-+    U=`echo $Uu | sed -e "s/&/\\\\\&/g"` ;
-+    
-     # Under Linux, "fix" the default interface if eth1 is not available
-     if test `uname -s` = "Linux" ; then
- 	$IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0
-@@ -221,7 +223,7 @@
-     $ECHO "** Summary of what you entered **"
-     $ECHO ""
-     $ECHO "Ethernet Interface: $E"
--    $ECHO "User name:          $U"
-+    $ECHO "User name:          $Uu"
-     if [ "$D" = "no" ] ; then
- 	$ECHO "Activate-on-demand: No"
-     else
-@@ -288,7 +290,12 @@
- fi
- 
- # Some #$(*& ISP's use a slash in the user name...
--sed -e "s&^USER=.*&USER='$U'&" \
-+for SEP in ':' ';' '/' '!' '|' '_' '-' '@' ; do 
-+	if [ "$U" = `echo $U | sed "sI${SEP}II"` ]; then 
-+		break;
-+	fi
-+done
-+sed -e "s${SEP}^USER=.*${SEP}USER='$U'${SEP}"\
-     -e "s&^ETH=.*&ETH='$E'&" \
-     -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-adsl.pid\"&" \
-     -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
-@@ -337,10 +344,10 @@
-     cp /dev/null /etc/ppp/chap-secrets-bak
- fi
- 
--egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
--egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
- 
- $ECHO ""
- $ECHO ""
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.7-gentoo-netscripts.patch
deleted file mode 100644
index d64e21edbed8..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-gentoo-netscripts.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Nur rp-pppoe-3.7.orig/configs/pppoe.conf rp-pppoe-3.7/configs/pppoe.conf
---- rp-pppoe-3.7.orig/configs/pppoe.conf	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/configs/pppoe.conf	2006-02-06 23:20:57.667106750 +0200
-@@ -21,6 +21,9 @@
- # When you configure a variable, DO NOT leave spaces around the "=" sign.
- 
- # Ethernet card connected to DSL modem
-+#
-+# NB: Gentoo overrides ETH when pppoe-start is called from the
-+# networking scripts.  This setting has no effect in that case.
- ETH=eth1
- 
- # PPPoE user name.  You may have to supply "@provider.com"  Sympatico
-@@ -86,8 +89,10 @@
- #   $PIDFILE       contains PID of pppoe-connect script
- #   $PIDFILE.pppoe contains PID of pppoe process
- #   $PIDFILE.pppd  contains PID of pppd process
--CF_BASE=`basename $CONFIG`
--PIDFILE="/var/run/$CF_BASE-pppoe.pid"
-+#
-+# NB: Gentoo overrides PIDFILE when pppoe-start is run from the
-+# networking scripts.  This setting has no effect in that case.
-+PIDFILE="/var/run/rp-pppoe.pid"
- 
- # Do you want to use synchronous PPP?  "yes" or "no".  "yes" is much
- # easier on CPU usage, but may not work for you.  It is safer to use
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-connect.in rp-pppoe-3.7/scripts/pppoe-connect.in
---- rp-pppoe-3.7.orig/scripts/pppoe-connect.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-connect.in	2006-02-06 23:20:57.667106750 +0200
-@@ -62,12 +62,17 @@
-     ;;
- esac
- 
--if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then
-+# In Gentoo, CONFIG is a named pipe when pppoe is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if test ! -r "$CONFIG" ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-start.in rp-pppoe-3.7/scripts/pppoe-start.in
---- rp-pppoe-3.7.orig/scripts/pppoe-start.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-start.in	2006-02-06 23:20:57.667106750 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # @configure_input@
- #***********************************************************************
- #
-@@ -113,12 +113,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when pppoe is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- # Check for command-line overriding of ETH and USER
- case "$#" in
-@@ -145,11 +150,11 @@
- 
- # Start the connection in the background unless we're debugging
- if [ "$DEBUG" != "" ] ; then
--    $CONNECT "$@"
-+    $CONNECT <(echo "$CONFREAD")
-     exit 0
- fi
- 
--$CONNECT "$@" > /dev/null 2>&1 &
-+$CONNECT <(echo "$CONFREAD") >/dev/null 2>&1 &
- CONNECT_PID=$!
- 
- if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then
-@@ -164,7 +169,7 @@
- # Monitor connection
- TIME=0
- while [ true ] ; do
--    @sbindir@/pppoe-status $CONFIG > /dev/null 2>&1
-+    @sbindir@/pppoe-status <(echo "$CONFREAD") >/dev/null 2>&1
- 
-     # Looks like the interface came up
-     if [ $? = 0 ] ; then
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-status rp-pppoe-3.7/scripts/pppoe-status
---- rp-pppoe-3.7.orig/scripts/pppoe-status	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-status	2006-02-06 23:20:57.667106750 +0200
-@@ -28,12 +28,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when pppoe is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-stop.in rp-pppoe-3.7/scripts/pppoe-stop.in
---- rp-pppoe-3.7.orig/scripts/pppoe-stop.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-stop.in	2006-02-06 23:20:57.671107000 +0200
-@@ -31,12 +31,17 @@
-     CONFIG=/etc/ppp/pppoe.conf
- fi
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when pppoe is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-on-demand-with-plugin.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.7-on-demand-with-plugin.patch
deleted file mode 100644
index 648ab0226243..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-on-demand-with-plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur rp-pppoe-3.7.orig/configs/pppoe.conf rp-pppoe-3.7/configs/pppoe.conf
---- rp-pppoe-3.7.orig/configs/pppoe.conf	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/configs/pppoe.conf	2006-02-06 23:26:51.809239250 +0200
-@@ -115,7 +115,7 @@
- FIREWALL=NONE
- 
- # Linux kernel-mode plugin for pppd.  If you want to try the kernel-mode
--# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
-+# plugin, use LINUX_PLUGIN=rp-pppoe.so
- LINUX_PLUGIN=
- 
- # Any extra arguments to pass to pppoe.  Normally, use a blank string
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-connect.in rp-pppoe-3.7/scripts/pppoe-connect.in
---- rp-pppoe-3.7.orig/scripts/pppoe-connect.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-connect.in	2006-02-06 23:26:51.809239250 +0200
-@@ -295,7 +295,7 @@
- 	$SETSID $OVERRIDE_PPPD_COMMAND &
- 	echo "$!" > $PPPD_PIDFILE
-     elif test "$LINUX_PLUGIN" != "" ; then
--	$SETSID $PPPD $PPP_STD_OPTIONS $DEMAND &
-+	$SETSID $PPPD $DEMAND $PPP_STD_OPTIONS &
- 	echo "$!" > $PPPD_PIDFILE
-     else
- 	$SETSID $PPPD pty "$PPPOE_CMD" \
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-plugin-options.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.7-plugin-options.patch
deleted file mode 100644
index 5f5fc4d38874..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-plugin-options.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-connect.in rp-pppoe-3.7/scripts/pppoe-connect.in
---- rp-pppoe-3.7.orig/scripts/pppoe-connect.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-connect.in	2006-02-06 23:31:53.608100500 +0200
-@@ -197,7 +197,7 @@
- 
- # If we're using kernel-mode PPPoE on Linux...
- if test "$LINUX_PLUGIN" != "" ; then
--    PLUGIN_OPTS="plugin $LINUX_PLUGIN nic-$ETH"
-+    PLUGIN_OPTS="plugin $LINUX_PLUGIN"
-     if test -n "$SERVICENAME" ; then
- 	PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME"
-     fi
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.7-username-charset.patch
deleted file mode 100644
index 0681e03378c7..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.7-username-charset.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur rp-pppoe-3.7.orig/scripts/pppoe-setup.in rp-pppoe-3.7/scripts/pppoe-setup.in
---- rp-pppoe-3.7.orig/scripts/pppoe-setup.in	2005-11-17 04:14:32.000000000 +0200
-+++ rp-pppoe-3.7/scripts/pppoe-setup.in	2006-02-06 23:22:59.150699000 +0200
-@@ -86,11 +86,13 @@
-     $ECHO "USER NAME"
-     $ECHO ""
-     printf "%s" ">>> Enter your PPPoE user name (default $USER): "
--    read U
-+    read Uu
- 
--    if [ "$U" = "" ] ; then
--	U="$USER"
-+    if [ "$Uu" = "" ] ; then
-+	Uu="$USER"
-     fi
-+  
-+    U=`echo $Uu | sed -e "s/&/\\\\\&/g"`
- 
-     # Under Linux, "fix" the default interface if eth1 is not available
-     if test `uname -s` = "Linux" ; then
-@@ -221,7 +223,7 @@
-     $ECHO "** Summary of what you entered **"
-     $ECHO ""
-     $ECHO "Ethernet Interface: $E"
--    $ECHO "User name:          $U"
-+    $ECHO "User name:          $Uu"
-     if [ "$D" = "no" ] ; then
- 	$ECHO "Activate-on-demand: No"
-     else
-@@ -288,7 +290,12 @@
- fi
- 
- # Some #$(*& ISP's use a slash in the user name...
--sed -e "s&^USER=.*&USER='$U'&" \
-+for SEP in ':' ';' '/' '!' '|' '_' '-' '@' ; do 
-+	if [ "$U" = `echo $U | sed "sI${SEP}II"` ]; then 
-+		break;
-+	fi
-+done
-+sed -e "s${SEP}^USER=.*${SEP}USER='$U'${SEP}"\
-     -e "s&^ETH=.*&ETH='$E'&" \
-     -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-pppoe.pid\"&" \
-     -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
-@@ -337,10 +344,10 @@
-     cp /dev/null /etc/ppp/chap-secrets-bak
- fi
- 
--egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
--egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
- 
- $ECHO ""
- $ECHO ""
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
deleted file mode 100644
index 2075221dd4cf..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 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-r11.ebuild,v 1.5 2006/01/06 09:56:38 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 ~ppc64"
-IUSE="X"
-
-DEPEND="net-dialup/ppp
-	X? ( 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}/${P}-gentoo-netscripts.patch
-
-	epatch ${FILESDIR}/${P}-dsa-557.patch #66296
-	epatch ${FILESDIR}/${P}-username-charset.patch #82410
-	epatch ${FILESDIR}/${P}-on-demand-with-plugin.patch #85535 and #89609
-
-	#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; 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"
-
-	#Don't use compiled rp-pppoe plugin; use it from the current version of pppd
-	rm ${D}/etc/ppp/plugins/rp-pppoe.so
-	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
-
-	prepalldocs
-
-	if use X; 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
-}
-
-pkg_postinst() {
-	einfo "Use adsl-setup to configure your dialup connection"
-}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild
deleted file mode 100644
index bf959400752c..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 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.7.ebuild,v 1.10 2006/05/26 21:46:24 kugelfang Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="http://www.roaringpenguin.com/pppoe/"
-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 ppc64 sh sparc x86"
-IUSE="X"
-
-DEPEND="net-dialup/ppp
-	X? ( dev-lang/tk )"
-
-pkg_setup() {
-	einfo "Gentoo is moving toward common configuration file for all network interfaces."
-	einfo "Please use baselayout adsl module for configuring your network using rp-pppoe"
-	einfo "or, better yet, use generic PPP support available in baselayout-1.12."
-
-	if [[ -x "${ROOT}/etc/init.d/rp-pppoe" ]]; then
-		echo
-		eerror "The old /etc/init.d/rp-pppoe script is incompatible with ${CATEGORY}/${P} and"
-		eerror "it should be removed before you could upgrade this package."
-		die "Unsupported old init script detected"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} || die "failed to unpack"
-
-	# 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}/${P}-gentoo-netscripts.patch"
-
-	epatch "${FILESDIR}/${P}-username-charset.patch" #82410
-	epatch "${FILESDIR}/${P}-on-demand-with-plugin.patch" #85535 and #89609
-	epatch "${FILESDIR}/${P}-plugin-options.patch" #remove invalid plugin option
-
-	#Avoid "setXid, dynamically linked and using lazy bindings" QA notice
-	sed -i -e 's:\(@CC@\) \(-o pppoe-wrapper wrapper.o\):\1 '$(bindnow-flags)' \2:' "${S}/gui/Makefile.in"
-
-	# sanbdox violation workaround
-	sed -i -e 's/modprobe/echo modprobe/' "${S}/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; 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"
-
-	#Don't use compiled rp-pppoe plugin; use it from the current version of pppd
-	rm "${D}/etc/ppp/plugins/rp-pppoe.so"
-	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
-
-	prepalldocs
-
-	if use X; 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
-}
-
-pkg_postinst() {
-	einfo "Use pppoe-setup to configure your dialup connection"
-	echo
-	ewarn "Please note that adsl-* scripts have been renamed to pppoe-*."
-}