From c8f7405eadcc39c9bd7b7e5d6fb563f43f7aa3fe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alin=20N=C4=83stac?= <mrness@gentoo.org>
Date: Tue, 9 Nov 2004 16:40:56 +0000
Subject: [PATCH] bump with the correct version this time

---
 net-dialup/isdn4k-utils/Manifest              |  12 +-
 .../isdn4k-utils/files/3.5_p20041024/config   | 120 ++++++++++++++++++
 .../files/3.5_p20041024/gentoo.patch          |  44 +++++++
 .../isdn4k-utils/files/3.5_p20041024/ioptions |   2 +
 .../isdn4k-utils/files/3.5_p20041024/ip-down  |  37 ++++++
 .../isdn4k-utils/files/3.5_p20041024/ip-up    |  42 ++++++
 .../files/3.5_p20041024/isdn4linux.conf       |   3 +
 .../files/3.5_p20041024/isdn4linux.init       |  35 +++++
 .../files/3.5_p20041024/net.ippp0             | 101 +++++++++++++++
 .../files/3.5_p20041024/options.ippp0         |  25 ++++
 .../files/3.5_p20041024/pathfix.patch         |  20 +++
 .../3.5_p20041024/vbox-makefile.am.patch      |  24 ++++
 .../isdn4k-utils-3.5_p20041024.ebuild         |   4 +-
 13 files changed, 461 insertions(+), 8 deletions(-)
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/config
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/gentoo.patch
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/ioptions
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/options.ippp0
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/pathfix.patch
 create mode 100644 net-dialup/isdn4k-utils/files/3.5_p20041024/vbox-makefile.am.patch

diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 6d89fa7abfbd..fec8e99a5a10 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -8,7 +8,7 @@ MD5 f18a68edbe338cae044acc49ae9fdd2b isdn4k-utils-3.2_p1-r4.ebuild 3553
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 f1cac015a1fd0ca2da5a4712ec6b24fa isdn4k-utils-20041024.ebuild 3525
 MD5 18e1229fe631fbf89555a54ddf4757be isdn4k-utils-20041024-r1.ebuild 3373
-MD5 6d16576d0e701e8c2416b718f262b36f isdn4k-utils-3.5_p20041024.ebuild 3414
+MD5 25e734017cd86e4def771bbfd2954306 isdn4k-utils-3.5_p20041024.ebuild 3414
 MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r3 136
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r4 136
@@ -45,8 +45,8 @@ MD5 76e9b700a1600d4b74dea30751934c83 files/3.5_p20041024/gentoo.patch 2383
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.5_p20041024/ioptions 86
 MD5 0fea1d14ab99bdbbbb5b6e652e105bd3 files/3.5_p20041024/ip-up 1083
 MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.5_p20041024/isdn4linux.conf 105
-MD5 4183c8198a49b738531a11c462cc69e7 files/3.5_p20041024/isdn4linux.init 712
-MD5 1c9b32ba3c1b3d083d5352af736f36cb files/3.5_p20041024/net.ippp0 2423
+MD5 5be734aa0bdd1a4817775806a6c50b54 files/3.5_p20041024/isdn4linux.init 717
+MD5 786c52d03809635b0a5617d7608c54a5 files/3.5_p20041024/net.ippp0 2428
 MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.5_p20041024/options.ippp0 443
 MD5 56b93c0cc4cc17b12c6add0237283271 files/3.5_p20041024/pathfix.patch 641
 MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/3.5_p20041024/vbox-makefile.am.patch 1211
