version bumb, some cleanups, added gcc4 patch (bug 117573).

(Portage version: 2.1_pre4-r1)

14 files changed, 642 insertions, 35 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index 8b2f48a5d673..8b5a3ff78c9f 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/isdn4k-utils
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.49 2005/12/26 15:11:30 sbriesen Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.50 2006/02/04 21:14:17 sbriesen Exp $
+
+*isdn4k-utils-3.9_pre20060124 (04 Feb 2006)
+
+  04 Feb 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/eiconctrl-gcc4.patch, +files/config-3.9_pre20060124,
+  files/hisax.initd, files/isdn.blacklist, files/isdn.initd,
+  files/isdnlog.initd, +isdn4k-utils-3.9_pre20060124.ebuild:
+  version bumb, some cleanups, added gcc4 patch (bug 117573).
 
   26 Dec 2005; Stefan Briesenick <sbriesen@gentoo.org>
   isdn4k-utils-3.8_pre20050821.ebuild:
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 549f255de753..7428e4901e84 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,41 +1,135 @@
-MD5 24f05e797b96586138802daf16e187f6 ChangeLog 13381
+MD5 e19b32eb2612afd7c42d6ce17cf55bf3 ChangeLog 13728
+RMD160 e53d4a5ca14b18967643552ea4ab894d07bb8cd2 ChangeLog 13728
+SHA256 0598bc959e2c92aae97e9900d18ddb14112d5de844dc0ca5e331d1090a2e9722 ChangeLog 13728
 MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752
+RMD160 4a9b014a1d1c39f6f0052a94b009df5d7ab96d19 files/3.6_pre20041219/auerswald.usermap 752
+SHA256 a6477a2dc60995e52160b0a22839e790aa01235ddf2523368961d7c402bb6895 files/3.6_pre20041219/auerswald.usermap 752
 MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693
+RMD160 17b93efccff90c7a55bf62038adcfd68be8e0209 files/3.6_pre20041219/config 2693
+SHA256 e544c20a401382ba92d7c73791802feec3dd5a083ff898815e5e005b79c22370 files/3.6_pre20041219/config 2693
 MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341
+RMD160 9d7fc78ef6550ce5462f5d95850f2af4656109f3 files/3.6_pre20041219/hisax.conf 1341
+SHA256 5795f91eff07a6bbf5471ca24e2973cdad994e3a82a531c22799064b51b730ba files/3.6_pre20041219/hisax.conf 1341
 MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817
+RMD160 9dddc00b425e7490320b1db337001762ddbacb4e files/3.6_pre20041219/hisax.initd 5817
+SHA256 d1719c5f28d531925ac6ae1cea91e6d00a0016021817cee32d271e32bcdc7f76 files/3.6_pre20041219/hisax.initd 5817
 MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188
+RMD160 1cc0d9d0bdd1ab334dd7d29103164ada721f8d26 files/3.6_pre20041219/hisax.usermap 188
+SHA256 99a8415d4eb72cd59c280e961722a119a1e9a5fc3d0a66a702d116c0891ba559 files/3.6_pre20041219/hisax.usermap 188
 MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323
+RMD160 0b7003ed7a5979c278849428ab0cc8e8eb50e41e files/3.6_pre20041219/ioptions 323
+SHA256 cef931b8135949809459844c32d966a741befc87dc77e806355c62d34ec0bd36 files/3.6_pre20041219/ioptions 323
 MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520
+RMD160 b581df44a1aec6faf88f0c21a19efc253458afa0 files/3.6_pre20041219/isdn.blacklist 520
+SHA256 dd90e0136c561d00324e684ca12db49bc88521956ea9fc0145fd957d9ed698f9 files/3.6_pre20041219/isdn.blacklist 520
 MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500
+RMD160 1551228843e5f8a2b1a4cb3837fd8c6b6aff3a7b files/3.6_pre20041219/isdn.confd 500
+SHA256 63933efdf51ac73b6d10f5f2a3020379224ae15bedc23b310d043b1461efba30 files/3.6_pre20041219/isdn.confd 500
 MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410
+RMD160 6a95703bbdc83668dd49af9812558288710e9066 files/3.6_pre20041219/isdn.initd 2410
+SHA256 28569828586832633d51d31aa36cdabbd68a41eebc1301356aea1c1d16cf8c2e files/3.6_pre20041219/isdn.initd 2410
 MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415
+RMD160 46f53e5071389cb918bc4c08ea33b7f39a034476 files/3.6_pre20041219/isdnlog.confd 415
+SHA256 321eb4cb078b374da955e85104483b1a7908f3a258d3ee74402793ed88cf99d7 files/3.6_pre20041219/isdnlog.confd 415
 MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047
+RMD160 cc546ea55e3c749eb13f14dad26e5dd50e7d541c files/3.6_pre20041219/isdnlog.initd 1047
+SHA256 dca4f6c99cb5aceb7a735a9532bbdc979384ceff362afd3e228e74cf901fb516 files/3.6_pre20041219/isdnlog.initd 1047
 MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438
