Add a check for kernel 2.6.17 and disable fcpcmcia there thanks to agaffney in bug 139502, remove old ebuilds

Package-Manager: portage-2.1.1_pre2-r4

8 files changed, 16 insertions, 525 deletions

diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index dec4d8396999..101112e1c721 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -1,21 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 86c3d49bbe0bef0dc707f3ed7a55076f ChangeLog 4173
-MD5 5485d246d87e5397761c0395b02c20e9 files/digest-fritzcapi-2.6.32 443
-MD5 385a495faa071b68234deddba9facb7e files/digest-fritzcapi-2.6.35 597
-MD5 4cab6f38300d72504a096d115b88440a files/digest-fritzcapi-2.6.42 150
-MD5 92edc11ebe48a38861b6343de11e23e3 files/digest-fritzcapi-2.6.43 150
-MD5 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-fix-for-2.6.10.patch 473
-MD5 bdf7edcbbf6c4c9fe836310037d003a0 fritzcapi-2.6.32.ebuild 5791
-MD5 11e4f3489033bacd0498e6c62bc3c422 fritzcapi-2.6.35.ebuild 6228
-MD5 274199dd7a68a8b5d0918dc6fc6de3c6 fritzcapi-2.6.42.ebuild 4889
-MD5 83f75ce6acb1328407b28bb1c954cc37 fritzcapi-2.6.43.ebuild 4830
+DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475
+DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645
+EBUILD fritzcapi-2.6.43.ebuild 5144 RMD160 95754c7c2af5855b3e13392417e5930e8346ee0a SHA1 f0b93b7c530c793520b07c076b82a0a82def978e SHA256 6921dcec301152db58b9414cc221cf0c6d1dfebea01d516bf536e4280bd4b649
+MD5 a6e0187b642d7188e4c7b3c762761bef fritzcapi-2.6.43.ebuild 5144
+RMD160 95754c7c2af5855b3e13392417e5930e8346ee0a fritzcapi-2.6.43.ebuild 5144
+SHA256 6921dcec301152db58b9414cc221cf0c6d1dfebea01d516bf536e4280bd4b649 fritzcapi-2.6.43.ebuild 5144
+MISC ChangeLog 4490 RMD160 ee725d5c7f7fce88ea3c6bea8ec2a97cc14c8790 SHA1 64a832fa85683ce5759d028e80b4cdbc0da4db70 SHA256 c5bc40e7204cfde4840cb27459db4165e993385f783d17f56bf7a06fe8dcda86
+MD5 8fc2bd62fefd8c9de3bb7c0223bd57bb ChangeLog 4490
+RMD160 ee725d5c7f7fce88ea3c6bea8ec2a97cc14c8790 ChangeLog 4490
+SHA256 c5bc40e7204cfde4840cb27459db4165e993385f783d17f56bf7a06fe8dcda86 ChangeLog 4490
+MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEUP2bjG8pv1lIUX4RAnQnAKDb6NnlaPNXXe+nD02Tjg/1DVQBNACeLfjc
-8qa4r0v0Lr1f+t9xEohTJ/8=
-=JZqj
------END PGP SIGNATURE-----
+RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319
+SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc metadata.xml 319
+MD5 74239aa732884700de3f06a4776ef529 files/digest-fritzcapi-2.6.43 344
+RMD160 17975c68cde3c435031b0235e07bff62549c550b files/digest-fritzcapi-2.6.43 344
+SHA256 1433d7644bb83eeee7b52d3c2cec82571678f91b785c8af36007ff6994166d56 files/digest-fritzcapi-2.6.43 344
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.32 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.32
deleted file mode 100644
index 75734ad09df9..000000000000
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.32
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b0f8eb15fc8f3902633dd48f93dc9a68 fcpci-suse9.1-3.11-02.tar.gz 974643
-MD5 071400f24d43f174d6325c8573e1b3e2 fcpcmcia-suse91-3.11-02.tar.gz 973605
-MD5 cb85199aac07bd47e02095057611ad27 fcusb-suse9.1-3.11-04.tar.gz 989012
-MD5 e1966846af1408d82306cdf748704947 fcusb2-suse9.1-3.11-04.tar.gz 1011965
-MD5 efcc695d18390fe5f2876a2e57256ac8 fxusb-suse9.1-3.11-04.tar.gz 991108
-MD5 152e5bd203645166c6b887b6e48dfc86 km_fritzcapi-2.6-32.i586.rpm 2532837
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35
deleted file mode 100644
index f036729ff4e6..000000000000
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 3ee301b5d0e8df9e4b915af58b725556 fcpci-suse93-3.11-07.tar.gz 837893
-MD5 96fc3e72afdc2087b4dafe41c069ec18 fcpcmcia-suse93-3.11-07.tar.gz 836920
-MD5 9ed1a9f8f53e04e5dba760c951f5df4f fcusb-suse93-3.11-04.tar.gz 808774
-MD5 52ec5d97a8eacac07e9539ab1e8c260c fcusb2-suse93-3.11-07.tar.gz 892341
-MD5 b88ce4d7a47ccb8a4afae5885358803b fxusb-suse93-3.11-06.tar.gz 872832
-MD5 dc3d5ad3cd04292b2d7920fd114e4ab1 km_fritzcapi-2.6-35.i586.rpm 2533178
-MD5 ec055a92ebdb27cb3ab1d5daaac1390f fcpci-suse93-64bit-3.11-07.tar.gz 769267
-MD5 2ff38a98ec611c882893e9b0aa0d6aee fcpcmcia-suse93-64bit-3.11-07.tar.gz 804580
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42
deleted file mode 100644
index cae66acdbf9f..000000000000
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bbee10cbc3c53ba212ab294556b533f7 km_fritzcapi-2.6-42.i586.rpm 2994649
-MD5 08da83ab3ad9b1635e0d55bf2a3e5531 km_fritzcapi-2.6-42.x86_64.rpm 1005816
diff --git a/net-dialup/fritzcapi/files/fritzcapi-fix-for-2.6.10.patch b/net-dialup/fritzcapi/files/fritzcapi-fix-for-2.6.10.patch
deleted file mode 100644
index 40dd7cb840e4..000000000000
--- a/net-dialup/fritzcapi/files/fritzcapi-fix-for-2.6.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru fritz.pcmcia.old/src/fcpcmcia_cs.c fritz.pcmcia/src/fcpcmcia_cs.c
---- fritz.pcmcia.old/src/fcpcmcia_cs.c	2004-03-10 13:01:03.000000000 +0200
-+++ fritz.pcmcia/src/fcpcmcia_cs.c	2004-12-31 12:51:57.480716688 +0200
-@@ -118,7 +118,7 @@
- static int irq_list_count	= -1;
- static int irq_list[10];
- 
--module_param_array (irq_list, int, irq_list_count, 0);
-+module_param_array (irq_list, int, &irq_list_count, 0);
- 
- MODULE_PARM_DESC (irq_list, "List of IRQ numbers");
- 
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild
deleted file mode 100644
index 4783296bd81b..000000000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild,v 1.10 2005/10/06 05:21:24 mrness Exp $
-
-inherit linux-mod rpm eutils
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc"
-HOMEPAGE="http://www.avm.de/"
-
-#All sources in one suse-package
-FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb" "fcusb2" "fxusb" "fcclassic"
-	"fcpnp" "fxusb_CZ" "e2220pc" "e5520pc")
-FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb" "fritz.usb2"
-	"fritz.xusb" "fritz.classic" "fritz.pnp" "fritz.xusb_CZ" "e2220pc" "e5520pc")
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	FRITZCAPI_SRC[${CARD}]="http://rpmfind.net/linux/SuSE-Linux/i386/current/suse/i586/km_${P/2.6./2.6-}.i586.rpm"
-done
-
-#get newer drivers for some cards from AVM
-AVM_SRC=("fritzcrd.pci" "fritzcrd.pcm" "fritzcrd.usb" "fritzcrdusb.v20" "fritzx.usb")
-AVM_FILES=("fcpci-suse9.1-3.11-02" "fcpcmcia-suse91-3.11-02"
-	"fcusb-suse9.1-3.11-04" "fcusb2-suse9.1-3.11-04" "fxusb-suse9.1-3.11-04")
-for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do
-	FRITZCAPI_SRC[${CARD}]="ftp://ftp.avm.de/cardware/${AVM_SRC[CARD]}/linux/suse.91/${AVM_FILES[CARD]}.tar.gz"
-done
-
-#specific selection
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	SRC_URI="${SRC_URI} fritzcapi_cards_${FRITZCAPI_MODULES[CARD]}? ( ${FRITZCAPI_SRC[CARD]} )"
-done
-
-#in case nothing is selected take all SRC_URI's
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	BEGIN="${BEGIN} !fritzcapi_cards_${FRITZCAPI_MODULES[CARD]}? ("
-	MIDDLE="${MIDDLE} ${FRITZCAPI_SRC[CARD]}"
-	END="${END} )"
-done
-SRC_URI="${SRC_URI}${BEGIN}${MIDDLE}${END}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="pcmcia usb"
-
-DEPEND="net-dialup/capi4k-utils"
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-get_card_module_name() {
-	local CARD=$1
-	echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then
-		#PCMCIA have also a *_cs module
-		echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if ! kernel_is 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-	if ! linux_chkconfig_present ISDN_CAPI_CAPI20; then
-		die "For using the driver you need a kernel with enabled CAPI support."
-	fi
-
-	local USERCARD CARD
-	FRITZCAPI_BUILD_CARDS=""
-	FRITZCAPI_BUILD_TARGETS=""
-	MODULE_NAMES=""
-	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz"
-	BUILD_TARGETS="all"
-
-	if [ -n "${FRITZCAPI_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${FRITZCAPI_CARDS} ; do
-			for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then
-					FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-					FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-					MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "FRITZCAPI_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${FRITZCAPI_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-		ebeep
-
-		#Filter build targets by USE
-		for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-			if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use pcmcia; then
-				continue
-			fi
-			if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then
-				continue
-			fi
-			FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-			FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-			MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-		done
-	fi
-
-	einfo "Selected cards: ${FRITZCAPI_BUILD_CARDS}"
-}
-
-src_unpack() {
-	if [ -e ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm ]; then
-		rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
-	else mkdir -p ${S}; fi
-	cd ${S}
-	for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do
-		if [ -e ${DISTDIR}/${AVM_FILES[CARD]}.tar.gz ]; then
-			unpack ${AVM_FILES[CARD]}.tar.gz  || die "error unpacking ${AVM_FILES[CARD]}.tar.gz"
-			CRD_NAME=${AVM_FILES[CARD]/-*}
-			CRD_NAME=${CRD_NAME/fc}
-			CRD_NAME=${CRD_NAME/f}
-			[ -e fritz.${CRD_NAME} ] && mv fritz.${CRD_NAME} fritz.${CRD_NAME}.orig
-			mv fritz fritz.${CRD_NAME}
-		fi
-	done
-
-	if kernel_is ge 2 6 10 && [ -e fritz.pcmcia ]; then
-		epatch ${FILESDIR}/${PN}-fix-for-2.6.10.patch
-	fi
-
-	for i in $(find . -name Makefile); do
-		sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i}
-		convert_to_m ${i}
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodir /lib/firmware /etc
-
-	[ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
-		dodoc ${S}/fritz.xusb_CZ/README.fxusb_CZ
-
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		insinto /lib/firmware
-		insopts -m0644
-		doins ${S}/fritz.usb2/*.frm
-	)
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "If your device needs a firmware, you should edit copy the firmware files"
-	einfo "in /lib/firmware and edit /etc/capi.conf."
-	einfo
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		einfo "Note: This ebuild has already installed firmware files necessary for following modules:"
-		einfo "   fcusb2"
-	)
-}
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild
deleted file mode 100644
index 9fd10c873ffc..000000000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild,v 1.3 2005/10/06 05:21:24 mrness Exp $
-
-inherit linux-mod rpm eutils
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc"
-HOMEPAGE="http://www.avm.de/"
-
-#All sources in one suse-package
-FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb" "fcusb2" "fxusb" "fcclassic"
-	"fcpnp" "fxusb_CZ" "e2220pc" "e5520pc")
-FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb" "fritz.usb2"
-	"fritz.xusb" "fritz.classic" "fritz.pnp" "fritz.xusb_CZ" "e2220pc" "e5520pc")
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	FRITZCAPI_SRC[${CARD}]="ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/suse/i386/9.3/suse/i586/km_${P/2.6./2.6-}.i586.rpm"
-done
-
-#get newer drivers for some cards from AVM
-AVM_SRC=("fritzcrd.pci" "fritzcrd.pcm" "fritzcrd.usb" "fritzcrdusb.v20" "fritzx.usb")
-AVM_FILES=("fcpci-suse93-3.11-07" "fcpcmcia-suse93-3.11-07"
-	"fcusb-suse93-3.11-04" "fcusb2-suse93-3.11-07" "fxusb-suse93-3.11-06")
-for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do
-	FRITZCAPI_SRC[${CARD}]="ftp://ftp.avm.de/cardware/${AVM_SRC[CARD]}/linux/suse.93/${AVM_FILES[CARD]}.tar.gz"
-done
-
-#specific selection
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	SRC_URI="${SRC_URI} fritzcapi_cards_${FRITZCAPI_MODULES[CARD]}? ( ${FRITZCAPI_SRC[CARD]} )"
-done
-
-#in case nothing is selected take all SRC_URI's
-for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-	BEGIN="${BEGIN} !fritzcapi_cards_${FRITZCAPI_MODULES[CARD]}? ("
-	MIDDLE="${MIDDLE} ${FRITZCAPI_SRC[CARD]}"
-	END="${END} )"
-done
-SRC_URI="!amd64? ( ${SRC_URI}${BEGIN}${MIDDLE}${END} )
-	amd64? ( ftp://ftp.avm.de/cardware/fritzcrd.pci/linux_64bit/suse.93/fcpci-suse93-64bit-3.11-07.tar.gz
-	ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.93/fcpcmcia-suse93-64bit-3.11-07.tar.gz )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="pcmcia usb"
-
-DEPEND="net-dialup/capi4k-utils"
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-get_card_module_name() {
-	local CARD=$1
-	echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then
-		#PCMCIA have also a *_cs module
-		echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if ! kernel_is 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-	if ! linux_chkconfig_present ISDN_CAPI_CAPI20; then
-		die "For using the driver you need a kernel with enabled CAPI support."
-	fi
-
-	local USERCARD CARD
-	FRITZCAPI_BUILD_CARDS=""
-	FRITZCAPI_BUILD_TARGETS=""
-	MODULE_NAMES=""
-	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz"
-	BUILD_TARGETS="all"
-
-	if [ -n "${FRITZCAPI_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${FRITZCAPI_CARDS} ; do
-			for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then
-					FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-					FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-					MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "FRITZCAPI_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${FRITZCAPI_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-		ebeep
-
-		#Filter build targets by USE
-		for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-			if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use pcmcia; then
-				continue
-			fi
-			if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then
-				continue
-			fi
-			FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-			FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-			MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-		done
-	fi
-
-	einfo "Selected cards: ${FRITZCAPI_BUILD_CARDS}"
-}
-
-src_unpack() {
-	if [ -e ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm ]; then
-		rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
-	else mkdir -p ${S}; fi
-	cd ${S}
-	mkdir -p ${WORKDIR}/var/lib/fritz
-	ln fritz.*/lib/*-lib.o ${WORKDIR}/var/lib/fritz
-	for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do
-		if [ -e ${DISTDIR}/${AVM_FILES[CARD]}.tar.gz ]; then
-			unpack ${AVM_FILES[CARD]}.tar.gz  || die "error unpacking ${AVM_FILES[CARD]}.tar.gz"
-			CRD_NAME=${AVM_FILES[CARD]/-*}
-			CRD_NAME=${CRD_NAME/fc}
-			CRD_NAME=${CRD_NAME/f}
-			[ -e fritz.${CRD_NAME} ] && mv fritz.${CRD_NAME} fritz.${CRD_NAME}.orig
-			mv fritz fritz.${CRD_NAME}
-			rm ${WORKDIR}/var/lib/fritz/${AVM_FILES[CARD]/-*}-lib.o
-		fi
-	done
-	ln -s fritz.${CRD_NAME} fritz
-
-	for i in $(find . -name Makefile); do
-		sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i}
-		sed -i 's:$(PWD)/../lib/$(CARD)-lib.o:$(LIBDIR)/$(CARD)-lib.o:' ${i}
-		sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i}
-		convert_to_m ${i}
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodir /lib/firmware /etc
-
-	[ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
-		dodoc ${S}/fritz.xusb_CZ/README.fxusb_CZ
-
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		insinto /lib/firmware
-		insopts -m0644
-		doins ${S}/fritz.usb2/*.frm
-	)
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "If your device needs a firmware, you should edit copy the firmware files"
-	einfo "in /lib/firmware and edit /etc/capi.conf."
-	einfo
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		einfo "Note: This ebuild has already installed firmware files necessary for following modules:"
-		einfo "   fcusb2"
-	)
-}
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild
deleted file mode 100644
index 8a8c41d44f03..000000000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild,v 1.1 2005/10/20 20:29:46 genstef Exp $
-
-inherit linux-mod rpm eutils
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc"
-HOMEPAGE="http://www.avm.de/"
-
-SRC_URI="!amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Alpha1-Extra/suse/i586/km_${P/2.6./2.6-}.i586.rpm )
-	amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Alpha1-Extra/suse/x86_64/km_${P/2.6./2.6-}.x86_64.rpm )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="pcmcia usb"
-
-DEPEND="net-dialup/capi4k-utils"
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-get_card_module_name() {
-	local CARD=$1
-	echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then
-		#PCMCIA have also a *_cs module
-		echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if ! kernel_is 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-	if ! linux_chkconfig_present ISDN_CAPI_CAPI20; then
-		die "For using the driver you need a kernel with enabled CAPI support."
-	fi
-
-	local USERCARD CARD
-	FRITZCAPI_BUILD_CARDS=""
-	FRITZCAPI_BUILD_TARGETS=""
-	MODULE_NAMES=""
-	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz"
-	BUILD_TARGETS="all"
-
-	if ! use amd64; then
-		FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb" "fcusb2" "fxusb" "fcclassic"
-			"fcpnp" "fxusb_CZ" "e2220pc" "e5520pc")
-		FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb" "fritz.usb2"
-			"fritz.xusb" "fritz.classic" "fritz.pnp" "fritz.xusb_CZ" "e2220pc" "e5520pc")
-	else
-		FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb2")
-		FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb2")
-	fi
-
-	if [ -n "${FRITZCAPI_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${FRITZCAPI_CARDS} ; do
-			for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then
-					FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-					FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-					MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		einfo
-		einfo "You can control the modules which are built with the variable"
-		einfo "FRITZCAPI_CARDS which should contain a blank separated list"
-		einfo "of a selection from the following cards:"
-		einfo "   ${FRITZCAPI_MODULES[*]}"
-		einfo
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-		ebeep
-
-		#Filter build targets by USE
-		for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-			if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use pcmcia; then
-				continue
-			fi
-			if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then
-				continue
-			fi
-			FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-			FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-			MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-		done
-	fi
-
-	einfo "Selected cards: ${FRITZCAPI_BUILD_CARDS}"
-}
-
-src_unpack() {
-	if ! use amd64; then
-		rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
-	else
-		rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.x86_64.rpm
-	fi
-	cd ${S}
-	mkdir -p ${WORKDIR}/var/lib/fritz
-	ln fritz.*/lib/*-lib.o ${WORKDIR}/var/lib/fritz
-	for i in $(find . -name Makefile); do
-		sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i}
-		sed -i 's:$(PWD)/../lib/$(CARD)-lib.o:$(LIBDIR)/$(CARD)-lib.o:' ${i}
-		sed -i "s:@cp -f ../lib/\$(CARD)-lib.o \$(LIBDIR)::" ${i}
-		sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i}
-		convert_to_m ${i}
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodir /lib/firmware /etc
-
-	[ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
-		dodoc ${S}/fritz.xusb_CZ/README.fxusb_CZ
-
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		insinto /lib/firmware
-		insopts -m0644
-		doins ${S}/fritz.usb2/*.frm
-	)
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo "If your device needs a firmware, you should edit copy the firmware files"
-	einfo "in /lib/firmware and edit /etc/capi.conf."
-	einfo
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		einfo "Note: This ebuild has already installed firmware files necessary for following modules:"
-		einfo "   fcusb2"
-	)
-}