remove badly named and obsolete ebuilds; now vbox3 has an ebuild on its own

25 files changed, 18 insertions, 1214 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index be8ceb3341f7..dab234b7b9fe 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.29 2004/11/22 20:05:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.30 2004/11/22 20:14:05 mrness Exp $
+
+  22 Nov 2004; Alin Nastac <mrness@gentoo.org> -files/local.start,
+  -files/3.2_p1-r4/config, -files/3.2_p1-r4/pathfix.patch,
+  -files/3.2_p1-r4/vbox-makefile.am.patch, -files/3.5_p20041024/config,
+  -files/3.5_p20041024/gentoo.patch, -files/3.5_p20041024/ioptions,
+  -files/3.5_p20041024/ip-down, -files/3.5_p20041024/ip-up,
+  -files/3.5_p20041024/isdn4linux.conf, -files/3.5_p20041024/isdn4linux.init,
+  -files/3.5_p20041024/net.ippp0, -files/3.5_p20041024/options.ippp0,
+  -files/3.5_p20041024/pathfix.patch,
+  -files/3.5_p20041024/vbox-makefile.am.patch, -isdn4k-utils-3.2_p1-r3.ebuild,
+  -isdn4k-utils-3.2_p1-r4.ebuild, -isdn4k-utils-3.5_p20041024-r1.ebuild,
+  -isdn4k-utils-3.5_p20041024.ebuild:
+  Remove obsolete testing ebuilds. Now vbox3 has its own ebuild.
 
 *isdn4k-utils-3.5_pre20041110 (22 Nov 2004)
 
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 193353fed194..88077140b89a 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,21 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d61b13b40bb68490857286252bf75585 ChangeLog 6615
+MD5 5ac26c33ae078e5d81656cb6b14bcb16 ChangeLog 7383
 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 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 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
@@ -26,20 +17,6 @@ MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.2_p1-r2/isdn4linux.conf 105
 MD5 875eb1dbe150bbae5bcdd6ae554f20c5 files/3.2_p1-r2/isdn4linux.init 718
 MD5 5d46112f6ebccecdb14e2812d2e348f2 files/3.2_p1-r2/net.ippp0 2426
 MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443