+RMD160 cc63d87d2186b29ee7ec7af126d6c10c907d7661 files/3.6_pre20041219/isdnlog.logrotated 438
+SHA256 6c40c7d04945581aec7b5c470dd4b4188254f46fd819a3010725ede5302c6ed0 files/3.6_pre20041219/isdnlog.logrotated 438
 MD5 4a1f7ca15a6ef5aa00648eb8ad43a9e1 files/3.6_pre20041219/net.ippp0 2428
+RMD160 fa3f2b46988da5d8bd5e0bb66fe7eac9e5530b0d files/3.6_pre20041219/net.ippp0 2428
+SHA256 de19cdee30dd8480d5712826314d610cc7f7391c5675daaf71a190c829d75eef files/3.6_pre20041219/net.ippp0 2428
 MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685
+RMD160 6c2779a3a9a0e7fb65f4b916f9b85ea9c6662052 files/3.6_pre20041219/options.ippp0 685
+SHA256 647f41b64ade8cf965912568768b674f5b45a26744ac5de13dda20faba14e982 files/3.6_pre20041219/options.ippp0 685
 MD5 857c709217075d76229be25e413710d9 files/auerswald.usermap 397
+RMD160 4914f36a0095823448f43c54066e8758636396d9 files/auerswald.usermap 397
+SHA256 d7986d6e79316664314cdcd273635f5011c7a9365505663a5bb78227db747d49 files/auerswald.usermap 397
 MD5 01e75c203125d9976400683136a21687 files/config-3.7_pre20050329 2872
+RMD160 9bf63f042ce846d2949f3da2e5bc341b9f67c3e9 files/config-3.7_pre20050329 2872
+SHA256 663d41280b5647facdb558ff9d4e55940b883eebf5cea80521d4887e81a84264 files/config-3.7_pre20050329 2872
 MD5 1485ac448762742431e425a8a9633caf files/config-3.7_pre20050626 2776
+RMD160 39234743767486e1334f97bc845c2b7739ef61da files/config-3.7_pre20050626 2776
+SHA256 6537766345181371f9fb41ce16f769a09cbd75cc91f899916400d52280c66751 files/config-3.7_pre20050626 2776
 MD5 6ac41911cd731019286016727a61f5ac files/config-3.8_pre20050821 2781
+RMD160 f9fdfd3d8b1360a278df98cf9b273b356da93d05 files/config-3.8_pre20050821 2781
+SHA256 08b531c1bf20d9d6188fab9f8afbff5693c2a3b99613880b6af0723375537081 files/config-3.8_pre20050821 2781
+MD5 6ac41911cd731019286016727a61f5ac files/config-3.9_pre20060124 2781
+RMD160 f9fdfd3d8b1360a278df98cf9b273b356da93d05 files/config-3.9_pre20060124 2781
+SHA256 08b531c1bf20d9d6188fab9f8afbff5693c2a3b99613880b6af0723375537081 files/config-3.9_pre20060124 2781
 MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219-r1 81
+RMD160 ae15bce602d0003e2c2800434deab2fe16528285 files/digest-isdn4k-utils-3.6_pre20041219-r1 81
+SHA256 8fd766b4d8b07739de3ee51866572b4ba5fc8afd75c88faef8624ba18e1af7cd files/digest-isdn4k-utils-3.6_pre20041219-r1 81
 MD5 0ec995fc0e6532f3934b3accad79f8cf files/digest-isdn4k-utils-3.7_pre20050626 81
-MD5 58808a3af01ef0246beb7d1b038c3faa files/digest-isdn4k-utils-3.8_pre20050821 81
+RMD160 3867b5b2303d3f7b944c07ab6dc2f67c05e238e2 files/digest-isdn4k-utils-3.7_pre20050626 81
+SHA256 240c05c191f6a392e21f60b7a092f271cc5a6bd7739a0c56f907ea4676bc47ad files/digest-isdn4k-utils-3.7_pre20050626 81
+MD5 12ef52efe9327c154209634d335cece8 files/digest-isdn4k-utils-3.8_pre20050821 289
+RMD160 744c728fee8c1af9529578e13488da46a5653f5f files/digest-isdn4k-utils-3.8_pre20050821 289
+SHA256 8e277c915e4fff37f550919f96fee1f976be4a771d2c6a5fc2162ef4a2f2e6e8 files/digest-isdn4k-utils-3.8_pre20050821 289
+MD5 23a226d133fb2e0922ba3bcafacf7524 files/digest-isdn4k-utils-3.9_pre20060124 289
+RMD160 676939ffad818783078fcb4032a5648eace80578 files/digest-isdn4k-utils-3.9_pre20060124 289
+SHA256 388f54ca04dad83410194b4c3ba94a1218036e2782e752c056dc548c51e2f81b files/digest-isdn4k-utils-3.9_pre20060124 289
+MD5 a441b940d846a92ca2f3b6a44e9b8c6c files/eiconctrl-gcc4.patch 387
+RMD160 fe61b877fcc5a4a694fd82bf3438cd02e8dcb4b9 files/eiconctrl-gcc4.patch 387
+SHA256 24bde423307ce2aa5033dce8b8bb52983e9fcd2857ffea2ce34c3bdceb14eed6 files/eiconctrl-gcc4.patch 387
 MD5 86576c4c0ae856485125ae3ae08c973d files/hisax.conf 1144
