--- /usr/portage/dev-lang/tcl/tcl-8.6.1.ebuild	2013-09-25 16:57:41.000000000 +0200
+++ dev-lang/tcl/tcl-8.6.1.ebuild	2013-12-25 21:46:26.426951221 +0100
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
 
 MY_P="${PN}${PV}"
 
@@ -17,6 +17,9 @@
 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
 
@@ -44,54 +47,55 @@
 		-i tcl.m4 || die
 
 	eautoconf
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	econf \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
 }
 
-src_install() {
+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${SPARENT}.*unix *::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${SPARENT}.*unix *::g" \
-		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/$(get_libdir) *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/$(get_libdir)/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/$(get_libdir) *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/$(get_libdir):g" \
 		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+		-i "${ED}"/usr/$(get_libdir)/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
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/$(get_libdir)'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/$(get_libdir)'|" \
+			-i "${ED}"/usr/$(get_libdir)/tclConfig.sh || die
 	fi
 
 	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	insinto /usr/$(get_libdir)/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/$(get_libdir)/tcl${v1}/include/generic
 	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+	rm -f "${ED}"/usr/$(get_libdir)/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
-
-	dosym tclsh${v1} /usr/bin/tclsh
+	dosym libtcl${v1}$(get_libname) /usr/$(get_libdir)/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
 
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	is_final_abi && {
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	}
 }
 
 pkg_postinst() {