Version Bump, #347561

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

9 files changed, 69 insertions, 174 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 9cbfe7c3f8a1..7acda33ab0d0 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.127 2010/11/08 13:16:52 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.128 2010/12/06 16:15:24 jlec Exp $
+
+*tcl-8.5.9 (06 Dec 2010)
+
+  06 Dec 2010; Justin Lecher <jlec@gentoo.org> -tcl-8.4.15.ebuild,
+  tcl-8.4.18.ebuild, tcl-8.4.19.ebuild, tcl-8.5.7.ebuild, -tcl-8.5.8.ebuild,
+  tcl-8.5.8-r1.ebuild, tcl-8.5.8-r2.ebuild, +tcl-8.5.9.ebuild:
+  Version Bump, #347561
 
   08 Nov 2010; Markus Duft <mduft@gentoo.org> tcl-8.5.8-r2.ebuild:
   added ~x86-interix keyword
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 7af941c57e0e..703751cf000b 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tcl-8.4.11-multilib.patch 1808 RMD160 fb26bcbc63a3fb79dc2793af35f64b4dc189fe24 SHA1 21b02ba0c68ec512a9225b2822119624321b30db SHA256 4925265d9fc72077d94ac23420671a4a0403cb0bad1be1dcc5d945e7bef5629a
 AUX tcl-8.4.15-tclm4-soname.patch 477 RMD160 65326daf481e3ac425eb4ba9f9495dc122b7964a SHA1 7c664afeddfb3bf51fa52104cca047f6e421fcee SHA256 2130b8b5fdddadfca35b74e9432d2651733e4f1c7b13d66ffc87b6995865076b
 AUX tcl-8.4.16-multilib.patch 988 RMD160 b674f7c4c78a89b3435b2b04831f974992c5c369 SHA1 ea83b70443ede2d52a2ad35a3c5e74a666044693 SHA256 6df0027ee02c1f458e8ae5f07538e0838317d72d028c6e1af97e8433d866b0ce
@@ -6,17 +9,23 @@ AUX tcl-8.5.8-fortify.patch 633 RMD160 2601056b5a92d5bb038ca81347de16ea1b650925
 AUX tcl-8.5_alpha6-multilib.patch 830 RMD160 e99162cf85299e44137c87c482b9d27f767f38f0 SHA1 c9de5b434aa2b479557e6be4db5dbb62ebcb2fe8 SHA256 5686025ce4e685afcf06cafac591a91a5ccd10f952c422cf01b4f72263023d55
 AUX tcl-8.5_alpha6-tclm4-soname.patch 486 RMD160 1795d442bf8ced0804d6aa364f628c545eb791f8 SHA1 9a7c9ed07eb1394c5ba16a8a41f9d47428414ac4 SHA256 af3c3ea0b0d6c37c666d2fb54cd9891c273c90ebaea4a4707583076faffb2925
 AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
-DIST tcl8.4.15-src.tar.gz 3635163 RMD160 b6b41cb5ae18744ba5aa7fdf3d64277d97d8546e SHA1 fbfae3ca68633a10b3fe870018588ade0944caed SHA256 84670f6a3647bc4e3608ab4630621a84caa8e35b0dda017d6beea2b06940afad
 DIST tcl8.4.18-src.tar.gz 3653369 RMD160 735a9cc0575585de70cbd3cb2ff5c97d46c1dfbd SHA1 83b04c3ad092c22507869dec3a5c7ba821f109b0 SHA256 dee273cba588ec9190f0ee3dfe917be49c52ae847f20c3aa72461546451df0a4
 DIST tcl8.4.19-src.tar.gz 3658647 RMD160 6e3d2991e8e44a2e32f0da8fdf7ab07aa9b8202f SHA1 ed25c5a206bcd603c2d5e58790354b9be178f331 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
 DIST tcl8.5.7-src.tar.gz 4421720 RMD160 1bb843548c05332eb3404b99b4800613f25a9dbf SHA1 a603d27bf0b854739c99f0d658bfc3f1c485f578 SHA256 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2
 DIST tcl8.5.8-src.tar.gz 4452127 RMD160 dfba63e9a3896350b88f592301fbe6669a60b5c1 SHA1 21de27a24633c7550383bc7c35736e9acd5cb3a8 SHA256 6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7
