Remove obsolete versions.

Package-Manager: portage-2.1.1

10 files changed, 0 insertions, 640 deletions

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 ""