dev-lang/tcl: Add multilib support, #496008 ; thanks Michael Mair-Keimberger for the patch

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 257 insertions, 15 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 1d0cd55cf6cb..0882105eac54 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.184 2013/10/10 13:04:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.185 2013/12/26 14:51:23 jlec Exp $
+
+*tcl-8.6.1-r1 (26 Dec 2013)
+*tcl-8.5.15-r1 (26 Dec 2013)
+
+  26 Dec 2013; Justin Lecher <jlec@gentoo.org> +tcl-8.5.15-r1.ebuild,
+  +tcl-8.6.1-r1.ebuild:
+  Add multilib support, #496008 ; thanks Michael Mair-Keimberger for the patch
 
   10 Oct 2013; Justin Lecher <jlec@gentoo.org> -tcl-8.5.10-r1.ebuild:
   Drop old
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index eb74a0a8e630..060073fc6411 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -21,25 +21,27 @@ DIST tcl8.5.14-src.tar.gz 4528533 SHA256 7494e94f1e195a505c542a3c50e01589d2f8bfd
 DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e SHA512 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df WHIRLPOOL da369146ccc1a449eae6b2fddc7802457c267b1ed047dba665b2684f27105a0763646b6a985e697891b3da9b3531a89f1ffb78168dc386c27889bcdaaa175e1c
 EBUILD tcl-8.5.13-r1.ebuild 3600 SHA256 4d94b08cc48df4d7bde64fa426bb5e6ce394ab60a26e34465e22f28995d4b600 SHA512 82871bdf9b5bd56ed493778c1f416536b587c8d011c19c3891d78f1a64bf59659ffc663e1d51b30410a0cd0bed74e95054493ec0687fcd02f6f2788756461540 WHIRLPOOL a8e654ec9ccb6345248cb3563fc4137a80ba1ca679e78a7dcaa3de64aa2c8a9303fef343919d57462def0690fd906025ab31bebdd605a5e7c445cbc0eaca5d67
 EBUILD tcl-8.5.14.ebuild 3616 SHA256 29fd1f6ac9ff718cefc9629f54e50a9986338a27c53c6a2a80fefa3faddfdbc5 SHA512 505ea1c497b2a3ae40777886fac41b247a4539e5663edd3eec5776cadde882d2fb9e03d6939b67138061eaed0f415b2325f8e020936be8418f4aeb70e0bfbd15 WHIRLPOOL 95f8289b5714f42f76c61dcc9b9262b13df0985417df331206aeb1407b9f525b34aec80a9abb942362aa47f0c1df1438b96d7988d74432297ae2d11aac11e5af
+EBUILD tcl-8.5.15-r1.ebuild 3724 SHA256 c073957eff43ff3c1ccc187599b48accb90e5a44e625984e400ec72e64b43dd2 SHA512 be6eb5ad82c3a4847e3ab9c08ce39d1c702405a43c0ba62adb4d9d7499cef37a06b513237e8179be14917570ec9a2103682e89a0b3ae71046464220b34177c08 WHIRLPOOL 9b18f1c578262fd320ce467187cfe0057b3ba26f9d740afbbfe8ae801be3e749c863284ca6808833751f6f774f26f1e70d0f1ec6c79287ef96377362ff949ec5
 EBUILD tcl-8.5.15.ebuild 3624 SHA256 2cdfc000fdb4a8bc692552b8d2f9bb9397f73997a5f10b067e66239d4e4202cb SHA512 ec9f932a878359e3245757e5be15b6ab77d38fce5b2b6cf1b8ac4065cf2ea54262a0e37b55fc2807fa283329f1f1a6ef54d72f0dd850b7d9e8e96de7e9a3f91a WHIRLPOOL 7610f4b09ad5d24958a98bcfa09b41e561c277143ee16b6017801b1724229235590b0836c17dcc26dc2845a31c5e46c15333c35feb4a791a9d7279fb90e59c8a
 EBUILD tcl-8.6.0-r1.ebuild 3479 SHA256 59a0a49b2658fea174c8c26e08cef25fc580ea8fb5d7e9ac4f38a37c1512b222 SHA512 5ab5dafd792b111b4e0bd86d857bae330aca4cce24cd650b49d18955436ccd741ff6019dcf77b99100142603b8999b00f90bb691f474657f3009846ea3573e3a WHIRLPOOL b0d86f7265525d43146f28de08c34bfdfc71ca7a64ca7d8a62e448f0a11acfe39cb168d419dfc5f959396b3a1ec7a0c739f7d6a770f829bcab549c739a100a32
+EBUILD tcl-8.6.1-r1.ebuild 3577 SHA256 de730cce46dff1e29a9586047db1059bfbdf60e2567051001fe4cafe97e16bca SHA512 9c726aa23b591fa7f989d52d158f34cf29b0b10f7282f6d08b7e322b13bb7b5f864bb502e4d6a49f572a8c4b80a7086c05e67430697eac7c9a9c1c3e33dbc1eb WHIRLPOOL e91087b932bb6243ca91c5a07438dda675f430dd6e994110c4761d9e47e746c086cc07ab965a8144ef23495f4340b13db06bde81e49c94540f88921aa37bfd22
 EBUILD tcl-8.6.1.ebuild 3465 SHA256 c83aba6ebbb68cf14d31f73f3ed898b55bdb5fd7ef2755b5c61ece517ece3a20 SHA512 2aacbb6e6320a5a38a2f0a492edd911bc8524868ffab2be685b910390646d3bfe1258066fa8a136c4650d73376978656f20e6aa6c0f5470cbfb669419ae0a5e4 WHIRLPOOL 2165e720b723b81f9e7836f6a14558c731c8f28d52d16a41016d152069c81c08bf64b55b773534e28484c9ac21951edbf38abf036a1656e262d94a4c09c450b9
