Fix quoting on =~ conditional to work also with bash-3.2_pre9 (bug #162018; thanks...

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index b5823ef967f52646a1219f69e1193c2e63bd8f03..5446b1f726bd0ba96fd4a96d571b710e23039f07 100644 (file)
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.91 2007/01/14 20:03:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.92 2007/01/14 21:19:26 kevquinn Exp $
+
+  14 Jan 2007; Kevin F. Quinn <kevquinn@gentoo.org>
+  acroread-7.0.8-r1.ebuild, acroread-7.0.9.ebuild:
+  Fix quoting on =~ conditional to work also with bash-3.2_pre9 (bug #162018;
+  thanks all)
 
   14 Jan 2007; Olivier Crête <tester@gentoo.org> acroread-7.0.9.ebuild:
   Make QA_TEXTRELS also apply to amd64

diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 4891e381918f75524c8c7760ed3e9c0a7fd59684..f19aba0e5af12e3ca8716674a993dde8eb5207e0 100644 (file)
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -21,7 +21,7 @@ DIST AdobeReader_dan-7.0.8-1.i386.tar.gz 48116001 RMD160 2add95edbe5be6cfcb3966d
 DIST AdobeReader_dan-7.0.9-1.i386.tar.gz 48129423 RMD160 f46a5e3d3c5b695431d39cc6f886763c70244f19 SHA1 ae65d075f4a968f96d97d86c6720c5f4d29a0cad SHA256 95d3e657a8e1da5aa7f32113508fc3c157e3d01d1c37a2f332227ddcec496f5c
 DIST AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428 RMD160 1a79cf1fad25e4bc515967214c1c34b85736d9f6 SHA1 767640e60dd70498294a7bb42dd9c05399ad175e SHA256 329a688ad9d27c40064ea7b0c10cd6d10cfbf067c39a31a4913ce67add634af8
 DIST AdobeReader_deu-7.0.9-1.i386.tar.gz 49388396 RMD160 6da97fb8349df8215a28118ad86bf997e44d9622 SHA1 a41e1cf35e200bf28b5a500fdeb5ddec201cea73 SHA256 f4446408b8b2a94c7e54bfd5480b2772f645f68956ffb9a639f1dfaca71cbc87
-DIST AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917 RMD160 a84ef272eed5612d8ab4004eb48004764d1bb1ee SHA1 bc917a2b4f85baf2a91ed55b61df16c2d4574f7f SHA256 dc4ddb572c88fd28fb410d8ff79e79910597694176837d799fea415fb1f532b7
+DIST AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042 RMD160 22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983 SHA1 ed3f955a0e9ba252fcb45263de00a37e392b7b72 SHA256 eb4a883910733ad63a93b168f20b9c2ca8f21d7174b0aedd6eba1ee6c2a2746f
 DIST AdobeReader_enu-7.0.9-1.i386.tar.gz 44165526 RMD160 b9d7b2068be3314054581ff129d6cb5fee7677f6 SHA1 793cc8bcf59a6c24b6e74881bad978efcd447df9 SHA256 1e161174d932788c17e784a626ec02eec79158ecd813e206117356f54ed94863
 DIST AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122 RMD160 bba9c7fecb8c5404976fada7dbdede5871c6c3e4 SHA1 f9635e3a416dc69147eb0789fc0ae28c69e79e19 SHA256 807cad63709f3f53af7f46bfa002c640d5c77cae3be923faa2cd18a695a89f31
 DIST AdobeReader_esp-7.0.9-1.i386.tar.gz 48236413 RMD160 acbc255aade77f35db69a942787e287318be13f1 SHA1 fd48713078bfd1226dfab0c0a8f863cea3f6d4b3 SHA256 fe18aea3831696badedd3f7cf505acfce154d4180afc65ee6191f4e5231439c4
@@ -44,39 +44,39 @@ DIST AdobeReader_suo-7.0.9-1.i386.tar.gz 48256107 RMD160 77c47af7d67fd4a8f17c419
 DIST AdobeReader_sve-7.0.8-1.i386.tar.gz 49181229 RMD160 210335f85ac392ccb5f915e3e19b4a4e75fe2602 SHA1 d659d83e7adc7f7b0b008e595693cadbbbb3982d SHA256 d8c519900f3b2a9936af218891ae4781c5dbe32143c2cb054ee20332c5dcc4ae
 DIST AdobeReader_sve-7.0.9-1.i386.tar.gz 49194849 RMD160 a93add1f6fb9e54272da283c848ef61d7b953baa SHA1 a494b65e2f7b2916ef346a13d8825c5b32b24239 SHA256 8b09ab347ab4b307b70ea44f0dfe3c3a2e19cfeafe936e43fe8f042464b50c26
 DIST libcups.so-i386.bz2 50564 RMD160 a8bedc7151eb1d547616124bfdd4844699a33c15 SHA1 d55609b2889c0cb668fb73b59d9d0ea4b3094a47 SHA256 77eb5cd6aeab630812f7e911db04b6042cd6dee6aa7b9d8cf7756dca14e24b38
-EBUILD acroread-7.0.8-r1.ebuild 7309 RMD160 dbf1b447e363308971fdea61bd4ff88c730ac23a SHA1 60e99d6d13bd86a95617bf0c5e063e82225a1c5b SHA256 1b439592d8a20f5c357ecaf66ceca116cea5be15a33b4c1efb0ae7c986dec29a
-MD5 58610a70368ab6f2362374a93fdf0be4 acroread-7.0.8-r1.ebuild 7309
-RMD160 dbf1b447e363308971fdea61bd4ff88c730ac23a acroread-7.0.8-r1.ebuild 7309
-SHA256 1b439592d8a20f5c357ecaf66ceca116cea5be15a33b4c1efb0ae7c986dec29a acroread-7.0.8-r1.ebuild 7309
+EBUILD acroread-7.0.8-r1.ebuild 7448 RMD160 2df453c33d7679b29095a83f8c782549b238f011 SHA1 410bd006680944d10ffd262ab55e6808bd192e56 SHA256 0240ba8e58259c377b2f8da26db4ad00a758cad20bb553b2c289575021ff1ec7
+MD5 b10f9aa396d8511a71e52a885d0de4ed acroread-7.0.8-r1.ebuild 7448
+RMD160 2df453c33d7679b29095a83f8c782549b238f011 acroread-7.0.8-r1.ebuild 7448
+SHA256 0240ba8e58259c377b2f8da26db4ad00a758cad20bb553b2c289575021ff1ec7 acroread-7.0.8-r1.ebuild 7448
 EBUILD acroread-7.0.8.ebuild 4902 RMD160 dcb6bc89e546993e5af6057047670e3ad35095a8 SHA1 28927724fe24403019ee0e998b614a63a9c0e6c2 SHA256 4afd6f43fcf834c5518620e309fa80b929938b064a9dda01c7ca632831668c8a
 MD5 a42f7cd5b030e12bc92494cd84272cec acroread-7.0.8.ebuild 4902
 RMD160 dcb6bc89e546993e5af6057047670e3ad35095a8 acroread-7.0.8.ebuild 4902
 SHA256 4afd6f43fcf834c5518620e309fa80b929938b064a9dda01c7ca632831668c8a acroread-7.0.8.ebuild 4902
-EBUILD acroread-7.0.9.ebuild 7301 RMD160 5ef0d67f841b88f4503a8658c10a1f4df04d8ef4 SHA1 add4b46ecdf2a594712ae54f69611cea30714ff2 SHA256 5290914890c5ad40aa61133cb243e53a71c34e07d3e99ae426db4572839e650d
-MD5 a86ce8172a746bdc576a1d56caa92cce acroread-7.0.9.ebuild 7301
-RMD160 5ef0d67f841b88f4503a8658c10a1f4df04d8ef4 acroread-7.0.9.ebuild 7301
-SHA256 5290914890c5ad40aa61133cb243e53a71c34e07d3e99ae426db4572839e650d acroread-7.0.9.ebuild 7301
-MISC ChangeLog 16469 RMD160 f3ea513a35bec8942e252a346773e29dc5834fec SHA1 fe161cb26735abe8e522fa8236722207bd232ef4 SHA256 e7be5f32a1db3b3e6014c6bd135080485aa0a6aef1d73040784b6bd0adc1f3df
-MD5 451dbb7ce853d7bd3a3dc3135f3fdfeb ChangeLog 16469
-RMD160 f3ea513a35bec8942e252a346773e29dc5834fec ChangeLog 16469
-SHA256 e7be5f32a1db3b3e6014c6bd135080485aa0a6aef1d73040784b6bd0adc1f3df ChangeLog 16469
+EBUILD acroread-7.0.9.ebuild 7440 RMD160 437ac25e0ea0d020ee7b104eabaf12ce49a68049 SHA1 68ea95bbe8992552154cc483e11b5027fc87d2d0 SHA256 320350eba14138182379b99e4e0d7883bc72ce860b3b6d9e52406252c0f3af22
+MD5 6dcc0174f315a2750d8b21a0d5d943bb acroread-7.0.9.ebuild 7440
+RMD160 437ac25e0ea0d020ee7b104eabaf12ce49a68049 acroread-7.0.9.ebuild 7440
+SHA256 320350eba14138182379b99e4e0d7883bc72ce860b3b6d9e52406252c0f3af22 acroread-7.0.9.ebuild 7440
+MISC ChangeLog 16667 RMD160 38ae7ed6a8e15677bfb0633dfba856b442c49281 SHA1 01301cae3f91ab61c09f058779a3367dcb44c38f SHA256 883e426c8cea1464c1a0ae738a8bffe1685b9f26e3a9bd08e2a1a87977f478c1
+MD5 2c6647c92508c0203fa535ff314634be ChangeLog 16667
+RMD160 38ae7ed6a8e15677bfb0633dfba856b442c49281 ChangeLog 16667
+SHA256 883e426c8cea1464c1a0ae738a8bffe1685b9f26e3a9bd08e2a1a87977f478c1 ChangeLog 16667
 MISC metadata.xml 411 RMD160 65693cf6d0a923442846552356219d5ab38bdea6 SHA1 13d21cc263bf180593abac9225b50a570ebe5b88 SHA256 e77c1ebd41c534bdc21610c46336162538a3d4a0623b3f4f1d08aa425782dd79
 MD5 98b1b45da9a6bf58f5ebb15e9dd3d00a metadata.xml 411
 RMD160 65693cf6d0a923442846552356219d5ab38bdea6 metadata.xml 411
 SHA256 e77c1ebd41c534bdc21610c46336162538a3d4a0623b3f4f1d08aa425782dd79 metadata.xml 411
-MD5 098beb29be422cb438ffde59f0b72cbd files/digest-acroread-7.0.8 4612
-RMD160 21fb45b60cd6c46c10c1e5522b912c3d4fa8b75a files/digest-acroread-7.0.8 4612
-SHA256 d31ad769df297fd0d23fa0c65f07e818bcb06135387f0b092850b0a5e8c3956d files/digest-acroread-7.0.8 4612
-MD5 098beb29be422cb438ffde59f0b72cbd files/digest-acroread-7.0.8-r1 4612
-RMD160 21fb45b60cd6c46c10c1e5522b912c3d4fa8b75a files/digest-acroread-7.0.8-r1 4612
-SHA256 d31ad769df297fd0d23fa0c65f07e818bcb06135387f0b092850b0a5e8c3956d files/digest-acroread-7.0.8-r1 4612
+MD5 a1316b7c14f9b63a4cc2729e369d10c6 files/digest-acroread-7.0.8 4615
+RMD160 a685fdc13b36b3b299fc26788ede78cd490aa114 files/digest-acroread-7.0.8 4615
+SHA256 5ee72dba69e5972240b048efe005b3ea10b95f844e9bf8f8e5ae81b92e5feb51 files/digest-acroread-7.0.8 4615
+MD5 a1316b7c14f9b63a4cc2729e369d10c6 files/digest-acroread-7.0.8-r1 4615
+RMD160 a685fdc13b36b3b299fc26788ede78cd490aa114 files/digest-acroread-7.0.8-r1 4615
+SHA256 5ee72dba69e5972240b048efe005b3ea10b95f844e9bf8f8e5ae81b92e5feb51 files/digest-acroread-7.0.8-r1 4615
 MD5 ddb00dfe94be8ed7d58257c6349b8587 files/digest-acroread-7.0.9 4615
 RMD160 077b5bc629ce347d9ecefc120c0d7ef0f1f4a16f files/digest-acroread-7.0.9 4615
 SHA256 698c24c0320413f4db1a938ce737c83121f92ce556686e1ff0906fa853214614 files/digest-acroread-7.0.9 4615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFqoyP+IXOQtHLm/gRAtYgAJ9RAQ5bsk+2MpYXllfWPlhusT5AiACeOrZ3
-I/2gxPYgQK2yCjdM5/MZ034=
-=Rpbw
+iD8DBQFFqp/UZfNLSOUrp0sRAgdgAJ44rFutZD8vskaMXdvDtkBkCcc+VgCcCEcE
+fpLBWh3WtvC50uG150IwAL0=
+=MngE
 -----END PGP SIGNATURE-----

diff --git a/app-text/acroread/acroread-7.0.8-r1.ebuild b/app-text/acroread/acroread-7.0.8-r1.ebuild
index a04c055e519d40654fbd9f85a30db52f7e32f1c7..65702fa9dddeab788a3f9f87e89a22205c7194f8 100644 (file)
--- a/app-text/acroread/acroread-7.0.8-r1.ebuild
+++ b/app-text/acroread/acroread-7.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.8-r1.ebuild,v 1.1 2006/11/22 00:58:48 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.8-r1.ebuild,v 1.2 2007/01/14 21:19:26 kevquinn Exp $
 
 inherit eutils nsplugins
 
@@ -101,7 +101,10 @@ src_unpack() {
        for pkg in ${A}; do
                cd ${WORKDIR}
                unpack ${pkg}
-               if [[ ${pkg} =~ "^AdobeReader_" ]]; then
+               # Note; bash-3.2_p9 doesn't like quotes on the rhs of =~
+               # Seems inconsistent to me; this works for now, awaiting
+               # upstream response.
+               if [[ ${pkg} =~ ^AdobeReader_ ]]; then
                        cd ${S}
                        tar xf ILINXR.TAR ||
                                die "Failed to unpack ILINXR.TAR; is distfile corrupt?"

diff --git a/app-text/acroread/acroread-7.0.9.ebuild b/app-text/acroread/acroread-7.0.9.ebuild
index aed0c26b0bc2510caa2255866cf97d9464042ed2..f36473f97b4e28a399c2a9e9d423068c7136456d 100644 (file)
--- a/app-text/acroread/acroread-7.0.9.ebuild
+++ b/app-text/acroread/acroread-7.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.9.ebuild,v 1.3 2007/01/14 20:03:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.9.ebuild,v 1.4 2007/01/14 21:19:26 kevquinn Exp $
 
 inherit eutils nsplugins
 
@@ -101,7 +101,10 @@ src_unpack() {
        for pkg in ${A}; do
                cd ${WORKDIR}
                unpack ${pkg}
-               if [[ "${pkg}" =~ "^AdobeReader_" ]]; then
+               # Note; bash-3.2_p9 doesn't like quotes on the rhs of =~
+               # Seems inconsistent to me; this works for now, awaiting
+               # upstream response.
+               if [[ ${pkg} =~ ^AdobeReader_ ]]; then
                        cd ${S}
                        tar xf ILINXR.TAR ||
                                die "Failed to unpack ILINXR.TAR; is distfile corrupt?"

diff --git a/app-text/acroread/files/digest-acroread-7.0.8 b/app-text/acroread/files/digest-acroread-7.0.8
index 0f2612e18c942cfd9c944c337f65735ddb6c9f75..7bcc5d2f5e74dfbee6cf55fbb5890e53cc188180 100644 (file)
--- a/app-text/acroread/files/digest-acroread-7.0.8
+++ b/app-text/acroread/files/digest-acroread-7.0.8
@@ -10,9 +10,9 @@ SHA256 993342c1ece81902f1b9770528df12bdadbc4f1035646b444d336f53e4a939b5 AdobeRea
 MD5 4a4f4225e873a32165311b09f2264d3d AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
 RMD160 1a79cf1fad25e4bc515967214c1c34b85736d9f6 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
 SHA256 329a688ad9d27c40064ea7b0c10cd6d10cfbf067c39a31a4913ce67add634af8 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
-MD5 8be38823e72aaa41e5bbe60a4b652b7e AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
-RMD160 a84ef272eed5612d8ab4004eb48004764d1bb1ee AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
-SHA256 dc4ddb572c88fd28fb410d8ff79e79910597694176837d799fea415fb1f532b7 AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
+MD5 4834f13ee45c7b1be263fb89aa49d212 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+RMD160 22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+SHA256 eb4a883910733ad63a93b168f20b9c2ca8f21d7174b0aedd6eba1ee6c2a2746f AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
 MD5 00151ce5b920870c05746c2a54a7feb2 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
 RMD160 bba9c7fecb8c5404976fada7dbdede5871c6c3e4 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
 SHA256 807cad63709f3f53af7f46bfa002c640d5c77cae3be923faa2cd18a695a89f31 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122

diff --git a/app-text/acroread/files/digest-acroread-7.0.8-r1 b/app-text/acroread/files/digest-acroread-7.0.8-r1
index 0f2612e18c942cfd9c944c337f65735ddb6c9f75..7bcc5d2f5e74dfbee6cf55fbb5890e53cc188180 100644 (file)
--- a/app-text/acroread/files/digest-acroread-7.0.8-r1
+++ b/app-text/acroread/files/digest-acroread-7.0.8-r1
@@ -10,9 +10,9 @@ SHA256 993342c1ece81902f1b9770528df12bdadbc4f1035646b444d336f53e4a939b5 AdobeRea
 MD5 4a4f4225e873a32165311b09f2264d3d AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
 RMD160 1a79cf1fad25e4bc515967214c1c34b85736d9f6 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
 SHA256 329a688ad9d27c40064ea7b0c10cd6d10cfbf067c39a31a4913ce67add634af8 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
-MD5 8be38823e72aaa41e5bbe60a4b652b7e AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
-RMD160 a84ef272eed5612d8ab4004eb48004764d1bb1ee AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
-SHA256 dc4ddb572c88fd28fb410d8ff79e79910597694176837d799fea415fb1f532b7 AdobeReader_enu-7.0.8-1.i386.tar.gz 3485917
+MD5 4834f13ee45c7b1be263fb89aa49d212 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+RMD160 22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+SHA256 eb4a883910733ad63a93b168f20b9c2ca8f21d7174b0aedd6eba1ee6c2a2746f AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
 MD5 00151ce5b920870c05746c2a54a7feb2 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
 RMD160 bba9c7fecb8c5404976fada7dbdede5871c6c3e4 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
 SHA256 807cad63709f3f53af7f46bfa002c640d5c77cae3be923faa2cd18a695a89f31 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122