new sourceforge pwlib and opal, masked because it breaks ekiga, remove some old stuff

svn path=/trunk/; revision=376

49 files changed, 0 insertions, 7867 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
deleted file mode 100644
index f413724..0000000
--- a/net-misc/zaptel/ChangeLog
+++ /dev/null
@@ -1,431 +0,0 @@
-2006-07-18 15:36  stkn
-
-	* [r320] Manifest, files/digest-zaptel-1.2.7,
-	  files/zaptel-1.2.7-gentoo.diff, zaptel-1.2.7.ebuild:
-	  Version bump zaptel to 1.2.7 + bristuff-0.3.0-PRE-1r
-
-2006-06-06 23:35  stkn
-
-	* [r269] Manifest, files/digest-zaptel-1.2.0,
-	  files/digest-zaptel-1.2.0_rc1, files/digest-zaptel-1.2.0_rc2,
-	  files/digest-zaptel-1.2.1, files/digest-zaptel-1.2.1-r1,
-	  files/digest-zaptel-1.2.2, files/digest-zaptel-1.2.3,
-	  files/digest-zaptel-1.2.5-r2, files/digest-zaptel-1.2.5-r3,
-	  files/digest-zaptel-1.2.6, zaptel-1.2.0_rc1.ebuild,
-	  zaptel-1.2.0_rc2.ebuild, zaptel-1.2.5-r1.ebuild:
-	  Remove 1.2-rc zaptel ebuilds.
-
-2006-06-04 20:50  stkn
-
-	* [r255] Manifest, files/zaptel-1.2.6-gentoo.diff:
-	  Fix make install part of zaptel gentoo patch
-
-2006-06-04 18:54  stkn
-
-	* [r252] Manifest, files/digest-zaptel-1.2.5-r2,
-	  files/digest-zaptel-1.2.6, files/zaptel-1.2.6-gentoo.diff,
-	  zaptel-1.2.5-r2.ebuild, zaptel-1.2.6.ebuild:
-	  add zaptel-1.2.6
-
-2006-05-23 18:51  stkn
-
-	* [r247] Manifest, files/digest-zaptel-1.2.5-r3,
-	  zaptel-1.2.5-r3.ebuild:
-	  Revbump zaptel to 1.2.5-r3, bristuff-0.3.0-PRE-1p update.
-
-2006-04-30 17:48  stkn
-
-	* [r243] Manifest, files/digest-zaptel-1.2.5-r2,
-	  zaptel-1.2.5-r2.ebuild:
-	  Revbump zaptel to 1.2.5-r2: bristuff-0.3.0-PRE-1o
-
-2006-04-11 23:17  stkn
-
-	* [r217] Manifest, files/digest-zaptel-1.2.5-r1,
-	  zaptel-1.2.5-r1.ebuild:
-	  Revbump zaptel to 1.2.5-r1, updating bristuff to 0.3.0-PRE1n
-
-2006-03-27 20:45  stkn
-
-	* [r200] Manifest, files/digest-zaptel-1.2.5, zaptel-1.2.5.ebuild:
-	  Version bump zaptel to 1.2.5
-
-2006-03-27 20:40  stkn
-
-	* [r199] Manifest, zaptel-1.2.4.ebuild:
-	  Update zaptel-1.2.4 SRC_URI
-
-2006-02-16 17:08  stkn
-
-	* [r139] Manifest, files/digest-zaptel-1.2.3-r1:
-	  Fixed zaptel bristuff digest problem
-
-2006-02-16 16:24  stkn
-
-	* [r137] Manifest, files/digest-zaptel-1.2.4,
-	  zaptel-1.2.3-r1.ebuild, zaptel-1.2.3.ebuild,
-	  zaptel-1.2.4.ebuild:
-	  Version bump zaptel to 1.2.4
-
-2006-02-03 00:19  stkn
-
-	* [r120] Manifest, files/digest-zaptel-1.2.3-r1,
-	  zaptel-1.2.3-r1.ebuild:
-	  Revision bump zaptel to 1.2.3-r1, updating bristuff to
-	  0.3.0-PRE1k.
-
-2006-02-01 02:22  stkn
-
-	* [r115] Manifest, files/digest-zaptel-1.2.3, zaptel-1.2.0.ebuild,
-	  zaptel-1.2.1-r1.ebuild, zaptel-1.2.1.ebuild,
-	  zaptel-1.2.2.ebuild, zaptel-1.2.3.ebuild:
-	  Version bump zaptel to 1.2.3 + bristuff-0.0.3-PRE1i
-
-2006-01-21 16:47  stkn
-
-	* [r103] Manifest, files/digest-zaptel-1.2.2, zaptel-1.2.2.ebuild:
-	  Enable bristuff-0.3.0_PRE1h and florz-0.3.0-PRE-1f_florz11 in
-	  zaptel-1.2.2 ebuild
-
-2006-01-19 00:31  stkn
-
-	* [r92] Manifest, files/digest-zaptel-1.2.2,
-	  files/zaptel-1.2.2-gentoo.diff, zaptel-1.2.2.ebuild:
-	  [NEW] Version bump zaptel to 1.2.2 (no bristuff!)
-
-2006-01-15 15:29  stkn
-
-	* [r84] Manifest, zaptel-1.2.1.ebuild:
-	  Move userpriv fix to the top of the bri patch section
-
-2006-01-15 15:27  stkn
-
-	* [r83] Manifest, files/digest-zaptel-1.2.1-r1,
-	  zaptel-1.2.1-r1.ebuild:
-	  Add Zaptel-1.2.1-r1 ebuild, updated bristuff to 0.3.0_PRE1f and
-	  florz to 0.3.0_PRE1f_11
-
-2006-01-15 15:21  stkn
-
-	* [r80] Manifest, files/digest-zaptel-1.2.0,
-	  files/digest-zaptel-1.2.0_beta1,
-	  files/digest-zaptel-1.2.0_beta2,
-	  files/zaptel-1.2.0_beta1-gentoo.diff, zaptel-1.2.0.ebuild,
-	  zaptel-1.2.0_beta1.ebuild, zaptel-1.2.0_beta2.ebuild:
-	  Removed old zaptel beta ebuilds
-
-2005-12-15 15:30  stkn
-
-	* [r72] Manifest, files/digest-zaptel-1.2.1, zaptel-1.2.1.ebuild:
-	  Fix typo in zaptel ebuild
-
-2005-12-15 15:28  stkn
-
-	* [r71] Manifest, files/digest-zaptel-1.2.1, zaptel-1.2.1.ebuild:
-	  zaptel-1.2.1 + bristuff-0.3.0-PRE1c
-
-2005-12-14 19:10  stkn
-
-	* [r67] Manifest, files/digest-zaptel-1.2.1,
-	  files/zaptel-1.2.1-gentoo.diff, zaptel-1.2.1.ebuild:
-	  Version bump zaptel to 1.2.1, no bristuff support!
-
-2005-12-08 15:07  stkn
-
-	* [r61] Manifest, files/digest-zaptel-1.2.0, zaptel-1.2.0.ebuild:
-	  Re-enabled florz support in zaptel-1.2.0 ebuild
-
-2005-12-03 01:17  stkn
-
-	* [r53] Manifest, files/digest-zaptel-1.2.0,
-	  files/zaptel-1.2.0-devfs26.diff, files/zaptel-1.2.0-gentoo.diff,
-	  files/zaptel-1.2.0-ukcid.patch, zaptel-1.2.0.ebuild:
-	  Version bumped zaptel to 1.2.0 + bristuff 0.3.0-PRE-1b
-
-2005-11-18 14:47  stkn
-
-	* [r37] files/digest-zaptel-1.2.0, zaptel-1.2.0.ebuild:
-	  And do not forget to add the files... :P
-
-2005-11-18 14:46  stkn
-
-	* [r36] Manifest, zaptel-1.2.0_rc2.ebuild:
-	  Version bumped zaptel to 1.2.0
-
-2005-11-12 15:15  stkn
-
-	* [r29] Manifest, files/digest-zaptel-1.2.0_rc2,
-	  zaptel-1.2.0_rc1.ebuild, zaptel-1.2.0_rc2.ebuild:
-	  Version bumped zaptel to 1.2.0_rc2
-
-2005-11-10 00:39  stkn
-
-	* [r18] Manifest, files/zaptel-1.2.0_beta2-ukcid.patch,
-	  zaptel-1.2.0_beta2.ebuild, zaptel-1.2.0_rc1.ebuild:
-	  Added missing ukcid patch.
-
-2005-11-10 00:31  stkn
-
-	* [r16] Manifest, files/digest-zaptel-1.2.0_rc1,
-	  zaptel-1.2.0_beta1.ebuild, zaptel-1.2.0_beta2.ebuild,
-	  zaptel-1.2.0_rc1.ebuild:
-	  Version bump and fixed SRC_URI in older ebuilds.
-
-2005-11-08 00:43  stkn
-
-	* [r7] Manifest, files/digest-zaptel-1.2.0_beta2,
-	  files/zaptel-1.2.0_beta2-devfs26.diff,
-	  files/zaptel-1.2.0_beta2-gentoo.diff, zaptel-1.2.0_beta2.ebuild:
-	  Version bump -> zaptel-1.2.0_beta2
-
-2005-10-29 21:37  stkn
-
-	* [r2] trunk/dev-libs, trunk/dev-libs/pwlib,
-	  trunk/dev-libs/pwlib/Manifest, trunk/dev-libs/pwlib/files,
-	  trunk/dev-libs/pwlib/files/digest-pwlib-1.8.4,
-	  trunk/dev-libs/pwlib/files/digest-pwlib-1.8.7,
-	  trunk/dev-libs/pwlib/files/digest-pwlib-1.9.1,
-	  trunk/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch,
-	  trunk/dev-libs/pwlib/files/pwlib-1.8.7-instplugins.diff,
-	  trunk/dev-libs/pwlib/pwlib-1.8.4.ebuild,
-	  trunk/dev-libs/pwlib/pwlib-1.8.7.ebuild,
-	  trunk/dev-libs/pwlib/pwlib-1.9.1.ebuild, trunk/dev-python,
-	  trunk/dev-python/pyst, trunk/dev-python/pyst/Manifest,
-	  trunk/dev-python/pyst/files,
-	  trunk/dev-python/pyst/files/digest-pyst-0.0.4_rc12,
-	  trunk/dev-python/pyst/pyst-0.0.4_rc12.ebuild, trunk/media-libs,
-	  trunk/media-libs/libsupertone,
-	  trunk/media-libs/libsupertone/Manifest,
-	  trunk/media-libs/libsupertone/files,
-	  trunk/media-libs/libsupertone/files/digest-libsupertone-0.0.2,
-	  trunk/media-libs/libsupertone/libsupertone-0.0.2.ebuild,
-	  trunk/media-libs/spandsp, trunk/media-libs/spandsp/Manifest,
-	  trunk/media-libs/spandsp/files,
-	  trunk/media-libs/spandsp/files/digest-spandsp-0.0.2_pre20,
-	  trunk/media-libs/spandsp/files/spandsp-0.0.2_pre20-nommx.diff,
-	  trunk/media-libs/spandsp/spandsp-0.0.2_pre20.ebuild,
-	  trunk/media-sound, trunk/media-sound/mpg123,
-	  trunk/media-sound/mpg123/Manifest,
-	  trunk/media-sound/mpg123/files,
-	  trunk/media-sound/mpg123/files/digest-mpg123-0.59r,
-	  trunk/media-sound/mpg123/files/mpg123-0.59r-patches-1.0.tar.bz2,
-	  trunk/media-sound/mpg123/mpg123-0.59r.ebuild, trunk/net-im,
-	  trunk/net-im/gnomemeeting, trunk/net-im/gnomemeeting/Manifest,
-	  trunk/net-im/gnomemeeting/files,
-	  trunk/net-im/gnomemeeting/files/digest-gnomemeeting-1.2.2,
-	  trunk/net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch,
-	  trunk/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff,
-	  trunk/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild,
-	  trunk/net-im/ohphone, trunk/net-im/ohphone/Manifest,
-	  trunk/net-im/ohphone/files,
-	  trunk/net-im/ohphone/files/digest-ohphone-1.14.4,
-	  trunk/net-im/ohphone/files/ohphone-1.14.4-pwlibsdl.diff,
-	  trunk/net-im/ohphone/ohphone-1.14.4.ebuild, trunk/net-libs,
-	  trunk/net-libs/libmfcr2, trunk/net-libs/libmfcr2/Manifest,
-	  trunk/net-libs/libmfcr2/files,
-	  trunk/net-libs/libmfcr2/files/digest-libmfcr2-0.0.3,
-	  trunk/net-libs/libmfcr2/files/libmfcr2-0.0.3-gentoo.diff,
-	  trunk/net-libs/libmfcr2/libmfcr2-0.0.3.ebuild,
-	  trunk/net-libs/libpri, trunk/net-libs/libpri/ChangeLog,
-	  trunk/net-libs/libpri/Manifest, trunk/net-libs/libpri/files,
-	  trunk/net-libs/libpri/files/digest-libpri-1.2.0_beta1,
-	  trunk/net-libs/libpri/files/libpri-1.2.0_beta1-gentoo.diff,
-	  trunk/net-libs/libpri/libpri-1.2.0_beta1.ebuild,
-	  trunk/net-libs/libpri/metadata.xml, trunk/net-libs/libunicall,
-	  trunk/net-libs/libunicall/Manifest,
-	  trunk/net-libs/libunicall/files,
-	  trunk/net-libs/libunicall/files/digest-libunicall-0.0.3,
-	  trunk/net-libs/libunicall/libunicall-0.0.3.ebuild,
-	  trunk/net-libs/opal, trunk/net-libs/opal/Manifest,
-	  trunk/net-libs/opal/files,
-	  trunk/net-libs/opal/files/digest-opal-2.1.1,
-	  trunk/net-libs/opal/files/opal-2.1.1-notrace.diff,
-	  trunk/net-libs/opal/opal-2.1.1.ebuild, trunk/net-libs/openh323,
-	  trunk/net-libs/openh323/Manifest, trunk/net-libs/openh323/files,
-	  trunk/net-libs/openh323/files/digest-openh323-1.15.3,
-	  trunk/net-libs/openh323/files/digest-openh323-1.15.6,
-	  trunk/net-libs/openh323/files/digest-openh323-1.17.2,
-	  trunk/net-libs/openh323/files/openh323-1.15.2-notrace.diff,
-	  trunk/net-libs/openh323/openh323-1.15.3.ebuild,
-	  trunk/net-libs/openh323/openh323-1.15.6.ebuild,
-	  trunk/net-libs/openh323/openh323-1.17.2.ebuild,
-	  trunk/net-libs/osptoolkit, trunk/net-libs/osptoolkit/Manifest,
-	  trunk/net-libs/osptoolkit/files,
-	  trunk/net-libs/osptoolkit/files/digest-osptoolkit-3.3.1,
-	  trunk/net-libs/osptoolkit/osptoolkit-3.3.1.ebuild,
-	  trunk/net-misc, trunk/net-misc/asterisk,
-	  trunk/net-misc/asterisk-addons,
-	  trunk/net-misc/asterisk-addons/Manifest,
-	  trunk/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild,
-	  trunk/net-misc/asterisk-addons/files,
-	  trunk/net-misc/asterisk-addons/files/asterisk-addons-1.2.0_beta1-gentoo-base.diff,
-	  
-	  trunk/net-misc/asterisk-addons/files/asterisk-addons-1.2.0_beta1-gentoo-ooh323c.diff,
-	  
-	  trunk/net-misc/asterisk-addons/files/asterisk-addons-1.2.0_beta1-gentoo-res_sqlite3.diff,
-	  
-	  trunk/net-misc/asterisk-addons/files/digest-asterisk-addons-1.2.0_beta1,
-	  
-	  trunk/net-misc/asterisk-addons/files/sqlite-3.2.1-data-corruption.patch,
-	  trunk/net-misc/asterisk-app_backticks,
-	  trunk/net-misc/asterisk-app_backticks/Manifest,
-	  trunk/net-misc/asterisk-app_backticks/asterisk-app_backticks-20050917.ebuild,
-	  trunk/net-misc/asterisk-app_backticks/files,
-	  trunk/net-misc/asterisk-app_backticks/files/app_backticks-20050917-astcfg.diff,
-	  
-	  trunk/net-misc/asterisk-app_backticks/files/digest-asterisk-app_backticks-20050917,
-	  trunk/net-misc/asterisk-app_cepstral,
-	  trunk/net-misc/asterisk-app_cepstral/Manifest,
-	  trunk/net-misc/asterisk-app_cepstral/asterisk-app_cepstral-20050917.ebuild,
-	  trunk/net-misc/asterisk-app_cepstral/files,
-	  trunk/net-misc/asterisk-app_cepstral/files/app_cepstral-20050917-astcfg.diff,
-	  
-	  trunk/net-misc/asterisk-app_cepstral/files/digest-asterisk-app_cepstral-20050917,
-	  trunk/net-misc/asterisk-app_changrab,
-	  trunk/net-misc/asterisk-app_changrab/Manifest,
-	  trunk/net-misc/asterisk-app_changrab/asterisk-app_changrab-20050917.ebuild,
-	  trunk/net-misc/asterisk-app_changrab/files,
-	  trunk/net-misc/asterisk-app_changrab/files/app_changrab-20050917-astcfg.diff,
-	  
-	  trunk/net-misc/asterisk-app_changrab/files/digest-asterisk-app_changrab-20050917,
-	  trunk/net-misc/asterisk-app_intercept,
-	  trunk/net-misc/asterisk-app_intercept/Manifest,
-	  trunk/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild,
-	  
-	  trunk/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050917.ebuild,
-	  trunk/net-misc/asterisk-app_intercept/files,
-	  trunk/net-misc/asterisk-app_intercept/files/app_intercept-20050623-astcfg.diff,
-	  
-	  trunk/net-misc/asterisk-app_intercept/files/digest-asterisk-app_intercept-20050828,
-	  
-	  trunk/net-misc/asterisk-app_intercept/files/digest-asterisk-app_intercept-20050917,
-	  trunk/net-misc/asterisk-app_rtxfax,
-	  trunk/net-misc/asterisk-app_rtxfax/Manifest,
-	  trunk/net-misc/asterisk-app_rtxfax/asterisk-app_rtxfax-0.0.2_pre20.ebuild,
-	  trunk/net-misc/asterisk-app_rtxfax/files,
-	  trunk/net-misc/asterisk-app_rtxfax/files/app_rtxfax-0.0.2_pre20-gentoo.diff,
-	  
-	  trunk/net-misc/asterisk-app_rtxfax/files/digest-asterisk-app_rtxfax-0.0.2_pre20,
-	  trunk/net-misc/asterisk-app_valetparking,
-	  trunk/net-misc/asterisk-app_valetparking/Manifest,
-	  trunk/net-misc/asterisk-app_valetparking/asterisk-app_valetparking-20050917.ebuild,
-	  trunk/net-misc/asterisk-app_valetparking/files,
-	  trunk/net-misc/asterisk-app_valetparking/files/app_valetparking-20050917-astcfg.diff,
-	  
-	  trunk/net-misc/asterisk-app_valetparking/files/digest-asterisk-app_valetparking-20050917,
-	  trunk/net-misc/asterisk-chan_sccp,
-	  trunk/net-misc/asterisk-chan_sccp/ChangeLog,
-	  trunk/net-misc/asterisk-chan_sccp/Manifest,
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051022.ebuild,
-	  trunk/net-misc/asterisk-chan_sccp/files,
-	  trunk/net-misc/asterisk-chan_sccp/files/chan_sccp-20050725-gentoo.diff,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/chan_sccp-20050902-gentoo.diff,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050807,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050826,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050902,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050906,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050913,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20050922,
-	  
-	  trunk/net-misc/asterisk-chan_sccp/files/digest-asterisk-chan_sccp-0.0.20051022,
-	  trunk/net-misc/asterisk-chan_sccp/metadata.xml,
-	  trunk/net-misc/asterisk-chan_ss7,
-	  trunk/net-misc/asterisk-chan_ss7/Manifest,
-	  trunk/net-misc/asterisk-chan_ss7/asterisk-chan_ss7-0.1.ebuild,
-	  trunk/net-misc/asterisk-chan_ss7/files,
-	  trunk/net-misc/asterisk-chan_ss7/files/chan_ss7-0.1-gentoo.diff,
-	  trunk/net-misc/asterisk-chan_ss7/files/digest-asterisk-chan_ss7-0.1,
-	  trunk/net-misc/asterisk-chan_ss7/files/ss7.conf.sample,
-	  trunk/net-misc/asterisk-chan_unicall,
-	  trunk/net-misc/asterisk-chan_unicall/Manifest,
-	  trunk/net-misc/asterisk-chan_unicall/asterisk-chan_unicall-0.0.3_pre5.ebuild,
-	  trunk/net-misc/asterisk-chan_unicall/files,
-	  trunk/net-misc/asterisk-chan_unicall/files/digest-asterisk-chan_unicall-0.0.3_pre5,
-	  
-	  trunk/net-misc/asterisk-chan_unicall/files/unicall-0.0.3_pre5-gentoo.diff,
-	  trunk/net-misc/asterisk-chan_visdn,
-	  trunk/net-misc/asterisk-chan_visdn/Manifest,
-	  trunk/net-misc/asterisk-chan_visdn/asterisk-chan_visdn-0.14.0.ebuild,
-	  trunk/net-misc/asterisk-chan_visdn/files,
-	  trunk/net-misc/asterisk-chan_visdn/files/digest-asterisk-chan_visdn-0.14.0,
-	  
-	  trunk/net-misc/asterisk-chan_visdn/files/visdn-0.14.0-configure.diff,
-	  trunk/net-misc/asterisk-cvs,
-	  trunk/net-misc/asterisk-cvs/Manifest,
-	  trunk/net-misc/asterisk-cvs/asterisk-cvs-9999.ebuild,
-	  trunk/net-misc/asterisk-cvs/files,
-	  trunk/net-misc/asterisk-cvs/files/digest-asterisk-cvs-9999,
-	  trunk/net-misc/asterisk-format_base64,
-	  trunk/net-misc/asterisk-format_base64/Manifest,
-	  trunk/net-misc/asterisk-format_base64/asterisk-format_base64-20050917.ebuild,
-	  trunk/net-misc/asterisk-format_base64/files,
-	  trunk/net-misc/asterisk-format_base64/files/digest-asterisk-format_base64-20050917,
-	  
-	  trunk/net-misc/asterisk-format_base64/files/format_base64-20050917-astcfg.diff,
-	  trunk/net-misc/asterisk/ChangeLog,
-	  trunk/net-misc/asterisk/Manifest,
-	  trunk/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild,
-	  trunk/net-misc/asterisk/files,
-	  trunk/net-misc/asterisk/files/1.0.0,
-	  trunk/net-misc/asterisk/files/1.0.0/asterisk-1.0.5-uclibc-dns.diff,
-	  trunk/net-misc/asterisk/files/1.0.0/asterisk.confd,
-	  trunk/net-misc/asterisk/files/1.0.0/asterisk.rc6,
-	  trunk/net-misc/asterisk/files/1.2.0,
-	  trunk/net-misc/asterisk/files/1.2.0/asterisk.confd,
-	  trunk/net-misc/asterisk/files/1.2.0/asterisk.rc6,
-	  trunk/net-misc/asterisk/files/digest-asterisk-1.2.0_beta1,
-	  trunk/net-misc/asterisk/metadata.xml, trunk/net-misc/linphone,
-	  trunk/net-misc/linphone/Manifest, trunk/net-misc/linphone/files,
-	  trunk/net-misc/linphone/files/digest-linphone-1.1.0,
-	  trunk/net-misc/linphone/files/linphone-1.0.1-ipv6-include.diff,
-	  trunk/net-misc/linphone/linphone-1.1.0.ebuild,
-	  trunk/net-misc/wanpipe, trunk/net-misc/wanpipe/Manifest,
-	  trunk/net-misc/wanpipe/files,
-	  trunk/net-misc/wanpipe/files/digest-wanpipe-2.3.2_p4,
-	  trunk/net-misc/wanpipe/files/wanpipe-2.3.2_p4-gcc34.diff,
-	  trunk/net-misc/wanpipe/files/wanpipe.confd,
-	  trunk/net-misc/wanpipe/wanpipe-2.3.2_p4.ebuild,
-	  trunk/net-misc/yate, trunk/net-misc/yate/Manifest,
-	  trunk/net-misc/yate/files,
-	  trunk/net-misc/yate/files/digest-yate-0.9.0_pre1,
-	  trunk/net-misc/yate/files/digest-yate-0.9.0_pre2,
-	  trunk/net-misc/yate/files/yate-0.9.0-gtk2.diff,
-	  trunk/net-misc/yate/files/yate.confd,
-	  trunk/net-misc/yate/files/yate.rc6,
-	  trunk/net-misc/yate/yate-0.9.0_pre1.ebuild,
-	  trunk/net-misc/yate/yate-0.9.0_pre2.ebuild, ., ChangeLog,
-	  Manifest, files, files/digest-zaptel-1.2.0_beta1,
-	  files/zaptel-1.0.4-experimental-devfs26.diff,
-	  files/zaptel-1.0.4-gcc34.patch,
-	  files/zaptel-1.2.0_beta1-gentoo.diff, files/zaptel.confd,
-	  files/zaptel.devfsd, files/zaptel.rc6, files/zaptel.udevd,
-	  metadata.xml, zaptel-1.2.0_beta1.ebuild:
-	  Initial import of private gentoo-voip repos
-
-  27 Sep 2006; Stefan Schweizer <genstef@gentoo.org> zaptel-1.2.9.1.ebuild,
-  +files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch:
-  fix kbuild sandbox correctly, thanks stkn
-
-  24 Sep 2006; Stefan Schweizer <genstef@gentoo.org> +zaptel-1.2.9.1.ebuild,
-  +files/zaptel-1.2.9.1-gentoo.diff:
-  version bump - most work by kolla, with evil hacks by me, but working
-
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
deleted file mode 100644
index 9259fbb..0000000
--- a/net-misc/zaptel/Manifest
+++ /dev/null
@@ -1,201 +0,0 @@
-AUX zaptel-1.0.4-experimental-devfs26.diff 5982 RMD160 e7d331073edc6e50e394af8a142c865e2aa9a1d2 SHA1 68c82135d1fbb28f717dbfffe0e1cbcf1a63e60a SHA256 1d8ea43898ae88b7dd46bb6c868b909696350ee791af93c64664e803c1b9a66e
-MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
-RMD160 e7d331073edc6e50e394af8a142c865e2aa9a1d2 files/zaptel-1.0.4-experimental-devfs26.diff 5982
-SHA256 1d8ea43898ae88b7dd46bb6c868b909696350ee791af93c64664e803c1b9a66e files/zaptel-1.0.4-experimental-devfs26.diff 5982
-AUX zaptel-1.0.4-gcc34.patch 821 RMD160 64b53c7b57e62c0678cf84522809f14cf13c94e5 SHA1 24360edfca90977a00efa08061f7fb5bf8c5244a SHA256 8bd95bb618531fef437edb9d83e1a296bd10bea4eb7576cf7f0a2eb09a69dcbe
-MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
-RMD160 64b53c7b57e62c0678cf84522809f14cf13c94e5 files/zaptel-1.0.4-gcc34.patch 821
-SHA256 8bd95bb618531fef437edb9d83e1a296bd10bea4eb7576cf7f0a2eb09a69dcbe files/zaptel-1.0.4-gcc34.patch 821
-AUX zaptel-1.2.0-devfs26.diff 6046 RMD160 46be740e37e026a9bd7e19136b6c7094def445ef SHA1 0169f0a13563565756eb5c41b641ba2d557c0b66 SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856
-MD5 c0f95d699055c3b46e5d3078bfaa2afb files/zaptel-1.2.0-devfs26.diff 6046
-RMD160 46be740e37e026a9bd7e19136b6c7094def445ef files/zaptel-1.2.0-devfs26.diff 6046
-SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856 files/zaptel-1.2.0-devfs26.diff 6046
-AUX zaptel-1.2.0-gentoo.diff 4626 RMD160 5bcca52cb76caf03661dabe4f127452f7aa08b22 SHA1 6144298e9e99acd655bf83a05ba5dff561565779 SHA256 500fd8eecf4f568293a9d1712c4a3a65883d4755accfc13697cdf83dda437816
-MD5 e6c7407f2478a1836a087eec78ecd69d files/zaptel-1.2.0-gentoo.diff 4626
-RMD160 5bcca52cb76caf03661dabe4f127452f7aa08b22 files/zaptel-1.2.0-gentoo.diff 4626
-SHA256 500fd8eecf4f568293a9d1712c4a3a65883d4755accfc13697cdf83dda437816 files/zaptel-1.2.0-gentoo.diff 4626
-AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720
-MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
-RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.2.0-ukcid.patch 3787
-SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.2.0-ukcid.patch 3787
-AUX zaptel-1.2.0_beta2-devfs26.diff 6046 RMD160 46be740e37e026a9bd7e19136b6c7094def445ef SHA1 0169f0a13563565756eb5c41b641ba2d557c0b66 SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856
-MD5 c0f95d699055c3b46e5d3078bfaa2afb files/zaptel-1.2.0_beta2-devfs26.diff 6046
-RMD160 46be740e37e026a9bd7e19136b6c7094def445ef files/zaptel-1.2.0_beta2-devfs26.diff 6046
-SHA256 b63bd43dae1e61f55ee4dbbf25d3401532d728ca4dd79c747835e9907c011856 files/zaptel-1.2.0_beta2-devfs26.diff 6046
-AUX zaptel-1.2.0_beta2-gentoo.diff 4626 RMD160 5bcca52cb76caf03661dabe4f127452f7aa08b22 SHA1 6144298e9e99acd655bf83a05ba5dff561565779 SHA256 500fd8eecf4f568293a9d1712c4a3a65883d4755accfc13697cdf83dda437816
-MD5 e6c7407f2478a1836a087eec78ecd69d files/zaptel-1.2.0_beta2-gentoo.diff 4626
-RMD160 5bcca52cb76caf03661dabe4f127452f7aa08b22 files/zaptel-1.2.0_beta2-gentoo.diff 4626
-SHA256 500fd8eecf4f568293a9d1712c4a3a65883d4755accfc13697cdf83dda437816 files/zaptel-1.2.0_beta2-gentoo.diff 4626
-AUX zaptel-1.2.0_beta2-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720
-MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0_beta2-ukcid.patch 3787
-RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.2.0_beta2-ukcid.patch 3787
-SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.2.0_beta2-ukcid.patch 3787
-AUX zaptel-1.2.1-gentoo.diff 4756 RMD160 1ce3b91f5a6be87566d56fa49605f7e6ce5ac470 SHA1 fc7f97a078d542be5d7acdf2722f2fb09b70ec94 SHA256 f92466fb92dae6c0168fd27978aa75bb262c37d037d25ecd334ccc5e9a5939ea
-MD5 bc9d66166d440e69b69286ef26b4c52d files/zaptel-1.2.1-gentoo.diff 4756
-RMD160 1ce3b91f5a6be87566d56fa49605f7e6ce5ac470 files/zaptel-1.2.1-gentoo.diff 4756
-SHA256 f92466fb92dae6c0168fd27978aa75bb262c37d037d25ecd334ccc5e9a5939ea files/zaptel-1.2.1-gentoo.diff 4756
-AUX zaptel-1.2.2-gentoo.diff 7740 RMD160 70b52156389d66952f3f498bdc9af7d4092b3cdc SHA1 a2dd4ee7c7c8ab34c50f1618e23f3c212fdf97d0 SHA256 58ce489e499697a57ad9e939b119a2f07418c2cd48158efc89b8c46a1bd6b946
-MD5 51c21f33dde21f00000ccf671ac0ebff files/zaptel-1.2.2-gentoo.diff 7740
-RMD160 70b52156389d66952f3f498bdc9af7d4092b3cdc files/zaptel-1.2.2-gentoo.diff 7740
-SHA256 58ce489e499697a57ad9e939b119a2f07418c2cd48158efc89b8c46a1bd6b946 files/zaptel-1.2.2-gentoo.diff 7740
-AUX zaptel-1.2.6-gentoo.diff 4565 RMD160 ed630e59ca0f100c7f69ef918a4a15ddb580a256 SHA1 f4a48026c12b2a22486724fc32913b3eeb49a689 SHA256 49c3e58b351d9e7ec16d19f9e361a13ee041c5ed4dbdf389dfb34dabb4eaab1e
-MD5 e641eafe0366cfa523df967a7d31241c files/zaptel-1.2.6-gentoo.diff 4565
-RMD160 ed630e59ca0f100c7f69ef918a4a15ddb580a256 files/zaptel-1.2.6-gentoo.diff 4565
-SHA256 49c3e58b351d9e7ec16d19f9e361a13ee041c5ed4dbdf389dfb34dabb4eaab1e files/zaptel-1.2.6-gentoo.diff 4565
-AUX zaptel-1.2.7-gentoo.diff 4585 RMD160 e857675102e6b9ffc8429f59ba6e12548494ce23 SHA1 e55cf841eb56a2233aa506e23bc71ed8ab82ac50 SHA256 98a4b3f34aa43e7954e5a0e48474c4466461e6ca5706b652fe51bdb5171dd9e2
-MD5 5d537ff7c9b103e3f541a9278e64acc1 files/zaptel-1.2.7-gentoo.diff 4585
-RMD160 e857675102e6b9ffc8429f59ba6e12548494ce23 files/zaptel-1.2.7-gentoo.diff 4585
-SHA256 98a4b3f34aa43e7954e5a0e48474c4466461e6ca5706b652fe51bdb5171dd9e2 files/zaptel-1.2.7-gentoo.diff 4585
-AUX zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306 RMD160 565eb368b1b05a177caee5a43206738cb8302b2d SHA1 950ab0c803564831a8258e6df4b09688e0b18d9f SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf
-MD5 93494506ca6c66b90a6175a2f50965ec files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
-RMD160 565eb368b1b05a177caee5a43206738cb8302b2d files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
-SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
-AUX zaptel-1.2.9.1-gentoo.diff 5129 RMD160 b85980028878905c8db0821c5f5d59d500591a8f SHA1 fecf5625cb849d2bdc6bd28370fca3775ae987ad SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed
-MD5 2ba3db989e7bacdefb157b6bb6d57f61 files/zaptel-1.2.9.1-gentoo.diff 5129
-RMD160 b85980028878905c8db0821c5f5d59d500591a8f files/zaptel-1.2.9.1-gentoo.diff 5129
-SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed files/zaptel-1.2.9.1-gentoo.diff 5129
-AUX zaptel.confd 371 RMD160 1867454626e66743b26d8726e330534c9117c8a4 SHA1 c2ccc3eada8ccb28527fcacfe4b89cf25131867e SHA256 f1cf6c46282645567481118bfcd814b64c88510499c4f423ff2df4ced34c434f
-MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
-RMD160 1867454626e66743b26d8726e330534c9117c8a4 files/zaptel.confd 371
-SHA256 f1cf6c46282645567481118bfcd814b64c88510499c4f423ff2df4ced34c434f files/zaptel.confd 371
-AUX zaptel.devfsd 140 RMD160 99113a7b2fcdf0ee3b305ab10ee00a46c754e541 SHA1 daaacd0896a08af16c1bca0c81e70686fe999f7d SHA256 17de99387374f87f924de4d066dc698aa8ef420cb664d702c5d18c7775f4e4aa
-MD5 6e306307ede34b9428ec1c992a8a671e files/zaptel.devfsd 140
-RMD160 99113a7b2fcdf0ee3b305ab10ee00a46c754e541 files/zaptel.devfsd 140
-SHA256 17de99387374f87f924de4d066dc698aa8ef420cb664d702c5d18c7775f4e4aa files/zaptel.devfsd 140
-AUX zaptel.rc6 972 RMD160 898806437812819568f6801faf682302e20bbdde SHA1 d427875ae8ece8ca00cf0ac1f2ee92c6e1b9e321 SHA256 0558aa032de92fa9ae54076d9268fc3e704317eb54985656f0f21e2d334b6d84
-MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
-RMD160 898806437812819568f6801faf682302e20bbdde files/zaptel.rc6 972
-SHA256 0558aa032de92fa9ae54076d9268fc3e704317eb54985656f0f21e2d334b6d84 files/zaptel.rc6 972
-AUX zaptel.udevd 358 RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 SHA1 36410cd48fbe9a6695bbcfd88133408af9365bd9 SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5
-MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
-RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 files/zaptel.udevd 358
-SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5 files/zaptel.udevd 358
-DIST bristuff-0.3.0-PRE-1c.tar.gz 167219 RMD160 d826786216ca1dd85bb2f011b6273d8329e107fc SHA1 fd780e10ccb6586872f592b9498f1b57e2f5b30d SHA256 2b43a263f508194f0d6438c0c07655979261941b2041c4713f0aebc1d1cb993c
-DIST bristuff-0.3.0-PRE-1f.tar.gz 264428
-DIST bristuff-0.3.0-PRE-1h.tar.gz 207158 RMD160 a01dceb5ac8bf85265d322e2bc109e11df556f02 SHA256 46ce98670f184498126b5d3bbe1310ea4ec2ac7e063532e1832593a121e89681
-DIST bristuff-0.3.0-PRE-1i.tar.gz 207735 RMD160 d34f47c2f18f7732e80177bad557e36c08600b3f SHA1 f031fc76cb7915f93089af1b3fa1e731a7890e86 SHA256 4162bd62c1b168a5cfdfaed15bab74a706771d2d629af0d0c79caeedb629bef2
-DIST bristuff-0.3.0-PRE-1k.tar.gz 207577 RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca SHA1 e58a2d407a4f9d96d062c1378b97c5380a626508 SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c
-DIST bristuff-0.3.0-PRE-1n.tar.gz 248488 RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c SHA1 c4aa937dffa7dec4ffed1c08bc228f6521c52306 SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1
-DIST bristuff-0.3.0-PRE-1o.tar.gz 252770 RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 SHA1 fd215b07533532c04f60212284a4cd1d6f18d5ba SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9
-DIST bristuff-0.3.0-PRE-1p.tar.gz 254003 RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 SHA1 5372bf13be0f5c7dd36046a8ac1cf5ed0fbb1f0b SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164
-DIST bristuff-0.3.0-PRE-1r.tar.gz 262348 RMD160 c2f7e937fc7452d8abb392f6c17246c3f8291b01 SHA1 cfb957bb12000107db906bfd456e8e3dc52f5ca2 SHA256 944be5544eae6cbbc00ac30d63f76ea78cc355dac07732ed2c52f7bdec91117e
-DIST bristuff-0.3.0-PRE-1s.tar.gz 265953 RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 SHA1 1d942df9e4fd963755080e011caba88a33601c1b SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d
-DIST zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555 RMD160 d7e0492b994951d0c13ddea58e3703701619325e SHA256 538498913dc71ad5944f5e5d4edfcfad67907e5621f2d90127c567649dc1534b
-DIST zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563 RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 SHA1 a605939305a8346401cc6d1997ab4fae2968d644 SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae
-DIST zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647 RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 SHA1 b34928127b7a2dafbbcc0d2761e76b8ecb6daa1a SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1
-DIST zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736 RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 SHA1 f8ab2f312c6a2b2f607b9e7f3ccbcca0858c53a7 SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c
-DIST zaptel-1.2.0.tar.gz 596257 RMD160 de4b944d0e14671750fa5ef6ddbe92c2b246039f SHA256 4debb42372421019a532f919424af7ad14e7e06eac0b8fe1cbc11d81346b3116
-DIST zaptel-1.2.1.tar.gz 617212 RMD160 fd5948f5c45792aa8e8f18ac1a31957055d18fda SHA256 147d2bab9ff8e09fa5115957f692a218b5f86fb53de0e29da11c133d8bd15d34
-DIST zaptel-1.2.2.tar.gz 615509
-DIST zaptel-1.2.3.tar.gz 619706 RMD160 f57a41ac5838eed8443482d0ee5a55ae0c6ae511 SHA256 621d126c5622a037c0ea1ef20f1dd57171c1085ad04fc8c62013e218c9b33ef4
-DIST zaptel-1.2.4.tar.gz 673090 RMD160 05396ac7227762b9c052a3ff3642b99d47a8dd85 SHA256 9b511d2892dd7aaa66ac8ba4b0443fe560aa5835611d1973ae8ccfd5344b721d
-DIST zaptel-1.2.5.tar.gz 673161 RMD160 7de580a8424b436d77504501ef59c47f2498e04d SHA1 ac740850e49daed77683eaffba5732086a88f54f SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c
-DIST zaptel-1.2.6.tar.gz 676658 RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 SHA1 cd61a2e7efdab4c5400af5c44c4009702daf5ea2 SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938
-DIST zaptel-1.2.7.tar.gz 1137409 RMD160 76cb57b0c57fc25f6210de285bbc4291ee9fb4b9 SHA1 790a106ee975a77c413a01584c59ea7d91ca9efd SHA256 db6768c88380a1b5eaf6adea97eb1c9837ee83d284d87cec84853ae984994a00
-DIST zaptel-1.2.9.1.tar.gz 1255412 RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a SHA1 6145301bb47107c0910a098e26b4ca5cdb2377ab SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede
-EBUILD zaptel-1.2.0.ebuild 9088 RMD160 0a4672dbfa7101836a7c418a663a81aa825c6041 SHA1 f10ea0d3eddb283f045001dcbe7f6587bc388e43 SHA256 720aefb754ef4261a481cf0fed6fb292d802159e698343ebdb816d86752cd8a9
-MD5 5768ae3fe215f65c6a97ab80dec67b19 zaptel-1.2.0.ebuild 9088
-RMD160 0a4672dbfa7101836a7c418a663a81aa825c6041 zaptel-1.2.0.ebuild 9088
-SHA256 720aefb754ef4261a481cf0fed6fb292d802159e698343ebdb816d86752cd8a9 zaptel-1.2.0.ebuild 9088
-EBUILD zaptel-1.2.1-r1.ebuild 9318 RMD160 4c359f6967a5e134f208d7c8888a268d8d2afee9 SHA1 787c63caf98bfee5e9128ea9b74413023f901964 SHA256 9aebb3931e600a0c793548032568b950bed823d226ab1da3a596792a14f1c107
-MD5 07f712d35c82582a788fb771a17fdaec zaptel-1.2.1-r1.ebuild 9318
-RMD160 4c359f6967a5e134f208d7c8888a268d8d2afee9 zaptel-1.2.1-r1.ebuild 9318
-SHA256 9aebb3931e600a0c793548032568b950bed823d226ab1da3a596792a14f1c107 zaptel-1.2.1-r1.ebuild 9318
-EBUILD zaptel-1.2.1.ebuild 9136 RMD160 997a5543febde1d3e981347687083b50682f6c2d SHA1 aa6e11387e8cd7a4bfad9d614c9d8d6b0d76e332 SHA256 034323f8d3ee7138338a51a4a6b5e9916b3adfab186270a8649ae94919461db6
-MD5 40e2ebecf773b9adc843c1fa4f93a3ce zaptel-1.2.1.ebuild 9136
-RMD160 997a5543febde1d3e981347687083b50682f6c2d zaptel-1.2.1.ebuild 9136
-SHA256 034323f8d3ee7138338a51a4a6b5e9916b3adfab186270a8649ae94919461db6 zaptel-1.2.1.ebuild 9136
-EBUILD zaptel-1.2.2.ebuild 9304 RMD160 4ef0d77b3f9a2b6fe44bc26ead8228bc257a7fdb SHA1 c88cb78a658287fdb98ac3fc991b93396908d16a SHA256 ab564ecad3d99eff4d27b9b7d9e24d13d3505b861a022342cc18271f0c0c7267
-MD5 eafb0440cd17425fb9c1c86d7c05c507 zaptel-1.2.2.ebuild 9304
-RMD160 4ef0d77b3f9a2b6fe44bc26ead8228bc257a7fdb zaptel-1.2.2.ebuild 9304
-SHA256 ab564ecad3d99eff4d27b9b7d9e24d13d3505b861a022342cc18271f0c0c7267 zaptel-1.2.2.ebuild 9304
-EBUILD zaptel-1.2.3-r1.ebuild 9304 RMD160 2ad7ff1d54bf3f18273c2b509cc56fd71ee3b491 SHA1 eb48ef4856fb86e16839df0b229a1268faf39721 SHA256 1c3f4971bc3d1bc7f4ef40346e02743b3d842fafdab403da27780651f8175a87
-MD5 1a882437a39bea056f2844187a321c18 zaptel-1.2.3-r1.ebuild 9304
-RMD160 2ad7ff1d54bf3f18273c2b509cc56fd71ee3b491 zaptel-1.2.3-r1.ebuild 9304
-SHA256 1c3f4971bc3d1bc7f4ef40346e02743b3d842fafdab403da27780651f8175a87 zaptel-1.2.3-r1.ebuild 9304
-EBUILD zaptel-1.2.3.ebuild 9304 RMD160 946ef977840705ba1048a105305e752d724c4100 SHA1 dc1b37ac14292ba5f666969ffb3682db397d9ede SHA256 a5036fdd12c39a9d195712594a362ff9fdb08aebe67cb7ae0611cb1f27e94b23
-MD5 ee5281e2df181040f6dbb7f97883c388 zaptel-1.2.3.ebuild 9304
-RMD160 946ef977840705ba1048a105305e752d724c4100 zaptel-1.2.3.ebuild 9304
-SHA256 a5036fdd12c39a9d195712594a362ff9fdb08aebe67cb7ae0611cb1f27e94b23 zaptel-1.2.3.ebuild 9304
-EBUILD zaptel-1.2.4.ebuild 9304 RMD160 2ad7ff1d54bf3f18273c2b509cc56fd71ee3b491 SHA1 eb48ef4856fb86e16839df0b229a1268faf39721 SHA256 1c3f4971bc3d1bc7f4ef40346e02743b3d842fafdab403da27780651f8175a87
-MD5 1a882437a39bea056f2844187a321c18 zaptel-1.2.4.ebuild 9304
-RMD160 2ad7ff1d54bf3f18273c2b509cc56fd71ee3b491 zaptel-1.2.4.ebuild 9304
-SHA256 1c3f4971bc3d1bc7f4ef40346e02743b3d842fafdab403da27780651f8175a87 zaptel-1.2.4.ebuild 9304
-EBUILD zaptel-1.2.5-r1.ebuild 9499 RMD160 af55c55da45323c8cadf1eb136a6c6ff56c64bbf SHA1 72bf9fcfe1243911d531f29ec22eaadb4e8ff874 SHA256 9f74638ac569a7002d08a77d72c4771af1345de9d0b2d21646a6c5f7e897a497
-MD5 d7b371a98058ac6a6bb8f7cee8be274e zaptel-1.2.5-r1.ebuild 9499
-RMD160 af55c55da45323c8cadf1eb136a6c6ff56c64bbf zaptel-1.2.5-r1.ebuild 9499
-SHA256 9f74638ac569a7002d08a77d72c4771af1345de9d0b2d21646a6c5f7e897a497 zaptel-1.2.5-r1.ebuild 9499
-EBUILD zaptel-1.2.5-r2.ebuild 9303 RMD160 8217d798744cffa0649a0035f9644d844bf9a2c5 SHA1 efdb808d2e16f5a1ffeb6d8f5e43bc72b8ff61e8 SHA256 1ce018b43d5732720303140fde5b44ee08cbeac9ee19417e619e0c147a3d1012
-MD5 4350ae473a87bca074a404b52b694bb9 zaptel-1.2.5-r2.ebuild 9303
-RMD160 8217d798744cffa0649a0035f9644d844bf9a2c5 zaptel-1.2.5-r2.ebuild 9303
-SHA256 1ce018b43d5732720303140fde5b44ee08cbeac9ee19417e619e0c147a3d1012 zaptel-1.2.5-r2.ebuild 9303
-EBUILD zaptel-1.2.5-r3.ebuild 9316 RMD160 27c6eff191a3498f077e59a854eee6a4bbfa95a2 SHA1 9977c3125af2acc2796614f10e142cff46278d7c SHA256 67f9f36de27f78742a9aed386e21eab5822709a6d35c2f6ac98de78ec1c1d841
-MD5 d6202d95abdd5a66f0813436de5b7989 zaptel-1.2.5-r3.ebuild 9316
-RMD160 27c6eff191a3498f077e59a854eee6a4bbfa95a2 zaptel-1.2.5-r3.ebuild 9316
-SHA256 67f9f36de27f78742a9aed386e21eab5822709a6d35c2f6ac98de78ec1c1d841 zaptel-1.2.5-r3.ebuild 9316
-EBUILD zaptel-1.2.5.ebuild 9300 RMD160 76d330cdebcaf4c396a213204a90b9306a937629 SHA1 fb71f08c2fbf51c19212ffba7b09ab572ca558ad SHA256 b699343b54199d3d6080e0214403bfe8d96af73c7d7268bd73ed4ef8a2d0bbd1
-MD5 0157f2383f2eaa50bdc49d1e0d6bd7b5 zaptel-1.2.5.ebuild 9300
-RMD160 76d330cdebcaf4c396a213204a90b9306a937629 zaptel-1.2.5.ebuild 9300
-SHA256 b699343b54199d3d6080e0214403bfe8d96af73c7d7268bd73ed4ef8a2d0bbd1 zaptel-1.2.5.ebuild 9300
-EBUILD zaptel-1.2.6.ebuild 9332 RMD160 4c7051dad4a62a9b41ebe3ffc1d685d52b6672a9 SHA1 7cb8d57f877ca9a7a87f626aebd921fa46fce975 SHA256 0fffbed990860d58df7cfa404aeba39aaa281236a7070f1e0d06a3f7bab70d06
-MD5 4f87c6eaacd22ae72af3f7631fd47855 zaptel-1.2.6.ebuild 9332
-RMD160 4c7051dad4a62a9b41ebe3ffc1d685d52b6672a9 zaptel-1.2.6.ebuild 9332
-SHA256 0fffbed990860d58df7cfa404aeba39aaa281236a7070f1e0d06a3f7bab70d06 zaptel-1.2.6.ebuild 9332
-EBUILD zaptel-1.2.7.ebuild 9332 RMD160 9b47018d6846b0677ff2412cf86284a491056c8f SHA1 49395d1c9a21eadf622c56c1f67ba7159ac5e83f SHA256 6ea7cfb256d8ba98402fbc26546ba7b5ef2d4d47fa338a2dc4cbbd742a4b2864
-MD5 8e354fb682a7a8329b4a429b1458eb1f zaptel-1.2.7.ebuild 9332
-RMD160 9b47018d6846b0677ff2412cf86284a491056c8f zaptel-1.2.7.ebuild 9332
-SHA256 6ea7cfb256d8ba98402fbc26546ba7b5ef2d4d47fa338a2dc4cbbd742a4b2864 zaptel-1.2.7.ebuild 9332
-EBUILD zaptel-1.2.9.1.ebuild 8525 RMD160 f5609d11a76cbffa9df0cc15eb6991c64f55398a SHA1 f4f3336ee185e4da60f0b5337cedb0b7e1848084 SHA256 92221e825c529e5a32786aa23968eb70d7261d9e39751a61b3ae92b425150c37
-MD5 3b36bb38b0b61d0af4ed2d5bd8dd00be zaptel-1.2.9.1.ebuild 8525
-RMD160 f5609d11a76cbffa9df0cc15eb6991c64f55398a zaptel-1.2.9.1.ebuild 8525
-SHA256 92221e825c529e5a32786aa23968eb70d7261d9e39751a61b3ae92b425150c37 zaptel-1.2.9.1.ebuild 8525
-MISC ChangeLog 18028 RMD160 761d0cfe58d0e4ab10bd746e977d0b1d1c01a811 SHA1 5ac70679c28414acdd4616df1b3f654a5451ac47 SHA256 7e230564041c412551d9bc0bdc64bfb1347463694754439b296f5901772b21f2
-MD5 979a011b2b46b3b5191e6469aea1dcec ChangeLog 18028
-RMD160 761d0cfe58d0e4ab10bd746e977d0b1d1c01a811 ChangeLog 18028
-SHA256 7e230564041c412551d9bc0bdc64bfb1347463694754439b296f5901772b21f2 ChangeLog 18028
-MISC metadata.xml 248 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e SHA1 10bea6cd152e9f0ecb627eaacc19980a9d5f5dc4 SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b
-MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e metadata.xml 248
-SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b metadata.xml 248
-MD5 2a9f3be41d80938292e66064d40bb3c0 files/digest-zaptel-1.2.0 786
-RMD160 9a4e1735fad8a0db4d9d238be6f86c98fdc6f44d files/digest-zaptel-1.2.0 786
-SHA256 3726eb46773ddce7430c36c0c0c5fc3e7f218998df95fb9c33439c62b6138ceb files/digest-zaptel-1.2.0 786
-MD5 bbaf527cd75c1059e3c7ae86fd46ef2a files/digest-zaptel-1.2.1 786
-RMD160 3723ce9c1f9be8a9c3bc902070403a63111eeebb files/digest-zaptel-1.2.1 786
-SHA256 7d990f63b15a4907ee27cc29a5617827b5a6b0d45868f1e5de3ca20f7ea37d56 files/digest-zaptel-1.2.1 786
-MD5 6b3f481abd2f338c43105b55d2bf5e31 files/digest-zaptel-1.2.1-r1 597
-RMD160 9d300ced919dabd726b0f2e39c347f606c1a4173 files/digest-zaptel-1.2.1-r1 597
-SHA256 4de1d1f36ab1b15be04b4d28e92f10fb856b6b48078e12792ede392b960e6633 files/digest-zaptel-1.2.1-r1 597
-MD5 d384c736914b20ca66d45a9035eb625a files/digest-zaptel-1.2.2 615
-RMD160 facdd1bb7fb34a64b2bc1cf28d425d7356600d0f files/digest-zaptel-1.2.2 615
-SHA256 707d51bff87081085cabf9e7b170952b5fc84a7cca044188b3a0046285f9628b files/digest-zaptel-1.2.2 615
-MD5 b8a1bacda1d185c8da271bed275445ae files/digest-zaptel-1.2.3 789
-RMD160 4e2ae5b553a3acb421ed05bd448315f675ad7f61 files/digest-zaptel-1.2.3 789
-SHA256 6619ec9161fbcbb19e009e3d65cbfda6d41d0413fb95f5d48a8d3af4b27c35aa files/digest-zaptel-1.2.3 789
-MD5 5f7da2cec142455e571667cb0618a2f5 files/digest-zaptel-1.2.3-r1 789
-RMD160 69158994b88578254a2ce6904911c01121a48575 files/digest-zaptel-1.2.3-r1 789
-SHA256 2666bd2e6d771d07e2cb8e793aed5603c994eeb3069070eb232ae68a36db703e files/digest-zaptel-1.2.3-r1 789
-MD5 6aaf88215a670b9320a9d2ae503595c9 files/digest-zaptel-1.2.4 789
-RMD160 5edcaaa8466e5cd8df26dd3456ee910824992132 files/digest-zaptel-1.2.4 789
-SHA256 51adc83361a36c07fb01da045377ed3ccddcc72627b649e885ecd4a2a78d76c4 files/digest-zaptel-1.2.4 789
-MD5 5c0e0cd9441dd2150c447a8085cf70bb files/digest-zaptel-1.2.5 789
-RMD160 7db3fdf39e6aeaaec2b9c9ee4d8b1dafa9f78763 files/digest-zaptel-1.2.5 789
-SHA256 ba9f78315e7f75aed1da7b724d92afd320cdbd931f35812ca327cbed9053d26f files/digest-zaptel-1.2.5 789
-MD5 da865311bc3aaa4dc53c3cc0e79a6017 files/digest-zaptel-1.2.5-r1 789
-RMD160 c1ed31a2fdcfb97907e77540ab9011dd22096324 files/digest-zaptel-1.2.5-r1 789
-SHA256 0ab3c45417e958d58d38e1d71b95128b764f0508f089854403cef599b19653b2 files/digest-zaptel-1.2.5-r1 789
-MD5 4118282f88566778acf16320b66df5ba files/digest-zaptel-1.2.5-r2 789
-RMD160 a6bba0a2dcd5438b5b10bbf78053c84a823ac039 files/digest-zaptel-1.2.5-r2 789
-SHA256 c43892c542017555e81b888881227364230be6fb9fb95a8b0d3331a099ea3b7c files/digest-zaptel-1.2.5-r2 789
-MD5 a4675fbeb24bb7f97a3c402599b35057 files/digest-zaptel-1.2.5-r3 503
-RMD160 f525f29faa7b73cbb0428f1eb7f22f5f3a45143b files/digest-zaptel-1.2.5-r3 503
-SHA256 87101a55a9f567fd33eea36548b4b9b20eca755e3d2fecc68db9c11dcc8d26a7 files/digest-zaptel-1.2.5-r3 503
-MD5 3708063a489c0d321af32910c0ed7aa8 files/digest-zaptel-1.2.6 789
-RMD160 3b5f6a6d32b45ba78ab69b9d8e9d8af4354f40de files/digest-zaptel-1.2.6 789
-SHA256 e0c1e502dc6c176d176a5877ce51ece60d7b8e99f20d47f048e0ebcf760fe30c files/digest-zaptel-1.2.6 789
-MD5 399d589bcd69d3f411f3fd4772cfe395 files/digest-zaptel-1.2.7 792
-RMD160 6a73a6eaa51d4eae507d8ae1b8f70134d051aef6 files/digest-zaptel-1.2.7 792
-SHA256 653e57cf54d5c60cefd58b4b5cbea157f00ec74e68f08ab5a63787612cee2f19 files/digest-zaptel-1.2.7 792
-MD5 1e13a9665022158b1d78f47b331688ed files/digest-zaptel-1.2.9.1 798
-RMD160 f10faf8fefa2221dfa0fd8e8a85b658a095d803c files/digest-zaptel-1.2.9.1 798
-SHA256 367d7228a51892a9ad986338a37a3355564b2fc324af014a65f7af78bf676b3d files/digest-zaptel-1.2.9.1 798
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.0 b/net-misc/zaptel/files/digest-zaptel-1.2.0
deleted file mode 100644
index c8bc5b0..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 97b25f6bc1df0a962383b1bc930266b9 bristuff-0.3.0-PRE-1c.tar.gz 167219
-RMD160 d826786216ca1dd85bb2f011b6273d8329e107fc bristuff-0.3.0-PRE-1c.tar.gz 167219
-SHA256 2b43a263f508194f0d6438c0c07655979261941b2041c4713f0aebc1d1cb993c bristuff-0.3.0-PRE-1c.tar.gz 167219
-MD5 021421e8b07547d907c4378e9bed2d43 zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-RMD160 d7e0492b994951d0c13ddea58e3703701619325e zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-SHA256 538498913dc71ad5944f5e5d4edfcfad67907e5621f2d90127c567649dc1534b zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-MD5 83d4aaab1594c5aa0dedc6b4f221fb48 zaptel-1.2.0.tar.gz 596257
-RMD160 de4b944d0e14671750fa5ef6ddbe92c2b246039f zaptel-1.2.0.tar.gz 596257
-SHA256 4debb42372421019a532f919424af7ad14e7e06eac0b8fe1cbc11d81346b3116 zaptel-1.2.0.tar.gz 596257
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.1 b/net-misc/zaptel/files/digest-zaptel-1.2.1
deleted file mode 100644
index ca99ddd..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 97b25f6bc1df0a962383b1bc930266b9 bristuff-0.3.0-PRE-1c.tar.gz 167219
-RMD160 d826786216ca1dd85bb2f011b6273d8329e107fc bristuff-0.3.0-PRE-1c.tar.gz 167219
-SHA256 2b43a263f508194f0d6438c0c07655979261941b2041c4713f0aebc1d1cb993c bristuff-0.3.0-PRE-1c.tar.gz 167219
-MD5 021421e8b07547d907c4378e9bed2d43 zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-RMD160 d7e0492b994951d0c13ddea58e3703701619325e zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-SHA256 538498913dc71ad5944f5e5d4edfcfad67907e5621f2d90127c567649dc1534b zaphfc_0.3.0-PRE-1_florz-10.diff.gz 10555
-MD5 efabb39a05d4c51f1e9d7d55ac097e2c zaptel-1.2.1.tar.gz 617212
-RMD160 fd5948f5c45792aa8e8f18ac1a31957055d18fda zaptel-1.2.1.tar.gz 617212
-SHA256 147d2bab9ff8e09fa5115957f692a218b5f86fb53de0e29da11c133d8bd15d34 zaptel-1.2.1.tar.gz 617212
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.1-r1 b/net-misc/zaptel/files/digest-zaptel-1.2.1-r1
deleted file mode 100644
index 9009530..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.1-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 2c361dc916804f42fb52978832e87cf3 bristuff-0.3.0-PRE-1f.tar.gz 264428
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 efabb39a05d4c51f1e9d7d55ac097e2c zaptel-1.2.1.tar.gz 617212
-RMD160 fd5948f5c45792aa8e8f18ac1a31957055d18fda zaptel-1.2.1.tar.gz 617212
-SHA256 147d2bab9ff8e09fa5115957f692a218b5f86fb53de0e29da11c133d8bd15d34 zaptel-1.2.1.tar.gz 617212
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.2 b/net-misc/zaptel/files/digest-zaptel-1.2.2
deleted file mode 100644
index 2161296..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.2
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 99f82076904be0325029f6f71357eeba bristuff-0.3.0-PRE-1h.tar.gz 207158
-RMD160 a01dceb5ac8bf85265d322e2bc109e11df556f02 bristuff-0.3.0-PRE-1h.tar.gz 207158
-SHA256 46ce98670f184498126b5d3bbe1310ea4ec2ac7e063532e1832593a121e89681 bristuff-0.3.0-PRE-1h.tar.gz 207158
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 6ae9032a2d869f020d1a00caaca713c6 zaptel-1.2.2.tar.gz 615509
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.3 b/net-misc/zaptel/files/digest-zaptel-1.2.3
deleted file mode 100644
index 21ea694..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 78e72cf28ced39483b76c61a6c363ce4 bristuff-0.3.0-PRE-1i.tar.gz 207735
-RMD160 d34f47c2f18f7732e80177bad557e36c08600b3f bristuff-0.3.0-PRE-1i.tar.gz 207735
-SHA256 4162bd62c1b168a5cfdfaed15bab74a706771d2d629af0d0c79caeedb629bef2 bristuff-0.3.0-PRE-1i.tar.gz 207735
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 9bcb705458f9b20a9644310298a9cd4d zaptel-1.2.3.tar.gz 619706
-RMD160 f57a41ac5838eed8443482d0ee5a55ae0c6ae511 zaptel-1.2.3.tar.gz 619706
-SHA256 621d126c5622a037c0ea1ef20f1dd57171c1085ad04fc8c62013e218c9b33ef4 zaptel-1.2.3.tar.gz 619706
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.3-r1 b/net-misc/zaptel/files/digest-zaptel-1.2.3-r1
deleted file mode 100644
index a1e16f3..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.3-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 11fc325f78d61be01621b6d59493fd56 bristuff-0.3.0-PRE-1k.tar.gz 207577
-RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca bristuff-0.3.0-PRE-1k.tar.gz 207577
-SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c bristuff-0.3.0-PRE-1k.tar.gz 207577
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 9bcb705458f9b20a9644310298a9cd4d zaptel-1.2.3.tar.gz 619706
-RMD160 f57a41ac5838eed8443482d0ee5a55ae0c6ae511 zaptel-1.2.3.tar.gz 619706
-SHA256 621d126c5622a037c0ea1ef20f1dd57171c1085ad04fc8c62013e218c9b33ef4 zaptel-1.2.3.tar.gz 619706
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.4 b/net-misc/zaptel/files/digest-zaptel-1.2.4
deleted file mode 100644
index cd83aa9..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 11fc325f78d61be01621b6d59493fd56 bristuff-0.3.0-PRE-1k.tar.gz 207577
-RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca bristuff-0.3.0-PRE-1k.tar.gz 207577
-SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c bristuff-0.3.0-PRE-1k.tar.gz 207577
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 4e48364e657e512108f2f8026dcd9a4a zaptel-1.2.4.tar.gz 673090
-RMD160 05396ac7227762b9c052a3ff3642b99d47a8dd85 zaptel-1.2.4.tar.gz 673090
-SHA256 9b511d2892dd7aaa66ac8ba4b0443fe560aa5835611d1973ae8ccfd5344b721d zaptel-1.2.4.tar.gz 673090
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5 b/net-misc/zaptel/files/digest-zaptel-1.2.5
deleted file mode 100644
index 3d1e941..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 11fc325f78d61be01621b6d59493fd56 bristuff-0.3.0-PRE-1k.tar.gz 207577
-RMD160 c06919d8d9878aeda822c8e07af0fc4f7a0c51ca bristuff-0.3.0-PRE-1k.tar.gz 207577
-SHA256 1e8544b966012f9ea44f30b36123c205ca8745c8756a8c0ac88e6f4406d86e6c bristuff-0.3.0-PRE-1k.tar.gz 207577
-MD5 88160b95c990e8bc92e7d0a755df6792 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-RMD160 7ab9166da63bb81902d3b6eaeaa6691dade108b7 zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-SHA256 efa70642be1913007423a6b177af55c5678522f9e71e2bd5a19275c6f57e79ae zaphfc_0.3.0-PRE-1f_florz-11.diff.gz 10563
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1 b/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
deleted file mode 100644
index 91a39f7..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a0c78e7676acbc06b26d2c68ef3e0c86 bristuff-0.3.0-PRE-1n.tar.gz 248488
-RMD160 3da3043a88551578b4495ae8e54ffb6a4f3bfd2c bristuff-0.3.0-PRE-1n.tar.gz 248488
-SHA256 31b894bdd2741e309dfed23963db1cda3d74a8d616de8df9f1281b5558aa27f1 bristuff-0.3.0-PRE-1n.tar.gz 248488
-MD5 8e072de546cce9db77a65036819361a4 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-RMD160 31f1f82a5452bafa191b2023cfa559b8431786c6 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-SHA256 923f6f8fa8a520d14978aab5ff2911234e587bee1fae085f76fb992ed9e1f9b1 zaphfc_0.3.0-PRE-1n_florz-11.diff.gz 10647
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5-r2 b/net-misc/zaptel/files/digest-zaptel-1.2.5-r2
deleted file mode 100644
index ac29b01..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 93bb8a5661aaf3022cf4a102ea061f83 bristuff-0.3.0-PRE-1o.tar.gz 252770
-RMD160 60f1656a815bd1ff7d86ca7cb657c1d850a84804 bristuff-0.3.0-PRE-1o.tar.gz 252770
-SHA256 aec95d12959181b601d7d10f05bb16eff715859dc8ea9fbb10e670296f61b6e9 bristuff-0.3.0-PRE-1o.tar.gz 252770
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.5-r3 b/net-misc/zaptel/files/digest-zaptel-1.2.5-r3
deleted file mode 100644
index 57e198d..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.5-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 842636e711ff9d9977099db5af091fd7 bristuff-0.3.0-PRE-1p.tar.gz 254003
-RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 bristuff-0.3.0-PRE-1p.tar.gz 254003
-SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164 bristuff-0.3.0-PRE-1p.tar.gz 254003
-MD5 8c8561259d29a314aa5a076050124697 zaptel-1.2.5.tar.gz 673161
-RMD160 7de580a8424b436d77504501ef59c47f2498e04d zaptel-1.2.5.tar.gz 673161
-SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c zaptel-1.2.5.tar.gz 673161
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.6 b/net-misc/zaptel/files/digest-zaptel-1.2.6
deleted file mode 100644
index 963775d..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 842636e711ff9d9977099db5af091fd7 bristuff-0.3.0-PRE-1p.tar.gz 254003
-RMD160 e87c0289bc598b52b962d192bc54008edc9b38a9 bristuff-0.3.0-PRE-1p.tar.gz 254003
-SHA256 d7dbb352ac68d64458919b94f815c8c97418c54fa8ae5411084370325528c164 bristuff-0.3.0-PRE-1p.tar.gz 254003
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 c6058b74f43ae12a29e486cf1e919562 zaptel-1.2.6.tar.gz 676658
-RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 zaptel-1.2.6.tar.gz 676658
-SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938 zaptel-1.2.6.tar.gz 676658
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.7 b/net-misc/zaptel/files/digest-zaptel-1.2.7
deleted file mode 100644
index b7981e5..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 99b011a28dd9c65d2c20c048f5898a31 bristuff-0.3.0-PRE-1r.tar.gz 262348
-RMD160 c2f7e937fc7452d8abb392f6c17246c3f8291b01 bristuff-0.3.0-PRE-1r.tar.gz 262348
-SHA256 944be5544eae6cbbc00ac30d63f76ea78cc355dac07732ed2c52f7bdec91117e bristuff-0.3.0-PRE-1r.tar.gz 262348
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 5134f361d92e5ec7342d7e80bad7d30a zaptel-1.2.7.tar.gz 1137409
-RMD160 76cb57b0c57fc25f6210de285bbc4291ee9fb4b9 zaptel-1.2.7.tar.gz 1137409
-SHA256 db6768c88380a1b5eaf6adea97eb1c9837ee83d284d87cec84853ae984994a00 zaptel-1.2.7.tar.gz 1137409
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.9.1 b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
deleted file mode 100644
index 0e5dc7e..0000000
--- a/net-misc/zaptel/files/digest-zaptel-1.2.9.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 760eba19b03d03cd1dc8648d6239b4af bristuff-0.3.0-PRE-1s.tar.gz 265953
-RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 bristuff-0.3.0-PRE-1s.tar.gz 265953
-SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d bristuff-0.3.0-PRE-1s.tar.gz 265953
-MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
-MD5 c2f5798196ac1b53f4161547cc4efb2c zaptel-1.2.9.1.tar.gz 1255412
-RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a zaptel-1.2.9.1.tar.gz 1255412
-SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede zaptel-1.2.9.1.tar.gz 1255412
diff --git a/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff b/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff
deleted file mode 100644
index e33002e..0000000
--- a/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel/zaptel.c.orig	2005-01-03 23:31:28.266487240 +0100
-+++ zaptel/zaptel.c	2005-01-03 23:20:16.149664528 +0100
-@@ -143,12 +143,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1087,6 +1089,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1129,6 +1132,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4304,6 +4337,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4313,6 +4347,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4360,11 +4403,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6301,6 +6355,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6312,6 +6367,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6342,6 +6413,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6357,6 +6429,16 @@
- 	class_simple_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel/zaptel.h.orig	2005-01-03 23:31:32.029915112 +0100
-+++ zaptel/zaptel.h	2005-01-03 23:20:18.380325416 +0100
-@@ -46,18 +46,17 @@
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #define LINUX26
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -65,6 +64,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1123,8 +1124,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1254,7 +1257,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch b/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
deleted file mode 100644
index ea80c9e..0000000
--- a/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN zaptel-1.0.4.orig/wcfxs.c zaptel-1.0.4/wcfxs.c
---- zaptel-1.0.4.orig/wcfxs.c	2005-01-31 14:27:54.828322677 -0500
-+++ zaptel-1.0.4/wcfxs.c	2005-01-31 14:32:15.629810758 -0500
-@@ -740,7 +740,7 @@
-     return 0;
- }
- 
--static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
- {
- #ifndef AUDIO_RINGCHECK
- 	unsigned char res;
-@@ -884,7 +884,7 @@
- 	}
- }
- 
--static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
- {
- 	char res;
- 	int hook;
-@@ -939,7 +939,7 @@
- 	
- }
- 
--static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
- {
- 	int res;
- 	/* Check loopback */
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff b/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
deleted file mode 100644
index d9cfef2..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel-1.2.0-beta2/zaptel.c.orig	2005-10-04 20:34:36.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.c	2005-11-07 21:08:39.000000000 +0000
-@@ -148,12 +148,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1123,6 +1125,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1165,6 +1168,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4429,6 +4462,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4438,6 +4472,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4485,11 +4528,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6510,6 +6564,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6521,6 +6576,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6551,6 +6622,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6566,6 +6638,16 @@
- 	class_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel-1.2.0-beta2/zaptel.h.orig	2005-10-27 16:05:07.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.h	2005-11-07 21:08:39.000000000 +0000
-@@ -52,18 +52,17 @@
- #define zap_pci_module pci_register_driver
- #else
- #define zap_pci_module pci_module_init
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -71,6 +70,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1172,8 +1173,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1309,7 +1312,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.0-gentoo.diff
deleted file mode 100644
index 2470a57..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0-gentoo.diff
+++ /dev/null
@@ -1,113 +0,0 @@
---- zaptel-1.2.0-beta2/Makefile.orig	2005-10-16 16:07:49.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile	2005-11-07 21:01:42.000000000 +0000
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X64-64)
-@@ -55,27 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--        MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -83,7 +63,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
- endif
- 
- CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-@@ -296,7 +276,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -323,39 +303,22 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -363,10 +325,6 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
diff --git a/net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch b/net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch
deleted file mode 100644
index 940abf8..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0-ukcid.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: zaptel.c
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.c,v
-retrieving revision 1.95.2.1
-diff -u -r1.95.2.1 zaptel.c
---- zaptel.c	6 Oct 2004 22:11:41 -0000	1.95.2.1
-+++ zaptel.c	2 Nov 2004 10:59:16 -0000
-@@ -703,6 +703,20 @@
- 	unsigned char *newbuf, *oldbuf;
- 	unsigned long flags;
- 	int x;
-+
-+        /* Allocate history buffer, or not.  This probably shouldn't
-+	 *            be here, but it's convenient */
-+       if(!j)
-+       {
-+          if(ss->history) kfree(ss->history);
-+          ss->history = NULL;
-+       }
-+       else
-+       {
-+         if(!ss->history) ss->history=kmalloc(ZT_HISTORY_BUF_LEN, GFP_KERNEL);
-+       }
-+       ss->historypos=0;
-+
- 	/* Check numbufs */
- 	if (numbufs < 2)
- 		numbufs = 2;
-@@ -3856,11 +3870,12 @@
- {
- 	struct zt_chan *chan = chans[unit];
- 	unsigned long flags;
--	int j, rv;
-+	int j, k1, k2, rv;
- 	int ret;
- 	int oldconf;
- 	void *rxgain=NULL;
- 	echo_can_state_t *ec, *tec;
-+	struct zt_history hist;
- 
- 	if (!chan)
- 		return -ENOSYS;
-@@ -4186,6 +4201,29 @@
- 			return -EINVAL;
- 		break;
- #endif
-+	case ZT_GET_HISTORY:
-+		if (copy_from_user(&hist,(struct zt_history *) data,sizeof(hist)))
-+			return -EIO;
-+
-+		if (!(chan->flags & ZT_FLAG_AUDIO)) return (-EINVAL);
-+		if (!chan->history) return -EINVAL;
-+		j=hist.len;
-+		k1=ZT_HISTORY_BUF_LEN-chan->historypos;
-+		k2=chan->historypos;
-+		if(j>0 && k1>0)
-+		{
-+			if (copy_to_user(hist.buf,chan->history+chan->historypos,min(j,k1)))
-+				return -EIO;
-+			j-=min(j,k1);
-+		}
-+		if(j>0 && k2>0)
-+		{
-+			if (copy_to_user(hist.buf+k1,chan->history,min(j,k2)))
-+				return -EIO;
-+			j-=min(j,k2);
-+		}
-+		/* Probably should assert j==0 here */
-+		break;
- 	default:
- 		return zt_chanandpseudo_ioctl(inode, file, cmd, data, unit);
- 	}
-@@ -5371,6 +5409,15 @@
- 	if (!(ms->flags &  ZT_FLAG_PSEUDO)) {
- 		memcpy(ms->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
- 		memcpy(ms->putraw, rxb, ZT_CHUNKSIZE);
-+	}
-+
-+	/* Store in the history buffer */
-+	if(ms->history)
-+	{
-+		memcpy(ms->history+ms->historypos,rxb,ZT_CHUNKSIZE);
-+		ms->historypos+=ZT_CHUNKSIZE;
-+		if(ms->historypos >= ZT_HISTORY_BUF_LEN)
-+			ms->historypos=0;
- 	}
- 	
- 	/* Take the rxc, twiddle it for conferencing if appropriate and put it
-Index: zaptel.h
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.h,v
-retrieving revision 1.38
-diff -u -r1.38 zaptel.h
---- zaptel.h	27 Sep 2004 19:50:03 -0000	1.38
-+++ zaptel.h	2 Nov 2004 10:59:17 -0000
-@@ -137,6 +137,8 @@
- #define ZT_MAX_NUM_BUFS		 32
- #define ZT_MAX_BUF_SPACE         32768
- 
-+#define ZT_HISTORY_BUF_LEN       16384 /* Count of ulaw samples */
-+
- #define ZT_DEFAULT_BLOCKSIZE 1024
- #define ZT_DEFAULT_MTR_MRU	 2048
- 
-@@ -277,6 +279,11 @@
- int reserved[4];	/* Reserved for future expansion -- always set to 0 */
- } ZT_DIAL_PARAMS;
- 
-+typedef struct zt_history
-+{
-+	unsigned char   *buf;           /* Sample buffer */
-+	int len;                /* Length of buffer, in bytes */
-+} ZT_HISTORY;
- 
- typedef struct zt_dynamic_span {
- 	char driver[20];	/* Which low-level driver to use */
-@@ -584,6 +591,11 @@
- #define ZT_TIMERPONG _IOW (ZT_CODE, 53, int)
- 
- /*
-+ * Return history buffer
-+ */
-+#define ZT_GET_HISTORY _IOR(ZT_CODE, 54, struct zt_history)
-+
-+/*
-  * Set/get signalling freeze
-  */
- #define ZT_SIGFREEZE _IOW (ZT_CODE, 54, int)
-@@ -989,6 +1001,10 @@
- 	wait_queue_head_t writebufq; /* write wait queue */
- 	
- 	int		blocksize;	/* Block size */
-+
-+
-+        u_char          *history;       /* History buffer, for pre-ring caller ID (ZT_HISTORY_BUF_LEN) */
-+        u_short         historypos;     /* Current position within buffer */
- 
- 	int		eventinidx;  /* out index in event buf (circular) */
- 	int		eventoutidx;  /* in index in event buf (circular) */
diff --git a/net-misc/zaptel/files/zaptel-1.2.0_beta2-devfs26.diff b/net-misc/zaptel/files/zaptel-1.2.0_beta2-devfs26.diff
deleted file mode 100644
index d9cfef2..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0_beta2-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel-1.2.0-beta2/zaptel.c.orig	2005-10-04 20:34:36.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.c	2005-11-07 21:08:39.000000000 +0000
-@@ -148,12 +148,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1123,6 +1125,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1165,6 +1168,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4429,6 +4462,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4438,6 +4472,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4485,11 +4528,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6510,6 +6564,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6521,6 +6576,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6551,6 +6622,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6566,6 +6638,16 @@
- 	class_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel-1.2.0-beta2/zaptel.h.orig	2005-10-27 16:05:07.000000000 +0000
-+++ zaptel-1.2.0-beta2/zaptel.h	2005-11-07 21:08:39.000000000 +0000
-@@ -52,18 +52,17 @@
- #define zap_pci_module pci_register_driver
- #else
- #define zap_pci_module pci_module_init
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -71,6 +70,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1172,8 +1173,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1309,7 +1312,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.2.0_beta2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.0_beta2-gentoo.diff
deleted file mode 100644
index 2470a57..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0_beta2-gentoo.diff
+++ /dev/null
@@ -1,113 +0,0 @@
---- zaptel-1.2.0-beta2/Makefile.orig	2005-10-16 16:07:49.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile	2005-11-07 21:01:42.000000000 +0000
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X64-64)
-@@ -55,27 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--        MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -83,7 +63,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
- endif
- 
- CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-@@ -296,7 +276,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -323,39 +303,22 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -363,10 +325,6 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
diff --git a/net-misc/zaptel/files/zaptel-1.2.0_beta2-ukcid.patch b/net-misc/zaptel/files/zaptel-1.2.0_beta2-ukcid.patch
deleted file mode 100644
index 940abf8..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.0_beta2-ukcid.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: zaptel.c
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.c,v
-retrieving revision 1.95.2.1
-diff -u -r1.95.2.1 zaptel.c
---- zaptel.c	6 Oct 2004 22:11:41 -0000	1.95.2.1
-+++ zaptel.c	2 Nov 2004 10:59:16 -0000
-@@ -703,6 +703,20 @@
- 	unsigned char *newbuf, *oldbuf;
- 	unsigned long flags;
- 	int x;
-+
-+        /* Allocate history buffer, or not.  This probably shouldn't
-+	 *            be here, but it's convenient */
-+       if(!j)
-+       {
-+          if(ss->history) kfree(ss->history);
-+          ss->history = NULL;
-+       }
-+       else
-+       {
-+         if(!ss->history) ss->history=kmalloc(ZT_HISTORY_BUF_LEN, GFP_KERNEL);
-+       }
-+       ss->historypos=0;
-+
- 	/* Check numbufs */
- 	if (numbufs < 2)
- 		numbufs = 2;
-@@ -3856,11 +3870,12 @@
- {
- 	struct zt_chan *chan = chans[unit];
- 	unsigned long flags;
--	int j, rv;
-+	int j, k1, k2, rv;
- 	int ret;
- 	int oldconf;
- 	void *rxgain=NULL;
- 	echo_can_state_t *ec, *tec;
-+	struct zt_history hist;
- 
- 	if (!chan)
- 		return -ENOSYS;
-@@ -4186,6 +4201,29 @@
- 			return -EINVAL;
- 		break;
- #endif
-+	case ZT_GET_HISTORY:
-+		if (copy_from_user(&hist,(struct zt_history *) data,sizeof(hist)))
-+			return -EIO;
-+
-+		if (!(chan->flags & ZT_FLAG_AUDIO)) return (-EINVAL);
-+		if (!chan->history) return -EINVAL;
-+		j=hist.len;
-+		k1=ZT_HISTORY_BUF_LEN-chan->historypos;
-+		k2=chan->historypos;
-+		if(j>0 && k1>0)
-+		{
-+			if (copy_to_user(hist.buf,chan->history+chan->historypos,min(j,k1)))
-+				return -EIO;
-+			j-=min(j,k1);
-+		}
-+		if(j>0 && k2>0)
-+		{
-+			if (copy_to_user(hist.buf+k1,chan->history,min(j,k2)))
-+				return -EIO;
-+			j-=min(j,k2);
-+		}
-+		/* Probably should assert j==0 here */
-+		break;
- 	default:
- 		return zt_chanandpseudo_ioctl(inode, file, cmd, data, unit);
- 	}
-@@ -5371,6 +5409,15 @@
- 	if (!(ms->flags &  ZT_FLAG_PSEUDO)) {
- 		memcpy(ms->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
- 		memcpy(ms->putraw, rxb, ZT_CHUNKSIZE);
-+	}
-+
-+	/* Store in the history buffer */
-+	if(ms->history)
-+	{
-+		memcpy(ms->history+ms->historypos,rxb,ZT_CHUNKSIZE);
-+		ms->historypos+=ZT_CHUNKSIZE;
-+		if(ms->historypos >= ZT_HISTORY_BUF_LEN)
-+			ms->historypos=0;
- 	}
- 	
- 	/* Take the rxc, twiddle it for conferencing if appropriate and put it
-Index: zaptel.h
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.h,v
-retrieving revision 1.38
-diff -u -r1.38 zaptel.h
---- zaptel.h	27 Sep 2004 19:50:03 -0000	1.38
-+++ zaptel.h	2 Nov 2004 10:59:17 -0000
-@@ -137,6 +137,8 @@
- #define ZT_MAX_NUM_BUFS		 32
- #define ZT_MAX_BUF_SPACE         32768
- 
-+#define ZT_HISTORY_BUF_LEN       16384 /* Count of ulaw samples */
-+
- #define ZT_DEFAULT_BLOCKSIZE 1024
- #define ZT_DEFAULT_MTR_MRU	 2048
- 
-@@ -277,6 +279,11 @@
- int reserved[4];	/* Reserved for future expansion -- always set to 0 */
- } ZT_DIAL_PARAMS;
- 
-+typedef struct zt_history
-+{
-+	unsigned char   *buf;           /* Sample buffer */
-+	int len;                /* Length of buffer, in bytes */
-+} ZT_HISTORY;
- 
- typedef struct zt_dynamic_span {
- 	char driver[20];	/* Which low-level driver to use */
-@@ -584,6 +591,11 @@
- #define ZT_TIMERPONG _IOW (ZT_CODE, 53, int)
- 
- /*
-+ * Return history buffer
-+ */
-+#define ZT_GET_HISTORY _IOR(ZT_CODE, 54, struct zt_history)
-+
-+/*
-  * Set/get signalling freeze
-  */
- #define ZT_SIGFREEZE _IOW (ZT_CODE, 54, int)
-@@ -989,6 +1001,10 @@
- 	wait_queue_head_t writebufq; /* write wait queue */
- 	
- 	int		blocksize;	/* Block size */
-+
-+
-+        u_char          *history;       /* History buffer, for pre-ring caller ID (ZT_HISTORY_BUF_LEN) */
-+        u_short         historypos;     /* Current position within buffer */
- 
- 	int		eventinidx;  /* out index in event buf (circular) */
- 	int		eventoutidx;  /* in index in event buf (circular) */
diff --git a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
deleted file mode 100644
index 9cf6c0a..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.1-gentoo.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- zaptel-1.2.1/Makefile.orig	2005-12-04 20:29:27.000000000 +0100
-+++ zaptel-1.2.1/Makefile	2005-12-14 19:45:38.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -87,7 +63,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS:=$(shell ps ax | grep -v grep | grep -q udevd && echo "yes")
- endif
- 
- CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
-@@ -302,7 +278,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -329,39 +305,22 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -369,10 +328,6 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
diff --git a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
deleted file mode 100644
index 960e98b..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.2-gentoo.diff
+++ /dev/null
@@ -1,166 +0,0 @@
---- zaptel-1.2.2/Makefile.orig	2006-01-19 00:04:48.000000000 +0100
-+++ zaptel-1.2.2/Makefile	2006-01-19 00:09:24.000000000 +0100
-@@ -21,7 +21,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -55,31 +55,7 @@
-   BUILDVER:=linux24
- endif
- 
--ifeq ($(BUILDVER),linux26)
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.d))
--    MODCONF:=$(ROOT_PREFIX)/etc/modprobe.d/zaptel
--  else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.d))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.d/zaptel
--    else
--      ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modprobe.conf))
--        MODCONF:=$(ROOT_PREFIX)/etc/modprobe.conf
--      else
--        ifneq (,$(wildcard $(ROOT_PREFIX)/etc/conf.modules))
--          MODCONF:=$(ROOT_PREFIX)/etc/conf.modules
--        endif
--      endif
--    endif
--  endif
--else # BUILDVER == linux24
--  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modutils))
--    MODCONF:=$(ROOT_PREFIX)/etc/modutils/zaptel
--   else
--    ifneq (,$(wildcard $(ROOT_PREFIX)/etc/modules.conf))
--      MODCONF:=$(ROOT_PREFIX)/etc/modules.conf
--     endif
--  endif
--endif
-+MODCONF:=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- 
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -87,8 +63,8 @@
- endif
- 
- ifeq (${BUILDVER},linux26)
-+  DYNFS:=$(shell ps ax | grep -v grep | grep -q "devfsd\|udevd" && echo "yes")
-   ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
--    DYNFS=yes
-     UDEVRULES=yes
-     ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d))
-       UDEVPERMISSIONS=yes
-@@ -328,17 +304,17 @@
- else # DYNFS
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
- endif
- 
--install: all devices
-+install: devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -365,42 +341,25 @@
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o; \
- 	fi
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8/ztcfg.8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8/zttool.8
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	if [ -n "$(MODCONF)" ]; then \
--		if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi; \
--		cat $(MODCONF).bak | grep -v "alias char-major-250" | \
--		grep -v "post-install torisa /sbin/ztcfg" | \
--		grep -v "post-install wcfxsusb /sbin/ztcfg" | \
--		grep -v "alias wctdm" | \
--		grep -v "post-install wctdm /sbin/ztcfg" > $(MODCONF); \
- 		if ! grep "options torisa" $(MODCONF); then \
- 			echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
- 		fi; \
- 		if ! grep "alias char-major-196" $(MODCONF); then \
- 			echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
- 		fi; \
--		for x in $(MODULES); do \
--			if ! grep -q "post-install $$x" $(MODCONF); then \
--				if ! grep -q "install $$x " $(MODCONF); then \
--					if [ "$$x" != "zaptel" ] ; then \
--						if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--						else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--						fi; \
--					fi; \
--				fi; \
--			fi; \
--		done; \
- 		if ! grep "ias wcfxs" $(MODCONF); then \
- 			echo "alias wcfxs wctdm" >> $(MODCONF); \
- 		fi; \
-@@ -408,19 +367,15 @@
- 			echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
- 		fi; \
- 	fi
--	if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- install-udev:
-   ifdef UDEVRULES
-     ifdef UDEVPERMISSIONS
--	install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d
--	install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d
-+	install -D -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-+	install -D -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d/10-zaptel.permissions
-     else # !UDEVPERMISSIONS (newer, combined syntax)
--	install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	install -D -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-     endif
-   endif
- 
---- zaptel-1.2.2/udev/zaptel.permissions.orig	2006-01-19 00:11:04.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.permissions	2006-01-19 00:11:17.000000000 +0100
-@@ -1,2 +1,2 @@
- # zaptel devices -- for running asterisk as non-root
--zap/*:asterisk:asterisk:660
-+zap/*:root:dialout:660
---- zaptel-1.2.2/udev/zaptel.rules-combined.orig	2006-01-19 00:11:25.000000000 +0100
-+++ zaptel-1.2.2/udev/zaptel.rules-combined	2006-01-19 00:12:12.000000000 +0100
-@@ -1,6 +1,6 @@
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL="zapctl",     NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zaptimer",   NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL="zapctl",     NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zaptimer",   NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zappseudo",  NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL="zap[0-9]*",  NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
diff --git a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
deleted file mode 100644
index cb66641..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.6-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.000000000 +0200
-@@ -79,20 +79,6 @@
- 
- echo Building ${target}...
- 
--if [ "${1}" == "linux24" ]; then
--    for mod in ${3}; do
--	if ! grep -q "post-install ${mod} " ${target}; then
--	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
--	fi
--    done
--elif [ "${1}" == "linux26" ]; then
--    for mod in ${3}; do
--	if ! grep -q "install ${mod} " ${target}; then
--	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
--	fi
--    done
--fi
--
- if ! grep -q "alias wcfxs" ${target}; then
-     echo "alias wcfxs wctdm" >> ${target};
- fi;
---- zaptel-1.2.6/Makefile.orig	2006-06-04 19:27:17.000000000 +0200
-+++ zaptel-1.2.6/Makefile	2006-06-04 19:28:11.000000000 +0200
-@@ -22,7 +22,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -294,7 +294,8 @@
- 	done
- else # DYNFS
-   ifdef UDEVRULES
--	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	build_tools/genudevrules > zaptel.rules
-+	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -323,24 +324,20 @@
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
--	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
-+	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
- 
- install-udev: devices
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
deleted file mode 100644
index 0124e77..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.7-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- zaptel-1.2.7/Makefile.orig	2006-07-07 20:03:59.000000000 +0200
-+++ zaptel-1.2.7/Makefile	2006-07-17 19:52:09.000000000 +0200
-@@ -24,7 +24,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -Iinclude -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -308,7 +308,8 @@
- 	done
- else # DYNFS
-   ifdef UDEVRULES
--	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	build_tools/genudevrules > zaptel.rules
-+	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -337,24 +338,20 @@
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
--	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
-+	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
- 
- install-udev: devices
- 
---- zaptel-1.2.6/build_tools/genudevrules.orig	2006-06-04 15:57:29.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genudevrules	2006-06-04 15:58:11.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
---- zaptel-1.2.6/build_tools/genmodconf.orig	2006-06-04 15:59:02.000000000 +0200
-+++ zaptel-1.2.6/build_tools/genmodconf	2006-06-04 15:59:13.000000000 +0200
-@@ -79,20 +79,6 @@
- 
- echo Building ${target}...
- 
--if [ "${1}" == "linux24" ]; then
--    for mod in ${3}; do
--	if ! grep -q "post-install ${mod} " ${target}; then
--	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
--	fi
--    done
--elif [ "${1}" == "linux26" ]; then
--    for mod in ${3}; do
--	if ! grep -q "install ${mod} " ${target}; then
--	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
--	fi
--    done
--fi
--
- if ! grep -q "alias wcfxs" ${target}; then
-     echo "alias wcfxs wctdm" >> ${target};
- fi;
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch b/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
deleted file mode 100644
index 485a337..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- zaptel-1.2.9.1/wct4xxp/Kbuild.orig	2006-09-28 01:47:38.000000000 +0000
-+++ zaptel-1.2.9.1/wct4xxp/Kbuild	2006-09-28 01:47:53.000000000 +0000
-@@ -2,6 +2,7 @@
- # but we need to be able to support older verions as well
- host-progs := fw2h
- hostprogs-y := fw2h
-+fw2h-objs := fw2h.o
- 
- obj-m += wct4xxp.o
- 
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
deleted file mode 100644
index 34ac155..0000000
--- a/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nru zaptel-1.2.9.1.orig/Makefile zaptel-1.2.9.1/Makefile
---- zaptel-1.2.9.1.orig/Makefile	2006-09-09 01:49:43.000000000 +0200
-+++ zaptel-1.2.9.1/Makefile	2006-09-15 02:14:35.000000000 +0200
-@@ -23,7 +23,7 @@
- endif
- KINCLUDES:=$(KSRC)/include
- 
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -Iinclude -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
-@@ -300,7 +300,8 @@
- 	done
- else # DYNFS
-   ifdef UDEVRULES
--	build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
-+	build_tools/genudevrules > zaptel.rules
-+	install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
-   else # !UDEVRULES
- 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
-   endif
-@@ -315,7 +316,7 @@
- 	tar -zxf mISDNuser.tar.gz
- 	$(MAKE) -C mISDNuser install
- 
--install: all devices firmware
-+install: devices firmware
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -338,24 +339,20 @@
- 	fi; \
- 	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
- 	install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
- 	rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
- 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
--	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
- 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
--	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	install -D -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-+	install -D -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
--	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
--	@if [ -d /etc/modutils ]; then \
--		/sbin/update-modules ; \
--	fi
-+	install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
-+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
- 
- install-udev: devices
- 
-diff -Nru zaptel-1.2.9.1.orig/build_tools/genmodconf zaptel-1.2.9.1/build_tools/genmodconf
---- zaptel-1.2.9.1.orig/build_tools/genmodconf	2006-05-23 19:51:00.000000000 +0200
-+++ zaptel-1.2.9.1/build_tools/genmodconf	2006-09-15 02:13:37.000000000 +0200
-@@ -79,20 +79,6 @@
- 
- echo Building ${target}...
- 
--if [ "${1}" == "linux24" ]; then
--    for mod in ${3}; do
--	if ! grep -q "post-install ${mod} " ${target}; then
--	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
--	fi
--    done
--elif [ "${1}" == "linux26" ]; then
--    for mod in ${3}; do
--	if ! grep -q "install ${mod} " ${target}; then
--	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
--	fi
--    done
--fi
--
- if ! grep -q "alias wcfxs" ${target}; then
-     echo "alias wcfxs wctdm" >> ${target};
- fi;
-diff -Nru zaptel-1.2.9.1.orig/build_tools/genudevrules zaptel-1.2.9.1/build_tools/genudevrules
---- zaptel-1.2.9.1.orig/build_tools/genudevrules	2006-05-17 18:49:46.000000000 +0200
-+++ zaptel-1.2.9.1/build_tools/genudevrules	2006-09-15 02:12:19.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
- EOF
diff --git a/net-misc/zaptel/files/zaptel.confd b/net-misc/zaptel/files/zaptel.confd
deleted file mode 100644
index 5d547f3..0000000
--- a/net-misc/zaptel/files/zaptel.confd
+++ /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-misc/zaptel/files/zaptel.confd,v 1.2 2004/07/15 00:16:05 agriffis Exp $
-
-#
-# Some options for the zaptel init script
-#
-
-#
-# Forces the script to re-create missing /dev/zap
-# directory and device nodes
-#
-ZAP_FORCE_CREATE="no"
diff --git a/net-misc/zaptel/files/zaptel.devfsd b/net-misc/zaptel/files/zaptel.devfsd
deleted file mode 100644
index 2669777..0000000
--- a/net-misc/zaptel/files/zaptel.devfsd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# devfs rules for zaptel
-#
-REGISTER     zap	PERMISSIONS root.dialout rwxrwx---
-REGISTER     zap/.*     PERMISSIONS root.dialout rw-rw----
diff --git a/net-misc/zaptel/files/zaptel.rc6 b/net-misc/zaptel/files/zaptel.rc6
deleted file mode 100644
index 3295422..0000000
--- a/net-misc/zaptel/files/zaptel.rc6
+++ /dev/null
@@ -1,54 +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-misc/zaptel/files/zaptel.rc6,v 1.4 2005/05/11 12:36:55 stkn Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -f /etc/zaptel.conf ]; then
-		eerror "Please create /etc/zaptel.conf!"
-		return 1
-	fi
-
-	return 0
-}
-
-create_devices() {
-	mkdir -p -m 0775 /dev/zap
-	for i in `seq 1 250`; do
-		mknod /dev/zap/$i c 196 $i
-	done
-	mknod /dev/zap/ctl c 196 0
-	mknod /dev/zap/timer c 196 253
-	mknod /dev/zap/channel c 196 254
-	mknod /dev/zap/pseudo c 196 255
-
-	chown -R root:dialout   /dev/zap
-	chmod -R u=rwX,g=rwX,o= /dev/zap
-}
-
-
-start() {
-	checkconfig || return 1
-
-	if [ ! -d /dev/zap ] && [ "$ZAP_FORCE_CREATE" != "no" ]; then
-		einfo "Creating zaptel device nodes"
-		create_devices
-	fi
-
-	ebegin "Starting zaptel"
-	/sbin/ztcfg
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping zaptel"
-	/sbin/ztcfg -s
-	eend $?
-}
-
-
-# vim:ts=4
diff --git a/net-misc/zaptel/files/zaptel.udevd b/net-misc/zaptel/files/zaptel.udevd
deleted file mode 100644
index 45ae729..0000000
--- a/net-misc/zaptel/files/zaptel.udevd
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# udev rules for zaptel
-#
-KERNEL="zapctl",	NAME="zap/ctl", MODE="0660", GROUP="dialout"
-KERNEL="zaptimer",	NAME="zap/timer", MODE="0660", GROUP="dialout"
-KERNEL="zapchannel",	NAME="zap/channel", MODE="0660", GROUP="dialout"
-KERNEL="zappseudo",	NAME="zap/pseudo", MODE="0660", GROUP="dialout"
-KERNEL="zap[0-9]*",	NAME="zap/%n", MODE="0660", GROUP="dialout"
diff --git a/net-misc/zaptel/metadata.xml b/net-misc/zaptel/metadata.xml
deleted file mode 100644
index 10f27dc..0000000
--- a/net-misc/zaptel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>voip</herd>
-<maintainer>
-  <email>stkn@gentoo.org</email>
-  <name>Stefan Knoblich</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/zaptel/zaptel-1.2.0.ebuild b/net-misc/zaptel/zaptel-1.2.0.ebuild
deleted file mode 100644
index 15519f2..0000000
--- a/net-misc/zaptel/zaptel-1.2.0.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.0.ebuild,v 1.2 2005/11/20 21:36:46 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1c"
-FLORZ_VERSION="0.3.0-PRE-1_florz-10"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo.diff
-
-	if use devfs26; then
-		epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-		# fix Makefile to not create device nodes for
-		# devfs enabled 2.6 kernels
-		sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-			Makefile
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-#			# remove as soon as there's a new florz patch available
-#			sed -i -e "s:zaptel-1\.0\.7:zaptel-1.0.8:g" \
-#				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# disable udev support on devfs26 systems
-	use devfs26 && \
-		zconfig_disable CONFIG_ZAP_UDEV
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.1-r1.ebuild b/net-misc/zaptel/zaptel-1.2.1-r1.ebuild
deleted file mode 100644
index 9de4b72..0000000
--- a/net-misc/zaptel/zaptel-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1f"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-		#	# remove as soon as there's a new florz patch available
-		#	sed -i -e "s:zaptel-1\.0\.7:zaptel-1.0.8:g" \
-		#		${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.1.ebuild b/net-misc/zaptel/zaptel-1.2.1.ebuild
deleted file mode 100644
index ad3b05c..0000000
--- a/net-misc/zaptel/zaptel-1.2.1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.0.ebuild,v 1.2 2005/11/20 21:36:46 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1c"
-FLORZ_VERSION="0.3.0-PRE-1_florz-10"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff
-
-	if use devfs26; then
-		epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-		# fix Makefile to not create device nodes for
-		# devfs enabled 2.6 kernels
-		sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-			Makefile
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-		#	# remove as soon as there's a new florz patch available
-		#	sed -i -e "s:zaptel-1\.0\.7:zaptel-1.0.8:g" \
-		#		${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# disable udev support on devfs26 systems
-	use devfs26 && \
-		zconfig_disable CONFIG_ZAP_UDEV
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.2.ebuild b/net-misc/zaptel/zaptel-1.2.2.ebuild
deleted file mode 100644
index 206f582..0000000
--- a/net-misc/zaptel/zaptel-1.2.2.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1h"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.2:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.3-r1.ebuild b/net-misc/zaptel/zaptel-1.2.3-r1.ebuild
deleted file mode 100644
index 683844a..0000000
--- a/net-misc/zaptel/zaptel-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1k"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.3:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.3.ebuild b/net-misc/zaptel/zaptel-1.2.3.ebuild
deleted file mode 100644
index cb78059..0000000
--- a/net-misc/zaptel/zaptel-1.2.3.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1i"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.2:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.4.ebuild b/net-misc/zaptel/zaptel-1.2.4.ebuild
deleted file mode 100644
index 683844a..0000000
--- a/net-misc/zaptel/zaptel-1.2.4.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1k"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/old/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.3:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5-r1.ebuild b/net-misc/zaptel/zaptel-1.2.5-r1.ebuild
deleted file mode 100644
index 497cec3..0000000
--- a/net-misc/zaptel/zaptel-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1n"
-FLORZ_VERSION="0.3.0-PRE-1n_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapgsm zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	else
-		sed -i -e "\$i#undef ${1}" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	else
-		sed -i -e "\$i#define ${1}" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.3:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-
-	# disable gsm support
-	use zapgsm || \
-		zconfig_disable ZAPATA_GSM
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5-r2.ebuild b/net-misc/zaptel/zaptel-1.2.5-r2.ebuild
deleted file mode 100644
index 53cf959..0000000
--- a/net-misc/zaptel/zaptel-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1o"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-#			# remove as soon as there's a new florz patch available
-#			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.5:g" \
-#				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5-r3.ebuild b/net-misc/zaptel/zaptel-1.2.5-r3.ebuild
deleted file mode 100644
index 28ff143..0000000
--- a/net-misc/zaptel/zaptel-1.2.5-r3.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1p"
-FLORZ_VERSION="0.3.0-PRE-1n_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
-#	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-#		if use florz; then
-#			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-#
-#			# remove as soon as there's a new florz patch available
-#			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.5:g" \
-#				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-#
-#			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-#		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.5.ebuild b/net-misc/zaptel/zaptel-1.2.5.ebuild
deleted file mode 100644
index 567bd5c..0000000
--- a/net-misc/zaptel/zaptel-1.2.5.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1k"
-FLORZ_VERSION="0.3.0-PRE-1f_florz-11"
-
-IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-
-	if kernel_is 2 6 && use devfs26; then
-		if [[ ${KV_PATCH} -ge 14 ]]; then
-			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-		else
-			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-
-			# fix Makefile to not create device nodes for
-			# devfs enabled 2.6 kernels
-			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-				Makefile
-
-			# disable udev support on devfs26 systems
-			zconfig_disable CONFIG_ZAP_UDEV
-		fi
-	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.1:zaptel-1.2.3:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-		ewarn "*** Warning! ***"
-		ewarn "Devfs support for linux-2.6 is experimental and not"
-		ewarn "supported by digium or the asterisk project!"
-		echo
-		ewarn "Send bug-reports to: stkn@gentoo.org"
-	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.6.ebuild b/net-misc/zaptel/zaptel-1.2.6.ebuild
deleted file mode 100644
index 2d7a556..0000000
--- a/net-misc/zaptel/zaptel-1.2.6.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1p"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.6-gentoo.diff
-
-# gone
-#	if kernel_is 2 6 && use devfs26; then
-#		if [[ ${KV_PATCH} -ge 14 ]]; then
-#			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-#		else
-#			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-#
-#			# fix Makefile to not create device nodes for
-#			# devfs enabled 2.6 kernels
-#			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-#				Makefile
-#
-#			# disable udev support on devfs26 systems
-#			zconfig_disable CONFIG_ZAP_UDEV
-#		fi
-#	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-#	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-#		ewarn "*** Warning! ***"
-#		ewarn "Devfs support for linux-2.6 is experimental and not"
-#		ewarn "supported by digium or the asterisk project!"
-#		echo
-#		ewarn "Send bug-reports to: stkn@gentoo.org"
-#	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.7.ebuild b/net-misc/zaptel/zaptel-1.2.7.ebuild
deleted file mode 100644
index a1d8abb..0000000
--- a/net-misc/zaptel/zaptel-1.2.7.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.1.ebuild,v 1.1 2005/12/16 20:49:44 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## TODO:
-#
-# - bristuff (waiting for next upstream release...)
-# - cleanup (work-in-progress)
-# - testing of new features (zapras / -net)
-#
-
-BRI_VERSION="0.3.0-PRE-1r"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.7-gentoo.diff
-
-# gone
-#	if kernel_is 2 6 && use devfs26; then
-#		if [[ ${KV_PATCH} -ge 14 ]]; then
-#			eerror "Devfs has been removed in linux-2.6.14, skipping devfs26!"
-#		else
-#			epatch ${FILESDIR}/${PN}-1.2.0-devfs26.diff
-#
-#			# fix Makefile to not create device nodes for
-#			# devfs enabled 2.6 kernels
-#			sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-#				Makefile
-#
-#			# disable udev support on devfs26 systems
-#			zconfig_disable CONFIG_ZAP_UDEV
-#		fi
-#	fi
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-#	if kernel_is 2 6 && [[ ${KV_PATCH} -lt 14 ]] && use devfs26; then
-#		ewarn "*** Warning! ***"
-#		ewarn "Devfs support for linux-2.6 is experimental and not"
-#		ewarn "supported by digium or the asterisk project!"
-#		echo
-#		ewarn "Send bug-reports to: stkn@gentoo.org"
-#	fi
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}
diff --git a/net-misc/zaptel/zaptel-1.2.9.1.ebuild b/net-misc/zaptel/zaptel-1.2.9.1.ebuild
deleted file mode 100644
index 03f08fc..0000000
--- a/net-misc/zaptel/zaptel-1.2.9.1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.8.ebuild,v 1.1 2006/09/05 19:15:11 stkn Exp $
-
-inherit toolchain-funcs eutils linux-mod
-
-## NOTE:
-#
-#
-
-BRI_VERSION="0.3.0-PRE-1s"
-FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
-
-IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/releases/${MY_P}.tar.gz
-	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-	 florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="virtual/libc
-	virtual/linux-sources
-	>=dev-libs/newt-0.50.0"
-
-# list of echo canceller use flags,
-# first active in this list is selected (=order does matter)
-ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
-
-### Begin: Helper functions
-
-select_echo_cancel() {
-	local myEC=""
-
-	for x in ${ZAP_EC_FLAGS}; do
-		if use $x; then
-			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
-			break;
-		fi
-	done
-
-	echo ${myEC}
-}
-
-zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		# match a little more than ${1} so we can use zconfig_disable
-		# to disable all echo cancellers in zconfig.h w/o calling it several times
-		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
-		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
-			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
-	fi
-
-	return $?
-}
-
-### End: Helper functions
-
-pkg_setup() {
-	local result=0 numec=0
-
-	linux-mod_pkg_setup
-
-	einfo "Running pre-flight checks..."
-
-	# basic zaptel checks
-	if ! linux_chkconfig_present CRC_CCITT; then
-		echo
-		eerror "Your kernel lacks CRC_CCIT support!"
-		eerror "Enable CONFIG_CRC_CCIT!"
-		result=$((result+1))
-	fi
-
-	# check if multiple echo cancellers have been selected
-	for x in ${ZAP_EC_FLAGS}; do
-		use $x && numec=$((numec+1))
-	done
-	if [[ $numec -gt 1 ]]; then
-		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
-		# will be used, make sure the user knows about this
-		echo
-		ewarn "Multiple echo canceller flags are active but only one will be used!"
-		ewarn "Selected: $(select_echo_cancel)"
-	fi
-
-	# we need at least HDLC generic support
-	if use zapnet && ! linux_chkconfig_present HDLC; then
-		echo
-		eerror "zapnet: Your kernel lacks HDLC support!"
-		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
-		result=$((result+1))
-	fi
-
-	# zapras needs PPP support
-	if use zapras && ! linux_chkconfig_present PPP; then
-		echo
-		eerror "zapras: Your kernel lacks PPP support!"
-		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
-		result=$((result+1))
-	fi
-
-	# rtc needs linux-2.6 and CONFIG_RTC
-	if use rtc; then
-		if ! kernel_is 2 6; then
-			echo
-			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
-			result=$((result+1))
-		fi
-
-		if ! linux_chkconfig_present RTC; then
-			eerror "rtc: Your kernel lacks RealTime-Clock support!"
-			result=$((result+1))
-		fi
-	fi
-
-	if [[ $result -gt 0 ]]; then
-		echo
-		ewarn "One or more of the neccessary precondition(s) is/are not met!"
-		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
-		echo
-
-		if [[ $result -lt 3 ]]; then
-			eerror "[$result Error(s)] Zaptel is not happy :("
-		else
-			eerror "[$result Error(s)] You're making zaptel cry :'("
-		fi
-		die "[$result] Precondition(s) not met"
-	fi
-
-	echo
-	einfo "Zaptel is happy and continues... :)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
-
-	use ukcid && \
-		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
-
-	# try to apply bristuff patch
-	if use bri; then
-		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
-
-		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
-
-		cd ${S_BRI}
-
-		if use florz; then
-			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-			# remove as soon as there's a new florz patch available
-			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-		fi
-
-		# patch includes
-		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-			qozap/qozap.c \
-			zaphfc/zaphfc.c \
-			cwain/cwain.c
-
-		# patch makefiles
-		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-			-e "s:linux-2.6:linux:g" \
-			qozap/Makefile \
-			zaphfc/Makefile \
-			cwain/Makefile
-
-		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-			zaphfc/Makefile
-
-		cd ${S}
-	fi
-
-### Configuration changes
-	local myEC
-
-	# prepare zconfig.h
-	myEC=$(select_echo_cancel)
-	if [[ -n "${myEC}" ]]; then
-		einfo "Selected echo canceller: ${myEC}"
-		# disable default first, set new selected ec afterwards
-		zconfig_disable ECHO_CAN
-		zconfig_enable ECHO_CAN_${myEC}
-	fi
-
-	# enable rtc support on 2.6
-	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
-		einfo "Enabling ztdummy RTC support"
-		zconfig_enable USE_RTC
-	fi
-
-	# enable agressive echo surpression
-	use ecaggressive && \
-		zconfig_enable AGGRESSIVE_SUPPRESSOR
-
-	# ppp ras support
-	use zapras && \
-		zconfig_enable CONFIG_ZAPATA_PPP
-
-	# frame relay, syncppp...
-	use zapnet && \
-		zconfig_enable CONFIG_ZAPATA_NET
-
-	# zaptel watchdog
-	use watchdog && \
-		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
-}
-
-src_compile() {
-	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
-
-	if use bri; then
-		cd ${S_BRI}
-		for x in cwain qozap zaphfc; do
-			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
-				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
-
-	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-	# additional tools
-	dobin ztmonitor ztspeed zttest
-
-	# install all header files, several packages need the complete set
-	# (e.g. sangoma wanpipe)
-	insinto /usr/include/zaptel
-	doins *.h
-
-	if use bri; then
-		einfo "Installing bri"
-		cd ${S_BRI}
-
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
-
-		# install example configs for octoBRI and quadBRI
-		insinto /etc
-		doins qozap/zaptel.conf.octoBRI
-		newins qozap/zaptel.conf zaptel.conf.quadBRI
-		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-		insinto /etc/asterisk
-		doins qozap/zapata.conf.octoBRI
-		newins qozap/zapata.conf zapata.conf.quadBRI
-		newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-		docinto bristuff
-		dodoc CHANGES INSTALL
-
-		docinto bristuff/qozap
-		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-		docinto bristuff/zaphfc
-		dodoc zaphfc/LICENSE zaphfc/*.conf
-
-		docinto bristuff/cwain
-		dodoc cwain/TODO cwain/LICENSE
-
-		cd ${S}
-	fi
-
-	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
-
-	# install devfsd rule file
-	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
-
-	# install udev rule file
-	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-	fi
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	echo
-	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-	echo
-
-	if use bri; then
-		einfo "Bristuff configs have been merged as:"
-		einfo ""
-		einfo "${ROOT}etc/"
-		einfo "    zaptel.conf.zaphfc"
-		einfo "    zaptel.conf.quadBRI"
-		einfo "    zaptel.conf.octoBRI"
-		einfo ""
-		einfo "${ROOT}etc/asterisk/"
-		einfo "    zapata.conf.zaphfc"
-		einfo "    zapata.conf.quadBRI"
-		einfo "    zapata.conf.octoBRI"
-		echo
-	fi
-
-	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
-	fi
-}