Version bump including amd64 support thanks to Jochen Klumpp <jochen.klumpp@online.de> and sbriesen for testing.

(Portage version: 2.0.53_rc6)

4 files changed, 156 insertions, 14 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index fd0af92811f0..f37256441d39 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.18 2005/08/23 10:27:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.19 2005/10/20 20:29:46 genstef Exp $
+
+*fritzcapi-2.6.42 (20 Oct 2005)
+
+  20 Oct 2005; Stefan Schweizer <genstef@gentoo.org>
+  +fritzcapi-2.6.42.ebuild:
+  Version bump including amd64 support thanks to Jochen Klumpp
+  <jochen.klumpp@online.de> and sbriesen for testing.
 
   23 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
   fritzcapi-2.6.35.ebuild:
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index 9ff9fa97af16..11a6d6203dc0 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 11e4f3489033bacd0498e6c62bc3c422 fritzcapi-2.6.35.ebuild 6228
-MD5 bdf7edcbbf6c4c9fe836310037d003a0 fritzcapi-2.6.32.ebuild 5791
 MD5 0af2211c710fb859dd4a3e9af71a1a25 ChangeLog 3494
-MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
 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 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-fix-for-2.6.10.patch 473
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDRLRpNSP4Vda7IdsRAmasAJ9az+lPUTcMYicyILg7XWbxT2Y2+wCdHoTB
-MGmi2z89hx87Lpc78Y01A1c=
-=zSw8
------END PGP SIGNATURE-----
+MD5 bdf7edcbbf6c4c9fe836310037d003a0 fritzcapi-2.6.32.ebuild 5791
+MD5 11e4f3489033bacd0498e6c62bc3c422 fritzcapi-2.6.35.ebuild 6228
+MD5 bb9d075124063df6577525aba7effdc1 fritzcapi-2.6.42.ebuild 4888
+MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42
new file mode 100644
index 000000000000..cae66acdbf9f
--- /dev/null
+++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.42
@@ -0,0 +1,2 @@
+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/fritzcapi-2.6.42.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild
new file mode 100644
index 000000000000..8a8c41d44f03
--- /dev/null
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.42.ebuild
@@ -0,0 +1,141 @@
+# 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"
+	)
+}