add support for 2.6 kernels

4 files changed, 73 insertions, 12 deletions

diff --git a/net-dialup/fcpci/ChangeLog b/net-dialup/fcpci/ChangeLog
index 71bab33d2a02..8bd98bb8d847 100644
--- a/net-dialup/fcpci/ChangeLog
+++ b/net-dialup/fcpci/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/fcpci
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpci/ChangeLog,v 1.8 2004/10/02 15:25:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpci/ChangeLog,v 1.9 2004/11/13 19:38:34 mrness Exp $
+
+*fcpci-3.11.02-r1 (13 Nov 2004)
+
+  13 Nov 2004; Alin Nastac <mrness@gentoo.org> +fcpci-3.11.02-r1.ebuild:
+  Add support for 2.6 kernels. See #55902
 
 *fcpci-03.11.02 (10 Apr 2004)
 
diff --git a/net-dialup/fcpci/Manifest b/net-dialup/fcpci/Manifest
index 273f19c2c166..9568c18b2ee3 100644
--- a/net-dialup/fcpci/Manifest
+++ b/net-dialup/fcpci/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7cf9322dffebdb8437de5a07e33a4268 ChangeLog 811
+MD5 7832269dd23a6edd30b50803f38cf8f8 ChangeLog 960
 MD5 b6e834e8d8a57bce3b9933ce3828bfa9 fcpci-03.09.10.ebuild 1122
 MD5 0d5d85f3c77ee1182c4bb748c53fdf3f fcpci-03.10.02.ebuild 1080
 MD5 05a7eed1fb08c56cb30255fa983c97fd fcpci-03.11.02.ebuild 1136
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 5ca4b897ab17c2c779613ccb5aa92299 fcpci-3.11.02-r1.ebuild 1617
 MD5 90cc176e076cf2b4cfd1bf929679fa63 files/digest-fcpci-03.09.10 74
 MD5 a9248e51d7bf2980d55b7e5872c378f7 files/digest-fcpci-03.10.02 74
 MD5 e4cdfad1b954f1a2875dce5a65e1f64c files/digest-fcpci-03.11.02 75
 MD5 a8deb5bd6be2291d0af5ac6be6f35ca8 files/tools.c.diff 556
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsiBI1lqEGTUzyQRAk+fAKCfzR5j00YhvDVwf/Yy0WjLDTJ/xQCgoPaf
-SLOPPdL6C+g1d0+Ucy3Ay3c=
-=PEYj
------END PGP SIGNATURE-----
+MD5 19cda2540206daba0f907ca4fa34c8b4 files/digest-fcpci-3.11.02-r1 148
diff --git a/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild b/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild
new file mode 100644
index 000000000000..f60d2b4b9d79
--- /dev/null
+++ b/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild,v 1.1 2004/11/13 19:38:34 mrness Exp $
+
+inherit flag-o-matic kernel-mod
+
+PV_K24=fcpci-suse8.2-0${PV}.tar.gz
+PV_K26=fcpci-suse9.1-${PV/.0/-0}.tar.gz
+
+DESCRIPTION="CAPI4Linux drivers for AVM Fritz!Card PCI"
+HOMEPAGE="http://www.avm.de/"
+S="${WORKDIR}/fritz"
+SRC_URI="ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.82/${PV_K24}
+	ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.91/${PV_K26}"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="virtual/linux-sources"
+
+src_unpack() {
+	if kernel-mod_is_2_4_kernel; then
+		unpack ${PV_K24}
+	else
+		unpack ${PV_K26}
+	fi
+}
+
+src_compile() {
+	if kernel-mod_is_2_4_kernel; then
+		sed -i -e "s/\`uname -r\`/${KV_VERSION_FULL}/" \
+			-e 's/-DMODULE/-DMODULE -DMODVERSIONS/' \
+			-e "s:(DEFINES) -O2:(DEFINES) ${CFLAGS} -I /usr/src/linux/include/ -include linux/modversions.h:" src.drv/makefile
+
+		#gentoo-sources contains this typedef
+		sed -i -e "s:^typedef void irqreturn_t;.*:/*&*/:" src.drv/defs.h
+	else
+		sed -i -e 's:SUBDIRS=:M=:' \
+			-e 's:/var/lib/fritz:${S}/lib:' \
+			-e "s:\(.*@cp.*\):#\1:" ${S}/src/Makefile || die "sed failed"
+	fi
+
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+	(
+		unset ARCH
+		emake all || die "make failed"
+	)
+}
+
+src_install () {
+	if kernel-mod_is_2_4_kernel; then
+		insinto /lib/modules/${KV}/misc
+		doins src.drv/fcpci.o || die "failed to install fcpci.o"
+	else
+		insinto /lib/modules/${KV}/misc
+		doins src/fcpci.ko || die "failed to install fcpci.ko"
+	fi
+
+	dodoc CAPI* compile* license.txt
+	dohtml install_passive-?.html
+}
diff --git a/net-dialup/fcpci/files/digest-fcpci-3.11.02-r1 b/net-dialup/fcpci/files/digest-fcpci-3.11.02-r1
new file mode 100644
index 000000000000..a09fc35a8083
--- /dev/null
+++ b/net-dialup/fcpci/files/digest-fcpci-3.11.02-r1
@@ -0,0 +1,2 @@
+MD5 70821234398c08b1ec09fce16e2bac40 fcpci-suse8.2-03.11.02.tar.gz 1028015
+MD5 b0f8eb15fc8f3902633dd48f93dc9a68 fcpci-suse9.1-3.11-02.tar.gz 974643