Change firmware directory in order to be compatible with other ebuilds.

diff --git a/net-dialup/capi4k-firmware/ChangeLog b/net-dialup/capi4k-firmware/ChangeLog
index 549101711e0c79049e884cb0323a10fe9cf61466..4be2d6815a0dbd71b492c7896aeeacbcd2b88ec4 100644 (file)
--- a/net-dialup/capi4k-firmware/ChangeLog
+++ b/net-dialup/capi4k-firmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/capi4k-firmware
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-firmware/ChangeLog,v 1.2 2004/11/13 15:04:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-firmware/ChangeLog,v 1.3 2004/11/20 13:14:29 mrness Exp $
+
+*capi4k-firmware-2004.4.5-r1 (20 Nov 2004)
+
+  20 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  +capi4k-firmware-2004.4.5-r1.ebuild, -capi4k-firmware-2004.4.5.ebuild:
+  Change firmware directory in order to be compatible with other ebuilds.
 
   13 Nov 2004; Alin Nastac <mrness@gentoo.org>
   capi4k-firmware-2004.4.5.ebuild:

diff --git a/net-dialup/capi4k-firmware/Manifest b/net-dialup/capi4k-firmware/Manifest
index 3f5f513eba0bf66bf1ce9cc65c1f25fb4d14ea04..b349cd7436504c07d39d3f646ef8e749be658e5b 100644 (file)
--- a/net-dialup/capi4k-firmware/Manifest
+++ b/net-dialup/capi4k-firmware/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 85b1f1923eb31e3cf7dfdba47b0208ab capi4k-firmware-2004.4.5.ebuild 699
-MD5 207958af194d43e2901ebff78baebd23 ChangeLog 569
-MD5 89ba560b85c0e4aaaec2e36831fa2470 files/digest-capi4k-firmware-2004.4.5 73
+MD5 266e7bdc7b18bb6ceedaa62f1abca2dc ChangeLog 808
+MD5 3d9b23abcd7db0ed3cb6da56a191c6c3 capi4k-firmware-2004.4.5-r1.ebuild 1019
+MD5 89ba560b85c0e4aaaec2e36831fa2470 files/digest-capi4k-firmware-2004.4.5-r1 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBliKnjtv59x0+BrURAl9WAJ4iCr2Z1vOj2v2BpddzlZvZYaExFACfdaEl
-u6/gey4HWiBtC2c6S5JBmYY=
-=I/Qp
+iD8DBQFBn0M+jtv59x0+BrURAjNkAJoC7bTtigv+xHrkdjij0rbIXNnklQCdEe6U
+FvO04bvq5p/4OEKog7igDoA=
+=e4Nk
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5-r1.ebuild b/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5-r1.ebuild
new file mode 100644 (file)
index 0000000..e408110
--- /dev/null
+++ b/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5-r1.ebuild,v 1.1 2004/11/20 13:14:29 mrness Exp $
+
+inherit rpm
+
+MY_P=${P/capi4k-firmware/i4lfirm}
+DESCRIPTION="ISDN firmware for active ISDN cards"
+HOMEPAGE="http://www.isdn4linux.de/"
+SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/i586/${MY_P}-0.i586.rpm"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
+
+IUSE=""
+DEPEND="app-arch/rpm2targz"
+S=${WORKDIR}
+
+src_install() {
+       dodir /lib/firmware /usr/lib/isdn
+       insinto /lib/firmware
+       insopts -m 0644
+       cd ${S}/usr/lib/isdn || die "source firmware dir not found"
+       local FIRMWARE_FILE MAIN_PN=${PN%%-*}
+       for FIRMWARE_FILE in * ; do
+               newins ${FIRMWARE_FILE} ${MAIN_PN}_${FIRMWARE_FILE} && \
+                       dosym /lib/firmware/${MAIN_PN}_${FIRMWARE_FILE} /usr/lib/isdn/${FIRMWARE_FILE} || \
+                       die "failed to install firmware file ${FIRMWARE_FILE}"
+       done
+}

diff --git a/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5.ebuild b/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5.ebuild
deleted file mode 100644 (file)
index eee06c0..0000000
--- a/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-firmware/capi4k-firmware-2004.4.5.ebuild,v 1.2 2004/11/13 15:04:49 mrness Exp $
-
-inherit rpm
-
-MY_P=${P/capi4k-firmware/i4lfirm}
-DESCRIPTION="ISDN firmware for active ISDN cards"
-HOMEPAGE="http://www.isdn4linux.de/"
-SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/i586/${MY_P}-0.i586.rpm"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
-
-IUSE=""
-DEPEND="app-arch/rpm"
-S=${WORKDIR}
-
-src_install() {
-       insinto /usr/share/isdn
-       insopts -m 0444
-       doins usr/lib/isdn/* || die "failed to copy firmware files"
-}

diff --git a/net-dialup/capi4k-firmware/files/digest-capi4k-firmware-2004.4.5 b/net-dialup/capi4k-firmware/files/digest-capi4k-firmware-2004.4.5-r1
similarity index 100%
rename from net-dialup/capi4k-firmware/files/digest-capi4k-firmware-2004.4.5
rename to net-dialup/capi4k-firmware/files/digest-capi4k-firmware-2004.4.5-r1