Quote strings containing env vars. Beautify src_unpack code.

Package-Manager: portage-2.0.54

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 8d969387a5b5a28130e572724c97d92e8f7fe7b7..7a1eef97e695ada9db2d875e25796b16282ae54c 100644 (file)
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.22 2006/02/22 21:43:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.23 2006/03/12 11:31:03 mrness Exp $
+
+  12 Mar 2006; Alin Nastac <mrness@gentoo.org> fcdsl-2.6.37.ebuild:
+  Quote strings containing env vars. Beautify src_unpack code.
 
 *fcdsl-2.6.37 (22 Feb 2006)
 

diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index d75a27fb3ff4e32147cfa0198386957c540cfcc7..94486b4f1396b2a53d5fc5293a4b7dee7b8a7211 100644 (file)
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,33 +1,21 @@
-MD5 334b332d91377e60da10e88467f03974 ChangeLog 4141
-RMD160 eefa32558a6ac5b336ad63779e1f47ab9b4c38eb ChangeLog 4141
-SHA256 98a5964713da8179dba4b92675326d583b9fcc4341202cd11c7112c2507005e0 ChangeLog 4141
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ebb5d1ba9ac674ff4c99c773766ee4f6 ChangeLog 4272
 MD5 0982f7b0c52fbeb78c2639512a38d4f3 fcdsl-2.6.20.7-r5.ebuild 7877
-RMD160 c1c98a030a614c9155a7430d9422f7dd50917473 fcdsl-2.6.20.7-r5.ebuild 7877
-SHA256 9c2ff34ebc76ee11e62b7f505bafe3f6dacc69607bc024488aed23fc660bc3fb fcdsl-2.6.20.7-r5.ebuild 7877
 MD5 148f263dda7f3624f16da4775621994b fcdsl-2.6.30.ebuild 8516
-RMD160 45a7314547a93edc491a202dfe1e931bc97a5526 fcdsl-2.6.30.ebuild 8516
-SHA256 859ea26741d55b4bce67761da8dad516808a8dccff3934244a7f4b1cc7d4ec1f fcdsl-2.6.30.ebuild 8516
-MD5 027b25a6e6259d5cafd715573e99e00f fcdsl-2.6.37.ebuild 7989
-RMD160 d3c6d72edf85d6cc9cb48a4c7ffd8755ebfa2ede fcdsl-2.6.37.ebuild 7989
-SHA256 78fd4e1a812c48536bf0ff38ee5b049f7034941eefc1472f9031458bac927c7d fcdsl-2.6.37.ebuild 7989
+MD5 90b3b5be88bd2c258df94ca649ef1760 fcdsl-2.6.37.ebuild 7907
 MD5 7d0d40b4547c891577925915b046cffc files/digest-fcdsl-2.6.20.7-r5 381
-RMD160 a06205a89ef0bc2a41c2a0771f04d5952af41d75 files/digest-fcdsl-2.6.20.7-r5 381
-SHA256 74a1afafe4f14438cf1901ed76bd0cac3afe05cf944b917c59efa5e7f6a8d2da files/digest-fcdsl-2.6.20.7-r5 381
 MD5 dab3e4adbbff865b35f3dce666fc454a files/digest-fcdsl-2.6.30 525
-RMD160 dcb6d62bbcc6e3331b50e256d254eeb282a1f76f files/digest-fcdsl-2.6.30 525
-SHA256 e7fd3baa3ff27ae3b504986d9f62fe83d916e9fe85892a1c48db82dfa3ae7f8f files/digest-fcdsl-2.6.30 525
-MD5 e41c4dcf268ff09e5857f2c60e586cbc files/digest-fcdsl-2.6.37 1042
-RMD160 d492ceb309343268216cdad8a1f78731fb32e0ba files/digest-fcdsl-2.6.37 1042
-SHA256 9a82e617c81de5fd9ccdffa972127d6f4a4cbc6b1dbba90df5f6d567ec720c3d files/digest-fcdsl-2.6.37 1042
+MD5 c0b3cc92d24bdd968271801fd0ec9f63 files/digest-fcdsl-2.6.37 286
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
-RMD160 cbb6808cc70d914352153ffa38971f331977c432 files/fcdsl.diff 4636
-SHA256 6e30c6dd4f5e00f519b738c704171be15c7d8721fdce18a801b54fc62be9bb8c files/fcdsl.diff 4636
 MD5 4d073842f89f61ce68ae5ee7ac100d70 files/fcdsl2.diff 1867
-RMD160 a18821ffd68c63624e7e3b51b7306ba4a362f937 files/fcdsl2.diff 1867
-SHA256 1a9b844401810f124081da49432be11f1e7b2536cba6dbedb1b8a5d500b146f9 files/fcdsl2.diff 1867
 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
-RMD160 3025a672f4d21d2aa0456c224ddc7c97f1a18b44 files/fcdslsl.diff 1896
-SHA256 461cd3841d888275fe823f185c4cd8caafdae2e772ecac7b259a323e09b0e5d3 files/fcdslsl.diff 1896
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
-SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEFAaIjG8pv1lIUX4RAqD6AKCgm1qxFB2QA6QJTof3hcJjY9++NgCg0Or0
+VmPzjJ8bWmG4wxIlGR0EBrY=
+=4Sek
+-----END PGP SIGNATURE-----

diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
index f0c0b4ef3f4c57fbeb313daa582d1e10927f0a6b..88646bc9a10e3dd55e2a6004e671aa4b899b9d5d 100644 (file)
--- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.37.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/fcdsl/fcdsl-2.6.37.ebuild,v 1.1 2006/02/22 21:43:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.2 2006/03/12 11:31:03 mrness Exp $
 
 inherit linux-mod eutils rpm
 
@@ -17,10 +17,11 @@ LICENSE="LGPL-2"
 KEYWORDS="~x86 ~amd64 -*"
 IUSE="unicode"
 SLOT="0"
-S=${WORKDIR}
 
 RDEPEND=">=net-dialup/capi4k-utils-20040810"
 
+S="${WORKDIR}"
+
 pkg_setup() {
        use x86 && FCDSL_MODULES=("fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb" "fcdslusb2"
                "fcdsl" "fcdslusba")
@@ -61,24 +62,24 @@ pkg_setup() {
                done
        fi
        BUILD_TARGETS="all"
-       BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}"
+       BUILD_PARAMS="KDIR='${KV_DIR}' LIBDIR='${S}'"
 }
 
 src_unpack() {
-       use x86 && rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.i586.rpm
-       use amd64 && rpm_unpack ${DISTDIR}/km_${P/2.6./2.6-}.x86_64.rpm
-
-       use x86 && rpm_unpack ${DISTDIR}/avm_${P/2.6./2.6-}.i586.rpm
-       use amd64 && rpm_unpack ${DISTDIR}/avm_${P/2.6./2.6-}.x86_64.rpm
+       local rpm_archive
+       for rpm_archive in ${A} ; do
+               rpm_unpack "${DISTDIR}/${rpm_archive}" || die "failed to unpack ${rpm_archive} file"
+       done
 
+       cd "${S}"
        mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \
                usr/src/kernel-modules/fcdsl/src/src.fcdslusb
 
        if use x86; then
                for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
                        cd usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]}
-                       [ -f ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff ] && epatch ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
-                       cd ${S}
+                       [ -f "${FILESDIR}/${FCDSL_MODULES[CARD]}.diff" ] && epatch "${FILESDIR}/${FCDSL_MODULES[CARD]}.diff"
+                       cd "${S}"
                done
        fi
 
@@ -104,7 +105,7 @@ src_install() {
                fi
 
                insinto /lib/firmware/isdn
-               doins ${WORKDIR}/lib/firmware/isdn/${FCDSL_FIRMWARES[CARD]}
+               doins "${WORKDIR}/lib/firmware/isdn/${FCDSL_FIRMWARES[CARD]}"
        done
 
        insinto /etc/drdsl
@@ -169,8 +170,8 @@ detect_fcdsl_card() {
                for BUS_ID in ${BUS_IDS}; do
                        if [ "${BUS_ID}" == "${FCDSL_IDS[CARD]}" ]; then
                                einfo "Found: ${FCDSL_NAMES[CARD]}"
-                               FCDSL_FIRMWARE=${FCDSL_FIRMWARES[CARD]}
-                               FCDSL_MODULE=${FCDSL_MODULES[CARD]}
+                               FCDSL_FIRMWARE="${FCDSL_FIRMWARES[CARD]}"
+                               FCDSL_MODULE="${FCDSL_MODULES[CARD]}"
                        fi
                done
        done
@@ -238,7 +239,7 @@ pkg_config() {
                                readpassword FCDSL_PASSWORD
                                echo '"'${FCDSL_USER}'" * "'${FCDSL_PASSWORD}'"' >>/etc/ppp/pap-secrets
                                unset FCDSL_PASSWORD
-                               cat <<EOF >/etc/ppp/peers/${FCDSL_PROVIDER}
+                               cat <<EOF >"/etc/ppp/peers/${FCDSL_PROVIDER}"
 connect ""
 ipcp-accept-remote
 ipcp-accept-local

diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.37 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
index 1623b4ff6e5b98ef1fdfc5859cea800ce40f63e4..28eadcaabab34a5db128b9f0c96cbf2673f5e164 100644 (file)
--- a/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
+++ b/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
@@ -1,12 +1,4 @@
 MD5 cdbb9f6bbaa4d44f0346ed81e089c202 avm_fcdsl-2.6-37.i586.rpm 1059204
-RMD160 3ab3bb6a8006167004c93c5348f07d4fc6fc2a96 avm_fcdsl-2.6-37.i586.rpm 1059204
-SHA256 6f3531eaa2583a50586d6f29c7f3a48cd16a507ea4d1cbc1ccb2e2d718396021 avm_fcdsl-2.6-37.i586.rpm 1059204
 MD5 0cceb1102af309056d00df7cc1a6a4d5 avm_fcdsl-2.6-37.x86_64.rpm 1064850
-RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 avm_fcdsl-2.6-37.x86_64.rpm 1064850
-SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757 avm_fcdsl-2.6-37.x86_64.rpm 1064850
 MD5 c0613d5e257cb6f27fbaa9d197ad92d1 km_fcdsl-2.6-37.i586.rpm 2447670
-RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e km_fcdsl-2.6-37.i586.rpm 2447670
-SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e km_fcdsl-2.6-37.i586.rpm 2447670
 MD5 db9062e2a9725814ca5f5098fe30d864 km_fcdsl-2.6-37.x86_64.rpm 1792580
-RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c km_fcdsl-2.6-37.x86_64.rpm 1792580
-SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33 km_fcdsl-2.6-37.x86_64.rpm 1792580