Fixed fails with bash 3.1, Bug 117744.

(Portage version: 2.0.53)

4 files changed, 124 insertions, 22 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index db971687605c..18c8d3f35dad 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tcl
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.59 2005/08/03 22:08:10 kloeri Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.60 2006/01/08 14:01:17 matsuu Exp $
+
+*tcl-8.4.11-r1 (08 Jan 2006)
+
+  08 Jan 2006; MATSUU Takuto <matsuu@gentoo.org> +tcl-8.4.11-r1.ebuild:
+  Fixed fails with bash 3.1, Bug 117744.
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> tcl-8.4.9.ebuild:
   Stable on alpha.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index cfb0fee89c41..39c54181f3e4 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
 MD5 211feab113da2798b9be2e5f040cb10a ChangeLog 7381
-MD5 69d01ea195cf8047c70a0d4d9e5521dd tcl-8.4.11.ebuild 3246
-MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
-MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
-MD5 eec3607c728a5f0125ea427870897539 tcl-8.4.9.ebuild 3262
-MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
 MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
-MD5 23a4b408a4ea393df1da149ed8cb4d4c files/tcl-8.4.11-multilib.patch 1808
-MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
 MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11 66
-MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
-MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11-r1 66
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8UBZKf2g/qXtneoRAs24AJ4zZJFW+p3hT8RNMJzOslJdZcL9SgCfVz17
-f9o8dMtO9Jr/lL3Pa7W5BB8=
-=NCiS
------END PGP SIGNATURE-----
+MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
+MD5 23a4b408a4ea393df1da149ed8cb4d4c files/tcl-8.4.11-multilib.patch 1808
+MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
+MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
+MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
+MD5 07751fa765ebf79a1a3d73e21a6663e0 tcl-8.4.11-r1.ebuild 3328
+MD5 69d01ea195cf8047c70a0d4d9e5521dd tcl-8.4.11.ebuild 3246
+MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
+MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 eec3607c728a5f0125ea427870897539 tcl-8.4.9.ebuild 3262
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.11-r1 b/dev-lang/tcl/files/digest-tcl-8.4.11-r1
new file mode 100644
index 000000000000..30bdbfe47fb5
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.11-r1
@@ -0,0 +1 @@
+MD5 629dfea34e4087eb4683f834060abb63 tcl8.4.11-src.tar.gz 3474428
diff --git a/dev-lang/tcl/tcl-8.4.11-r1.ebuild b/dev-lang/tcl/tcl-8.4.11-r1.ebuild
new file mode 100644
index 000000000000..9b5886c11ba4
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.4.11-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11-r1.ebuild,v 1.1 2006/01/08 14:01:17 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="threads"
+
+DEPEND=""
+PDEPEND="threads? ( dev-tcltk/thread )"
+
+S=${WORKDIR}/${PN}${PV}
+
+pkg_setup() {
+	if use threads ; then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-multilib.patch
+
+	# bug 117744
+	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
+}
+
+src_compile() {
+	local local_config_use=""
+
+	if use threads ; then
+		local_config_use="--enable-threads"
+	fi
+
+	cd "${S}"/unix
+	econf ${local_config_use} || die
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd ${S}/unix
+	S= make DESTDIR=${D} install || die
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	[[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		${D}/usr/${mylibdir}/tclConfig.sh || die
+
+	# install private headers
+	dodir /usr/${mylibdir}/tcl${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix
+	dodir /usr/${mylibdir}/tcl${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
+
+	# install symlink for libraries
+	dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	ln -sf tclsh${v1} ${D}/usr/bin/tclsh
+
+	cd ${S}
+	dodoc README changes license.terms
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you're upgrading from tcl-8.3, you must recompile the other"
+	ewarn "packages on your system that link with tcl after the upgrade"
+	ewarn "completes.  To perform this action, please run revdep-rebuild"
+	ewarn "in package app-portage/gentoolkit."
+	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+	ewarn "upgrade them before this recompilation, too,"
+	ewarn
+}