remove firmware files from ebuild. will create a separate ebuild for that

diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog
index 0b3be16dfbac04c5bc409d010e54add3385088c5..8e5f96f25f3cf37684c6622a933ece35f6f7474a 100644 (file)
--- a/net-dialup/capi4k-utils/ChangeLog
+++ b/net-dialup/capi4k-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/capi4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.19 2004/11/13 11:03:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.20 2004/11/13 12:22:37 mrness Exp $
+
+  13 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  capi4k-utils-20041006-r2.ebuild:
+  Remove firmware files from ebuild since only active ISDN boards needs that.
 
   13 Nov 2004; Alin Nastac <mrness@gentoo.org> -files/capi,
   -capi4k-utils-20021026.ebuild, -capi4k-utils-20041006-r1.ebuild:

diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest
index 17a5174649e68f1a31cbac61cc472b681edaa544..378df58cba2bd6610f3070ca356a9491d6de5994 100644 (file)
--- a/net-dialup/capi4k-utils/Manifest
+++ b/net-dialup/capi4k-utils/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9fe49819066e279ac6ddd38c690bb37a ChangeLog 3071
+MD5 6fe5c709ff40b883d16bc03f64378e31 ChangeLog 3232
 MD5 8a68cd59daa9bd143ce9987778320b62 capi4k-utils-20040810.ebuild 1760
 MD5 22354caf6445da21e5ebe8609a9e7012 capi4k-utils-20041006.ebuild 2267
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 61fc3a332c1ca7656b3d5b3f5ae70e5b capi4k-utils-20041006-r2.ebuild 3221
+MD5 0d20849aed2b524d25501ce0769d0909 capi4k-utils-20041006-r2.ebuild 3036
 MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20040810 609
 MD5 b1de4263d145b4fb13baf0e4791e49a0 files/capi-init-20041006 617
 MD5 9bc030e6ab061e50f16efb0def04f0b6 files/capi4k-utils-2004-10-06-fPIC.patch 286
 MD5 8b4a7394c2826badb822b9575dbfbd4d files/capi4k-utils-2004-10-06.patch 2144
 MD5 daf5a35ac5aeac77c4ac69274ed15395 files/digest-capi4k-utils-20040810 75
 MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006 75
-MD5 cb15a2735647985444a8e80b295363b4 files/digest-capi4k-utils-20041006-r2 149
+MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006-r2 75
 MD5 2c94e9d125d5c9af8c485d8b844f55a2 files/20041006/README.gentoo 1548
 MD5 f9d08e560e844f4556da1f58bb5513b4 files/20041006/capi.init 829
 MD5 2892db0b497c4141318dbf30ef60e550 files/20041006/capi4k-utils.patch 1075
@@ -21,7 +21,7 @@ MD5 2fe94d2623c5b129780b72bacaf4a7bc files/20041006/rcapid.xinetd 236
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBleoNjtv59x0+BrURAg30AKCEJrlrAb3Q24kgbrjbZOt/iNSu+ACgru8f
-s+7auE/lVB7adoMdQ23GyjA=
-=GVJL
+iD8DBQFBlfy0jtv59x0+BrURAhleAKDrkjIyaBMIkTR0ySwk3fr2SfLs4wCfR26l
+E9Ya8yIoTzb5YiGrl2KgkN8=
+=LsHp
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild
index 3caa9824aaba574b7760fc2bc93846e2739a5e45..516fb362e3abf4d83f949ad93b47d831c96ad448 100644 (file)
--- a/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild
+++ b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild,v 1.1 2004/11/13 10:29:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild,v 1.2 2004/11/13 12:22:37 mrness Exp $
 
-inherit eutils rpm
+inherit eutils
 
 YEAR_PV=${PV:0:4}
 MON_PV=${PV:4:2}
@@ -20,8 +20,7 @@ KEYWORDS="~x86"
 IUSE=""
 S=${WORKDIR}/${PN}
 SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz
-       ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz
-       ftp://ftp.suse.com/pub/suse/i386/9.2/suse/src/i4l-base-2004.9.27-2.src.rpm"
+       ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz"
 
 DEPEND="virtual/linux-sources
        dev-lang/perl
@@ -29,12 +28,11 @@ DEPEND="virtual/linux-sources
        virtual/os-headers
        sys-devel/automake
        sys-devel/autoconf
-       sys-devel/libtool
-       app-arch/rpm"
+       sys-devel/libtool"
 RDEPEND=""
 
 src_unpack() {
-       rpm_src_unpack || die "failed to unpack sources or firmware files"
+       unpack ${A} || die "failed to unpack sources"
        cd ${S}
        # set our config
        cp -f ${MY_FILES}/config .config
@@ -66,7 +64,7 @@ src_compile() {
 }
 
 src_install() {
-       dodir /dev
+       dodir /dev /usr/share/isdn
        emake DESTDIR=${D} install || die "make install failed"
 
        # install docs
@@ -90,11 +88,6 @@ src_install() {
 
        # very useful tool ;-)
        dobin scripts/isdncause
-
-       # install AVM firmware files
-       insinto /usr/share/isdn
-       insopts -m 0444
-       doins ${WORKDIR}/i4l_suse/firm/{*.t4,*.frm,c[24].bin}
 }
 
 pkg_postinst() {
@@ -102,6 +95,7 @@ pkg_postinst() {
        einfo "/usr/share/doc/${PN}/README.gentoo.gz"
        einfo ""
        einfo "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):"
-       einfo "This ebuild has installed a bunch of firmware files"
-       einfo "which are to be found in /usr/share/isdn"
+       einfo "Please run the following command:"
+       einfo "  emerge suse-isdn-firmware"
+       einfo "You will probably find your board's firmware in /usr/share/isdn"
 }

diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
index 68471e5613f38e6215b23398baa8e366eff6fc52..63aefc8b31c8daa1e057099fac7cdea915b58dca 100644 (file)
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
+++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
@@ -1,2 +1 @@
 MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667
-MD5 e04c301fce86343f8b60d5bfd14db409 i4l-base-2004.9.27-2.src.rpm 8380094