-MD5 0a638249458e39c304846ddd401e3fee files/3.2_p1-r4/config 2405
-MD5 56b93c0cc4cc17b12c6add0237283271 files/3.2_p1-r4/pathfix.patch 641
-MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/3.2_p1-r4/vbox-makefile.am.patch 1211
-MD5 36eadf8ec47ec3bf118cffbf2a42adb5 files/3.5_p20041024/config 2407
-MD5 76e9b700a1600d4b74dea30751934c83 files/3.5_p20041024/gentoo.patch 2383
-MD5 92412760dfacc81cfac908d522ac8e39 files/3.5_p20041024/ioptions 86
-MD5 b75b68506a43d3d897d7b32eb280b42e files/3.5_p20041024/ip-down 956
-MD5 38984b8cf470784c9052f566b4faa5d8 files/3.5_p20041024/ip-up 1105
-MD5 4cd4db641466668b0e04c6c3c9ff4ce7 files/3.5_p20041024/isdn4linux.conf 189
-MD5 79e7d5d0bfba905952294d6500361296 files/3.5_p20041024/isdn4linux.init 962
-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
@@ -54,7 +31,7 @@ MD5 02118ba89fc41144086224482bff7422 files/3.5_pre20041110/options.ippp0 685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBokadjtv59x0+BrURAhcvAJwM2GwpJ2Z/kH5JVyzB/VUV7AyIswCfZP3v
-OUH+T3wwRzlKV+gj5xwd97g=
-=SORI
+iD8DBQFBokiXjtv59x0+BrURAgduAJ4+7lNUbEN7aVWPdCuPY+Pq/Ic3VQCdHmVu
+IscTATZZXSo7fVJOQ+VVT8k=
+=eD+x
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r4/config b/net-dialup/isdn4k-utils/files/3.2_p1-r4/config
deleted file mode 100644
index 50eeaa14e2e8..000000000000
--- a/net-dialup/isdn4k-utils/files/3.2_p1-r4/config
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# 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.2_p1-r4/pathfix.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r4/pathfix.patch
deleted file mode 100644
index 1b5c0bdd5d17..000000000000
--- a/net-dialup/isdn4k-utils/files/3.2_p1-r4/pathfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.2_p1-r4/vbox-makefile.am.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r4/vbox-makefile.am.patch
deleted file mode 100644
index 226262112f89..000000000000
--- a/net-dialup/isdn4k-utils/files/3.2_p1-r4/vbox-makefile.am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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/files/3.5_p20041024/config b/net-dialup/isdn4k-utils/files/3.5_p20041024/config
deleted file mode 100644
index a07d9589bf52..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/config
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# 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
deleted file mode 100644
index 4101b3abf044..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index 39cd232ddaba..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/ioptions
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 52ae93395c14..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/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 "$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
deleted file mode 100644
index 4f16ae3220f6..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/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 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_p20041024/isdn4linux.conf b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
deleted file mode 100644
index b81d7173c1ed..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Location where isdnctrl will save its configuration
-ISDNCTRL_SAVE="/var/lib/isdn4linux/isdnctrl.conf"
-
-# ISDN drivers to load via modprobe
-# comment out to disable
-ISDN_DRIVERS="capidrv"
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init b/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
deleted file mode 100644
index 428e2830f74a..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/isdn4linux.init
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/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.2 2004/11/10 21:30:05 mrness Exp $
-
-opts="start stop save reload"
-
-depend() {
-	use pcmcia
-	after capi
-}
-
-start() {
-	# set this variable if you want to load drivers
-	for DRIVER in ${ISDN_DRIVERS} ; do
-		if ! /bin/grep -q "^${DRIVER} " /proc/modules ; then
-			ebegin "Loading ISDN driver ${DRIVER}"
-			/sbin/modprobe ${DRIVER}
-			eend $?
-		fi
-	done
-
-	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
deleted file mode 100644
index 693d220b68d1..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/net.ippp0
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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
deleted file mode 100644
index 13983f19ee96..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/options.ippp0
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
deleted file mode 100644
index 1b5c0bdd5d17..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/pathfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 226262112f89..000000000000
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/vbox-makefile.am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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/files/digest-isdn4k-utils-3.2_p1-r3 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r3
deleted file mode 100644
index fa921629c0cd..000000000000
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d347afa462e46eccfd1284aebae227b6 isdn4k-utils.v3.2p1.tar.bz2 5238737
-MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r4 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r4
deleted file mode 100644
index fa921629c0cd..000000000000
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d347afa462e46eccfd1284aebae227b6 isdn4k-utils.v3.2p1.tar.bz2 5238737
-MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024
deleted file mode 100644
index 50734554dc2d..000000000000
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 453e6ca8812555d96fe3e840c89b15a8 isdn4k-utils-CVS-2004-10-24.tar.bz2 5508166
-MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1
deleted file mode 100644
index 50734554dc2d..000000000000
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_p20041024-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 453e6ca8812555d96fe3e840c89b15a8 isdn4k-utils-CVS-2004-10-24.tar.bz2 5508166
-MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/files/local.start b/net-dialup/isdn4k-utils/files/local.start
deleted file mode 100644
index eb9af496e053..000000000000
--- a/net-dialup/isdn4k-utils/files/local.start
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/local.start,v 1.3 2004/07/14 23:16:01 agriffis Exp $
-
-# This is a good place to load any misc.
-# programs on startup ( 1>&2 )
-
-echo " - Starte ISDN+Kisdnmon services"
-/usr/sbin/isdnctrl verbose 3
-/usr/sbin/hisaxctrl 0 1 4
-# /usr/sbin/isdninfo # <-- this for kisdnmon !!
-# /usr/sbin/i4lmond2 # <-- this for kisdnmon !!
-/sbin/isdnlog -f/etc/isdn/isdnlog.isdnctrl0.options /dev/isdn/isdnctrl -D
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r3.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r3.ebuild
deleted file mode 100644
index 5eac651e1ff0..000000000000
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.2_p1-r3.ebuild,v 1.7 2004/07/01 22:07:43 eradicator Exp $
-
-inherit eutils
-
-IUSE="X"
-VBOX_V=0.1.9
-MY_PVR=${PV}-r2
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="ISDN-4-Linux Utils"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${PN}.v3.2p1.tar.bz2
-	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
-HOMEPAGE="http://www.isdn4linux.de/"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
-LICENSE="GPL-2"
-
-RDEPEND=">=sys-apps/portage-2.0.47-r10
-	virtual/libc
-	sys-libs/ncurses
-	sys-libs/gdbm
-	X? (
-		virtual/x11
-		dev-lang/tcl
-	)"
-
-DEPEND="${RDEPEND} virtual/linux-sources"
-
-src_unpack() {
-	unpack ${A}
-	# Get country code from I4L_CC variable
-	# default country: DE (Germany)
-	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
-	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
-	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
-	cd ${S}
-
-	# Patch .config file to suit our needs
-	cat ${FILESDIR}/${MY_PVR}/config | { \
-		if use X >/dev/null; then
-			cat
-		else
-			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
-		fi; } | { \
-		case "${I4L_CC}" in
-			DE|AT|CH|NL)
-				# These countries are specially supported in the isdnlog source.
-				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
-				;;
-			*)
-				# Others get a generic isdnlog.
-				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
-				;;
-		esac } \
-		> .config || die
-
-	# Patch in order to make generic config for countries which are not known to isdnlog source
-	epatch ${FILESDIR}/${MY_PVR}/gentoo.patch
-
-	#disabling device creation the easy way:
-	echo "#!/bin/bash" > scripts/makedev.sh
-	echo "true" >> scripts/makedev.sh
-
-	epatch ${FILESDIR}/gcc33-multiline.patch
-
-	#disable vbox
-	sed -i -e "s:CONFIG_VBOX=y::" .config
-}
-
-src_compile() {
-	make subconfig || die
-	make || die
-
-	cd ${S}/../vbox3-${VBOX_V}
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dodir /dev /sbin /usr/bin
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/doc ${D}/dev
-	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt
-
-	cd ${FILESDIR}/${MY_PVR}
-	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
-
-	exeinto /etc/init.d
-	doexe net.ippp0
-	newexe isdn4linux.init isdn4linux
-
-	insinto /etc/conf.d
-	newins isdn4linux.conf isdn4linux
-
-	exeinto /etc/ppp
-	insinto /etc/ppp
-	doexe ip-up
-	dosym ip-up /etc/ppp/ip-down
-	doins ip-down.ippp0
-	doins ioptions
-	doins options.ippp0
-
-	cd ${S}/../vbox3-${VBOX_V}
-	einstall || die
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "Please edit:"
-	einfo
-	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
-	einfo "- /etc/isdn/* (critical)"
-	einfo "- /etc/ppp/* (critical)"
-	einfo
-	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
-	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
-	einfo "you need to set up using isdnctrl first!"
-	einfo
-
-}
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild
deleted file mode 100644
index e93930a17d22..000000000000
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.2_p1-r4.ebuild,v 1.7 2004/09/24 02:14:45 dragonheart Exp $
-
-inherit eutils
-
-IUSE="X"
-VBOX_V=0.1.9
-MY_PVR=${PV}-r2
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="ISDN-4-Linux Utils"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${PN}.v3.2p1.tar.bz2
-	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
-HOMEPAGE="http://www.isdn4linux.de/"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
-LICENSE="GPL-2"
-
-RDEPEND=">=sys-apps/portage-2.0.47-r10
-	virtual/libc
-	sys-libs/ncurses
-	sys-libs/gdbm
-	dev-lang/tcl
-	X? (
-		virtual/x11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sys-devel/libtool
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-
-	# Get country code from I4L_CC variable
-	# default country: DE (Germany)
-	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
-	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
-	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
-	cd ${S}
-
-	# fix for 2.6 headers
-	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
-
-	# Patch .config file to suit our needs
-	cat ${FILESDIR}/${PVR}/config | { \
-		if use X >/dev/null; then
-			cat
-		else
-			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
-		fi; } | { \
-		case "${I4L_CC}" in
-			DE|AT|CH|NL)
-				# These countries are specially supported in the isdnlog source.
-				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
-				;;
-			*)
-				# Others get a generic isdnlog.
-				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
-				;;
-		esac } \
-		> .config || die
-
-	# Patch in order to make generic config for countries which are not known to isdnlog source
-	epatch ${FILESDIR}/${MY_PVR}/gentoo.patch
-
-	# disabling device creation the easy way:
-	echo "#!/bin/bash" > scripts/makedev.sh
-	echo "true" >> scripts/makedev.sh
-
-	epatch ${FILESDIR}/gcc33-multiline.patch
-
-	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
-	do
-		cd ${S}/${x}
-		[ -f ltmain.sh ] && libtoolize --force
-		rm -f missing
-		aclocal
-		automake --add-missing
-		autoconf
-	done
-
-	cd ${WORKDIR}/vbox3-${VBOX_V}
-	epatch ${FILESDIR}/${PVR}/vbox-makefile.am.patch || die "failed to patch"
-}
-
-src_compile() {
-	make subconfig || die
-	make || die
-
-	cd ${S}/../vbox3-${VBOX_V}
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dodir /dev /sbin /usr/bin
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/doc ${D}/dev
-	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt
-
-	cd ${FILESDIR}/${MY_PVR}
-	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
-
-	exeinto /etc/init.d
-	doexe net.ippp0
-	newexe isdn4linux.init isdn4linux
-
-	insinto /etc/conf.d
-	newins isdn4linux.conf isdn4linux
-
-	exeinto /etc/ppp
-	insinto /etc/ppp
-	doexe ip-up
-	dosym ip-up /etc/ppp/ip-down
-	doins ip-down.ippp0
-	doins ioptions
-	doins options.ippp0
-
-	cd ${S}/../vbox3-${VBOX_V}
-	emake DESTDIR=${D} install || die
-
-	cd ${D}/etc/isdn
-	epatch ${FILESDIR}/${PVR}/pathfix.patch || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please edit:"
-	einfo
-	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
-	einfo "- /etc/isdn/* (critical)"
-	einfo "- /etc/ppp/* (critical)"
-	einfo
-	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
-	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
-	einfo "you need to set up using isdnctrl first!"
-	einfo
-
-}
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild
deleted file mode 100644
index 4df09aec03cc..000000000000
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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-r1.ebuild,v 1.1 2004/11/10 21:30:05 mrness Exp $
-
-inherit eutils
-
-MY_V=${PV/*_p/}
-MY_PV=${PN}-CVS-${MY_V:0:4}-${MY_V:4:2}-${MY_V:6:2}
-VBOX_V=0.1.9
-S=${WORKDIR}/${MY_PV}
-DESCRIPTION="ISDN-4-Linux Utils"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_PV}.tar.bz2
-	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
-HOMEPAGE="http://www.isdn4linux.de/"
-
-KEYWORDS="~x86 ~amd64 ~alpha"
-LICENSE="GPL-2"
-IUSE="X"
-SLOT="0"
-
-RDEPEND="virtual/modutils
-	virtual/libc
-	sys-libs/ncurses
-	sys-libs/gdbm
-	dev-lang/tcl
-	X? (
-		virtual/x11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sys-devel/libtool
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-
-	# Get country code from I4L_CC variable
-	# default country: DE (Germany)
-	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
-	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
-	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
-	cd ${S}
-
-	# fix for 2.6 headers
-	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
-
-	# Patch .config file to suit our needs
-	cat ${FILESDIR}/${PV}/config | { \
-		if use X >/dev/null; then
-			cat
-		else
-			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
-		fi; } | { \
-		case "${I4L_CC}" in
-			DE|AT|CH|NL)
-				# These countries are specially supported in the isdnlog source.
-				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
-				;;
-			*)
-				# Others get a generic isdnlog.
-				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
-				;;
-		esac } \
-		> .config || die
-
-	# Patch in order to make generic config for countries which are not known to isdnlog source
-	epatch ${FILESDIR}/${PV}/gentoo.patch
-
-	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
-	do
-		cd ${S}/${x}
-		[ -f ltmain.sh ] && libtoolize --force
-		rm -f missing
-		aclocal
-		automake --add-missing
-		autoconf
-	done
-
-	cd ${WORKDIR}/vbox3-${VBOX_V}
-	epatch ${FILESDIR}/${PV}/vbox-makefile.am.patch || die "failed to patch vbox"
-}
-
-src_compile() {
-	make subconfig || die
-	make || die
-
-	cd ${S}/../vbox3-${VBOX_V}
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dodir /dev /sbin /usr/bin
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh
-
-	cd ${FILESDIR}/${PV}
-	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
-
-	exeinto /etc/init.d
-	doexe net.ippp0
-	newexe isdn4linux.init isdn4linux
-
-	insinto /etc/conf.d
-	newins isdn4linux.conf isdn4linux
-
-	exeinto /etc/ppp
-	insinto /etc/ppp
-	doexe ip-up ip-down
-	doins ioptions
-	doins options.ippp0
-
-	cd ${S}/../vbox3-${VBOX_V}
-	einstall || die "cannot install vbox3"
-
-	cd ${D}/etc/isdn
-	epatch ${FILESDIR}/${PV}/pathfix.patch || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please edit:"
-	einfo
-	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
-	einfo "- /etc/isdn/* (critical)"
-	einfo "- /etc/ppp/* (critical)"
-	einfo
-	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
-	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
-	einfo "you need to set up using isdnctrl first!"
-	einfo
-
-}
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild
deleted file mode 100644
index ea56303c62b3..000000000000
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_p20041024.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.2 2004/11/09 16:40:56 mrness Exp $
-
-inherit eutils
-
-MY_V=${PV/*_p/}
-MY_PV=${PN}-CVS-${MY_V:0:4}-${MY_V:4:2}-${MY_V:6:2}
-VBOX_V=0.1.9
-S=${WORKDIR}/${MY_PV}
-DESCRIPTION="ISDN-4-Linux Utils"
-SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_PV}.tar.bz2
-	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
-HOMEPAGE="http://www.isdn4linux.de/"
-
-KEYWORDS="~x86 ~amd64 ~alpha"
-LICENSE="GPL-2"
-IUSE="X"
-SLOT="0"
-
-RDEPEND=">=sys-apps/portage-2.0.47-r10
-	virtual/libc
-	sys-libs/ncurses
-	sys-libs/gdbm
-	dev-lang/tcl
-	X? (
-		virtual/x11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sys-devel/libtool
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-
-	# Get country code from I4L_CC variable
-	# default country: DE (Germany)
-	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
-	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
-	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
-	cd ${S}
-
-	# fix for 2.6 headers
-	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
-
-	# Patch .config file to suit our needs
-	cat ${FILESDIR}/${PV}/config | { \
-		if use X >/dev/null; then
-			cat
-		else
-			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
-		fi; } | { \
-		case "${I4L_CC}" in
-			DE|AT|CH|NL)
-				# These countries are specially supported in the isdnlog source.
-				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
-				;;
-			*)
-				# Others get a generic isdnlog.
-				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
-				;;
-		esac } \
-		> .config || die
-
-	# Patch in order to make generic config for countries which are not known to isdnlog source
-	epatch ${FILESDIR}/${PV}/gentoo.patch
-
-	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
-	do
-		cd ${S}/${x}
-		[ -f ltmain.sh ] && libtoolize --force
-		rm -f missing
-		aclocal
-		automake --add-missing
-		autoconf
-	done
-
-	cd ${WORKDIR}/vbox3-${VBOX_V}
-	epatch ${FILESDIR}/${PV}/vbox-makefile.am.patch || die "failed to patch vbox"
-}
-
-src_compile() {
-	make subconfig || die
-	make || die
-
-	cd ${S}/../vbox3-${VBOX_V}
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	dodir /dev /sbin /usr/bin
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh
-
-	cd ${FILESDIR}/${PV}
-	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
-
-	exeinto /etc/init.d
-	doexe net.ippp0
-	newexe isdn4linux.init isdn4linux
-
-	insinto /etc/conf.d
-	newins isdn4linux.conf isdn4linux
-
-	exeinto /etc/ppp
-	insinto /etc/ppp
-	doexe ip-up ip-down
-	doins ioptions
-	doins options.ippp0
-
-	cd ${S}/../vbox3-${VBOX_V}
-	einstall || die "cannot install vbox3"
-
-	cd ${D}/etc/isdn
-	epatch ${FILESDIR}/${PV}/pathfix.patch || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please edit:"
-	einfo
-	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
-	einfo "- /etc/isdn/* (critical)"
-	einfo "- /etc/ppp/* (critical)"
-	einfo
-	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
-	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
-	einfo "you need to set up using isdnctrl first!"
-	einfo
-
-}