Remove obsolete versions

(Portage version: 2.1.1)

5 files changed, 65 insertions, 41 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index cee25cf65e9a..9f65456de8de 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.160 2006/10/24 07:53:30 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.161 2006/10/24 09:12:14 mrness Exp $
+
+  24 Oct 2006; Alin Nastac <mrness@gentoo.org> -files/chat-default,
+  -files/confd.ppp0, files/ip-down, -files/ip-down.baselayout, files/ip-up,
+  -files/ip-up.baselayout, -files/net.ppp0, -files/options-pppoe,
+  -files/options-pptp, -files/plog, -files/poff, -files/pon, -files/pon.1,
+  -files/pppoe.html, -ppp-2.4.2-r15.ebuild, ppp-2.4.3-r16.ebuild,
+  -ppp-2.4.4-r1.ebuild, ppp-2.4.4-r2.ebuild:
+  Remove obsolete versions.
 
   24 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> ppp-2.4.3-r16.ebuild:
   Alpha stable as per bug #148472
diff --git a/net-dialup/ppp/files/ip-down b/net-dialup/ppp/files/ip-down
index 77e05655a585..f1422e53d620 100644
--- a/net-dialup/ppp/files/ip-down
+++ b/net-dialup/ppp/files/ip-down
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # this is a script which is executed after disconnecting the ppp interface.
 # look at man pppd for details
@@ -12,26 +12,29 @@
 # $6 = ipparam
 
 if [ "$USEPEERDNS" ]; then
+	if [ -x /sbin/resolvconf ]; then
+		resolvconf -d "$1"
+	else
+		# taken from debian's 0000usepeerdns
+		# follow any symlink to find the real file
+		REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
 
-	# taken from debian's 0000usepeerdns
-	# follow any symlink to find the real file
-	REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
+		if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
 
-	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
+			# if an old resolv.conf file exists, restore it
+			if [ -e $REALRESOLVCONF.pppd-backup ]; then
+				mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
+			fi
 
-		# if an old resolv.conf file exists, restore it
-		if [ -e $REALRESOLVCONF.pppd-backup ]; then
-			mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
 		fi
-
 	fi
-
 fi
 
-# Recreate the default route so autodial works
-[ -s /etc/conf.d/net ] && . /etc/conf.d/net
-if [ -n "${gateway}" ] && [ "${gateway%/*}" = "$1" ]; then
-	/sbin/route add default dev ${gateway%/*}
+if [ -x /etc/init.d/net.$1 ]; then
+	if /etc/init.d/net.$1 --quiet status ; then
+		export IN_BACKGROUND="true"
+		/etc/init.d/net.$1 --quiet stop
+	fi
 fi
 
 [ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$@"
diff --git a/net-dialup/ppp/files/ip-up b/net-dialup/ppp/files/ip-up
index 5dee00ad32d4..786ace1e3785 100644
--- a/net-dialup/ppp/files/ip-up
+++ b/net-dialup/ppp/files/ip-up
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # this is a script which is executed after connecting the ppp interface.
 # look at man pppd for details
@@ -13,30 +13,43 @@
 
 if [ "$USEPEERDNS" ]; then
 
-	# add the server supplied DNS entries to /etc/resolv.conf
-	# (taken from debian's 0000usepeerdns)
-
-	# follow any symlink to find the real file
-	REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
-
-	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
-
-		# merge the new nameservers with the other options from the old configuration
-		{
+	if [ -x /sbin/resolvconf ]; then
+		conf="# Generated by ppp for $1\n"
+		[ -n "$DNS1" ] && conf="${conf}nameserver $DNS1\n"
+		[ -n "$DNS2" ] && conf="${conf}nameserver $DNS2\n"
+		echo -e "$conf" | resolvconf -a "$1"
+	else
+		# add the server supplied DNS entries to /etc/resolv.conf
+		# (taken from debian's 0000usepeerdns)
+
+		# follow any symlink to find the real file
+		REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
+	
+		if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
+
+			# merge the new nameservers with the other options from the old configuration
+			{
 			grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
 			cat /etc/ppp/resolv.conf
-		} > $REALRESOLVCONF.tmp
-
-		# backup the old configuration and install the new one
-		cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
-		mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+			} > $REALRESOLVCONF.tmp
+
+			# backup the old configuration and install the new one
+			cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+			mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+	
+			# correct permissions
+			chmod 0644 /etc/resolv.conf
+			chown root:root /etc/resolv.conf
+		fi
+	fi
 
-		# correct permissions
-		chmod 0644 /etc/resolv.conf
-		chown root:root /etc/resolv.conf
+fi
 
+if [ -x /etc/init.d/net.$1 ]; then
+	if ! /etc/init.d/net.$1 --quiet status ; then
+		export IN_BACKGROUND="true"
+		/etc/init.d/net.$1 --quiet start
 	fi
-
 fi
 
 [ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$@"
diff --git a/net-dialup/ppp/ppp-2.4.3-r16.ebuild b/net-dialup/ppp/ppp-2.4.3-r16.ebuild
index 111ebf792dab..1af5524f71af 100644
--- a/net-dialup/ppp/ppp-2.4.3-r16.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r16.ebuild,v 1.11 2006/10/24 07:53:31 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r16.ebuild,v 1.12 2006/10/24 09:12:14 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -196,8 +196,8 @@ src_install() {
 	doins etc.ppp/options
 
 	insopts -m0755
-	newins "${FILESDIR}/ip-up.baselayout" ip-up
-	newins "${FILESDIR}/ip-down.baselayout" ip-down
+	doins "${FILESDIR}/ip-up"
+	doins "${FILESDIR}/ip-down"
 
 	if use pam; then
 		insinto /etc/pam.d
diff --git a/net-dialup/ppp/ppp-2.4.4-r2.ebuild b/net-dialup/ppp/ppp-2.4.4-r2.ebuild
index 65a9e91a36f6..ce647e15db1b 100644
--- a/net-dialup/ppp/ppp-2.4.4-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r2.ebuild,v 1.1 2006/10/05 07:28:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r2.ebuild,v 1.2 2006/10/24 09:12:14 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -152,8 +152,8 @@ src_install() {
 	doins etc.ppp/options
 
 	insopts -m0755
-	newins "${FILESDIR}/ip-up.baselayout" ip-up
-	newins "${FILESDIR}/ip-down.baselayout" ip-down
+	doins "${FILESDIR}/ip-up"
+	doins "${FILESDIR}/ip-down"
 
 	if use pam; then
 		insinto /etc/pam.d