Version bumped.

(Portage version: 2.0.51.19)

5 files changed, 158 insertions, 6 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index feffa5a52da0..e1752608e5c2 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2005/06/06 08:21:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.57 2005/07/02 14:14:59 matsuu Exp $
+
+*tcl-8.4.11 (02 Jul 2005)
+
+  02 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tcl-8.4.11-multilib.patch, +tcl-8.4.11.ebuild:
+  Version bumped.
 
   06 Jun 2005; Markus Rothe <corsair@gentoo.org> tcl-8.4.9.ebuild:
   Stable on ppc64
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 3630145dec34..d1b2f38de8fe 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,11 +1,14 @@
-MD5 90816028906b880f9c01f86147bade32 ChangeLog 7043
-MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
-MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
+MD5 7c1f9838e04da8cb3040a3cc1b67cb8e tcl-8.4.11.ebuild 3207
 MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
-MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
 MD5 2dd4cd8b64f9331badaba7f7f08f660a tcl-8.4.9.ebuild 3264
+MD5 cb8a6b0fd1e057fb640692a597bc051d ChangeLog 7194
+MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
+MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
 MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
-MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
 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 23a4b408a4ea393df1da149ed8cb4d4c files/tcl-8.4.11-multilib.patch 1808
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.11 b/dev-lang/tcl/files/digest-tcl-8.4.11
new file mode 100644
index 000000000000..30bdbfe47fb5
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.11
@@ -0,0 +1 @@
+MD5 629dfea34e4087eb4683f834060abb63 tcl8.4.11-src.tar.gz 3474428
diff --git a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
new file mode 100644
index 000000000000..8ada22d8f93e
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
@@ -0,0 +1,42 @@
+diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure
+--- tcl8.4.11.orig/unix/configure	2005-06-30 01:40:33.000000000 +0900
++++ tcl8.4.11/unix/configure	2005-07-02 20:23:23.000000000 +0900
+@@ -7664,7 +7664,7 @@
+ DBGX='${TCL_DBGX}'
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
+@@ -7788,7 +7788,7 @@
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+     TCL_PACKAGE_PATH="${prefix}/lib"
+diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in
+--- tcl8.4.11.orig/unix/configure.in	2005-06-30 01:40:33.000000000 +0900
++++ tcl8.4.11/unix/configure.in	2005-07-02 20:23:12.000000000 +0900
+@@ -459,7 +459,7 @@
+ DBGX='${TCL_DBGX}'
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
+@@ -552,7 +552,7 @@
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/tcl-8.4.11.ebuild b/dev-lang/tcl/tcl-8.4.11.ebuild
new file mode 100644
index 000000000000..7c67d20ccd2b
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.4.11.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/07/02 14:14:59 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=""
+
+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
+}
+
+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
+}