summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-07-07 01:18:52 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-07-07 01:18:52 +0000
commit6f9fe9fd535e22de10ce8294263109264fbc994e (patch)
tree2811ba32d3926f0270f518e8306e946b30b05bdf /net-dialup/fritzcapi
parentAdd patch for CXXFLAGS and RPATH thanks to vapier in bug 139457 and 139459 (diff)
downloadgentoo-2-6f9fe9fd535e22de10ce8294263109264fbc994e.tar.gz
gentoo-2-6f9fe9fd535e22de10ce8294263109264fbc994e.tar.bz2
gentoo-2-6f9fe9fd535e22de10ce8294263109264fbc994e.zip
Add a check for kernel 2.6.17 and disable fcpcmcia there thanks to agaffney in bug 139502, remove old ebuilds
(Portage version: 2.1.1_pre2-r4)
Diffstat (limited to 'net-dialup/fritzcapi')
-rw-r--r--net-dialup/fritzcapi/ChangeLog9
-rw-r--r--net-dialup/fritzcapi/files/digest-fritzcapi-2.6.432
-rw-r--r--net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild10
3 files changed, 18 insertions, 3 deletions
diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index e0c9e276f839..c642764f766c 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dialup/fritzcapi
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.22 2006/04/27 17:18:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.23 2006/07/07 01:18:52 genstef Exp $
+
+ 07 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+ -files/fritzcapi-fix-for-2.6.10.patch, -fritzcapi-2.6.32.ebuild,
+ -fritzcapi-2.6.35.ebuild, -fritzcapi-2.6.42.ebuild,
+ fritzcapi-2.6.43.ebuild:
+ Add a check for kernel 2.6.17 and disable fcpcmcia there thanks to agaffney
+ in bug 139502, remove old ebuilds
27 Apr 2006; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.43.ebuild:
Stable on x86 (#131352).
diff --git a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43 b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
index 2ebb49bc2fe3..990e37766fea 100644
--- a/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
+++ b/net-dialup/fritzcapi/files/digest-fritzcapi-2.6.43
@@ -1,2 +1,4 @@
MD5 5f9f4f61426f3cf5aa10aad42fad6444 km_fritzcapi-2.6-43.i586.rpm 2991322
+RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 km_fritzcapi-2.6-43.i586.rpm 2991322
+SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475 km_fritzcapi-2.6-43.i586.rpm 2991322
MD5 d59f758e9f6da998cd77775fc3547882 km_fritzcapi-2.6-43.x86_64.rpm 1006645
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
index aa6053d93eee..f5c6f9cb8148 100644
--- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.3 2006/04/27 17:18:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.4 2006/07/07 01:18:52 genstef Exp $
inherit linux-mod rpm eutils
@@ -62,6 +62,12 @@ pkg_setup() {
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}`"
+
+ if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && kernel_is ge 2 6 17; then
+ eerror "kernel 2.6.17 fails to build fcpcmcia"
+ eerror "Please use an older kernel or the isdn4linux drivers"
+ die "kernel 2.6.17 fails to build fcpcmcia"
+ fi
continue 2
fi
done
@@ -80,7 +86,7 @@ pkg_setup() {
#Filter build targets by USE
for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
- if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use pcmcia; then
+ if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && (! use pcmcia || kernel_is ge 2 6 17); then
continue
fi
if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then