-EBUILD tcl-8.4.15.ebuild 3521 RMD160 6ce2fae9e2dabab1fe0fc60ca06847443bdf91f1 SHA1 591bb89518fc289498f8a528534a35f831cbb4cd SHA256 960ab873e207dcc45057ec500c51a5df8c42e38f9752b840a7994788d8bb38b0
-EBUILD tcl-8.4.18.ebuild 3616 RMD160 0e692057dc06d804d2e135f3d9fd34592066a5a9 SHA1 3498973d4ae81b61ee34210fdb1cad7a6368ac6d SHA256 533956e3efd4d579e3c34e2a6c0b6be191788b7018203aa8b9ae8a6a7d8da74e
-EBUILD tcl-8.4.19.ebuild 3627 RMD160 7abc5e056c8b826e8a2c5c0831098136e7970249 SHA1 048455a731e94bfa9c0e7a00a05bee293983e3e9 SHA256 69a6c8f859a0b618ad2efcbe46fbdb2a02603787c56ec0728a6962d3ac7a0839
-EBUILD tcl-8.5.7.ebuild 3293 RMD160 446a3decdb73bdafebceafae2307b4bd8cfa3254 SHA1 a36ffa5cd1ac5f46b4843cff91626b39724c4339 SHA256 e8d85e915f11eb2fea254ae361e682cd929f57d3588cc495c67151357c675af9
-EBUILD tcl-8.5.8-r1.ebuild 3569 RMD160 0a462b2d7dfac7022813d7375138693354e5bcd3 SHA1 5e0e65af2a36d7459a4847eb85cc6931e0808ef0 SHA256 5ec3e01b4ac5d457c39e2937480acce0799c0e58131e0bf149cc933f7b5baa9e
-EBUILD tcl-8.5.8-r2.ebuild 3641 RMD160 6b901e2c4b66c621015c0047932a036e9c004d17 SHA1 91e783cc9cd11ddbe73474d4346fafc5f8167869 SHA256 131e599fa95c6c628e5c625df35aefe5c9f0c42ebfe8ceb6bef561bad5912fb9
-EBUILD tcl-8.5.8.ebuild 3304 RMD160 7dc5371797c0d561ab06732a68e0f61e8042b174 SHA1 5e27053d4a9b289dc0f1f81a2b6e9011cfb4d963 SHA256 c986c410052bd0bba1bc100e67e2c404d6452f83c96446f4f7209bdb909e3933
-MISC ChangeLog 16030 RMD160 1d22564a3a8ae221e4d672db02fa856efcf40c42 SHA1 ef65e9b4c45d9c98dfecf94e7e94cc908f374f20 SHA256 345dc7ff4d1f141c4a733617926b10f98187671bec0040f6826dc8f23d950191
+DIST tcl8.5.9-src.tar.gz 4469603 RMD160 d858c4fbe1a75bef9c4a4c03e50d8aa807a9d28b SHA1 ae87c5e58ba20760d9bc77117d219bbf1b6a5557 SHA256 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
+EBUILD tcl-8.4.18.ebuild 3592 RMD160 49c8d0fb27091543f8dbe1f5e4d51ce1e53b7ae2 SHA1 c479e86962f4004a3a083439cb4f56eff9410af9 SHA256 b6b0f3037e532616096edc29f82d47d8ca9c84d9111ba1c4bfff78670619d7ca
+EBUILD tcl-8.4.19.ebuild 3603 RMD160 86757a74d5e5b4e983f3593f428daeaded86cc21 SHA1 6cf332e5be575710015a0363fd1177fd378bbc58 SHA256 4b45c0d54f1c8552537830ea760d0ca2203667aa342fd96abdd27aa97660eea9
+EBUILD tcl-8.5.7.ebuild 3270 RMD160 761243b303803944871fe45ba9e1af8b6e12fcbf SHA1 ff0f32781f1e430edb09fc92610cbbc4b7323179 SHA256 e7f02697e96499a6b13b5c76796e4aac33dee931a47a391269a78bfc4aaefa0d
+EBUILD tcl-8.5.8-r1.ebuild 3561 RMD160 c1e0c8ed4ef6ef46a0bd6cbcf16bb8c45856657c SHA1 0b8cebd867381f68db0606264a023e10d3402f46 SHA256 1d19819b8523af011be71d572f3c1da28ced245f25f72da898868cf461dfd14e
+EBUILD tcl-8.5.8-r2.ebuild 3633 RMD160 6abd59c799af045bee547aa37d0977927ee001c1 SHA1 2457498b740239f9b60c5d1775ddd4ef3aae4868 SHA256 a37613eb8362428fd352b26d53135f6f16af1d452a98943d8ea8d7334146ec82
+EBUILD tcl-8.5.9.ebuild 3581 RMD160 04a4ee2299531d96a2818d09347d4447dc8dbc39 SHA1 a15069e52fbc006f37d36fb55374741606b104eb SHA256 51c2178fe7bbca280e47bf7e13b53473b07c2c687ac2533db41f67b7cd993baa
+MISC ChangeLog 16287 RMD160 291efff0613b6a8ad0949295418d373a96f6a0c6 SHA1 bd50ac0b3bff6465b23cb96a4d9bb5d552aba556 SHA256 87c12c1893d99852b2e4dbdce1fa13aa7e7127072cf9c9c169ecae615a9c573d
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz9DCIACgkQgAnW8HDreRZQSQCdGY94xQ6E2vHOAxDH9Ur9CR0j
+YeMAoLHrlCGksbDjx8R73Bl6O7o266b4
+=Jd1D
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.4.15.ebuild b/dev-lang/tcl/tcl-8.4.15.ebuild
deleted file mode 100644
index d0e613893af4..000000000000
--- a/dev-lang/tcl/tcl-8.4.15.ebuild
+++ /dev/null
@@ -1,119 +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.15.ebuild,v 1.10 2010/06/15 23:46:51 mr_bones_ Exp $
-
-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.4.18.ebuild b/dev-lang/tcl/tcl-8.4.18.ebuild
index 23a8ed5d9713..b8977f194621 100644
--- a/dev-lang/tcl/tcl-8.4.18.ebuild
+++ b/dev-lang/tcl/tcl-8.4.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.11 2010/06/15 23:46:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.12 2010/12/06 16:15:24 jlec Exp $
 
 inherit autotools eutils multilib toolchain-funcs
 
