Revision bump, removing 2.6 kernel support in favour of fritzcapi.

Package-Manager: portage-1.582-cvs

5 files changed, 70 insertions, 82 deletions

diff --git a/net-dialup/fcpci/ChangeLog b/net-dialup/fcpci/ChangeLog
index b034165b12e8..f77b8e54791a 100644
--- a/net-dialup/fcpci/ChangeLog
+++ b/net-dialup/fcpci/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/fcpci
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpci/ChangeLog,v 1.14 2005/03/09 06:34:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcpci/ChangeLog,v 1.15 2005/03/09 12:59:42 genstef Exp $
+
+*fcpci-3.11.02-r2 (09 Mar 2005)
+
+  09 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  -fcpci-3.11.02-r1.ebuild, +fcpci-3.11.02-r2.ebuild:
+  Revision bump, removing 2.6 kernel support in favour of fritzcapi.
 
   09 Mar 2005; Alin Nastac <mrness@gentoo.org> fcpci-3.11.02-r1.ebuild:
   Replace kernel-mod inheritance with linux-mod.
diff --git a/net-dialup/fcpci/Manifest b/net-dialup/fcpci/Manifest
index 3f70cd76619a..fbb53e742f6d 100644
--- a/net-dialup/fcpci/Manifest
+++ b/net-dialup/fcpci/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82e6a296b2608b816a6fe7d4781cd361 ChangeLog 1484
+MD5 b6cfd10db028253299a95aad98c2aeea fcpci-3.11.02-r2.ebuild 1429
+MD5 175237edeba848f1406662641b9d8197 ChangeLog 1695
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 4c84299fe162dbd62aea6e46c308f8f8 fcpci-3.11.02-r1.ebuild 1657
-MD5 19cda2540206daba0f907ca4fa34c8b4 files/digest-fcpci-3.11.02-r1 148
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLpkbjiC39V7gKu0RAnlUAKCrih4H0VVcxKYF0G5/n93y7WqN4QCfRn38
-Qp2J3rm6/A+AYc6hd058PmI=
-=b+4U
------END PGP SIGNATURE-----
+MD5 e4cdfad1b954f1a2875dce5a65e1f64c files/digest-fcpci-3.11.02-r2 75
diff --git a/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild b/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild
deleted file mode 100644
index fedf885453d4..000000000000
--- a/net-dialup/fcpci/fcpci-3.11.02-r1.ebuild
+++ /dev/null
@@ -1,67 +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/fcpci/fcpci-3.11.02-r1.ebuild,v 1.3 2005/03/09 06:34:58 mrness Exp $
-
-inherit flag-o-matic linux-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/"
-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"
-
-S="${WORKDIR}/fritz"
-
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if kernel_is 2 4; then
-		MODULE_NAMES="fcpci(extra::src.drv)"
-	else
-		MODULE_NAMES="fcpci(extra::src)"
-	fi
-}
-
-src_unpack() {
-	if kernel_is 2 4; then
-		unpack ${PV_K24}
-
-		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:" \
-			${S}/src.drv/makefile || die "sed failed"
-
-		#gentoo-sources contains this typedef
-		sed -i -e "s:^typedef void irqreturn_t;.*:/*&*/:" \
-			${S}/src.drv/defs.h || die "sed failed"
-	else
-		unpack ${PV_K26}
-
-		sed -i -e 's:SUBDIRS=:M=:' \
-			-e 's:/var/lib/fritz:${S}/lib:' \
-			-e "s:\(.*@cp.*\):#\1:" ${S}/src/Makefile || die "sed failed"
-	fi
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-	filter-flags "-fstack-protector-all"
-
-	linux-mod_src_compile
-}
-
-src_install () {
-	linux-mod_src_install
-
-	dodoc CAPI* compile* license.txt
-	dohtml install_passive-?.html
-}
diff --git a/net-dialup/fcpci/fcpci-3.11.02-r2.ebuild b/net-dialup/fcpci/fcpci-3.11.02-r2.ebuild
new file mode 100644
index 000000000000..f63562e31d6a
--- /dev/null
+++ b/net-dialup/fcpci/fcpci-3.11.02-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/03/09 12:59:42 genstef Exp $
+
+inherit flag-o-matic linux-mod
+
+DESCRIPTION="CAPI4Linux drivers for AVM Fritz!Card PCI for the 2.4 Kenrel series"
+HOMEPAGE="http://www.avm.de/"
+SRC_URI="ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.82/fcpci-suse8.2-0${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+S=${WORKDIR}/fritz
+
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	if kernel_is 2 4; then
+		MODULE_NAMES="fcpci(extra::src.drv)"
+	else
+		ewarn
+		ewarn
+		eerror "Please do:"
+		echo FRITZCAPI_CARDS="fcpci" emerge fritzcapi
+		eerror "for 2.6 kernels"
+
+		die kernel too new
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	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:" \
+		${S}/src.drv/makefile || die "sed failed"
+
+	#gentoo-sources contains this typedef
+	sed -i -e "s:^typedef void irqreturn_t;.*:/*&*/:" \
+		${S}/src.drv/defs.h || die "sed failed"
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+
+	linux-mod_src_compile
+}
+
+src_install () {
+	linux-mod_src_install
+
+	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-r2
index a09fc35a8083..e1e0b5b0142b 100644
--- a/net-dialup/fcpci/files/digest-fcpci-3.11.02-r1
+++ b/net-dialup/fcpci/files/digest-fcpci-3.11.02-r2
@@ -1,2 +1 @@
 MD5 70821234398c08b1ec09fce16e2bac40 fcpci-suse8.2-03.11.02.tar.gz 1028015
-MD5 b0f8eb15fc8f3902633dd48f93dc9a68 fcpci-suse9.1-3.11-02.tar.gz 974643