Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023

Package-Manager: portage-1.585-cvs

3 files changed, 19 insertions, 11 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index c7c406977164..58062689c04d 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2005/02/26 22:23:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.13 2005/04/14 13:33:48 genstef Exp $
+
+  14 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
+  fritzcapi-2.6.32.ebuild:
+  Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023
 
   26 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
   fritzcapi-2.6.32.ebuild:
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index bb5583534a4d..15539f05f614 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -1,5 +1,5 @@
-MD5 992a32de688150a003c4cfdcd41278b2 ChangeLog 2474
+MD5 8fe57489ff052323d96c85bb0c9df309 fritzcapi-2.6.32.ebuild 5248
+MD5 58857bc0169e28af235176b55bf8d04f ChangeLog 2629
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
-MD5 631ee0b2c2ce64aac2d14b71bdde7b8a fritzcapi-2.6.32.ebuild 4900
-MD5 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-fix-for-2.6.10.patch 473
 MD5 94a169a4f214862fa95e35813e857c54 files/digest-fritzcapi-2.6.32 518
+MD5 9944aebce0f4b12843c5312ac4ba90b5 files/fritzcapi-fix-for-2.6.10.patch 473
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild
index 6f4743e9c67e..0201f22fac6d 100644
--- a/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild
@@ -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/fritzcapi/fritzcapi-2.6.32.ebuild,v 1.5 2005/02/27 17:59:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.32.ebuild,v 1.6 2005/04/14 13:33:48 genstef Exp $
 
 inherit linux-mod rpm eutils
 
@@ -30,9 +30,6 @@ FRITZCAPI_MODULES=("fcclassic" "fcpci" "fcpcmcia" "fcpnp" "fcusb" "fcusb2"
 FRITZCAPI_TARGETS=("fritz.classic" "fritz.pci" "fritz.pcmcia" "fritz.pnp"
 	"fritz.usb" "fritz.usb2" "fritz.xusb_CZ" "fritz.xusb" "e2220pc" "e5520pc")
 
-BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz"
-BUILD_TARGETS="all"
-
 get_card_module_name() {
 	local CARD=$1
 	echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
@@ -51,6 +48,9 @@ pkg_setup() {
 		die "For using the driver you need a kernel with enabled CAPI support."
 	fi
 
+	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${WORKDIR}/var/lib/fritz"
+	BUILD_TARGETS="all"
+
 	local USERCARD CARD
 	FRITZCAPI_BUILD_CARDS=""
 	FRITZCAPI_BUILD_TARGETS=""
@@ -97,11 +97,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-	rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
-	rpm_unpack ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm
+	rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm || die "error unpacking ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm"
+	rpm_unpack ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm || die "error unpacking ${DISTDIR}/capi4linux-2004.4.5-0.i586.rpm"
 	cd ${S}
 	for ((CARD=0; CARD < ${#AVM_SRC[*]}; CARD++)); do
-		unpack ${AVM_FILES[CARD]}.tar.gz
+		unpack ${AVM_FILES[CARD]}.tar.gz || die "error unpacking ${AVM_FILES[CARD]}.tar.gz"
 		CRD_NAME=${AVM_FILES[CARD]/-*}
 		CRD_NAME=${CRD_NAME/fc}
 		CRD_NAME=${CRD_NAME/f}
@@ -113,6 +113,10 @@ src_unpack() {
 	if kernel_is ge 2 6 10; then
 		epatch ${FILESDIR}/${PN}-fix-for-2.6.10.patch
 	fi
+	for i in $(find . -name Makefile); do
+		sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i}
+		convert_to_m ${i}
+	done
 }
 
 src_install() {