@@ -13,14 +13,12 @@ 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 ${PF} with"
+		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"
@@ -62,7 +60,7 @@ src_compile() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
 	emake || die
 }
 
diff --git a/dev-lang/tcl/tcl-8.4.19.ebuild b/dev-lang/tcl/tcl-8.4.19.ebuild
index 0bee571e5297..81ab667916ac 100644
--- a/dev-lang/tcl/tcl-8.4.19.ebuild
+++ b/dev-lang/tcl/tcl-8.4.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.19.ebuild,v 1.3 2010/06/15 23:46:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.19.ebuild,v 1.4 2010/12/06 16:15:24 jlec Exp $
 
 inherit autotools eutils multilib toolchain-funcs
 
@@ -13,14 +13,12 @@ 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 ${PF} with"
+		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"
@@ -62,7 +60,7 @@ src_compile() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
 	emake || die
 }
 
diff --git a/dev-lang/tcl/tcl-8.5.7.ebuild b/dev-lang/tcl/tcl-8.5.7.ebuild
index 96ee13e6e4ae..2907f6a82f9b 100644
--- a/dev-lang/tcl/tcl-8.5.7.ebuild
+++ b/dev-lang/tcl/tcl-8.5.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.7.ebuild,v 1.13 2010/06/15 23:46:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.7.ebuild,v 1.14 2010/12/06 16:15:24 jlec Exp $
 
 inherit autotools eutils flag-o-matic multilib toolchain-funcs
 
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug threads"
 
