remove ip-{up,down} scripts - using the net-dialup/ppp scripts instead; mark as stable on x86 (#73067)

(Portage version: 2.0.51-r15)

6 files changed, 17 insertions, 90 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index cf67a69535cb..debf2b7b7293 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/isdn4k-utils
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.35 2004/12/23 22:12:34 mrness Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.36 2005/02/06 09:43:58 mrness Exp $
+
+  06 Feb 2005; Alin Nastac <mrness@gentoo.org>
+  -files/3.6_pre20041219/ip-down, -files/3.6_pre20041219/ip-up,
+  isdn4k-utils-3.6_pre20041219.ebuild:
+  Remove ip-up & ip-down scripts - using net-dialup/ppp scripts instead. Mark
+  as stable on x86. See bug #76641.
 
 *isdn4k-utils-3.6_pre20041219 (24 Dec 2004)
 
diff --git a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down b/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down
deleted file mode 100644
index 77e05655a585..000000000000
--- a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# this is a script which is executed after disconnecting the ppp interface.
-# look at man pppd for details
-
-# the followings parameters are available:
-# $1 = interface-name
-# $2 = tty-device
-# $3 = speed
-# $4 = local-IP-address
-# $5 = remote-IP-address
-# $6 = ipparam
-
-if [ "$USEPEERDNS" ]; then
-
-	# 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 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%/*}
-fi
-
-[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$@"
diff --git a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up b/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up
deleted file mode 100644
index 29719562096f..000000000000
--- a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# this is a script which is executed after connecting the ppp interface.
-# look at man pppd for details
-
-# the followings parameters are available:
-# $1 = interface-name
-# $2 = tty-device
-# $3 = speed
-# $4 = local-IP-address
-# $5 = remote-IP-address
-# $6 = ipparam
-
-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
-		{
-			grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
-			cat /etc/ppp/resolv.conf
-		} > $REALRESOLVCONF.tmp
-
-		# backup the old configuration and install the new one
-		cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
-		mv $REALRESOLVCONF.tmp $REALRESOLVCONF
-
-		# correct permissions
-		chmod 0644 /etc/resolv.conf
-		chown root:root /etc/resolv.conf
-
-	fi
-
-fi
-
-[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$@"
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild
index cc193c3eaa7b..c3c6391e472b 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild,v 1.13 2004/12/02 12:47:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild,v 1.14 2005/02/06 09:43:58 mrness Exp $
 
 inherit eutils
 
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild
index 22e5776f3522..8fe68125dbd8 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild,v 1.1 2004/12/03 18:45:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild,v 1.2 2005/02/06 09:43:58 mrness Exp $
 
 inherit eutils
 
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild
index 514cf7dbd59d..84ff3bd40f50 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild,v 1.1 2004/12/23 22:12:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild,v 1.2 2005/02/06 09:43:58 mrness Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="ISDN4Linux Utils"
 SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.isdn4linux.de/"
 
-KEYWORDS="~x86 ~amd64 ~alpha"
+KEYWORDS="x86 ~amd64 ~alpha"
 LICENSE="GPL-2"
 IUSE="X unicode"
 SLOT="0"
@@ -23,7 +23,8 @@ DEPEND="virtual/linux-sources
 	dev-lang/tcl
 	X? ( virtual/x11 )"
 RDEPEND="${DEPEND}
-	virtual/modutils"
+	virtual/modutils
+	net-dialup/ppp"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -159,7 +160,6 @@ src_install() {
 	# install example ippp scripts and configs
 	exeinto /etc/ppp
 	insinto /etc/ppp
-	doexe ${FILESDIR}/${PV}/{ip-up,ip-down}
 	doins ${FILESDIR}/${PV}/{ioptions,options.ippp0}
 
 	# install example isdn configs