Version bumped, bug #208464.

(Portage version: 2.1.4.4)

5 files changed, 13 insertions, 137 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 0ea83a03db93..239656758491 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.92 2008/02/04 16:27:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.93 2008/02/16 04:43:07 matsuu Exp $
+
+*tcl-8.5.1 (16 Feb 2008)
+*tcl-8.4.18 (16 Feb 2008)
+
+  16 Feb 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/tcl-8.4.6-multilib.patch, -tcl-8.4.9.ebuild, -tcl-8.4.17.ebuild,
+  +tcl-8.4.18.ebuild, -tcl-8.5.0.ebuild, +tcl-8.5.1.ebuild:
+  Version bumped, bug #208464.
+  Removed old versions.
 
 *tcl-8.4.17 (04 Feb 2008)
 
diff --git a/dev-lang/tcl/files/tcl-8.4.6-multilib.patch b/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
deleted file mode 100644
index d193064ab607..000000000000
--- a/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tcl8.4.6.orig/unix/configure tcl8.4.6/unix/configure
---- tcl8.4.6.orig/unix/configure	2004-03-01 15:58:59.000000000 -0800
-+++ tcl8.4.6/unix/configure	2004-12-21 01:58:16.250206343 -0800
-@@ -7248,7 +7248,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
--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.6.orig/unix/configure.in tcl8.4.6/unix/configure.in
---- tcl8.4.6.orig/unix/configure.in	2004-03-01 15:58:59.000000000 -0800
-+++ tcl8.4.6/unix/configure.in	2004-12-21 01:57:58.059204301 -0800
-@@ -510,7 +510,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
--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.17.ebuild b/dev-lang/tcl/tcl-8.4.18.ebuild
index 9d9ae7388809..66df57b2898b 100644
--- a/dev-lang/tcl/tcl-8.4.17.ebuild
+++ b/dev-lang/tcl/tcl-8.4.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.17.ebuild,v 1.1 2008/02/04 16:27:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.1 2008/02/16 04:43:07 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
deleted file mode 100644
index 9c9e8291fd68..000000000000
--- a/dev-lang/tcl/tcl-8.4.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.9.ebuild,v 1.16 2007/06/24 23:36:14 peper Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-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 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}"/${PN}-8.4.6-multilib.patch
-
-	# bug 117744
-	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
-
-	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 ${local_config_use} || die
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd ${S}/unix
-	S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man 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='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{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
-
-	# 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
-}
diff --git a/dev-lang/tcl/tcl-8.5.0.ebuild b/dev-lang/tcl/tcl-8.5.1.ebuild
index f9382e478eeb..9bf13e834f55 100644
--- a/dev-lang/tcl/tcl-8.5.0.ebuild
+++ b/dev-lang/tcl/tcl-8.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.0.ebuild,v 1.1 2007/12/22 03:54:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.1.ebuild,v 1.1 2008/02/16 04:43:07 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest