improved ebuild with version bump; imported from #71845

17 files changed, 831 insertions, 8 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index d98ead973de3..be8ceb3341f7 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,19 @@
 # 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.28 2004/11/11 06:20:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.29 2004/11/22 20:05:39 mrness Exp $
+
+*isdn4k-utils-3.5_pre20041110 (22 Nov 2004)
+
+  22 Nov 2004; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  +files/3.5_pre20041110/config, +files/3.5_pre20041110/config.old,
+  +files/3.5_pre20041110/ioptions, +files/3.5_pre20041110/ip-down,
+  +files/3.5_pre20041110/ip-up, +files/3.5_pre20041110/isdn.conf,
+  +files/3.5_pre20041110/isdn.init, +files/3.5_pre20041110/isdnlog.conf,
+  +files/3.5_pre20041110/isdnlog.init,
+  +files/3.5_pre20041110/isdnlog.logrotated, +files/3.5_pre20041110/net.ippp0,
+  +files/3.5_pre20041110/options.ippp0, +isdn4k-utils-3.5_pre20041110.ebuild:
+  Improved ebuild imported from #71845, thanks to Stefan Briesenick
+  <sbriesen@gmx.de>.
 
   11 Nov 2004; Alin Nastac <mrness@gentoo.org> 
   files/3.5_p20041024/ip-down, files/3.5_p20041024/ip-up:
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 0267b4fc9e83..193353fed194 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a168b5cac63db5c3798bfb8903ddcd92 ChangeLog 5949
+MD5 d61b13b40bb68490857286252bf75585 ChangeLog 6615
 MD5 9f4187355b91c0dabfca1b251589f527 isdn4k-utils-3.2_p1-r2.ebuild 2808
 MD5 5bfcbc27dc20e18327b61f5df2bbec60 isdn4k-utils-3.2_p1-r3.ebuild 3070
 MD5 f18a68edbe338cae044acc49ae9fdd2b isdn4k-utils-3.2_p1-r4.ebuild 3553
-MD5 25e734017cd86e4def771bbfd2954306 isdn4k-utils-3.5_p20041024.ebuild 3414
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 7ca65626f4d8c91f33553f51041c8ca6 isdn4k-utils-3.5_p20041024-r1.ebuild 3404
+MD5 25e734017cd86e4def771bbfd2954306 isdn4k-utils-3.5_p20041024.ebuild 3414
+MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215
+MD5 e31251b709b455442ed665298683484c isdn4k-utils-3.5_pre20041110.ebuild 6575
 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
 MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-3.5_p20041024 144
+MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-3.5_p20041024-r1 144
 MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
 MD5 adcc3c0ef100b737b0af224401812a4b files/local.start 564
-MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-3.5_p20041024-r1 144
+MD5 8de88f6cf872f012abe1e320b3fb4336 files/digest-isdn4k-utils-3.5_pre20041110 81
 MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405
 MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86
@@ -38,10 +40,21 @@ 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
+MD5 f4dd44c758ead761b337771b9244ae81 files/3.5_pre20041110/net.ippp0 2406
+MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.5_pre20041110/config 2693
+MD5 b729cb8e840e3d8d19aa8628f04cf948 files/3.5_pre20041110/isdnlog.init 1046
+MD5 6db07967fecf59be29521a38d433da1f files/3.5_pre20041110/isdn.conf 698
+MD5 2c3d7ec38577340f0bbf130c15e62ff6 files/3.5_pre20041110/isdn.init 1684
+MD5 02eb09752af937202a4dc000bcb1caf0 files/3.5_pre20041110/isdnlog.conf 414
+MD5 077c13d881acae71e88763ffc42b7015 files/3.5_pre20041110/isdnlog.logrotated 439
+MD5 b49a72df686b7a94d7ac291a91f20fc5 files/3.5_pre20041110/ioptions 323
+MD5 b75b68506a43d3d897d7b32eb280b42e files/3.5_pre20041110/ip-down 956
+MD5 38984b8cf470784c9052f566b4faa5d8 files/3.5_pre20041110/ip-up 1105
+MD5 02118ba89fc41144086224482bff7422 files/3.5_pre20041110/options.ippp0 685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkwTQjtv59x0+BrURAozOAJwJU8myQH6ZL53zek0iH8MJZlTdcACgvsg3
-3FSP1PwHWH4jjsI34zdSMVU=
-=XeSX
+iD8DBQFBokadjtv59x0+BrURAhcvAJwM2GwpJ2Z/kH5JVyzB/VUV7AyIswCfZP3v
+OUH+T3wwRzlKV+gj5xwd97g=
+=SORI
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/config b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config
new file mode 100644
index 000000000000..f22ecec7e525
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config
@@ -0,0 +1,132 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General configuration
+#
+CONFIG_BUILDX11=y
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/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_ISDNCTRL_DWABC_UDP_INFO=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 is not set
+CONFIG_ACTCTRL=y
+CONFIG_EICONCTRL=y
+CONFIG_LOOPCTRL=y
+# CONFIG_LOOPCTRL_DEBUG is not set
+
+#
+# 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/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/init.d/isdn stop'
+CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_DOCDIR=''
+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_ISDN_LOG_DEST_BE=y
+CONFIG_ISDN_LOG_DEST_CN=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 ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+CONFIG_IPPP_FILTER=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+# CONFIG_CAPIFAX is not set
+# CONFIG_RCAPID is not set
+# CONFIG_PPPDCAPIPLUGIN is not set
+CONFIG_EUROFILE=y
+
+#
+# Options for eurofile
+#
+CONFIG_EFTD=y
+CONFIG_EFTD_WUAUTH=y
+CONFIG_EFTD_SERVER_MSN=''
+# CONFIG_EFT_INSTALL_EFTD_SH is not set
+CONFIG_EFTP=y
+CONFIG_EFTP_READLINE=y
+# CONFIG_EFTP_SETUID is not set
+CONFIG_EFTP_CLIENT_MSN=''
+CONFIG_EFT_INSTALL_CONF=y
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+# CONFIG_FAQ is not set
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old
new file mode 100644
index 000000000000..d67d3163a1eb
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old
@@ -0,0 +1,91 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# General configuration
+#
+CONFIG_BUILDX11=y
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/usr/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_ISDNCTRL_DWABC_UDP_INFO=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 is not set
+CONFIG_ACTCTRL=y
+CONFIG_EICONCTRL=y
+CONFIG_LOOPCTRL=y
+# CONFIG_LOOPCTRL_DEBUG is not set
+
+#
+# Tools for monitoring activity
+#
+CONFIG_IMON=y
+CONFIG_IMONTTY=y
+# CONFIG_ISDNLOG is not set
+# CONFIG_IPPPSTATS is not set
+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 is not set
+# CONFIG_CAPIFAX is not set
+# CONFIG_RCAPID is not set
+# CONFIG_PPPDCAPIPLUGIN is not set
+# CONFIG_EUROFILE is not set
+
+#
+# Options for eurofile
+#
+# CONFIG_EFTD is not set
+# CONFIG_EFTP is not set
+# CONFIG_EFT_INSTALL_CONF is not set
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+# CONFIG_FAQ is not set
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions
new file mode 100644
index 000000000000..844c62029e0e
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions
@@ -0,0 +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/files/3.5_pre20041110/ioptions,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+# System-wide configuration for ipppd.
+# Normally, put all options into options.ipppX
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-down b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-down
new file mode 100644
index 000000000000..52ae93395c14
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/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_pre20041110/ip-up b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-up
new file mode 100644
index 000000000000..4f16ae3220f6
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/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 644 /etc/resolv.conf
+		chown root:root /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_pre20041110/isdn.conf b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.conf
new file mode 100644
index 000000000000..36e778c9f30b
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.conf
@@ -0,0 +1,22 @@
+# 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_pre20041110/isdn.conf,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+# Location where isdnctrl will save its configuration
+ISDNCTRL_CONFIG="/var/lib/isdn/isdnctrl.conf"
+
+# Location where iprofd will save the modem-register settings
+# comment out if you don't want to use iprofd
+IPROFD_SETTINGS="/var/lib/isdn/modem-register.dat"
+
+# ISDN drivers to load via modprobe <driver> <params>
+# comment out to disable
+
+ISDN_DRIVER_0="capidrv"
+ISDN_PARAMS_0=""
+
+# ISDN_DRIVER_1=""
+# ISDN_PARAMS_1=""
+
+# ISDN_DRIVER_2=""
+# ISDN_PARAMS_2=""
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init
new file mode 100644
index 000000000000..28a206f47286
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init
@@ -0,0 +1,68 @@
+#!/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_pre20041110/isdn.init,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+opts="start stop save reload info show"
+
+depend() {
+	use pcmcia capi
+}
+
+start() {
+	local i=0
+	while true; do
+		local DRIVER=$(eval echo "\$ISDN_DRIVER_${i}")
+		local PARAMS=$(eval echo "\$ISDN_PARAMS_${i}")
+		[ -z "${DRIVER}" ] && break
+		if ! /bin/grep -q "^${DRIVER} " /proc/modules ; then
+			ebegin "Loading ISDN driver ${DRIVER}"
+			/sbin/modprobe ${DRIVER} ${PARAMS} &>/dev/null
+			eend $?
+		fi
+		: $((i++))
+	done
+
+	ebegin "Loading isdnctrl configuration"
+	[ ! -f "${ISDNCTRL_CONFIG}" ] || /usr/sbin/isdnctrl readconf "${ISDNCTRL_CONFIG}" >/dev/null
+	eend $?
+	
+	if [ -n "${IPROFD_SETTINGS}" ]; then
+		ebegin "Starting modem-register daemon"
+		start-stop-daemon --start --quiet --exec /usr/sbin/iprofd -- "${IPROFD_SETTINGS}"
+		eend $?
+	fi
+}
+
+stop() {
+	if [ -n "${IPROFD_SETTINGS}" ]; then
+		ebegin "Stopping modem-register daemon"
+		start-stop-daemon --stop --quiet --retry 5 --exec /usr/sbin/iprofd
+		eend $?
+	fi
+
+	ebegin "Unloading isdnctrl configuration"
+	/usr/sbin/isdnctrl reset force >/dev/null
+	eend $?
+}
+
+save() {
+	ebegin "Saving isdnctrl configuration"
+	/usr/sbin/isdnctrl writeconf "${ISDNCTRL_CONFIG}" >/dev/null
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading isdnctrl configuration"
+	/usr/sbin/isdnctrl reset >/dev/null
+	[ ! -f "${ISDNCTRL_CONFIG}" ] || /usr/sbin/isdnctrl readconf "${ISDNCTRL_CONFIG}" >/dev/null
+	eend $?
+}
+
+info() {
+	/usr/sbin/isdnctrl status all
+}
+
+show() {
+        /usr/sbin/isdnctrl list all
+}
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf
new file mode 100644
index 000000000000..43945f39fa4c
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf
@@ -0,0 +1,10 @@
+# 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_pre20041110/isdnlog.conf,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+# here you can add some switches not covered by the
+# corresponding /etc/isdnlog.options.contrX file.
+#
+# see "man (8) isdnlog" for further informations
+
+ISDNLOG_OPTIONS=""
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init
new file mode 100644
index 000000000000..be5a086e72f6
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init
@@ -0,0 +1,33 @@
+#!/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_pre20041110/isdnlog.init,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+opts="start stop"
+
+depend() {
+	need isdn
+}
+
+start() {
+	local CONTR="${myservice#*.contr}" CTRL=$((CONTR * 2))
+	local CONFIG="/etc/isdn/isdnlog.isdnctrl${CTRL}.options"
+	[ -e "$CONFIG" ] || CONFIG="/etc/isdn/isdnlog.options.contr${CONTR}"
+ 
+	if [ ! -e "$CONFIG" ] ; then
+		eerror "You're missing ${CONFIG}"
+		return 1
+	fi
+
+	ebegin "Starting ISDNLOG for controller #${CONTR}"
+	start-stop-daemon --start --quiet --pidfile "/var/run/isdnlog.isdnctrl${CTRL}.pid" \
+		--exec /usr/sbin/isdnlog -- ${ISDNLOG_OPTIONS} -f "${CONFIG}" "/dev/isdnctrl${CTRL}"
+	eend $?
+}
+
+stop() {
+        local CONTR="${myservice#*.contr}" CTRL=$((CONTR * 2))
+	ebegin "Stopping ISDNLOG for controller #${CONTR}"
+	start-stop-daemon --stop --quiet --retry 5 --pidfile "/var/run/isdnlog.isdnctrl${CTRL}.pid"
+	eend $?
+}
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated
new file mode 100644
index 000000000000..1b1e86166c3a
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated
@@ -0,0 +1,15 @@
+# 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_pre20041110/isdnlog.logrotated,v 1.1 2004/11/22 20:05:39 mrness Exp $
+#
+# isdnlog logrotate snippet for Gentoo Linux
+# contributed by Stefan Briesenick
+
+/var/log/isdn.log {
+    compress
+    rotate 99
+    size=4096k
+    notifempty
+    missingok
+    copytruncate
+}
diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0 b/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0
new file mode 100644
index 000000000000..2046ffd290e5
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0
@@ -0,0 +1,100 @@
+# 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_pre20041110/net.ippp0,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+#NB: Config is in /etc/conf.d/net
+
+depend() {
+	need isdn
+}
+
+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_pre20041110/options.ippp0 b/net-dialup/isdn4k-utils/files/3.5_pre20041110/options.ippp0
new file mode 100644
index 000000000000..9b1b431c655f
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/options.ippp0
@@ -0,0 +1,29 @@
+# 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_pre20041110/options.ippp0,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+# 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/digest-isdn4k-utils-3.5_pre20041110 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110
new file mode 100644
index 000000000000..9a14b65cf8e9
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110
@@ -0,0 +1 @@
+MD5 363efe6929db2fa4196b950c816edb1d isdn4k-utils-CVS-2004-11-10.tar.bz2 5511924
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110.ebuild
new file mode 100644
index 000000000000..9f72bedba41b
--- /dev/null
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110.ebuild
@@ -0,0 +1,210 @@
+# 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_pre20041110.ebuild,v 1.1 2004/11/22 20:05:39 mrness Exp $
+
+inherit eutils
+
+MY_PV="${PV/*_pre/}"
+MY_P="${PN}-CVS-${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="ISDN4Linux Utils"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.isdn4linux.de/"
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+IUSE="X unicode"
+SLOT="0"
+
+RDEPEND="virtual/modutils
+	virtual/libc
+	sys-libs/ncurses
+	sys-libs/gdbm
+	dev-lang/tcl
+	X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+src_setup() {
+	# Get country code from I4L_CC variable
+	# default country: DE (Germany)
+	I4L_CC=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]")
+	[ -z "${I4L_CC}" ] && I4L_CC="DE"
+	I4L_CC_LOW=$(echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]")
+
+	# Get language from I4L_LANG variable ('de' or 'en')
+	I4L_LANG=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]")
+	if [ -z "${I4L_LANG}" ]; then
+		case "${I4L_CC}" in
+			AT|CH|DE)
+				I4L_LANG="DE"
+				;;
+			*)
+				I4L_LANG="EN"
+				;;
+		esac
+	fi
+	[ "${I4L_LANG}" = "DE" -o "${I4L_LANG}" = "EN" ] || I4L_LANG="EN"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix for 2.6 headers
+	find . -name "*.c" | \
+	xargs -r sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
+
+	# patch all Makefiles to use our CFLAGS
+	find . -name "Makefile*" | \
+	xargs -r sed -i -e "s:^CFLAGS\(.*\)-O[26]:CFLAGS\1${CFLAGS}:g" \
+					-e "s:^CFLAGS\(.*\)-g:CFLAGS\1${CFLAGS}:g" \
+					-e "s:^CFLAGS = -Wall$:CFLAGS = ${CFLAGS}:g" || die "sed failed"
+
+	# install our config
+	case "${I4L_CC}" in
+		DE|AT|NL|LU|CH)
+			# These countries are specially supported in the isdnlog source.
+			sed -e "s:^CONFIG_ISDN_LOG_XX=:CONFIG_ISDN_LOG_${I4L_CC}=:g" -e "s:^CONFIG_ISDN_LOG_CC=.*$:#:g" \
+				-e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/${PV}/config > .config || die "failed to modify .config"
+			;;
+		*)
+			# Others get a generic isdnlog.
+			sed -e "s:^\(CONFIG_ISDN_LOG_CC=\).*$:\1'${I4L_CC_LOW}':g" \
+				-e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/${PV}/config > .config || die "failed to modify .config"
+			;;
+	esac
+
+	useq X || \
+		sed -i -e "s:^CONFIG_BUILDX11=.*$:#:g" \
+			-e "s:^CONFIG_XISDNLOAD=.*$:#:g" \
+			-e "s:^CONFIG_XMONISDN=.*$:#:g" .config
+
+	# Patch in order to make generic config for countries which are not known to isdnlog source
+	sed -i -e "s:\$(INSTALL_DATA) rate-:-\$(INSTALL_DATA) rate-:g" \
+		-e "s:\$(INSTALL_DATA) holiday-:-\$(INSTALL_DATA) holiday-:g" isdnlog/Makefile.in
+
+	# if specified, convert all relevant files from latin1 to UTF-8
+	if useq unicode; then
+		for i in isdnlog/samples/{isdn,rate}.conf* isdnlog/*-{at,ch,de,no}.dat isdnlog/{Isdn,.country-alias}; do
+			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+}
+
+src_compile() {
+	make subconfig || die "make subconfig failed"
+	make || die "make failed"
+}
+
+src_install() {
+	keepdir /var/lib/isdn
+	dodir /dev /etc/isdn /usr/bin /usr/sbin
+	make DESTDIR=${D} install || die "make install failed"
+
+	# remove obsolete firmware files
+	rm -f ${D}/usr/share/isdn/{bip1120.btl,dnload.bin,ds4bri.bit,dspdload.bin}
+	rm -f ${D}/usr/share/isdn/{loadpg.bin,pc_??_ca.bin,prload.bin,te_????.*}
+
+	# install docs (base)
+	dodoc NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh FAQ/_howto/xp*
+
+	# install docs (ipppd)
+	docinto ipppd
+	dodoc LEGAL.ipppcomp ipppd/{README,README.*.ORIG,NOTES.IPPPD} ipppcomp/README.LZS  # ipppd/README.RADIUS
+	docinto ipppd/example
+	dodoc FAQ/_example/*.txt
+	docinto ipppd/howto
+	dodoc FAQ/_howto/{dns*,i4l_ipx*,isdn*,lan*,leased*,masq*,mppp*,ppp*,route*}
+
+	# install docs (isdnlog)
+	docinto isdnlog
+	dodoc isdnlog/{BUGS,FAQ,Isdn,NEWS,README*} FAQ/_howto/win*
+	docinto isdnlog/areacode
+	dodoc areacode/*.doc
+	docinto isdnlog/contrib/isdnbill
+	dodoc isdnlog/contrib/isdnbill/{*.isdnbill,*.gz}
+	docinto isdnlog/contrib/winpopup
+	dodoc isdnlog/contrib/winpopup/*
+
+	# install docs (eft)
+	docinto eft
+	dodoc eurofile/{CHANGES,INSTALL,README*,TODO}
+	newdoc eurofile/src/wuauth/README README.AUTHLIB
+	docinto eft/scripts
+	dodoc eurofile/scripts/{eft_useradd,check_system,ix25test,eftd.sh,eftp.sh}
+
+	# install init-scripts
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PV}/isdn.init isdn
+	newexe ${FILESDIR}/${PV}/net.ippp0 net.ippp0
+	newexe ${FILESDIR}/${PV}/isdnlog.init isdnlog.contr0
+
+	# install init-configs
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PV}/isdn.conf isdn
+	newins ${FILESDIR}/${PV}/isdnlog.conf isdnlog.contr0
+
+	# install example scripts and configs
+	exeinto /etc/ppp
+	insinto /etc/ppp
+	doexe ${FILESDIR}/${PV}/{ip-up,ip-down}
+	doins ${FILESDIR}/${PV}/{ioptions,options.ippp0}
+
+	# install example configs
+	insinto /etc/isdn
+	doins isdnlog/samples/{isdn,rate}.conf.{at,de,lu,nl,no,pl}
+	newins isdnlog/samples/isdn.conf isdn.conf.unknown
+	if [ -f isdnlog/samples/isdn.conf.${I4L_CC_LOW} ]; then
+		newins isdnlog/samples/isdn.conf.${I4L_CC_LOW} isdn.conf
+	else
+		doins isdnlog/samples/isdn.conf
+	fi
+	if [ -f isdnlog/samples/rate.conf.${I4L_CC_LOW} ]; then
+		newins isdnlog/samples/rate.conf.${I4L_CC_LOW} rate.conf
+	fi
+	sed -i -e "s:/usr/lib/isdn/:/usr/share/isdn/:g" ${D}/etc/isdn/isdn.conf*
+
+	# install sample provider script
+	exeinto /etc/isdn
+	doexe isdnlog/samples/provider
+
+	# rename isdnlog options file
+	insinto /etc/isdn
+	mv -f ${D}/etc/isdn/isdnlog.isdnctrl0.options ${D}/etc/isdn/isdnlog.options.contr0
+
+	# install isdnlog data files
+	insinto /usr/share/isdn
+	doins isdnlog/*.dat
+
+	# install logrotate configs
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/${PV}/isdnlog.logrotated isdnlog
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please edit:"
+	einfo
+	einfo "- /etc/conf.d/isdn   to contain your ISDN kernel modules"
+	einfo "- /etc/ppp/*         critical if you need networking"
+	einfo
+	einfo "For isdnlog you should edit:"
+	einfo
+	einfo "- /etc/conf.d/isdnlog.contr0"
+	einfo "- /etc/isdn/isdnlog.options.contr0"
+	einfo "- /etc/isdn/*.conf"
+	einfo
+	einfo "/etc/init.d/isdn will save and restore your isdnctrl config."
+	einfo "it will also handle the modem-register daemon."
+	einfo
+	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections"
+	einfo "which you need to set up using isdnctrl first!"
+	einfo
+	einfo "/etc/init.d/isdnlog.contr0 starts and stops isdnlog for contr0"
+	einfo "You can symlink it to isdnlog.contr1 and copy the corresponding"
+	einfo "configs if you have more than one card."
+	einfo
+}
diff --git a/net-dialup/isdn4k-utils/metadata.xml b/net-dialup/isdn4k-utils/metadata.xml
index 1e11e7bbd01b..1fa8855a476e 100644
--- a/net-dialup/isdn4k-utils/metadata.xml
+++ b/net-dialup/isdn4k-utils/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-dialup</herd>
+<longdescription>ISDN4Linux Utils</longdescription>
 </pkgmetadata>