-MD5 f04fcf14f44566a2ca0719204ed87e4a files/hisax.initd 6556
+RMD160 0b8d175ef78b6ad7fceca687e9c0167475ddd477 files/hisax.conf 1144
+SHA256 6f281aa0ad3b6dafb0492ec98e5ad98156cfabac9a280d98a027bad10da3878d files/hisax.conf 1144
+MD5 13c594dcfd7a0cb7abed728898e87a6f files/hisax.initd 6556
+RMD160 42abe369adf7b339d8c21efccbb6254d8982c654 files/hisax.initd 6556
+SHA256 693ee27c14fc6c496ab39b629490e31c21a0befcad806770b9961c3cf3ed14cd files/hisax.initd 6556
 MD5 649d35c1add6b0d84e4280a432074351 files/hisax.usermap 122
+RMD160 10a4ab81d20faf1cd76b83f73a97f54b8ccd590f files/hisax.usermap 122
+SHA256 3f614ecb6c9a5d486acad83c31cf5ada7de4d93c39f53227a0406210cee6fdf5 files/hisax.usermap 122
 MD5 92412760dfacc81cfac908d522ac8e39 files/ioptions 86
+RMD160 7562b3b63d424743f1dc66d47ce27094c6ede1e2 files/ioptions 86
+SHA256 c6ea603efce6b2e0d4ae3b9a4202ab44c5d23545181a29947601e9503ed02b1d files/ioptions 86
 MD5 9898159595a17b492bb241b959f5f074 files/ipppd-pcap-0.9.3.patch 1590
-MD5 f7290656d6dcbd0ec40f00e3d797f79d files/isdn.blacklist 356
+RMD160 aa62f3fdeb98b69e208cb96ad60db184ebf96273 files/ipppd-pcap-0.9.3.patch 1590
+SHA256 f5e6b84ca891880081b10416bd5d3c5d7126d7c692c29e469f9d7e44b0e14d35 files/ipppd-pcap-0.9.3.patch 1590
+MD5 06e7abc965c0eac1380c6c8ba4390378 files/isdn.blacklist 216
+RMD160 1d2a672f45ef1cfa1902d64a9c0221365af9b344 files/isdn.blacklist 216
+SHA256 0d526486dc22a815fa8ec1beb5f0e0ab1e26d21bc4a63e28ea70732314bb4ae1 files/isdn.blacklist 216
 MD5 6e0925cc6a39e1aa656b143bf4fc75f6 files/isdn.confd 634
-MD5 cd9fbe733c2252c425ca6961aea2b6fc files/isdn.initd 3820
+RMD160 dd6039533238a06b75cfe817e9c24a31af11b752 files/isdn.confd 634
+SHA256 611ade91c898328a81a0f740364acb8502777657d27963d11669d24c7f526cf9 files/isdn.confd 634
+MD5 74c76531d81f5f6875562d0bf4ee4f71 files/isdn.initd 3828
+RMD160 881392c6089f7859b4194e3ef72af55f3399fd4d files/isdn.initd 3828
+SHA256 f4b5bd914a0b1daae4e57367e15f072b952eb217b001e12fcf5b3048f8cd407e files/isdn.initd 3828
 MD5 fc829217e8c183d2ab6e9b6dd5dd50e6 files/isdn.pcmcia 523
+RMD160 26b25fbf1e504321f6fb30876238ec52e04468e5 files/isdn.pcmcia 523
+SHA256 c42943bc84dd1d77732bc0c4db3d14e2a19abc5285ee76479b8f9c649fe5ea02 files/isdn.pcmcia 523
 MD5 01f12d0a19d1304719792797f8977782 files/isdn.pcmcia.conf 4581
+RMD160 06af23d70633ed1183054b5687f07dac5ba5c59b files/isdn.pcmcia.conf 4581
+SHA256 212293f7ca17272d215740d6d415bf9fbcd17d7c5f8bc8932904d5b6aac7ea62 files/isdn.pcmcia.conf 4581
 MD5 64c78da4643b660b18da623dcf0d9826 files/isdnlog.confd 679
-MD5 8f84f8daae8d5655d6da26d18dce0626 files/isdnlog.initd 2418
+RMD160 6c3cfce8a979ce5b79abd4c8f59efececd2a29de files/isdnlog.confd 679
+SHA256 f293af570546ed89ebfd17003ce0c5053030efabf14b0250f04c20a88e745c0f files/isdnlog.confd 679
+MD5 dd76031a1ec71272be4c9750fabc2275 files/isdnlog.initd 2418
+RMD160 0761195654190f2bfd15789e4944440df072f97a files/isdnlog.initd 2418
+SHA256 6d69534b42e0ea6f627137a5ceafad153c9a2935cfff344fcec7006a6c7f43b5 files/isdnlog.initd 2418
 MD5 e56d47fcff15cbd8278b196cdffd7433 files/isdnlog.logrotated 191
+RMD160 b9c0339d2e92efb388cde9af68bcb5ecd3f0893c files/isdnlog.logrotated 191
+SHA256 1a0d028b9ac55aa07edb12fb5f23dbe6bf3a94a0a20bdd91cd61052f5c514c25 files/isdnlog.logrotated 191
 MD5 521e30e785f269e397b134eaaedb9072 files/net.ippp0 2412
+RMD160 10ade1490a6cb92c0e953eb0eff819028379f596 files/net.ippp0 2412
+SHA256 517f6659c2d43a35abd1b3b7cd07740f46bc16443ea60b3862f397b5b959e922 files/net.ippp0 2412
 MD5 48266d44ebe70519d3fc67a6b0e260ff files/options.ippp0 443
-MD5 5eeb7174364e6bddb64a87d746660f78 isdn4k-utils-3.6_pre20041219-r1.ebuild 7145
-MD5 feee5c40e3619fe18a532086f1c13929 isdn4k-utils-3.7_pre20050626.ebuild 9401
-MD5 59669231b05e16aa730bc91a00660337 isdn4k-utils-3.8_pre20050821.ebuild 10830
+RMD160 8ed0921ae6912fdb4462181a1b9a5209f2bb0c0d files/options.ippp0 443
+SHA256 663e9db679a5cc471f07bd6e75ff450c3c7e6508f6bfd904b8da5437ec72d052 files/options.ippp0 443
+MD5 c3ac1a7dc46c523156832c64174907dc isdn4k-utils-3.6_pre20041219-r1.ebuild 7146
+RMD160 fc10f6171dc5180a871797d3e2499c8d985674c3 isdn4k-utils-3.6_pre20041219-r1.ebuild 7146
+SHA256 35068ed7c783f110be93e6f038bdf6898f83de547c67784d00674ecee2de7cd3 isdn4k-utils-3.6_pre20041219-r1.ebuild 7146
+MD5 818b9cc733a122475a463a33dd5421d6 isdn4k-utils-3.7_pre20050626.ebuild 9402
+RMD160 00b504f022f403bd3e5ddf8cf5335204cfe83895 isdn4k-utils-3.7_pre20050626.ebuild 9402
+SHA256 741592c1caac36fc5e42fa5c43479b21f0df1d3b87ade0a0381fbd3696adaabb isdn4k-utils-3.7_pre20050626.ebuild 9402
+MD5 7c2678a91006f2696313b5aedb4706c3 isdn4k-utils-3.8_pre20050821.ebuild 10832
+RMD160 53f340af3897454221c4725d6a95d96f948a8e13 isdn4k-utils-3.8_pre20050821.ebuild 10832
+SHA256 5f78505d89250a219a8587749f1fa653890be8b1070cd812eb0bbc772ced08be isdn4k-utils-3.8_pre20050821.ebuild 10832
+MD5 d41233479be4f6ecb32ed2107111bff1 isdn4k-utils-3.9_pre20060124.ebuild 11817
+RMD160 4ede9df972980bb699d1c2f3d2f0271ffe01dea7 isdn4k-utils-3.9_pre20060124.ebuild 11817
+SHA256 74eee83b8137729d49dd6b9c9213a8f1bb6e3d44daac18a5435ec1b0c7f205f0 isdn4k-utils-3.9_pre20060124.ebuild 11817
 MD5 41bb308eb7db7d75c04a60f8cfb73be3 metadata.xml 418
+RMD160 17c396ff690867e3973b4edc6e9d12913f2d122f metadata.xml 418
+SHA256 26d507f24caf982ef7137e998ccb984ed6c555dbd4134e4c291739aebe6fccf1 metadata.xml 418
diff --git a/net-dialup/isdn4k-utils/files/config-3.9_pre20060124 b/net-dialup/isdn4k-utils/files/config-3.9_pre20060124
new file mode 100644
index 000000000000..bf4875ca9916
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/config-3.9_pre20060124
@@ -0,0 +1,137 @@
+#
+# 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_CARD_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_FIRMWAREDIR='/lib/firmware/isdn'
+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=y
+CONFIG_ACTCTRL=y
+CONFIG_PCBITCTL=y
+# CONFIG_AVMCAPICTRL is not set
+CONFIG_ACTCTRL=y
+CONFIG_EICONCTRL=y
+CONFIG_LOOPCTRL=y
+# CONFIG_LOOPCTRL_DEBUG=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/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=y
+# CONFIG_ISDNLOG_POSTGRESDIR='/usr'
+# CONFIG_ISDNLOG_MYSQLDB=y
+# CONFIG_ISDNLOG_MYSQLDIR='/usr'
+# CONFIG_ISDNLOG_ORACLE=y
+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=y
+# CONFIG_RADIUS_WTMP_LOGGING=y
+# 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=y
+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/digest-isdn4k-utils-3.8_pre20050821 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.8_pre20050821
index f0dac960c47f..8f0afc27424c 100644
--- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.8_pre20050821
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.8_pre20050821
@@ -1 +1,3 @@
 MD5 dcbe134eb8d4a4aea4a24a180a129c93 isdn4k-utils-CVS-2005-08-21.tar.bz2 5650794
