Copy bash-3 fix from tk-8.4.11-r1.ebuild to tk-8.4.9.ebuild #117982. Port

tk-8.3.4-r1 to modular X
Package-Manager: portage-2.1_pre5-r4

4 files changed, 61 insertions, 9 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 3b5683285b38..6ad18fcec513 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.67 2006/03/03 16:15:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.68 2006/03/24 19:50:33 agriffis Exp $
+
+  24 Mar 2006; Aron Griffis <agriffis@gentoo.org> tk-8.3.4-r1.ebuild,
+  tk-8.4.9.ebuild:
+  Copy bash-3 fix from tk-8.4.11-r1.ebuild to tk-8.4.9.ebuild #117982. Port
+  tk-8.3.4-r1 to modular X
 
 *tk-8.4.12 (03 Mar 2006)
 
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 73d4df37ecb7..003155d2550e 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,15 +1,55 @@
-MD5 174015c21a710a78b5af8aa8b5febfe2 ChangeLog 8843
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 172ccd49f7e4e6bb5eddcff359645cb8 ChangeLog 9038
+RMD160 af3c898f7988d28a9ce9727dd2d0cd5c140679d8 ChangeLog 9038
+SHA256 d9e744aed96dbf84ceb4916f6ded62efbc1ddf9d3db673e169dc9d16c28aaa4b ChangeLog 9038
 MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
+RMD160 f97e98bd4c32afe70376ae3a68c7e39485137d92 files/digest-tk-8.3.4-r1 60
+SHA256 c2a69653d2e7a8792204bc4d31d95be1f20e216f64ac76129a3a3fadfe0d7b3d files/digest-tk-8.3.4-r1 60
 MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11-r1 65
+RMD160 33d96c38a704c39617676cb2c41a511d4a2a81c4 files/digest-tk-8.4.11-r1 65
+SHA256 618530bdca7b86eb8279fe892c889103e700552785f132f3d83cb1f2e898555d files/digest-tk-8.4.11-r1 65
 MD5 2c7f40cd2d3510fd3243146e4499cd54 files/digest-tk-8.4.12 65
+RMD160 910e12c4b189b627c034312aa7ceb35d063946ed files/digest-tk-8.4.12 65
+SHA256 562c3529533f01d31e8d93e646826ce854a0bd4ab19e6c01892e90bd03e4a9db files/digest-tk-8.4.12 65
 MD5 76d0b4599f29136b31e902d15566e8c8 files/digest-tk-8.4.9 64
+RMD160 d012534789a995003b619fd68430900a9b454ff2 files/digest-tk-8.4.9 64
+SHA256 bf4dc1fe66f87bff6bb3367a14328ee35111d46d4ce3f44d88165a5f0ffabe14 files/digest-tk-8.4.9 64
 MD5 3003fb2cb4a185ec54b8c94ec0606313 files/remove-control-v-8.4.9.diff 522
+RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d files/remove-control-v-8.4.9.diff 522
+SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba files/remove-control-v-8.4.9.diff 522
 MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
+RMD160 0ecd0ac7aed9aa516e763de4cf930a1d005a878f files/remove-control-v.diff 400
+SHA256 44890be11039fec5cf4a5f52cb4e3b9e131ee85b77a7fe15279076f1a251a99b files/remove-control-v.diff 400
 MD5 7442ab63dabe7e4d5bdde18a28c118e2 files/tk-8.4.11-multilib.patch 896
+RMD160 29152dde424c41555e132c1b279ccc7ab279e27f files/tk-8.4.11-multilib.patch 896
+SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636 files/tk-8.4.11-multilib.patch 896
 MD5 f4d1359d10fdb4a572e9da8f9896c603 files/tk-8.4.9-man.patch 800
