summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2004-12-12 19:14:21 +0000
committerAlin Năstac <mrness@gentoo.org>2004-12-12 19:14:21 +0000
commit1ddfe164ec13ede72538a4f4a044253c915c31ec (patch)
tree205fb6364c97ed942de97bf9bb74325f7d5bb173 /net-dialup
parentFixed DEPEND to specify packages currently in portage; fixed leading whitespace (diff)
downloadhistorical-1ddfe164ec13ede72538a4f4a044253c915c31ec.tar.gz
historical-1ddfe164ec13ede72538a4f4a044253c915c31ec.tar.bz2
historical-1ddfe164ec13ede72538a4f4a044253c915c31ec.zip
move firmware files to /lib/firmware
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/fcdsl/ChangeLog9
-rw-r--r--net-dialup/fcdsl/Manifest12
-rw-r--r--net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild (renamed from net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild)36
-rw-r--r--net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r2 (renamed from net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r1)0
4 files changed, 39 insertions, 18 deletions
diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index d2e3a710f6bf..4a157c5c9211 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dialup/fcdsl
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.5 2004/11/22 18:20:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.6 2004/12/12 19:14:21 mrness Exp $
+
+*fcdsl-2.6.20.7-r2 (12 Dec 2004)
+
+ 12 Dec 2004; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r1.ebuild,
+ +fcdsl-2.6.20.7-r2.ebuild:
+ Move firmware files to /lib/firmware, the new FHS standard location for
+ firmware files.
22 Nov 2004; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.20.7-r1.ebuild:
Add support for env variable FCDSL_CARDS. If is non-empty, only these modules
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 3b8653353a42..fffe3172580f 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 022a9aa4339d4899491bb1c1e6a692fc ChangeLog 1136
+MD5 0cc00b2e6d53d6bae0841f23b81eed17 ChangeLog 1366
MD5 7e441fe8845d85e66f3cf257959d2572 fcdsl-2.6.20.7.ebuild 7203
MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 c845dade301e078af7def1b2339950b1 fcdsl-2.6.20.7-r1.ebuild 7451
+MD5 b9f8e7db9b4b16241ddba974ff0ecaa6 fcdsl-2.6.20.7-r2.ebuild 7870
MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7 72
-MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7-r1 72
+MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7-r2 72
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFBoi3yjtv59x0+BrURAsWHAKCykeuuxcLhBvjgRY+HVAeYsaT0vgCg0wUv
-bd6ChtnlTkAoT+mh8Cw/4Y0=
-=haeL
+iD8DBQFBvJiWjtv59x0+BrURAlHjAJ9+KMqfQMZ7UhLnRWl1pDl2Mx9hTQCfTSwg
++u1EIJ1HkNwzgtng9OcNgAw=
+=68Lz
-----END PGP SIGNATURE-----
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild
index c277b22aad80..0835cd82445d 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r1.ebuild,v 1.6 2004/11/22 18:20:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild,v 1.1 2004/12/12 19:14:21 mrness Exp $
inherit kernel-mod rpm eutils
@@ -94,14 +94,26 @@ pkg_setup() {
kernel-mod_check_modules_supported
#Check existence of user selected cards
- for USERCARD in ${FCDSL_CARDS} ; do
- for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
- if [ "$USERCARD" = "${FCDSL_MODULES[CARD]}" ]; then
- continue 2
- fi
+ if [ -n "${FCDSL_CARDS}" ] ; then
+ for USERCARD in ${FCDSL_CARDS} ; do
+ for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+ if [ "$USERCARD" = "${FCDSL_MODULES[CARD]}" ]; then
+ continue 2
+ fi
+ done
+ die "Card ${USERCARD} not present in ${P}"
done
- die "Card ${USERCARD} not present in ${P}"
- done
+ else
+ einfo
+ einfo "You can control the modules which are built with the variable"
+ einfo "FCDSL_CARDS which should contain a blank separated list"
+ einfo "of a selection from the following cards:"
+ einfo " ${FCDSL_MODULES[*]}"
+ einfo
+ ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
+ ewarn "adjustments in /etc/make.conf."
+ ebeep
+ fi
}
src_compile() {
@@ -136,11 +148,14 @@ src_install() {
doins ${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/src/${FCDSL_MODULES[CARD]}.ko
insinto /lib/firmware
- newins ${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/${FCDSL_FIRMWARES[CARD]} ${PN}_${FCDSL_FIRMWARES[CARD]}
- dosym /lib/firmware/${PN}_${FCDSL_FIRMWARES[CARD]} /usr/lib/isdn/${FCDSL_FIRMWARES[CARD]}
+ doins ${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/${FCDSL_FIRMWARES[CARD]}
fi
done
+ #Compatibility with <=net-dialup/isdn4k-utils-20041006-r3.
+ #Please remove it when it becomes obsolete
+ dosym firmware /lib/isdn
+
insinto /etc/drdsl
doins ${S}/drdsl.ini
@@ -149,7 +164,6 @@ src_install() {
dodoc ${S}/CAPI* ${S}/compile* ${S}/license.txt ${S}/release.txt
dohtml install_passive-*.html
-
}
pkg_postinst() {
diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r1 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r2
index 531d29dea75a..531d29dea75a 100644
--- a/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r1
+++ b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r2