Version bumped, Bug 117122.

(Portage version: 2.0.54)

9 files changed, 18 insertions, 206 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 8c9e4698fe1d..2da18356fbae 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2006/02/26 18:20:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.64 2006/03/03 16:09:32 matsuu Exp $
+
+*tcl-8.4.12 (03 Mar 2006)
+
+  03 Mar 2006; MATSUU Takuto <matsuu@gentoo.org> -tcl-8.4.6.ebuild,
+  -tcl-8.4.6-r1.ebuild, -tcl-8.4.11.ebuild, +tcl-8.4.12.ebuild:
+  Version bumped, Bug 117122.
+  Removed old versions.
 
   26 Feb 2006; Joshua Kinard <kumba@gentoo.org> tcl-8.4.9.ebuild:
   Marked stable on mips.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 880ae9b28341..e6171beb8061 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -2,6 +2,7 @@ MD5 dfb9da0067c6a3a07dc024ce6be6cd37 ChangeLog 7899
 MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
 MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11 66
 MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11-r1 66
+MD5 c8aa611da8e9cc0f331fde445f8ea43f files/digest-tcl-8.4.12 66
 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
@@ -12,6 +13,7 @@ MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
 MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
 MD5 0b8378f196b89bb5d3fce63d5dd6b21e tcl-8.4.11-r1.ebuild 3503
 MD5 57dee0c0856ba4776eaa46c4f14168d3 tcl-8.4.11.ebuild 3408
+MD5 67de51d50209ea662d4467aca5d1b668 tcl-8.4.12.ebuild 3511
 MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
 MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
 MD5 41ad4c4ba298af4bc2e184f2d6d37d60 tcl-8.4.9.ebuild 3422
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.11 b/dev-lang/tcl/files/digest-tcl-8.4.11
deleted file mode 100644
index 30bdbfe47fb5..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.4.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 629dfea34e4087eb4683f834060abb63 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
new file mode 100644
index 000000000000..bcdf774c3651
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.12
@@ -0,0 +1 @@
+MD5 7480432d8730263f267952788eb4839b tcl8.4.12-src.tar.gz 3500222
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.6 b/dev-lang/tcl/files/digest-tcl-8.4.6
deleted file mode 100644
index 61274224905f..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9009a92dc648775fb8a9b0789b995756 tcl8.4.6-src.tar.gz 3448711
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.6-r1 b/dev-lang/tcl/files/digest-tcl-8.4.6-r1
deleted file mode 100644
index 61274224905f..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.4.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9009a92dc648775fb8a9b0789b995756 tcl8.4.6-src.tar.gz 3448711
diff --git a/dev-lang/tcl/tcl-8.4.11.ebuild b/dev-lang/tcl/tcl-8.4.12.ebuild
index ea44baf00924..22675c2dd23c 100644
--- a/dev-lang/tcl/tcl-8.4.11.ebuild
+++ b/dev-lang/tcl/tcl-8.4.12.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.3 2006/02/03 01:33:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.12.ebuild,v 1.1 2006/03/03 16:09:32 matsuu Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
@@ -34,7 +34,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${PN}-8.4.11-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%%/*}
diff --git a/dev-lang/tcl/tcl-8.4.6-r1.ebuild b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
deleted file mode 100644
index 2973ef6f7c8a..000000000000
--- a/dev-lang/tcl/tcl-8.4.6-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.6-r1.ebuild,v 1.7 2005/03/21 18:57:49 pylon Exp $
-
-inherit eutils
-
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="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}/${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 INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
-		-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/$(get_libdir)'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
-		${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
-	mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
-
-	# install private headers
-	dodir /usr/$(get_libdir)/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
-	dodir /usr/$(get_libdir)/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
-	dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/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
-	ewarn ${S}
-}
diff --git a/dev-lang/tcl/tcl-8.4.6.ebuild b/dev-lang/tcl/tcl-8.4.6.ebuild
deleted file mode 100644
index eb86a6f72d52..000000000000
--- a/dev-lang/tcl/tcl-8.4.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.6.ebuild,v 1.17 2005/01/19 23:35:00 vapier Exp $
-
-inherit eutils
-
-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 mips ppc ppc64 s390 sh sparc x86"
-IUSE="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_compile() {
-	local local_config_use=""
-
-	if use threads
-	then
-		local_config_use="--enable-threads"
-	fi
-
-	cd ${S}/unix
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${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
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L${S}/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-		-e "s,^TCL_SRC_DIR='${S}',TCL_SRC_DIR='/usr/lib/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L${S}/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='${S}/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-		-e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
-		${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
-	mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
-
-	# install private headers
-	dodir /usr/lib/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tcl${v1}/include/unix
-	dodir /usr/lib/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tcl${v1}/include/generic
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym /usr/lib/libtcl${v1}.so /usr/lib/libtcl.so
-	dosym /usr/lib/libtclstub${v1}.a /usr/lib/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
-}