Version bumped, Bug #173467, #181597.

(Portage version: 2.1.2.9)

8 files changed, 292 insertions, 1 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index abc72593aa94..7e002c8edc82 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.81 2007/07/12 18:06:14 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.82 2007/07/20 18:39:11 matsuu Exp $
+
+*tcl-8.5_alpha6 (20 Jul 2007)
+*tcl-8.4.15 (20 Jul 2007)
+
+  20 Jul 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tcl-8.4.15-tclm4-soname.patch,
+  +files/tcl-8.5_alpha6-multilib.patch,
+  +files/tcl-8.5_alpha6-tclm4-soname.patch, +tcl-8.4.15.ebuild,
+  +tcl-8.5_alpha6.ebuild:
+  Version bumped, Bug #173467, #181597.
 
 *tcl-8.4.14-r1 (12 Jul 2007)
 
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.15 b/dev-lang/tcl/files/digest-tcl-8.4.15
new file mode 100644
index 000000000000..ac8d9d60903b
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.15
@@ -0,0 +1,3 @@
+MD5 5e1b71eef1f75a294072aa3218f62b66 tcl8.4.15-src.tar.gz 3635163
+RMD160 b6b41cb5ae18744ba5aa7fdf3d64277d97d8546e tcl8.4.15-src.tar.gz 3635163
+SHA256 84670f6a3647bc4e3608ab4630621a84caa8e35b0dda017d6beea2b06940afad tcl8.4.15-src.tar.gz 3635163
diff --git a/dev-lang/tcl/files/digest-tcl-8.5_alpha6 b/dev-lang/tcl/files/digest-tcl-8.5_alpha6
new file mode 100644
index 000000000000..6942ad4863d7
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.5_alpha6
@@ -0,0 +1,3 @@
+MD5 2759f9517898e2928d3a4bf6831a7eaa tcl8.5a6-src.tar.gz 4231357
+RMD160 d9db96aa34919c5c699a73e9ead7e871dd4865d2 tcl8.5a6-src.tar.gz 4231357
+SHA256 16f6d0c48f766560789e91ac79b07aa3c3adc2ef7159dd2fe7e4ceff370636ac tcl8.5a6-src.tar.gz 4231357
diff --git a/dev-lang/tcl/files/tcl-8.4.15-tclm4-soname.patch b/dev-lang/tcl/files/tcl-8.4.15-tclm4-soname.patch
new file mode 100644
index 000000000000..4f2dce927d5e
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.4.15-tclm4-soname.patch
@@ -0,0 +1,11 @@
+--- tcl8.4.15.orig/unix/tcl.m4	2007-05-25 05:40:13.000000000 +0900
++++ tcl8.4.15/unix/tcl.m4	2007-07-20 08:40:41.000000000 +0900
+@@ -1345,7 +1345,7 @@
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/files/tcl-8.5_alpha6-multilib.patch b/dev-lang/tcl/files/tcl-8.5_alpha6-multilib.patch
new file mode 100644
index 000000000000..ca7535fe0bb5
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5_alpha6-multilib.patch
@@ -0,0 +1,24 @@
+diff -Naur tcl8.5a6.orig/unix/configure tcl8.5a6/unix/configure
+--- tcl8.5a6.orig/unix/configure	2007-04-27 02:33:51.000000000 +0900
++++ tcl8.5a6/unix/configure	2007-05-16 10:27:25.000000000 +0900
+@@ -17623,7 +17623,7 @@
+ 
+ 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'
+ 
+diff -Naur tcl8.5a6.orig/unix/configure.in tcl8.5a6/unix/configure.in
+--- tcl8.5a6.orig/unix/configure.in	2007-04-27 02:33:51.000000000 +0900
++++ tcl8.5a6/unix/configure.in	2007-05-16 10:27:25.000000000 +0900
+@@ -645,7 +645,7 @@
+ 
+ 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'
+ 
diff --git a/dev-lang/tcl/files/tcl-8.5_alpha6-tclm4-soname.patch b/dev-lang/tcl/files/tcl-8.5_alpha6-tclm4-soname.patch
new file mode 100644
index 000000000000..f24cdc6088ee
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5_alpha6-tclm4-soname.patch
@@ -0,0 +1,11 @@
+--- tcl8.5a6.orig/unix/tcl.m4	2007-04-27 02:33:51.000000000 +0900
++++ tcl8.5a6/unix/tcl.m4	2007-05-16 10:46:31.000000000 +0900
+@@ -1425,7 +1425,7 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/tcl-8.4.15.ebuild b/dev-lang/tcl/tcl-8.4.15.ebuild
new file mode 100644
index 000000000000..414010f7bc02
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.4.15.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.15.ebuild,v 1.1 2007/07/20 18:39:11 matsuu Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs
+
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug 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}"/${PN}-8.4.11-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${P}-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
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+	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= emake DESTDIR="${D}" install || die
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/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
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	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
+	if use debug ; then
+		dosym libtcl${v1}g.so /usr/${mylibdir}/libtcl${v1}.so
+		dosym libtclstub${v1}g.a /usr/${mylibdir}/libtclstub${v1}.a
+	fi
+	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	cd "${S}"
+	dodoc ChangeLog* README changes
+}
+
+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
+}
diff --git a/dev-lang/tcl/tcl-8.5_alpha6.ebuild b/dev-lang/tcl/tcl-8.5_alpha6.ebuild
new file mode 100644
index 000000000000..7fbe662f666e
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5_alpha6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5_alpha6.ebuild,v 1.1 2007/07/20 18:39:11 matsuu Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV/_alpha/a}"
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug threads"
+
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+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 125971
+	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+
+	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= emake DESTDIR="${D}" install || die
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/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
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	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 libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	cd "${S}"
+	dodoc ChangeLog* README changes
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you're upgrading from <dev-lang/tcl-8.5, 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
+}