-DEPEND=""
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -54,7 +52,7 @@ src_compile() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
 	emake || die
 }
 
diff --git a/dev-lang/tcl/tcl-8.5.8-r1.ebuild b/dev-lang/tcl/tcl-8.5.8-r1.ebuild
index b992842b4f20..33ac2f50a1a3 100644
--- a/dev-lang/tcl/tcl-8.5.8-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r1.ebuild,v 1.9 2010/10/24 15:30:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r1.ebuild,v 1.10 2010/12/06 16:15:24 jlec Exp $
 
 EAPI="3"
 
@@ -51,7 +51,7 @@ src_configure() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
 }
 
 src_compile() {
diff --git a/dev-lang/tcl/tcl-8.5.8-r2.ebuild b/dev-lang/tcl/tcl-8.5.8-r2.ebuild
index 9bfa4de07b45..141f093c9b53 100644
--- a/dev-lang/tcl/tcl-8.5.8-r2.ebuild
+++ b/dev-lang/tcl/tcl-8.5.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r2.ebuild,v 1.2 2010/11/08 13:16:52 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r2.ebuild,v 1.3 2010/12/06 16:15:24 jlec Exp $
 
 EAPI="3"
 
@@ -52,7 +52,7 @@ src_configure() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
 }
 
 src_compile() {
diff --git a/dev-lang/tcl/tcl-8.5.8.ebuild b/dev-lang/tcl/tcl-8.5.9.ebuild
index 32a74355ede0..80fd21d5bd44 100644
--- a/dev-lang/tcl/tcl-8.5.8.ebuild
+++ b/dev-lang/tcl/tcl-8.5.9.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8.ebuild,v 1.3 2010/06/15 23:46:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.9.ebuild,v 1.1 2010/12/06 16:15:24 jlec Exp $
+
+EAPI="3"
 
 inherit autotools eutils flag-o-matic multilib toolchain-funcs
 
 MY_P="${PN}${PV/_beta/b}"
+
 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
-DEPEND=""
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -27,13 +28,10 @@ pkg_setup() {
 		ewarn "that compile against tcl. You use threading at"
 		ewarn "your own discretion."
 		ewarn ""
-		epause 5
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
 
 	# Bug 125971
@@ -43,7 +41,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# workaround stack check issues, bug #280934
 	if use hppa; then
 		append-cflags "-DTCL_NO_STACK_CHECK=1"
@@ -54,7 +52,11 @@ src_compile() {
 	cd "${S}"/unix
 	econf \
 		$(use_enable threads) \
-		$(use_enable debug symbols) || die
+		$(use_enable debug symbols)
+}
+
+src_compile() {
+	cd "${S}"/unix
 	emake || die
 }
 
@@ -69,32 +71,34 @@ src_install() {
 	# 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_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/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
+		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	[[ ${CHOST} != *-darwin* ]] && sed -i \
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
+		"${ED}"/usr/${mylibdir}/tclConfig.sh
 
 	# 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
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f "${ED}"/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 libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
 
-	dosym tclsh${v1} /usr/bin/tclsh
+	dosym tclsh${v1} /usr/bin/tclsh || die
 
 	cd "${S}"
-	dodoc ChangeLog* README changes
+	dodoc ChangeLog* README changes || die
 }
 
 pkg_postinst() {