-MISC ChangeLog 23684 SHA256 a6bb02cce6c51912a81e1bb20b0cd9dd6ce94fef502dcd58cdd6681d477176ce SHA512 971b3f63f116a621747597eabe704e2847e3c5d847a382fdb84fcfea13219b4fcca5b1fe8ff568dcb7878bbd80bc3935045e20b20fbcac5b6e9b02d28b00b15f WHIRLPOOL d7a7cbef78e2c061db5e6d039ec6c8ab37939699df9e3c3643b7e12fda33207821f5be883248a91934c7df4093096b0cc4aaa4221ba0f956fe3f3ec3849e98db
+MISC ChangeLog 23916 SHA256 6d8eb2b169115f678633d53ae1998f2126860962848a722cd22c90c79d2f0f84 SHA512 439cbad25d2b62b79eab19a7491f97137f6b6f8fb01ecff65bed84317c95929bca479406bbd5e4ea69aee286db47486c20946dea41e91815545b800627fc4619 WHIRLPOOL 90139b32530303d23e2feb753de7bd893942cdcce49f1d585cb863e70ac8410d2d927eae948c85b97e1865b26f74688706254aac8478b6ae9a03201ae0c9abe8
 MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSVqX0AAoJELnU8jG9FVirMaMP/RC0piOEXYVd+Nz9ruTElOdS
-hVF4qTDFJn6kXTrvOwQ5/ib5jmgURP6Ea6uYhmGj2vg7eY/FXJxNF9wEIWdBtciZ
-Eh5U8leIW9V8eU5rBZdCR246LPut3g4IA2ZpLlVtamoO6SR0D9gC07qYHrRIbxgc
-e+WmaaiGrJI6c+s3yxY/pyqYxOpQVpA4hhfAQT4FhBFWedeQpsDWPTXvy52vEb0R
-FeLf46L8zK2NDIRGVK8PAz9WIQNFwU82hcpG5nyS5ddJkD7+Wu9bNoqFIIQuRucJ
-cmmW9D/SUDIT6rthGUO4X1BgZnW7NPSsbTC5/Ww9pW+/I3wEmoVdFZc3DHInRnl+
-eYD6InuPOLRUffKnJmmeOu/hk/al0gI2IamIL3XoJ6maz9a1FisD2pjXkS9GCJ26
-RMNid++jZCO6zqyZGsFYPKJnPhZdetnQ8HYDgej8rc8Zkb+tDtXPFxios90pgrab
-Ef5odZdTST0ArxggQZnh9G3Ntdg1wcty/4P7rebqhoSH9AW+Jrbhf/LVYRwf91Wb
-W8RReNm8KtEmRufXGvv0plReX+rJSJY35w8BPsk+lMIwW6y7KMJlarq3gt8JsApR
-XGgKcscpskPJPvRrZQKkG8kQ3GVbKRYnNN+AtD6gmst7io2lyYdKzkX+huLU8NtU
-2XcVD0Pdt66rATI84/sh
-=QH7X
+iQIcBAEBCgAGBQJSvEJsAAoJELnU8jG9FVirEEYP/2nCG/2llWPNNiXa3nRcE/In
+wTYL2G9j8URXxv7dV/leQ+wilnNPFC0kFMsOqWM0lGrQlw+wsIwY9/ngw+J+vpYR
+8hBH8teaV41nVVPlT04h7Iqd23BYAWoV3+hTEEcgOXI3CzO9DraGgUTvM0BvcmSr
+E2bTHY/IJbYsziXSr3YitMHFyPFwGFOtZ/mZnhSeTHSWQuVYdbBPcTuju+j/c5/q
+tvTLMCrB2Qzylf0SSIO4LFVNclerp/DR97ezBgNBxaq6gYwFQr1Vz7E3PSKkx1uP
+AbLcBRLF8TGtTSZdT4dPWtJjqbtre+GEj6ILAyaGS3msG1mdouJ+2xp6I5aIjYmY
+5fSVlydVk9BOOL8xXEOKVDK7USwdbSMDBWfsmqjFkc2fktOF6txfF9dED4su0NAv
++eXWewNLsdk8RzKlHGjUxZ2NBZ7YPHCh2mjvp4jWgcj4vNwvobBFYxjujkmWKMnJ
+BcriZQZVqdF/WBGZBFFdQaLfXgJoV/zAT8tFu+1S3WGuhivIVUocbuqsEvskXc08
+ELlj8vMi5eHct+Rgb91JftGHg9nNNGbQEBALR/jQ1WZ/B7jMlfd3JA7BDiW/KJ5g
+Z4IVxSIbTshBKgLUMrLTnU7ZYZVEluHeN/VAO6knpOpiA2rs9bH31kPoyJ+aOlPp
+gzLVprFmKsWaEsO5ZRIJ
+=PEvl
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.5.15-r1.ebuild b/dev-lang/tcl/tcl-8.5.15-r1.ebuild
new file mode 100644
index 000000000000..e488ef74bbec
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.15-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15-r1.ebuild,v 1.1 2013/12/26 14:51:23 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+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="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+pkg_setup() {
+	if use threads ; then
+		echo
+		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."
+		echo
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	eautoconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	is_final_abi && {
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	}
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.5 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, 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,"
+			echo
+		fi
+	done
+}
diff --git a/dev-lang/tcl/tcl-8.6.1-r1.ebuild b/dev-lang/tcl/tcl-8.6.1-r1.ebuild
new file mode 100644
index 000000000000..6951eab5d039
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.6.1-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1-r1.ebuild,v 1.1 2013/12/26 14:51:23 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${P}-conf.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	is_final_abi && {
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	}
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.6 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, 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,"
+			echo
+		fi
+	done
+}