Version bump thanks to sf <sf@b-i-t.de>, Markus Friedrich <fm12@freenet.de> and Christoph Dahlen <christoph@dahlen.org> in bug 99650

(Portage version: 2.0.51.22-r2)

4 files changed, 187 insertions, 1 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index 084e73c7502f..0e0a48dbd24f 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/fritzcapi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.16 2005/05/14 17:40:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.17 2005/08/11 09:31:11 genstef Exp $
+
+*fritzcapi-2.6.35 (11 Aug 2005)
+
+  11 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
+  +fritzcapi-2.6.35.ebuild:
+  Version bump thanks to sf <sf@b-i-t.de>, Markus Friedrich <fm12@freenet.de>
+  and Christoph Dahlen <christoph@dahlen.org> in bug 99650
 
   14 May 2005; Stefan Schweizer <genstef@gentoo.org>
   fritzcapi-2.6.32.ebuild:
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index a974e345d075..0baa91d5a7d8 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -1,5 +1,7 @@
+MD5 3a1d4342148fd2b765264299148c250b fritzcapi-2.6.35.ebuild 6154
 MD5 80024e8e01110a991ebf466f9336c946 fritzcapi-2.6.32.ebuild 5793
 MD5 4aea87645cccaefa746e93ff1c03d834 ChangeLog 3145
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
 MD5 5485d246d87e5397761c0395b02c20e9 files/digest-fritzcapi-2.6.32 443
+MD5 385a495faa071b68234deddba9facb7e files/digest-fritzcapi-2.6.35 597
 MD5 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-fix-for-2.6.10.patch 473
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35
new file mode 100644
index 000000000000..f036729ff4e6
--- /dev/null
+++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.35
@@ -0,0 +1,8 @@
+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/fritzcapi-2.6.35.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild
new file mode 100644
index 000000000000..743bad4e5099
--- /dev/null
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.35.ebuild
@@ -0,0 +1,169 @@
+# 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.1 2005/08/11 09:31:12 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/"
+
+#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]} ] && ! useq pcmcia; then
+				continue
+			fi
+			if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! useq 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}
+		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"
+	)
+}