Fixed Bug 128681, 123444, 125971.

(Portage version: 2.1_rc4)

7 files changed, 143 insertions, 1 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 36219c0f1065..5a12443ef32b 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.67 2006/04/11 16:27:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.68 2006/06/03 19:35:20 matsuu Exp $
+
+*tcl-8.4.13 (03 Jun 2006)
+
+  03 Jun 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tcl-8.3.5-tclm4-soname.patch, +tcl-8.4.13.ebuild:
+  Version bumped, Bug 128681.
+  Added debug USE flag, Bug 123444.
+  Added soname patch, Bug 125971.
+  Removed PDEPEND.
 
   11 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> tcl-8.4.12.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.11-r1 b/dev-lang/tcl/files/digest-tcl-8.4.11-r1
index 30bdbfe47fb5..59fe82ae7aa7 100644
--- a/dev-lang/tcl/files/digest-tcl-8.4.11-r1
+++ b/dev-lang/tcl/files/digest-tcl-8.4.11-r1
@@ -1 +1,3 @@
 MD5 629dfea34e4087eb4683f834060abb63 tcl8.4.11-src.tar.gz 3474428
+RMD160 933dda739859af170c31cef855409f861ed597cb tcl8.4.11-src.tar.gz 3474428
+SHA256 8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33 tcl8.4.11-src.tar.gz 3474428
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.12 b/dev-lang/tcl/files/digest-tcl-8.4.12
index bcdf774c3651..9487de9ef143 100644
--- a/dev-lang/tcl/files/digest-tcl-8.4.12
+++ b/dev-lang/tcl/files/digest-tcl-8.4.12
@@ -1 +1,3 @@
 MD5 7480432d8730263f267952788eb4839b tcl8.4.12-src.tar.gz 3500222
+RMD160 5a667face8be2cebced5238c481e96499a93237b tcl8.4.12-src.tar.gz 3500222
+SHA256 84d123318a51e14e5bbe1b8c2e5c93af299310fbc026b86f7375594cda5e00d8 tcl8.4.12-src.tar.gz 3500222
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.13 b/dev-lang/tcl/files/digest-tcl-8.4.13
new file mode 100644
index 000000000000..2b35235c31c3
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.13
@@ -0,0 +1,3 @@
+MD5 c6b655ad5db095ee73227113220c0523 tcl8.4.13-src.tar.gz 3513852
+RMD160 4e0aa4e67f0a910d3323d8288b707ae9a59408a3 tcl8.4.13-src.tar.gz 3513852
+SHA256 c650124caf4785bb532720cb9d2902358ee9a9d6c71852ef4cdbdd6b7c5db4fc tcl8.4.13-src.tar.gz 3513852
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.9 b/dev-lang/tcl/files/digest-tcl-8.4.9
index d22d43aba438..91b38789562d 100644
--- a/dev-lang/tcl/files/digest-tcl-8.4.9
+++ b/dev-lang/tcl/files/digest-tcl-8.4.9
@@ -1 +1,3 @@
 MD5 7e01b409925e4eb59ad44a4c12b9c681 tcl8.4.9-src.tar.gz 3496364
+RMD160 0d02e3224fcc6d2dd41f2edfb89a824e5437fca8 tcl8.4.9-src.tar.gz 3496364
+SHA256 b4178967e94bcfae6b73abaaf575397e6aac81ffbaf144d757a3891d0bf89d96 tcl8.4.9-src.tar.gz 3496364
diff --git a/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch b/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch
new file mode 100644
index 000000000000..1005f6715879
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch
@@ -0,0 +1,12 @@
+diff -u tcl8.3.5/unix/tcl.m4~ tcl8.3.5/unix/tcl.m4
+--- tcl8.3.5/unix/tcl.m4~	2003-01-14 20:42:53.000000000 +0900
++++ tcl8.3.5/unix/tcl.m4	2003-01-14 20:42:53.000000000 +0900
+@@ -954,7 +954,7 @@
+ 	    CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD="${CC} -shared"
++		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="-rdynamic"
diff --git a/dev-lang/tcl/tcl-8.4.13.ebuild b/dev-lang/tcl/tcl-8.4.13.ebuild
new file mode 100644
index 000000000000..cbe19ba6578c
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.4.13.ebuild
@@ -0,0 +1,112 @@
+# 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.13.ebuild,v 1.1 2006/06/03 19:35:20 matsuu Exp $
+
+inherit eutils multilib
+
+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 ~x86-fbsd"
+IUSE="debug threads"
+
+DEPEND="virtual/libc"
+
+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}"/${PN}-8.4.11-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.3.5-tclm4-soname.patch
+
+	local d
+	for d in */configure ; do
+		cd "${S}"/${d%%/*}
+		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
+		epatch "${FILESDIR}"/tcl-configure-LANG.patch
+	done
+}
+
+src_compile() {
+	local local_config_use=""
+
+	if use threads ; then
+		local_config_use="--enable-threads"
+	fi
+
+	cd "${S}"/unix
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols) || die
+	emake || 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
+}