need to apply the bash-3.1 patch more than once for some scripts

Package-Manager: portage-2.1_pre10-r5

3 files changed, 20 insertions, 18 deletions

diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 98a2764af9a0..a3c8ecde970d 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -13,10 +13,10 @@ AUX tclx-8.3-varinit.patch 386 RMD160 4a697796894cd6573573330843c6a9312aa15e0f S
 MD5 f4af4334bd8c05af3b43ee89b4dfb03c files/tclx-8.3-varinit.patch 386
 RMD160 4a697796894cd6573573330843c6a9312aa15e0f files/tclx-8.3-varinit.patch 386
 SHA256 7415da5026eab39fa272bd2e0b145cc6030f3a32a95fefc72d0ec9977f364cab files/tclx-8.3-varinit.patch 386
-AUX tclx-8.3.5-configure.patch 371 RMD160 9c27027d753b53ac3ad7cc9abb8977d2337c2a87 SHA1 193ee9b5c58fd9aef34f29b7512695231b6a2aa2 SHA256 486a65b8ee27c79d45dd88526ceccc1aadbcc974494e1f3bc21b5930665b85f9 size 371
-MD5 5220bcf4b6f84276e65fd739ecd7e59f files/tclx-8.3.5-configure.patch 371
-RMD160 9c27027d753b53ac3ad7cc9abb8977d2337c2a87 files/tclx-8.3.5-configure.patch 371
-SHA256 486a65b8ee27c79d45dd88526ceccc1aadbcc974494e1f3bc21b5930665b85f9 files/tclx-8.3.5-configure.patch 371
+AUX tclx-8.3.5-configure.patch 448 RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f28 SHA1 605c9c51144463ec9260a1d9fdcd2e86c47dde1e SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2 size 448
+MD5 10da4ddaa69eb2eedb883022d1f23961 files/tclx-8.3.5-configure.patch 448
+RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f28 files/tclx-8.3.5-configure.patch 448
+SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2 files/tclx-8.3.5-configure.patch 448
 DIST tcl8.4.2-src.tar.gz 3330617 RMD160 840e480c4328c3d981889ec25d29daf90ddc43d6 SHA256 8c580774ec010befb79f7f0517382ecb3369381804da46489e6c7a3c2ebcf52a size 3330617
 DIST tcl8.4.6-src.tar.gz 3448711 RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78 size 3448711
 DIST tclx8.3.5-src.tar.gz 434281 RMD160 b501c1c48b54950ea7fb6d3d6d27ef3e7d58c5a5 SHA256 4db028f303908b29b15cb2b97731f87a46a39cd65ab76219b9576f045d0b06ad size 434281
@@ -27,10 +27,10 @@ EBUILD tclx-8.3-r1.ebuild 2069 RMD160 4fab3341ae85ed75c076fd133466f4a941881aea S
 MD5 c5435205a572201b2e9c92882ee484c2 tclx-8.3-r1.ebuild 2069
 RMD160 4fab3341ae85ed75c076fd133466f4a941881aea tclx-8.3-r1.ebuild 2069
 SHA256 c10f39fa883615b6d68ec66c29dedbc0cf71312e5b2c9b8f0133d7bfab87e755 tclx-8.3-r1.ebuild 2069
-EBUILD tclx-8.3.5.ebuild 1857 RMD160 e605f3ac2bf45ae8263252f25d1a77f60b531846 SHA1 c11e7d4f0db7991179b9c470ec39bf1e53605cc6 SHA256 50a22637159a3a77fd2cb92d698ec27de82d00ad048e4ca05509fcf877c5ecec size 1857
-MD5 24f2e5fe35c75e3c073328ccf18f1c21 tclx-8.3.5.ebuild 1857
-RMD160 e605f3ac2bf45ae8263252f25d1a77f60b531846 tclx-8.3.5.ebuild 1857
-SHA256 50a22637159a3a77fd2cb92d698ec27de82d00ad048e4ca05509fcf877c5ecec tclx-8.3.5.ebuild 1857
+EBUILD tclx-8.3.5.ebuild 1947 RMD160 ee58e4aedd574b13c7ad51f016da19d0ff69bb57 SHA1 86b0504b779f5eaa8173d8a5ef96ec2d00868d17 SHA256 e25368976c8faf404b6ad189b06258250fa159e913f7aae74f4f65ff1418d5d4 size 1947
+MD5 5fa26ef694075efcc4a1bba3c333a2f1 tclx-8.3.5.ebuild 1947
+RMD160 ee58e4aedd574b13c7ad51f016da19d0ff69bb57 tclx-8.3.5.ebuild 1947
+SHA256 e25368976c8faf404b6ad189b06258250fa159e913f7aae74f4f65ff1418d5d4 tclx-8.3.5.ebuild 1947
 MISC ChangeLog 3913 RMD160 01eff466f399c7d28d47fa3a9ee37c11facda404 SHA1 037f44be712ff1b28fd3b258318ef2afa49aee23 SHA256 fc31564c9b9d17e532a805b90f816bdeaadae2765645e5ce3c99a4ce1afef4da size 3913
 MD5 b33e236db928e1a80d6e6ec822b04977 ChangeLog 3913
 RMD160 01eff466f399c7d28d47fa3a9ee37c11facda404 ChangeLog 3913
@@ -48,7 +48,7 @@ SHA256 11530dc4745f4cc1c287dbb0d1dd3d06d0384edc880d387671e9ce38f944e93c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEURsyW78445TWHXcRAk4LAKCeMeZqpX8seLSaDa9MMMCX3ExDkQCbB7CF
-EtnYaXfB+SSgIvioptgwwRI=
-=4R5l
+iD8DBQFEZAzK2+ySkm8kpY0RAiqsAKCtML3r5S1+kK6SaKGtnvBReRoZcwCeLaMo
+ke9MRpqBUwSGu0VvVGhCxjM=
+=s2ln
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch b/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch
index 43b8001ed39f..49821f91b9bd 100644
--- a/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch
+++ b/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch
@@ -1,5 +1,5 @@
---- unix/configure
-+++ unix/configure
+--- unix/configure.orig	2006-05-12 00:08:06.000000000 -0400
++++ unix/configure	2006-05-12 00:08:22.000000000 -0400
 @@ -5552,7 +5552,7 @@
  	    # results, and the version is kept in special file).
  	
diff --git a/dev-tcltk/tclx/tclx-8.3.5.ebuild b/dev-tcltk/tclx/tclx-8.3.5.ebuild
index c2dbf305985c..d3a1d3497fb3 100644
--- a/dev-tcltk/tclx/tclx-8.3.5.ebuild
+++ b/dev-tcltk/tclx/tclx-8.3.5.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/dev-tcltk/tclx/tclx-8.3.5.ebuild,v 1.13 2006/02/28 00:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.3.5.ebuild,v 1.14 2006/05/12 04:17:46 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,12 +23,14 @@ S=${WORKDIR}/${PN}${PV}
 src_unpack() {
 	unpack ${A}
 
-	# Fix bug in configure script #119619
+	# Fix bug[s] in configure script #119619
 	local d
 	for d in */unix/configure ; do
-		cd "${WORKDIR}"/${d%/*}
-		EPATCH_SINGLE_MSG="Fixing ${d} ..." \
-		epatch "${FILESDIR}"/${P}-configure.patch
+		ebegin "Fixing ${d}"
+		while patch ${EPATCH_OPTS} --dry-run ${d} "${FILESDIR}"/${P}-configure.patch > /dev/null ; do
+			patch ${d} "${FILESDIR}"/${P}-configure.patch > /dev/null
+		done
+		eend $?
 	done
 
 	cd "${S}"