@@ -54,7 +54,7 @@ MD5 a3751d222be8dc6eb7633a2b222ae45d files/3.5_p20041024/ip-down 940
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkPGzjtv59x0+BrURAiY2AJ42OMzuf5zoIv7ioo24RFz/s3K3+ACgkMna
-P+TJPX04/jQLh0jpGkxMOrE=
-=8Ry2
+iD8DBQFBkPMijtv59x0+BrURAu/WAJ48JI3btlln68vXWyJV6dpzGeKRzwCcC5vA
+LSkL5Cz8EBP+HYLBTJ91NhQ=
+=4OXD
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/config b/net-dialup/isdn4k-utils/files/3.5_p20041024/config
new file mode 100644
index 000000000000..a07d9589bf52
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/config
@@ -0,0 +1,120 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+# CONFIG_EXPERIMENTAL is not set
+
+#
+# General configuration
+#
+CONFIG_BUILDX11=y
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/sbin'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_RUNDIR='/var/run'
+CONFIG_LOCKDIR='/var/lock'
+CONFIG_LOCKFILE='LCK..'
+CONFIG_I4LCONFDIR='/etc/isdn'
+CONFIG_CONFFILE='isdn.conf'
+CONFIG_CALLERIDFILE='callerid.conf'
+CONFIG_USERCONFFILE='~/.isdn'
+CONFIG_COUNTRYCODE='49'
+CONFIG_AREACODE='89'
+CONFIG_COUNTRY_PREFIX='+'
+CONFIG_AREA_PREFIX='0'
+CONFIG_DATADIR='/usr/share/isdn'
+
+#
+# Runtime configuration tools
+#
+CONFIG_ISDNCTRL=y
+CONFIG_ISDNCTRL_CONF=y
+CONFIG_ISDNCTRL_TIMRU=y
+CONFIG_IPROFD=y
+CONFIG_DIVERTCTRL=y
+
+#
+# Card configuration tools
+#
+CONFIG_HISAXCTRL=y
+CONFIG_ICNCTRL=y
+# CONFIG_ICNCTRL_DEBUG is not set
+CONFIG_PCBITCTL=y
+# CONFIG_AVMCAPICTRL=y
+CONFIG_ACTCTRL=y
+CONFIG_EICONCTRL=y
+
+#
+# Tools for monitoring activity
+#
+CONFIG_IMON=y
+CONFIG_IMONTTY=y
+CONFIG_ISDNLOG=y
+
+#
+# Options for isdnlog package
+#
+CONFIG_ISDNLOG_SERV_PORT=20011
+CONFIG_ISDNLOG_USERFILE='isdnlog.users'
+CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
+CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
+CONFIG_ISDNLOG_RELOADCMD='/etc/init.d/isdn4linux restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/init.d/isdn4linux stop'
+CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
+CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
+# CONFIG_ISDNLOG_POSTGRES is not set
+# CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
+CONFIG_ISDN_LOG_XX=y
+CONFIG_ISDN_LOG_CC=''
+CONFIG_ISDN_LOG_CC_EN=y
+CONFIG_ISDN_LOG_DEST_DE=y
+CONFIG_ISDN_LOG_DEST_AT=y
+CONFIG_ISDN_LOG_DEST_NL=y
+CONFIG_ISDN_LOG_DEST_CH=y
+CONFIG_IPPPSTATS=y
+CONFIG_XISDNLOAD=y
+CONFIG_XMONISDN=y
+
+#
+# Options for xmonisdn
+#
+CONFIG_XMONISDN_UPCMD='/etc/isdn/netup'
+CONFIG_XMONISDN_DOWNCMD='/etc/isdn/netdown'
+
+#
+# Applications
+#
+# CONFIG_VBOX is not set
+CONFIG_IPPPD=y
+
+#
+# Options for vbox package
+#
+VBOX_SPOOLDIR='/var/spool/vbox'
+VBOX_LOGDIR='/var/log/vbox'
+VBOX_PIDDIR='/var/run'
+VBOX_LOCKDIR='/var/lock'
+VBOX_DOCDIR='/usr/doc/vbox'
+VBOX_TCL='tcl8.3'
+# VBOX_SUSPEND_ID is not set
+
+#
+# Options for ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+#CONFIG_FAQ=y
+#CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/gentoo.patch b/net-dialup/isdn4k-utils/files/3.5_p20041024/gentoo.patch
new file mode 100644
index 000000000000..4101b3abf044
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/gentoo.patch
@@ -0,0 +1,44 @@
+diff -ruN isdn4k-utils.orig/isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in
+--- isdn4k-utils.orig/isdnlog/Makefile.in	2002-07-19 21:03:55.000000000 +0200
++++ isdn4k-utils/isdnlog/Makefile.in	2003-04-26 12:06:28.000000000 +0200
+@@ -1959,6 +1959,7 @@
+ 				$(INSTALL_DATA) samples/$$f.conf.$(NATION) $(DESTDIR)$(I4LCONFDIR)/$$f.conf.new ; \
+ 			fi ; \
+ 		done
++		@[ -f "$(DESTDIR)$(I4LCONFDIR)/isdn.conf" ] || $(INSTALL_DATA) samples/isdn.conf $(DESTDIR)$(I4LCONFDIR)
+ 		@for f in callerid.conf isdnlog.isdnctrl0.options isdnlog.users ; do \
+ 			if [ ! -f "$(DESTDIR)$(I4LCONFDIR)/$$f" ]; then \
+ 				$(INSTALL_DATA) samples/$$f $(DESTDIR)$(I4LCONFDIR)/$$f ; \
+@@ -2005,8 +2005,8 @@
+ 		$(INSTALL_DATA) tools/isdnrate.1     $(DESTDIR)$(MAN1DIR)/isdnrate$(MAN1EXT)
+ 		$(INSTALL_DATA) tools/rate-files.5     $(DESTDIR)$(MAN5DIR)/rate-files$(MAN5EXT)
+ 		$(INSTALL_DATA) country-de.dat	$(DESTDIR)$(DATADIR)/country.dat
+-		$(INSTALL_DATA) rate-$(NATION).dat      $(DESTDIR)$(DATADIR)
+-		$(INSTALL_DATA) holiday-$(NATION).dat   $(DESTDIR)$(DATADIR)
++		@[ ! -f rate-${NATION}.dat ] || $(INSTALL_DATA) rate-$(NATION).dat      $(DESTDIR)$(DATADIR)
++		@[ ! -f holiday-${NATION}.dat ] || $(INSTALL_DATA) holiday-$(NATION).dat   $(DESTDIR)$(DATADIR)
+ 		@for f in `ls zone-$(NATION)-*.gdbm zone-$(NATION)-*.db zone-$(NATION)-*.cdb tools/dest/dest.gdbm tools/dest/dest.db tools/dest/dest.cdb 2>/dev/null` ; do \
+ 		  $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
+ 		  echo Installing $(DESTDIR)$(DATADIR)/$$f; \
+diff -ruN isdn4k-utils.orig/isdnlog/samples/isdn.conf isdn4k-utils/isdnlog/samples/isdn.conf
+--- isdn4k-utils.orig/isdnlog/samples/isdn.conf	2002-01-29 17:39:20.000000000 +0100
++++ isdn4k-utils/isdnlog/samples/isdn.conf	2003-04-26 12:05:01.000000000 +0200
+@@ -21,13 +21,13 @@
+ CHARGEMAX       = 50.00
+ CURRENCY = 0.062,EUR
+ 
+-COUNTRYFILE = /usr/lib/isdn/country.dat
+-DESTFILE= /usr/lib/isdn/dest.cdb
++COUNTRYFILE = /usr/share/isdn/country.dat
++DESTFILE= /usr/share/isdn/dest.cdb
+ RATECONF= /etc/isdn/rate.conf
+ # replace the xx in the next 3 lines with your country's letters!
+-RATEFILE= /usr/lib/isdn/rate-xx.dat
+-HOLIDAYS= /usr/lib/isdn/holiday-xx.dat
+-ZONEFILE= /usr/lib/isdn/zone-xx-%s.cdb
++RATEFILE= /usr/share/isdn/rate-xx.dat
++HOLIDAYS= /usr/share/isdn/holiday-xx.dat
++ZONEFILE= /usr/share/isdn/zone-xx-%s.cdb
+ 
+ # providerselect
+ VBN = 10	# change this, depends on your country
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/ioptions b/net-dialup/isdn4k-utils/files/3.5_p20041024/ioptions
new file mode 100644
index 000000000000..39cd232ddaba
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/ioptions
@@ -0,0 +1,2 @@
+# System-wide configuration for ipppd.
+# Normally, put all options into options.ipppX
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
new file mode 100644
index 000000000000..a9ea5b5c2d94
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
@@ -0,0 +1,37 @@
+#!/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 $1 $2 $3 $4 $5 $6
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
new file mode 100644
index 000000000000..0aa384f01b7a
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
@@ -0,0 +1,42 @@
+#!/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 640 /etc/resolv.conf
+	chown root:users /etc/resolv.conf
+
+	fi
+
+fi
+
+[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local $1 $2 $3 $4 $5 $6
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
new file mode 100644
index 000000000000..9c37494ca519
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
@@ -0,0 +1,3 @@
+# Location where isdnctrl will save its configuration
+
+ISDNCTRL_SAVE="/var/lib/isdn4linux/isdnctrl.conf"
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
new file mode 100644
index 000000000000..e65c5826e5a9
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init,v 1.1 2004/11/09 16:40:56 mrness Exp $
+
+opts="start stop save reload"
+
+depend() {
+	use pcmcia
+}
+
+start() {
+	ebegin "Loading isdnctrl configuration"
+
+	# This variable is set in /etc/conf.d/isdn4linux
+	[ ! -f ${ISDNCTRL_SAVE} ] || isdnctrl readconf ${ISDNCTRL_SAVE} >/dev/null
+
+	eend $?
+}
+
+save() {
+	ebegin "Saving isdnctrl configuration"
+
+	isdnctrl writeconf ${ISDNCTRL_SAVE} >/dev/null
+
+	eend $?
+}
+
+stop() {
+	ebegin "Unloading isdnctrl configuration"
+
+	isdnctrl reset force >/dev/null
+
+	eend $?
+}
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0 b/net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0
new file mode 100644
index 000000000000..693d220b68d1
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0,v 1.1 2004/11/09 16:40:56 mrness Exp $
+
+#NB: Config is in /etc/conf.d/net
+
+depend() {
+	need isdn4linux
+}
+
+checkconfig() {
+	if [ -z "$(eval echo \$\{iface_${IFACE}\})" ]
+	then
+		eerror "Please make sure that /etc/conf.d/net has \$iface_$IFACE set"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	local iface_args="$(eval echo \$\{iface_${IFACE}\})"
+	local ipppd_opts=""
+
+	ebegin "Starting ipppd for ${IFACE}"
+	[ -n "${gateway}" ] && [ "${gateway%/*}" = "${IFACE}" ] && ipppd_opts='defaultroute'
+	/sbin/ipppd ${ipppd_opts} pidfile /var/run/ipppd.${IFACE}.pid file /etc/ppp/options.${IFACE} || {
+		local retval=$?
+		eend ${retval} "Failed to start ipppd"
+		return ${retval}
+	}
+	eend 0
+
+	ebegin "Bringing ${IFACE} up"
+	/sbin/ifconfig ${IFACE} ${iface_args} >/dev/null || {
+		local retval=$?
+		eend ${retval} "Failed to bring ${IFACE} up"
+		stop
+		return ${retval}
+	}
+	eend 0
+
+	if [ -n "$(eval echo \$\{inet6_${IFACE}\})" ]
+	then
+		local x=""
+		ebegin "  Adding inet6 addresses"
+		for x in $(eval echo \$\{inet6_${IFACE}\})
+		do
+			ebegin "    ${IFACE} inet6 add ${x}"
+			/sbin/ifconfig ${IFACE} inet6 add ${x} >/dev/null
+			eend 0
+		done
+		save_options "inet6" "$(eval echo \$\{inet6_${IFACE}\})"
+	fi
+
+	if [ -n "${gateway}" ] && [ "${gateway%/*}" = "${IFACE}" ]
+	then
+		ebegin "  Setting default gateway"
+		/sbin/route add default dev ${gateway%/*} >/dev/null || {
+			local retval=$?
+			eend ${retval} "Failed to bring ${IFACE} up"
+			stop
+			return ${retval}
+		}
+		eend 0
+	fi
+
+	# Enabling rp_filter causes wacky packets to be auto-dropped by
+	# the kernel
+	if [ -e /proc/sys/net/ipv4/conf/${IFACE}/rp_filter ]
+	then
+		echo 1 > /proc/sys/net/ipv4/conf/${IFACE}/rp_filter
+	fi
+}
+
+stop() {
+	local myinet6="$(get_options inet6)"
+	local pidfile="/var/run/ipppd.${IFACE}.pid"
+
+	ebegin "Bringing ${IFACE} down"
+
+	# Also down the inet6 interfaces
+	if [ -n "${myinet6}" ]
+	then
+		local x=""
+		for x in ${myinet6}
+		do
+			/sbin/ifconfig ${IFACE} inet6 del ${x} >/dev/null
+		done
+	fi
+
+	/sbin/ifconfig ${IFACE} down >/dev/null
+
+	# Kill ipppd
+	test -s "${pidfile}" && kill `cat ${pidfile}`
+	sleep 1
+	test -s "${pidfile}" && sleep 2 && test -s "${pidfile}" && einfon "Killing ipppd" && kill -KILL `cat ${pidfile}`
+
+	eend 0
+}
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/options.ippp0 b/net-dialup/isdn4k-utils/files/3.5_p20041024/options.ippp0
new file mode 100644
index 000000000000..13983f19ee96
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/options.ippp0
@@ -0,0 +1,25 @@
+# Example config for a personal ISP dialin
+# see "man ipppd" for explanation of all possible options
+
+# for the defaultroute setting, look in /etc/conf.d/net
+
+/dev/isdn/ippp0
+
+# you have to put login and password into /etc/ppp/pap-secrets too
+
+name "insert ppp login here"
+
+lock
+ipcp-accept-local
+ipcp-accept-remote
+noipdefault
+
+# You might want to try these if you have problems:
+#-vj
+#-vjccomp
+#-ac
+#-pc
+#-bsdcomp
+#mru 1524
+#mtu 1500
+#noccp
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/pathfix.patch b/net-dialup/isdn4k-utils/files/3.5_p20041024/pathfix.patch
new file mode 100644
index 000000000000..1b5c0bdd5d17
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/pathfix.patch
@@ -0,0 +1,20 @@
+--- isdn.conf.install   2004-03-19 13:53:59.000000000 +0100
++++ isdn.conf   2004-03-19 13:54:48.000000000 +0100
+@@ -24,12 +24,12 @@
+ CHARGEMAX       = 50.00
+ CURRENCY = 0.062,EUR
+
+-COUNTRYFILE = /usr/lib/isdn/country.dat
++COUNTRYFILE = /usr/share/isdn/country.dat
+ RATECONF= /etc/isdn/rate.conf
+-RATEFILE= /usr/lib/isdn/rate-de.dat
+-HOLIDAYS= /usr/lib/isdn/holiday-de.dat
+-ZONEFILE= /usr/lib/isdn/zone-de-%s.cdb
+-DESTFILE= /usr/lib/isdn/dest.cdb
++RATEFILE= /usr/share/isdn/rate-de.dat
++HOLIDAYS= /usr/share/isdn/holiday-de.dat
++ZONEFILE= /usr/share/isdn/zone-de-%s.cdb
++DESTFILE= /usr/share/isdn/dest.cdb
+
+ # providerselect
+ VBN = 010:01900
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/vbox-makefile.am.patch b/net-dialup/isdn4k-utils/files/3.5_p20041024/vbox-makefile.am.patch
new file mode 100644
index 000000000000..226262112f89
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/vbox-makefile.am.patch
@@ -0,0 +1,24 @@
+--- vboxgetty/examples/scripts/Makefile.am.orig	2004-09-24 11:14:08.044455472 +0930
++++ vboxgetty/examples/scripts/Makefile.am	2004-09-24 11:14:38.451386288 +0930
+@@ -14,6 +14,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(pkgdatadir)/tcl
+-			  $(INSTALL) -m 644 initmodem.tcl $(pkgdatadir)/tcl/
+-			  $(INSTALL) -m 644 answercall.tcl $(pkgdatadir)/tcl/
++			  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/tcl
++			  $(INSTALL) -m 644 initmodem.tcl $(DESTDIR)$(pkgdatadir)/tcl/
++			  $(INSTALL) -m 644 answercall.tcl $(DESTDIR)$(pkgdatadir)/tcl/
+--- vboxgetty/examples/Makefile.am.orig	2004-09-24 11:27:49.756751152 +0930
++++ vboxgetty/examples/Makefile.am	2004-09-24 11:27:08.663145584 +0930
+@@ -18,6 +18,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxgetty.conf $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxcallerid.conf $(sysconfdir)
++			  $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxgetty.conf $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxcallerid.conf $(DESTDIR)/$(sysconfdir)
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild
index fbd317c5c4eb..ea56303c62b3 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_p20041024.ebuild,v 1.1 2004/11/09 16:34:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild,v 1.2 2004/11/09 16:40:56 mrness Exp $
 
 inherit eutils
 
@@ -15,8 +15,8 @@ HOMEPAGE="http://www.isdn4linux.de/"
 
 KEYWORDS="~x86 ~amd64 ~alpha"
 LICENSE="GPL-2"
-SLOT="0"
 IUSE="X"
+SLOT="0"
 
 RDEPEND=">=sys-apps/portage-2.0.47-r10
 	virtual/libc
-- 
2.26.2