+RMD160 8d06c54ab7ae0edf584248a8f6f14f46e08eec97 files/tk-8.4.9-man.patch 800
+SHA256 5e356b8d34fc6687af03f1aa93e2a05619e0df0bbef65a8bc76e0a9a3da56dfa files/tk-8.4.9-man.patch 800
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/tk-configure-LANG.patch 1686
+RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/tk-configure-LANG.patch 1686
+SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tk-configure-LANG.patch 1686
 MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
-MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
+RMD160 117cc289391c0477579de68e7347628756673eac metadata.xml 159
+SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce metadata.xml 159
+MD5 aa3881962c976081e4ea8bba6fc7f7c0 tk-8.3.4-r1.ebuild 2463
+RMD160 d98b481cf55f1563683eb13948269e0b89e30f7e tk-8.3.4-r1.ebuild 2463
+SHA256 36511a7f36fd0095685def06bdef4f7f41106c613ebda9b4337ea03f71265a58 tk-8.3.4-r1.ebuild 2463
 MD5 a29dfc6044a952b0d976bdcd546fca8f tk-8.4.11-r1.ebuild 3182
+RMD160 bbf0f86059858be8ffec8fb914190e074cc426f4 tk-8.4.11-r1.ebuild 3182
+SHA256 8c23e6aec90f484002a8e9321eb3d589bcc103681a41f64bdc7cbec9fdbb65af tk-8.4.11-r1.ebuild 3182
 MD5 9a091677cb6f9dfbf17f04f086cc9d81 tk-8.4.12.ebuild 3187
-MD5 fb0cef9b14192ab396f10bc2825d06e0 tk-8.4.9.ebuild 3094
+RMD160 dae4834cec56b6d4eee0ca1ab91c291177febd95 tk-8.4.12.ebuild 3187
+SHA256 8cde34bd2c45a162f507f3f68e56c3dcbc7de8a6d00c9dbbcd6774ae89362ec2 tk-8.4.12.ebuild 3187
+MD5 91033e7e274b85dcf6350f50d21d5832 tk-8.4.9.ebuild 3180
+RMD160 2e1c07debcfb4039cc09f922e957a512785a4dea tk-8.4.9.ebuild 3180
+SHA256 cf90e474903fa43d10b75c03cd4e2602f9577629ab582d43bb2218f31ebe953e tk-8.4.9.ebuild 3180
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEJE2VJrHF4yAQTrARApJYAKCTHIzVUnqVop0Lb1NCxIG5qnePnQCaAjmh
+VCSkVz5Q9c4cHv8a/f4tRFg=
+=POCa
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/tk-8.3.4-r1.ebuild b/dev-lang/tk/tk-8.3.4-r1.ebuild
index 9c3ae9519256..012e88ddd684 100644
--- a/dev-lang/tk/tk-8.3.4-r1.ebuild
+++ b/dev-lang/tk/tk-8.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.11 2005/03/19 05:53:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.12 2006/03/24 19:50:34 agriffis Exp $
 
 inherit eutils
 
@@ -16,8 +16,11 @@ KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-apps/portage-2.0.47-r10
-	virtual/x11
-	=dev-lang/tcl-${PV}*"
+	=dev-lang/tcl-${PV}*
+	|| (
+		( x11-libs/libXt x11-proto/xproto )
+		virtual/x11
+	)"
 
 S=${WORKDIR}/${PN}${PV}
 
diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
index abe032f5cf36..d7b979c4da87 100644
--- a/dev-lang/tk/tk-8.4.9.ebuild
+++ b/dev-lang/tk/tk-8.4.9.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-lang/tk/tk-8.4.9.ebuild,v 1.14 2006/02/26 19:30:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.15 2006/03/24 19:50:34 agriffis Exp $
 
 inherit eutils
 
@@ -42,6 +42,10 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/remove-control-v-${PV}.diff || die
 	epatch ${FILESDIR}/${P}-man.patch || die
+
+	# bug 117982
+	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
+
 	local d
 	for d in */configure ; do
 		cd "${S}"/${d%%/*}