Apply bash-3 fix to both tcl and tk trees in both versions of this package

#118985
Package-Manager: portage-2.1_pre5-r4

4 files changed, 33 insertions, 26 deletions

diff --git a/dev-util/insight/ChangeLog b/dev-util/insight/ChangeLog
index 812af8589c11..ab0ff4cdd923 100644
--- a/dev-util/insight/ChangeLog
+++ b/dev-util/insight/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for dev-util/insight
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.26 2006/01/14 17:11:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.27 2006/03/21 22:21:05 agriffis Exp $
+
+  21 Mar 2006; Aron Griffis <agriffis@gentoo.org> insight-6.1.ebuild,
+  insight-6.4.ebuild:
+  Apply bash-3 fix to both tcl and tk trees in both versions of this package
+  #118985
 
   14 Jan 2006; Olivier Crête <tester@gentoo.org> insight-6.4.ebuild:
-  Fix configurewith bash 3.1, bug #118985
+  Fix configure with bash 3.1, bug #118985
 
   05 Jan 2006; Olivier Crête <tester@gentoo.org> insight-6.1.ebuild,
   insight-6.4.ebuild:
diff --git a/dev-util/insight/Manifest b/dev-util/insight/Manifest
index cf15c6a76436..dc6e08ad2a3d 100644
--- a/dev-util/insight/Manifest
+++ b/dev-util/insight/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5243f55e7b5e862f8db36907ef0223fe ChangeLog 3031
+MD5 53b7c76780ba37d37a28bfbe6d9a59da ChangeLog 3214
+RMD160 cf0d3cacb8c26d31a83c714cb2641378724f3377 ChangeLog 3214
+SHA256 de1e10c86be479b3c8b3ee2ae8760fc9770f932b9ec68611d72e5ae960667960 ChangeLog 3214
 MD5 5a030894bc99706b3fd19213674c4043 files/99insight 70
+RMD160 52fcaed6d1e98148a618831a70244e0ff7ff20e2 files/99insight 70
+SHA256 3d2b493b8b7879f26b8189b3d424aeefa39f9eba1784b34c6741882eff9c1e78 files/99insight 70
 MD5 761285348baf9b36f19392b40d743ec9 files/digest-insight-6.1 66
+RMD160 2f0316e78bd7f099240eb3585490d7bb891cbb6a files/digest-insight-6.1 66
+SHA256 420c8931cde5a96db37599a28956956f945f6e93f07926d855f4dbbcdd3b150b files/digest-insight-6.1 66
 MD5 53a8802a6febebc518d5459fee2a74a2 files/digest-insight-6.4 66
-MD5 0393e4154d052e458fe7c21761b3b646 insight-6.1.ebuild 1254
-MD5 e2187a66e5a2601ed3cccf5b91ee4324 insight-6.4.ebuild 1228
+RMD160 262560dfbb89f328a5bca69208f668b49d8631e5 files/digest-insight-6.4 66
+SHA256 61633b1c43cfb2a416a7e789a237d44bd3ac970b267971133bc5fbc08a34f238 files/digest-insight-6.4 66
+MD5 58b772d9eb376ae97aeef2da760ad786 insight-6.1.ebuild 1229
+RMD160 1392828051107ac7a71e485a1363b11d62c43087 insight-6.1.ebuild 1229
+SHA256 2fb8754497a7b9069f8f4035933184c9b9476b8a862e400bb4149f51ef1c9332 insight-6.1.ebuild 1229
+MD5 be8a6b062edf41949a2bbe34441e62cc insight-6.4.ebuild 1228
+RMD160 b672a924467b7ba17b8c723fe6dd872e323016fd insight-6.4.ebuild 1228
+SHA256 2eb7963ddc561e9a9957e0574212bee69da123552e216e821118ef5d4f954a2c insight-6.4.ebuild 1228
 MD5 32f80b86a1f5194b0105357bc033324b metadata.xml 286
+RMD160 12882e7694c3c4e380056119fe840917e8e7b8db metadata.xml 286
+SHA256 6c1d998e5098e6d7a2d0df5b9f38fccc23a06b02e8d37a4f03f98b7c70da4fde metadata.xml 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDyTDmmOfEJZHYOKcRAlmOAJ0QDH6wIcuKGdpwlTXU/j17f3IRUgCg2e8U
-T3L6IpkgIYUGNeA9KYPHNec=
-=iK1Y
+iD8DBQFEIHxeJrHF4yAQTrARAriJAKDMsnBSb755vnkGw2zaZONSbpVq0wCfVz7L
+MaWGZutw8zT2eVJX6D/HKPg=
+=BoQV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/insight/insight-6.1.ebuild b/dev-util/insight/insight-6.1.ebuild
index feec9920886a..b66dded63009 100644
--- a/dev-util/insight/insight-6.1.ebuild
+++ b/dev-util/insight/insight-6.1.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-util/insight/insight-6.1.ebuild,v 1.12 2006/01/05 07:34:25 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.1.ebuild,v 1.13 2006/03/21 22:21:07 agriffis Exp $
 
 inherit eutils
 
@@ -21,15 +21,13 @@ SRC_URI="ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
 
 INSIGHTDIR="/opt/insight"
 
-disabled_src_unpack() {
-
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/insight-6.1-jimb-copy-section-addr-info.patch
+	sed -i -e "s/relid'/relid/" {tcl,tk}/unix/configure
 }
 
 src_compile() {
-
 	local myconf
 	use nls || myconf="--disable-nls"
 
@@ -38,11 +36,9 @@ src_compile() {
 		--infodir="${D}${INSIGHTDIR}/share/info"	\
 		${myconf} || die
 	emake || die
-
 }
 
 src_install () {
-
 	make \
 		prefix="${D}${INSIGHTDIR}" \
 		mandir="${D}${INSIGHTDIR}/share/man" \
@@ -50,5 +46,4 @@ src_install () {
 		install || die
 	insinto /etc/env.d
 	doins "${FILESDIR}/99insight"
-
 }
diff --git a/dev-util/insight/insight-6.4.ebuild b/dev-util/insight/insight-6.4.ebuild
index 28aec511eb85..2773156904a7 100644
--- a/dev-util/insight/insight-6.4.ebuild
+++ b/dev-util/insight/insight-6.4.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-util/insight/insight-6.4.ebuild,v 1.5 2006/01/14 17:11:07 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.4.ebuild,v 1.6 2006/03/21 22:21:07 agriffis Exp $
 
 inherit eutils
 
@@ -15,7 +15,6 @@ DEPEND="|| ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 )
 RDEPEND="sys-libs/ncurses
 	|| ( x11-libs/libX11 virtual/x11 )"
 
-
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${P}.tar.bz2"
@@ -24,14 +23,11 @@ INSIGHTDIR="/opt/insight"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	sed -i -e "s/relid'/relid/" tcl/unix/configure
+	sed -i -e "s/relid'/relid/" {tcl,tk}/unix/configure
 }
 
-
 src_compile() {
-
 	local myconf
 	myconf="$(use_enable nls)"
 
@@ -40,11 +36,9 @@ src_compile() {
 		--infodir="${D}${INSIGHTDIR}/share/info"	\
 		${myconf} || die
 	emake || die
-
 }
 
 src_install () {
-
 	make \
 		prefix="${D}${INSIGHTDIR}" \
 		mandir="${D}${INSIGHTDIR}/share/man" \
@@ -52,5 +46,4 @@ src_install () {
 		install || die
 	insinto /etc/env.d
 	doins "${FILESDIR}/99insight"
-
 }