Version bump, new modulesd file

(Portage version: 1.589-cvs)

5 files changed, 112 insertions, 5 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index d8cf002e55f6..241f94499797 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/misdn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.2 2005/05/08 21:10:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.3 2005/05/16 08:53:37 genstef Exp $
+
+*misdn-20050514 (16 May 2005)
+
+  16 May 2005; Stefan Schweizer <genstef@gentoo.org> files/misdn.modulesd,
+  +misdn-20050514.ebuild:
+  Version bump, new modulesd file
 
 *misdn-20050508 (08 May 2005)
 
diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index aaae947e705d..450715a80cfb 100644
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -1,8 +1,10 @@
 MD5 ebea3cc6a50b31c2733de19ec1898085 misdn-20050508.ebuild 3342
+MD5 ebea3cc6a50b31c2733de19ec1898085 misdn-20050514.ebuild 3342
 MD5 1788ac55437d5f1f6753542295913557 misdn-20050409.ebuild 3316
-MD5 e761f9e0d3ce711faa3718215f721314 ChangeLog 652
+MD5 9d516cbafb30f2c063df806c98af702e ChangeLog 819
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 faca61b6fa6c40a64ed122df59ab7a7d files/misdn.modulesd 2404
+MD5 8bcf6e31f9b7146f2bdf50454726148d files/misdn.modulesd 2359
 MD5 591b7a0690f210221ae79ac9f1ae5633 files/change-pci_find_subsys-to-pci_get_subsys.patch 919
 MD5 9b0b0d0760eb4e9f26bd420c16a1dc5d files/digest-misdn-20050409 73
 MD5 3df61544e763fc35f2001a51edfc6f3b files/digest-misdn-20050508 73
+MD5 be8104b2e9408328f43ee4fe05d6bab4 files/digest-misdn-20050514 73
diff --git a/net-dialup/misdn/files/digest-misdn-20050514 b/net-dialup/misdn/files/digest-misdn-20050514
new file mode 100644
index 000000000000..37714bdb9fdc
--- /dev/null
+++ b/net-dialup/misdn/files/digest-misdn-20050514
@@ -0,0 +1 @@
+MD5 ec06e37802f86a2d0a3e98842e9108a5 mISDN-CVS-2005-05-14.tar.bz2 256773
diff --git a/net-dialup/misdn/files/misdn.modulesd b/net-dialup/misdn/files/misdn.modulesd
index 5a358d04a730..bc946a0f4255 100644
--- a/net-dialup/misdn/files/misdn.modulesd
+++ b/net-dialup/misdn/files/misdn.modulesd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/files/misdn.modulesd,v 1.1 2005/04/24 13:37:58 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/files/misdn.modulesd,v 1.2 2005/05/16 08:53:37 genstef Exp $
 
 # Options for the mISDN card drivers
 #
@@ -69,7 +69,8 @@ remove avmfritz \
 install sedlfax \
 /sbin/modprobe mISDN && \
 /sbin/modprobe faxl3 && \
-/sbin/modprobe --ignore-install sedlfax
+/sbin/modprobe --ignore-install sedlfax && \
+/usr/sbin/avmcapictrl load /lib/firmware/ISAR.BIN
 remove sedlfax \
 /sbin/modprobe -r --ignore-remove sedlfax && \
 /sbin/modprobe -r faxl3 && \
diff --git a/net-dialup/misdn/misdn-20050514.ebuild b/net-dialup/misdn/misdn-20050514.ebuild
new file mode 100644
index 000000000000..65e044c29909
--- /dev/null
+++ b/net-dialup/misdn/misdn-20050514.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20050514.ebuild,v 1.1 2005/05/16 08:53:37 genstef Exp $
+
+inherit eutils linux-mod
+
+MY_P=mISDN-CVS-${PV:0:4}-${PV:4:2}-${PV:6:2}
+DESCRIPTION="mISDN (modular ISDN) is the new ISDN stack of the linux kernel version 2.6."
+HOMEPAGE="http://www.isdn4linux.de/mISDN"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
+	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
+	ftp://ftp.cs.tu-berlin.de/pub/net/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2
+	ftp://ftp.gwdg.de/pub/linux/isdn/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
+S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN/
+
+MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "sedlfax" "w6692pci")
+MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "SPEEDFAX" "W6692" )
+
+pkg_setup() {
+	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
+	linux-mod_pkg_setup
+	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
+	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
+	mISDN_l2(net:) faxl3(net:) mISDN_dsp(net:)"
+	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} EXTRA_CFLAGS=-I${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
+	BUILD_TARGETS="modules"
+	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
+	# the i4l->capi simulation seems to be only for kernel 2.4
+
+	if [ -n "${MISDN_CARDS}" ]; then
+		#Check existence of user selected cards
+		for USERCARD in ${MISDN_CARDS} ; do
+			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+					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 "MISDN_CARDS which should contain a blank separated list"
+		einfo "of a selection from the following cards:"
+		einfo "   ${MISDN_MODULES[*]}"
+		einfo
+		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
+		ewarn "adjustments in /etc/make.conf."
+
+		# enable everything
+		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+		done
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${MY_P}
+	kernel_is ge 2 6 10 && \
+		sed -i 's:pci_find_subsys:pci_get_subsys:g' \
+		drivers/isdn/hardware/mISDN/hfc_multi.c
+}
+
+src_compile() {
+	mv Makefile.v2.6 Makefile
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/misdn.modulesd misdn
+
+	dodoc Kconfig.v2.6
+}
+
+pkg_postinst() {
+	update_depmod
+	update_modules
+
+	ewarn
+	ewarn "This driver is still under heavy development"
+	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
+	ewarn "Please report driver bugs to the mISDN mailing-list:"
+	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
+}