+RMD160 f23f4bf9f0c89f0ea154a723db70ae68713233ec isdn4k-utils-CVS-2005-08-21.tar.bz2 5650794
+SHA256 8d5c16dfe6e0b0d806572946e03e1cedaeb9a931896ff1bc782c75ad3435ebaa isdn4k-utils-CVS-2005-08-21.tar.bz2 5650794
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.9_pre20060124 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.9_pre20060124
new file mode 100644
index 000000000000..03d5774ebef1
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.9_pre20060124
@@ -0,0 +1,3 @@
+MD5 9b972eb226d69eae1d2e19a09e664b78 isdn4k-utils-CVS-2006-01-24.tar.bz2 5756851
+RMD160 e54d10fbc4db46a004ba693bbfed8b0ba503d275 isdn4k-utils-CVS-2006-01-24.tar.bz2 5756851
+SHA256 92e7bbf0614cc1d7940658510456b847644cf61aae37d6ae5ec5c68bf8a05ac9 isdn4k-utils-CVS-2006-01-24.tar.bz2 5756851
diff --git a/net-dialup/isdn4k-utils/files/eiconctrl-gcc4.patch b/net-dialup/isdn4k-utils/files/eiconctrl-gcc4.patch
new file mode 100644
index 000000000000..d981452f195b
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/eiconctrl-gcc4.patch
@@ -0,0 +1,11 @@
+--- eicon/eiconctrl.c.orig	2001-03-01 15:59:12.000000000 +0100
++++ eicon/eiconctrl.c	2006-02-04 16:49:25.000000000 +0100
+@@ -1970,7 +1970,7 @@
+ 				val = strtol(p, &q, 16);
+ 				p = q;
+ 				val = strtol(p, &q, 16);
+-				(unsigned short) *buffer = (unsigned short) val;
++				*(unsigned short*)buffer = (unsigned short) val;
+ 				pos = 2;
+ 				while ((p != q) && (*q != 0)) {
+ 					p = q;
diff --git a/net-dialup/isdn4k-utils/files/hisax.initd b/net-dialup/isdn4k-utils/files/hisax.initd
index 9d4eb062f5fd..ecff8f97f61a 100644
--- a/net-dialup/isdn4k-utils/files/hisax.initd
+++ b/net-dialup/isdn4k-utils/files/hisax.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/hisax.initd,v 1.3 2005/09/03 20:56:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/hisax.initd,v 1.4 2006/02/04 21:14:17 sbriesen Exp $
 
 depend() {
         use isapnp pcmcia
diff --git a/net-dialup/isdn4k-utils/files/isdn.blacklist b/net-dialup/isdn4k-utils/files/isdn.blacklist
index 28e9b019df35..9c7ec3083082 100644
--- a/net-dialup/isdn4k-utils/files/isdn.blacklist
+++ b/net-dialup/isdn4k-utils/files/isdn.blacklist
@@ -5,10 +5,6 @@ hisax
 hisax_fcpcipnp
 hisax_st5481
 
-# handled by hotplug. But it's disabled by default, because mISDN
-# also offers a CAPI 'hfcsusb' module which should be preferred.
-hfc_usb
-
 # temporarily disabled, because we need an init-script first
 #auerswald
 #divas
diff --git a/net-dialup/isdn4k-utils/files/isdn.initd b/net-dialup/isdn4k-utils/files/isdn.initd
index 7ce1ca8f029a..4c6124a25dfb 100644
--- a/net-dialup/isdn4k-utils/files/isdn.initd
+++ b/net-dialup/isdn4k-utils/files/isdn.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/isdn.initd,v 1.3 2005/09/03 20:56:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/isdn.initd,v 1.4 2006/02/04 21:14:17 sbriesen Exp $
 
-opts="save reload makedev info"
+opts="${opts} save reload makedev info"
 
 depend() {
 	use hisax
diff --git a/net-dialup/isdn4k-utils/files/isdnlog.initd b/net-dialup/isdn4k-utils/files/isdnlog.initd
index 1db96d4428c9..c453cff54287 100644
--- a/net-dialup/isdn4k-utils/files/isdnlog.initd
+++ b/net-dialup/isdn4k-utils/files/isdnlog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/isdnlog.initd,v 1.3 2005/09/03 20:56:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/isdnlog.initd,v 1.4 2006/02/04 21:14:17 sbriesen Exp $
 
 depend() {
 	need isdn
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild
index dcdc3b3692d5..7d0f7d31c255 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild,v 1.1 2005/02/23 05:52:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild,v 1.2 2006/02/04 21:14:17 sbriesen Exp $
 
 inherit eutils linux-info
 
@@ -20,8 +20,8 @@ DEPEND="virtual/linux-sources
 	virtual/libc
 	sys-libs/ncurses
 	sys-libs/gdbm
-	dev-lang/tcl
-	X? ( virtual/x11 )"
+	dev-lang/tcl"
+#	X? ( virtual/x11 )
 RDEPEND="${DEPEND}
 	virtual/modutils
 	net-dialup/ppp"
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
index 6365f252b56f..c65a66f6f586 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.7_pre20050626.ebuild,v 1.3 2005/09/03 20:41:21 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050626.ebuild,v 1.4 2006/02/04 21:14:17 sbriesen Exp $
 
 inherit eutils linux-info multilib gnuconfig
 
@@ -25,8 +25,8 @@ DEPEND="virtual/linux-sources
 	virtual/libc
 	sys-libs/ncurses
 	sys-libs/gdbm
-	dev-lang/tcl
-	X? ( virtual/x11 )"
+	dev-lang/tcl"
+#	X? ( virtual/x11 )
 RDEPEND="${DEPEND}
 	virtual/modutils
 	ipppd? ( net-dialup/ppp )"
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
index b477df807cdf..34abd885a34c 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.8_pre20050821.ebuild,v 1.3 2005/12/26 15:11:30 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild,v 1.4 2006/02/04 21:14:17 sbriesen Exp $
 
 inherit eutils multilib gnuconfig linux-info
 
@@ -29,15 +29,15 @@ DEPEND="virtual/linux-sources
 	sys-libs/ncurses
 	sys-libs/gdbm
 	dev-lang/tcl
-	X? ( virtual/x11 )
 	eurofile? ( net-ftp/ftpbase )
 	ipppd? ( mschap? ( dev-libs/openssl ) )
 	ipppd? ( activefilter? ( >=virtual/libpcap-0.9.3 ) )"
+#	X? ( virtual/x11 )
 
 RDEPEND="${DEPEND}
 	virtual/modutils
-	ipppd? ( net-dialup/ppp )
-	pcmcia? ( virtual/pcmcia )"
+	ipppd? ( net-dialup/ppp )"
+#	pcmcia? ( virtual/pcmcia )
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.9_pre20060124.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.9_pre20060124.ebuild
new file mode 100644
index 000000000000..3ddf5e5ca9da
--- /dev/null
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.9_pre20060124.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2006 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.9_pre20060124.ebuild,v 1.1 2006/02/04 21:14:17 sbriesen Exp $
+
+inherit eutils multilib gnuconfig linux-info
+
+MY_PV="${PV/*_pre/}"
+MY_P="${PN}-CVS-${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}"
+
+FW_DIR="/lib/firmware"
+#FW_DIR="/lib/firmware/isdn"
+
+DESCRIPTION="ISDN4Linux Utils"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.isdn4linux.de/"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="X activefilter mschap ipppd isdnlog eurofile usb pcmcia"
+# TODO: mysql postgres oracle radius
+SLOT="0"
+
+# mysql? ( dev-db/mysql )
+# oracle? ( dev-db/oracle-instantclient-basic )
+# postgres? ( dev-db/postgresql )
+
+DEPEND="virtual/linux-sources
+	virtual/libc
+	sys-libs/ncurses
+	sys-libs/gdbm
+	dev-lang/tcl
+	eurofile? ( net-ftp/ftpbase )
+	ipppd? ( mschap? ( dev-libs/openssl ) )
+	ipppd? ( activefilter? ( >=virtual/libpcap-0.9.3 ) )"
+#	X? ( || ( x11-base/xorg-server virtual/x11 ) )
+
+RDEPEND="${DEPEND}
+	virtual/modutils
+	ipppd? ( net-dialup/ppp )"
+#	pcmcia? ( virtual/pcmcia )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# check kernel config
+	CONFIG_CHECK="~ISDN ~ISDN_I4L"
+	if use ipppd; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~ISDN_PPP"
+		use activefilter && CONFIG_CHECK="${CONFIG_CHECK} ~IPPP_FILTER"
+	fi
+	use eurofile && CONFIG_CHECK="${CONFIG_CHECK} ~X25 ~ISDN_X25"
+	get_version || die "check kernel config failed"  # config checked later in pkg_postinst
+
+	# check for new baselayout
+	#einfo "Checking baselayout"
+	#if [ -f /lib/rcscripts/net.modules.d/ipppd ]; then
+	#	einfo "    new baselayout with ipppd net-module found"
+	#	HAS_NETMODULE=1
+	#else
+	#	einfo "    old baselayout with no ipppd net-module found"
+	#	HAS_NETMODULE=0
+	#fi
+
+	# 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')
+	if [ -z "${I4L_LANG}" ]; then
+		case "${I4L_CC}" in
+			AT|CH|DE)
+				I4L_LANG="DE"
+				;;
+			*)
+				I4L_LANG="EN"
+				;;
+		esac
+	else
+		I4L_LANG=$(echo -n "${I4L_LANG}" | tr "[:lower:]" "[:upper:]")
+		[ "${I4L_LANG}" = "DE" -o "${I4L_LANG}" = "EN" ] || I4L_LANG="EN"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# apply pcap patch (bug #99190)
+	use ipppd && use activefilter && \
+	epatch "${FILESDIR}/ipppd-pcap-0.9.3.patch"
+
+	# apply gcc4 patch (bug #117573)
+	epatch "${FILESDIR}/eiconctrl-gcc4.patch"
+
+	# patch all Makefiles to use our CFLAGS
+	find . -name "Makefile*" -type f | \
+	xargs -r sed -i -e "s:^\(CFLAGS.*=.*-Wall\) -O2:\1 \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*=.*\) -O[26] -fomit-frame-pointer:\1 \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*=.*\) -fomit-frame-pointer -O2:\1 \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*=.*\) -g -Wall:\1 \$(MYCFLAGS) -Wall:g" \
+		-e "s:^\(CFLAGS.*=.*\) -Wall -g:\1 -Wall \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*=.*-Wall.*\) -O2 -g:\1 \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*= -Wall\)$:\1 \$(MYCFLAGS):g" \
+		-e "s:^\(CFLAGS.*=\) -g$:\1 \$(MYCFLAGS):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_\)..=:\1${I4L_LANG}=:g" \
+				-e "s:^CONFIG_ISDN_LOG_CC=.*$:#:g" \
+				< ${FILESDIR}/config-${PV} > .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}/config-${PV} > .config || die "failed to modify .config"
+			;;
+	esac
+
+	# build X clients
+	use X || \
+		sed -i -e "s:^\(CONFIG_BUILDX11=.*\)$:# \1:g" \
+			-e "s:^\(CONFIG_XISDNLOAD=.*\)$:# \1:g" \
+			-e "s:^\(CONFIG_XMONISDN=.*\)$:# \1:g" .config
+
+	# build ipppd
+	if use ipppd; then
+		use activefilter || \
+		sed -i -e "s:^\(CONFIG_IPPP_FILTER=.*\)$:# \1:g" .config
+		use mschap || \
+		sed -i -e "s:^\(CONFIG_IPPPD_MSCHAP=.*\)$:# \1:g" .config
+	else
+		sed -i -e "s:^\(CONFIG_IPPPD=.*\)$:# \1:g" \
+			-e "s:^\(CONFIG_IPPPSTATS=.*\)$:# \1:g" .config
+	fi
+
+	# build isdnlog
+	use isdnlog || sed -i -e "s:^\(CONFIG_ISDNLOG=.*\)$:# \1:g" .config
+
+	# build eurofile (etf)
+	use eurofile || sed -i -e "s:^\(CONFIG_EUROFILE=.*\)$:# \1:g" .config
+
+	# set firmware location
+	sed -i -e "s:^\(CONFIG_FIRMWAREDIR=\).*$:\1'${FW_DIR}':g" .config
+
+	# selecting database support for isdnlog (only ONE is possible)
+	#use mysql    || sed -i -e "s:^\(CONFIG_ISDNLOG_MYSQL.*=.*\)$:# \1:g" .config
+	#use oracle   || sed -i -e "s:^\(CONFIG_ISDNLOG_ORACLE.*=.*\)$:# \1:g"	.config
+	#use postgres || sed -i -e "s:^\(CONFIG_ISDNLOG_POSTGRES.*=.*\)$:# \1: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
+
+	# Patch path to isdnlog docs
+	sed -i -e "s:^\(CONFIG_ISDNLOG_DOCDIR=\).*$:\1'/usr/share/doc/${PF}/isdnlog':g" .config
+
+	# add --libdir to configure call in Makefile
+	sed -i -e "s:\(\./configure \):\1--libdir=/usr/$(get_libdir) :g" Makefile
+
+	# Fixing /usr/lib to /usr/$(get_libdir} (for multilib-strict)
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" isdnctrl/Makefile.in
+
+	# Fixing location of openssl-headers
+	sed -i -e "s:<ssl/:<openssl/:g" ipppd/chap_ms.c
+
+	# disable creation of /dev nodes
+	sed -i -e "s:\(sh scripts/makedev.sh\):echo \1:g" Makefile
+	sed -i -e "s:^\([[:space:]]*\)\(.*mknod.*capi20.*\)\$:\1# \2:g" \
+		-e "s:^\([[:space:]]*\)\(.*rm.*capi20.*\)\$:\1# \2:g" \
+		-e "s:^\([[:space:]]*\)\(.*chgrp.*capi20.*\)\$:\1true # \2:g" scripts/makedev.sh
+
+	# if specified, convert all relevant files to UTF-8
+	# 2006-02-04: commented out because upstream switched to UTF-8
+	#if use unicode; then
+	#	einfo "Converting configs and docs to UTF-8"
+	#	for i in isdnlog/samples/{isdn,rate}.conf* isdnlog/*-??.dat \
+	#		Mini-FAQ/*.txt FAQ/_howto/{pppbind,vbox_sound,xp-howto}.txt \
+	#		eurofile/TODO isdnlog/{README,Isdn,.country-alias}; do
+	#		iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+	#	done
+	#	for i in isdnlog/TODO; do
+	#		iconv -f cp850 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+	#	done
+	#fi
+
+	# run autoconf
+	gnuconfig_update
+	einfo "Running autoconf"
+	for i in act2000 divertctrl doc eicon eurofile FAQ hisax icn imon ipppd \
+		ipppstats iprofd isdnctrl isdnlog loop pcbit isdnlog isdnlog/client \
+		isdnlog/tools/cdb isdnlog/tools/dest isdnlog/tools/zone; do
+		einfo "  Updating ${i}"
+		pushd "${i}" >/dev/null
+		autoconf 2>/dev/null || die "autoconf failed in dir ${i}"
+		popd >/dev/null
+	done
+}
+
+src_compile() {
+	emake -j1 MYCFLAGS="${CFLAGS}" subconfig || die "make subconfig failed"
+	emake -j1 MYCFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	keepdir /var/lib/isdn
+	dodir /usr/sbin "${FW_DIR}"
+
+	use isdnlog && dodir /usr/share/isdn
+	(use isdnlog || use eurofile) && dodir /etc/isdn
+	(use X || use isdnlog || use eurofile) && dodir /usr/bin
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# remove obsolete firmware files (these are in net-dialup/isdn-firmware)
+	rm -f "${D}${FW_DIR}"/{bip1120,dnload,ds4bri,dspdload,loadpg,pc_??_ca,prload,te_????}.*
+
+	# remove obsolete symlink
+	rm -f "${D}/usr/lib/X11/app-defaults"
+	rmdir --ignore-fail-on-non-empty "${D}/usr/lib/X11"
+
+	# install USB hotplug stuff
+	if use usb; then
+		insinto /etc/hotplug/blacklist.d
+		newins "${FILESDIR}/isdn.blacklist" isdn
+	fi
+
+	# install PCMCIA stuff
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		newins "${FILESDIR}/isdn.pcmcia.conf" isdn.conf
+		exeinto /etc/pcmcia
+		newexe "${FILESDIR}/isdn.pcmcia" isdn
+	fi
+
+	# install init-scripts + configs
+	insinto /etc
+	newinitd "${FILESDIR}/isdn.initd" isdn
+	newconfd "${FILESDIR}/isdn.confd" isdn
+	newinitd "${FILESDIR}/hisax.initd" hisax
+	doins "${FILESDIR}/hisax.conf"
+
+	# install docs (base)
+	dodoc NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh FAQ/_howto/xp*
+
+	# install ipppd stuff
+	if use ipppd; then
+		newinitd "${FILESDIR}"/net.ippp0 net.ippp0
+		insinto /etc/ppp
+		doins "${FILESDIR}"/{ioptions,options.ippp0}
+		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*}
+	fi
+
+	# install isdnlog stuff
+	if use isdnlog; then
+		newinitd "${FILESDIR}/isdnlog.initd" isdnlog.contr0
+		newconfd "${FILESDIR}/isdnlog.confd" isdnlog.contr0
+
+		insinto /usr/share/isdn
+		doins isdnlog/*.dat
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/isdnlog.logrotated" isdnlog
+
+		insinto /etc/isdn  # install example isdnlog configs
+		cp -f "${D}/etc/isdn/isdnlog.isdnctrl0.options"	"${D}/etc/isdn/isdnlog.options.example"
+		mv -f "${D}/etc/isdn/isdnlog.isdnctrl0.options"	"${D}/etc/isdn/isdnlog.options.contr0"
+		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*
+
+		docinto isdnlog
+		dodoc isdnlog/{BUGS,CREDITS,FAQ,Isdn,NEWS,README*,TODO}
+	   	dodoc FAQ/_howto/win* isdnlog/samples/provider
+		docinto isdnlog/areacode
+		dodoc areacode/*.doc
+		docinto isdnlog/contrib/isdnbill
+		dodoc isdnlog/contrib/isdnbill/{*.isdnbill,*.gz}
+		docinto isdnlog/contrib/winpopup
+		dodoc isdnlog/contrib/winpopup/*
+
+		#if use oracle; then
+		#	docinto isdnlog/oracle
+		#	dodoc isdnlog/isdnlog/oracle/*.sql
+		#fi
+	fi
+
+	# install eurofile stuff
+	if use eurofile; then
+		docinto eurofile
+		dodoc eurofile/{CHANGES,INSTALL,README*,TODO}
+		newdoc eurofile/src/wuauth/README README.AUTHLIB
+		docinto eurofile/scripts
+		dodoc eurofile/scripts/{eft_useradd,check_system,ix25test,eftd.sh,eftp.sh}
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please edit:"
+	einfo
+	einfo "- /etc/conf.d/isdn   general config for init-script"
+	einfo "- /etc/hisax.conf    if you have hisax supported cards"
+	if use ipppd; then
+		einfo "- /etc/ppp/*         critical if you need networking"
+	fi
+	einfo
+	if use isdnlog; then
+		einfo "For isdnlog you should edit:"
+		einfo
+		einfo "- /etc/conf.d/isdnlog.contr0"
+		einfo "- /etc/isdn/isdnlog.options.contr0"
+		einfo "- /etc/isdn/*.conf"
+		einfo
+	fi
+	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/hisax will load and initialize your hisax based"
+	einfo "cards. If you have such cards, please edit /etc/hisax.conf"
+	einfo "and add the hisax init-script to your default runlevel."
+	einfo
+	if use ipppd; then
+		einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections"
+		einfo "which you need to set up using isdnctrl first!"
+		einfo
+	fi
+	if use isdnlog; then
+		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
+	fi
+	einfo "If any of the following kernel configuration options is missing, you"
+	einfo "should reconfigure and rebuild your kernel before using isdn4k-utils."
+	linux-info_pkg_setup
+	einfo
+}