Version Bump

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

3 files changed, 130 insertions, 7 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 2796486ad480..873292d315f4 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.139 2011/08/05 08:20:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.140 2011/10/04 16:59:29 jlec Exp $
+
+*tcl-8.5.10 (04 Oct 2011)
+
+  04 Oct 2011; Justin Lecher <jlec@gentoo.org> +tcl-8.5.10.ebuild:
+  Version Bump
 
   05 Aug 2011; Naohiro Aota <naota@gentoo.org> tcl-8.5.9.ebuild,
   +files/tcl-8.5.9-gentoo-fbsd.patch:
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index d3c7b1247a80..57115757e9bb 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -12,21 +12,23 @@ AUX tcl-8.5_alpha6-tclm4-soname.patch 486 RMD160 1795d442bf8ced0804d6aa364f628c5
 AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 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.10-src.tar.gz 4498413 RMD160 9b192388e74e46a4972d18c24b70b1a3d70ceba4 SHA1 e6c894d3b8cbcbfb7293a2e0c5e2cd15e178be2e SHA256 f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7
 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
 DIST tcl8.5.9-src.tar.gz 4469603 RMD160 d858c4fbe1a75bef9c4a4c03e50d8aa807a9d28b SHA1 ae87c5e58ba20760d9bc77117d219bbf1b6a5557 SHA256 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
 EBUILD tcl-8.4.18.ebuild 3590 RMD160 542eb68de305f6245e9b782967d8421b39ffdc42 SHA1 53e99c2bf2df2d69ea4f51c33d0217c0c3b41be9 SHA256 f95cd847bef526d992d8a7fab0473c29d411292b32a509cf0fd1924e06d898ab
 EBUILD tcl-8.4.19.ebuild 3601 RMD160 a928a5b8f0a1fc55eb99d54f38b9f599b0a221b4 SHA1 e4e7f69194d76de0fe1142a2e9ad491c407b3bf9 SHA256 43167a1314f2e33222c22121ddcb2fd15fbcc8dfd925238f74b7fea4cbe90208
+EBUILD tcl-8.5.10.ebuild 3649 RMD160 da6bcfccb4e2717767a21735fd147c9024cbceae SHA1 3e0f339319b411e924e40ed5bc78f26d30073231 SHA256 45def8dff4a6c95d202333953b9d8dc681c3f164c45313aa4717ca3fb531ac60
 EBUILD tcl-8.5.7.ebuild 3268 RMD160 4eddf2f2989e2d699d0b9dfe3714c874be77ea84 SHA1 a1549dd5e71c0c26a9c4f7a3bbd0691c95ea7192 SHA256 ac4b0d10918aba4fbbdc8574fe83b49f365f726ce2dd1fe54d07044d642a0750
 EBUILD tcl-8.5.8-r1.ebuild 3559 RMD160 38e2cb252b8dfba611458a1de310fa1089b6ee33 SHA1 510cd4f2b289e61d524b85197f8354a8ed479955 SHA256 8b1f31c94e6073af9e313edaf5eb4505402e22767b6a12293f8536e9ac84c28d
 EBUILD tcl-8.5.8-r2.ebuild 3631 RMD160 293406b38576a3a48b02dd5683e11bcff15fe115 SHA1 5e28f2ae943a4538286bf2f8d2cbb4ecaf13f790 SHA256 e0e18149683a7357409d49b438254d92d4290c2d3fdea169bcc7fbb1241c29e8
 EBUILD tcl-8.5.9.ebuild 3637 RMD160 3b2c3ecd047c916512d8b0595d14dc870d55586b SHA1 3772f69827f560b31e42b5551514f09a2794b504 SHA256 2eac249ebc62f2ea0e58ee0734b505c9350440e2dc716ee18c6fb81c241012e4
-MISC ChangeLog 17583 RMD160 3e54f0bf7e4881b711a3636a776beddc9155fa53 SHA1 6d12df7ac747883850f7b591b1011caca05c01b7 SHA256 851fb4a094c98efa3b93aab99f1386ad959cfea2de526747f58c2e05c1a5848a
+MISC ChangeLog 17692 RMD160 da8a33e7fa04fe3cc7df2ad698c8193b74dbe7dd SHA1 c2fb6d426f562b7ffa0d84e9870105a369a9e2b7 SHA256 e33bd7b928133e9d5610812130d2692630e90846a1d2b2e5813f3b99fcc33da4
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk47p9cACgkQGpDnPLSHuMD0NQCgzrepmI7hEREcQ2hZPsf+9VoB
-YR0AoJeo5fqCpJiYYdOkW+xInGFYlQEd
-=cccL
+iEYEAREKAAYFAk6LO3gACgkQgAnW8HDreRZmPACgvWmgJflj9rH+fcS4U++L5Bld
+vO4An3bAZoGnooGMJrDNHuX4ZnnoBSfX
+=913R
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.5.10.ebuild b/dev-lang/tcl/tcl-8.5.10.ebuild
new file mode 100644
index 000000000000..c9bbfa8d4cda
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.10.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.1 2011/10/04 16:59:29 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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+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 ""
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_configure() {
+	# workaround stack check issues, bug #280934
+	if use hppa; then
+		append-cflags "-DTCL_NO_STACK_CHECK=1"
+	fi
+
+	tc-export CC
+
+	cd "${S}"/unix
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_compile() {
+	cd "${S}"/unix
+	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${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\"," \
+		"${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 "${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 || die
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
+
+	dosym tclsh${v1} /usr/bin/tclsh || die
+
+	cd "${S}"
+	dodoc ChangeLog* README changes || die
+}
+
+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
+}