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

(Portage version: 2.1.2_rc4-r9)

5 files changed, 23 insertions, 12 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index b5823ef967f5..5446b1f726bd 100644
--- 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/acroread-7.0.8-r1.ebuild b/app-text/acroread/acroread-7.0.8-r1.ebuild
index a04c055e519d..65702fa9ddde 100644
--- 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 aed0c26b0bc2..f36473f97b4e 100644
--- 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 0f2612e18c94..7bcc5d2f5e74 100644
--- 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 0f2612e18c94..7bcc5d2f5e74 100644
--- 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