gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-tcltk
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
248 files changed, 5827 insertions, 711 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 7c0df1c8357b..21c48037a56f 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/anigif-1.3-r1 b/dev-tcltk/anigif-1.3-r1
deleted file mode 100644
index 3f411643b8db..000000000000
--- a/dev-tcltk/anigif-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/unzip
-DESCRIPTION=Image rotation package
-EAPI=5
-HOMEPAGE=http://cardtable.sourceforge.net/tcltk/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=tcltk
-RDEPEND=dev-lang/tcl:0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/anigif-1.3.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=085ef2b3c509381f31d36a296957e283
diff --git a/dev-tcltk/anigif/Manifest b/dev-tcltk/anigif/Manifest
new file mode 100644
index 000000000000..246c33786b34
--- /dev/null
+++ b/dev-tcltk/anigif/Manifest
@@ -0,0 +1,3 @@
+DIST anigif-1.3.zip 18270 BLAKE2B 02d154165d3d7b598e2ee6b0a537ca9a80b02c449a26aedb92aa4d7692e8443680fd55526fd4760757ca0686867475760ba2351baaf1be8592aff05215402c31 SHA512 d9611319461cd4a956eaacbbd63104594fc20752731a9dc314934409a1705d822738f266f4dd4419cd966ce4161148a74e9607be4ed734cb6b715ad00b4743ab
+EBUILD anigif-1.3-r1.ebuild 490 BLAKE2B 20a3c6015085dce1aeaa3f09130cedb899897fa7b08253ec7c45e02dfd4a347f048a8a9f20f775d349eb6b0cba84d001d36863fd537be717d16fe64bf342c4ac SHA512 ea21283209cd69e8fa1b0c87e3e8e75a6e7f099cd6117d60ca67cd9e697898de5e9fd80c39a7c612ff19c94772b74e0b6d4ca1d07ec68b974925191ce5b10f09
+MISC metadata.xml 251 BLAKE2B acd83d9f4b3e0aad8b344a89bfa05ecd317bafb67e94b6419126a240e3c1318b28fbcf0354b33a4c53de3dfb13a7dab86db1160210ce830aeaf6247244cc5cee SHA512 41c00844e2a94c1a10e3e18e835452e4eb171b62606f850305a8b24bcae57c201ab093ac7fc330e39c796e08a648cb8de98a0ca95a0dfc063ec5bafaa93f0790
diff --git a/dev-tcltk/anigif/anigif-1.3-r1.ebuild b/dev-tcltk/anigif/anigif-1.3-r1.ebuild
new file mode 100644
index 000000000000..21f658b0bee9
--- /dev/null
+++ b/dev-tcltk/anigif/anigif-1.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Image rotation package"
+HOMEPAGE="http://cardtable.sourceforge.net/tcltk/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.zip"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/tcl:0"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *
+}
diff --git a/dev-tcltk/anigif/metadata.xml b/dev-tcltk/anigif/metadata.xml
new file mode 100644
index 000000000000..a8cd1c3ffe87
--- /dev/null
+++ b/dev-tcltk/anigif/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">cardtable</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/blt-2.4z-r13 b/dev-tcltk/blt-2.4z-r13
deleted file mode 100644
index c84d8ec1a25a..000000000000
--- a/dev-tcltk/blt-2.4z-r13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc commands
-EAPI=5
-HOMEPAGE=http://blt.sourceforge.net/ http://jos.decoster.googlepages.com/bltfortk8.5.2
-IUSE=jpeg static-libs X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5e48bbbb7d0e6e26f25fb904c79e17e
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
new file mode 100644
index 000000000000..2dc9dc163313
--- /dev/null
+++ b/dev-tcltk/blt/Manifest
@@ -0,0 +1,14 @@
+AUX blt-2.4z-aclocal.patch 1705 BLAKE2B b6a60380857ad7a70fdf77587f726a7e55e159a9b7ccf9be743ff1594c35ed8d4a43b7c0b7206e245e6df999a3dbf8b6f80cf766c711333c2824c936d97d9891 SHA512 dfc4eb375b12d8ae87a65c039bae6445b70008ff1681cf1a40028a04685bbfcbb5dc841b25b475285679aac9303e0807f88c061f983a26a3de66fc1e1dc2ad12
+AUX blt-2.4z-darwin.patch 1186 BLAKE2B f58e5105e0655d4548d919a5dd95f6e8ea49d3d37cc1e8f4553ead2edf1244eec8a532d49409757a21c766cfba397e90bb8ae7008675fedbe665fff8178de8a0 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5
+AUX blt-2.4z-gbsd.patch 1980 BLAKE2B 2b629aff5a63c8a42bcbf8f8b1922be01f3e5239ea7a0a55ecdb3f3cef67fd0b988ed063fd6fa110ad0d6a912f28f1c432f0d25610b2ec54add1158c694075a4 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c
+AUX blt-2.4z-ldflags.patch 1086 BLAKE2B 351e459f3ca67a49f77875ddfb1a36cccc859fd8c537bb6d14b5d85d5c3ea5766ba242974de007cba515c13c7550dc3a76318fabce3fc5404c7a900a5566a38b SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445
+AUX blt-2.4z-linking.patch 684 BLAKE2B 1125105c5d8891412f31b966673f876ae8b36fe4349e81e7349dbd7636a49ddbcdbebbc68b78966ad86ff67f75b7236d724ad920176e2991cb8e77a2c07bb0b4 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e
+AUX blt-2.4z-r4-fix-makefile2.patch 728 BLAKE2B aa71cba7b9fae1f546838a722d44c3e276ed88f7417029d3c2b3c88c35c5e6071a73ee63e58bc66b03ca9a9a9fb144ecee1da1a671b75be69d423dd4a12c76c1 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681
+AUX blt-2.4z-r4-fix-makefile3.patch 509 BLAKE2B 54470814577ac56e3ec576d1d07bcaf392a5fc6436d2510adcb3d4eaa51ddf5168b4c0f9c5095b5d62f16dab551498ed79fd78433c6b5115e36801321f84ab47 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4
+AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 BLAKE2B ee98cfbffe662797c6da757f727044501e3689f21bbf0083a05c4b92a05780c93f12edb759286349aeaffc6276115bebc4462ab03903fd24543c455bdb93fc86 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41
+AUX blt-2.4z-tcl8.6.patch 3281 BLAKE2B bc4963adc5016d8b2606d357538ed6a2940b2e47f6bb4cf1e8e51eb39b3ee1e2fa0a0344719b5687fa2e85c1b3abea312431c7e8fcf90abd72cfcb1ae742f803 SHA512 38aa7a7f38e4ae98adda97948b3a0adb0747e4b8966b493efb87268717636c47a79ccd31caa73f44fb7e673e3d51b4552a23ad1b1a0360327fb678327814840c
+AUX blt-2.4z-tk8.6.patch 781 BLAKE2B 46e29dc6390033981e9db351d8d00503c37c45a0f7c6777f6d18c1855a143f11be3cb7fd4fde8b26e33c266ba74eb4e7ba32d53cfc7a63b4319004b0f4544f08 SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602
+AUX blt2.4z-64bit.patch 891 BLAKE2B ddf77f3a5d47a5252271e57adff1afeb9a4bca868a89c4060a13b7c494355499cd14238a5087cd6da43e7f589be8894f7cbdedb2d04c7ea004a7193da63e2c8f SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4
+DIST blt2.4z-8.5.2.tar.gz 2326234 BLAKE2B 83ea57989ee1e7bbbc243058b1a734942c4b6d796d06aa3a702012ea8d01eb059e76b6b8ff0efc9b43b000f1cfe7545419e2d892f1794b2add3d8c2c602e22ba SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a
+EBUILD blt-2.4z-r13.ebuild 3567 BLAKE2B 5171c823736a61120eff394735f13a24ee0c485e5a15c65afd77c6725cff1b48f2f0601e220256da01fd22595cf7ad9b5c3395d8aee876aa155942e4e9a3c8df SHA512 5e01b7863ce3797d9083193f4cc49cf1ab46dc0ffd906f3b193d871931deca3c49aa5dec2015a9ad67f9aba86e6c4e485b2e65ff4c4b38d477c9fc36038ff037
+MISC metadata.xml 336 BLAKE2B 42e123497016c3cffffc99cd56d04cf37bc81ad11487a39a97f1200df91edfb8d2c359ef76a3be83d4682cc6e2ba2695fd460af1de06d8f15b0932dd1f3ad211 SHA512 32593908c71225b7869b03d96dde6b7ed0d3db25f921257cf5027c80830cca794d0ed30b73c3189edd34553d6766ae57daf8caceb106bc49398fb519fd95d28c
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
new file mode 100644
index 000000000000..2ec7a4811499
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+HOMEPAGE="
+	http://blt.sourceforge.net/
+	http://jos.decoster.googlepages.com/bltfortk8.5.2"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
+	http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
+
+IUSE="jpeg static-libs X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-lang/tk:0=
+	jpeg? ( virtual/jpeg:0= )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile3.patch"
+	# From blt-2.4z-6mdk.src.rpm
+	epatch "${FILESDIR}"/blt2.4z-64bit.patch
+
+	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
+
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+
+	# Set the correct libdir and drop RPATH
+	sed \
+		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
+		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
+		-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
+		-i configure* || die "sed configure* failed"
+	sed \
+		-e "/^scriptdir =/s:lib:$(get_libdir):" \
+		-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
+
+	sed \
+		-e "/AR/s:ar:$(tc-getAR):g" \
+		-e 's:0444:0644:g' \
+		-i src/Makefile.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-darwin.patch \
+		"${FILESDIR}"/${P}-gbsd.patch \
+		"${FILESDIR}"/${P}-tk8.6.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch \
+		"${FILESDIR}"/${P}-aclocal.patch
+
+	append-cflags -fPIC
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	LC_ALL=C \
+	econf \
+		--x-includes="${EPREFIX}/usr/include" \
+		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
+		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tclincls="${EPREFIX}/usr/include" \
+		--with-tkincls="${EPREFIX}/usr/include" \
+		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-cc="$(tc-getCC)" \
+		--with-cflags="${CFLAGS}" \
+		--with-gnu-ld \
+		$(use_enable jpeg) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	sed \
+		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
+		-i demos/{,scripts/}*.tcl || die
+
+	dodir \
+		/usr/bin \
+		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
+		/usr/share/man/mann \
+		/usr/include
+
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc NEWS PROBLEMS README
+	dohtml html/*.html
+	for f in `ls "${ED}"/usr/share/man/mann` ; do
+		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} || die
+	done
+
+	# fix for linking against shared lib with -lBLT or -lBLTlite
+	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+
+	use static-libs || \
+		find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
+		xargs -r -0 rm -fv
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-aclocal.patch b/dev-tcltk/blt/files/blt-2.4z-aclocal.patch
new file mode 100644
index 000000000000..e7c62b5de7f3
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-aclocal.patch
@@ -0,0 +1,79 @@
+ aclocal.m4   |  6 +++---
+ configure.in | 38 +++-----------------------------------
+ 2 files changed, 6 insertions(+), 38 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 7441d3d..b86a6b2 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -11,11 +11,11 @@ if test "$cross_compiling" = yes; then
+ else
+ cat > conftest.$ac_ext <<EOF
+ [#]line __oline__ "configure"
+-#include "confdefs.h"
+-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
++[#include "confdefs.h"
++#ifdef __cplusplus
+ extern "C" void exit(int);
+ #endif
+-])dnl
++]dnl
+ [$2]
+ EOF
+ eval $ac_link
+diff --git a/configure.in b/configure.in
+index adde26d..b57eaa9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -83,35 +83,9 @@ PWD=`pwd`
+ #
+ # -----------------------------------------------------------------------
+ 
+-BLT_ENV_CC=$CC
+-
+-#
+-# CC search order
+-#
+-#  1. command line (--with-cc)
+-#  2. environment variable ($CC)
+-#  3. cached variable ($blt_cv_prog_cc)
+-#  4. check for program (AC_PROG_CC)
+-#  4. default to cc
+-#
+-
+-AC_MSG_CHECKING([which C compiler])
+-if test "x${blt_with_cc}" != "x" ; then 
+-  CC=${blt_with_cc}
+-  unset ac_cv_prog_CPP
+-  unset ac_cv_prog_CC
+-elif test "x${BLT_ENV_CC}" != "x" ; then
+-  unset ac_cv_prog_CPP
+-  unset ac_cv_prog_CC
+-elif test "x${blt_cv_prog_cc}" != "x" ; then
+-  CC=${blt_cv_prog_cc}
+-  unset ac_cv_prog_CC
+-else 
+-  AC_PROG_CC
+-fi
+-if test "x${CC}" = "x" ; then
+-  CC=cc
+-fi
++AC_PROG_CC
++AC_PROG_CPP
++AC_PROG_EGREP
+ 
+ case $target in
+   *-*-cygwin*|*-*-mingw*)
+@@ -121,12 +95,6 @@ case $target in
+     ;;
+ esac
+ 
+-AC_MSG_RESULT([$CC])
+-
+-unset blt_cv_prog_cc
+-AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC)
+-AC_SUBST(CC)
+-AC_PROG_CPP
+ if test "x${GCC}" != "x" ; then
+   blt_have_gcc="yes"
+ else
diff --git a/dev-tcltk/blt/files/blt-2.4z-darwin.patch b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
new file mode 100644
index 000000000000..0d766fe5e17f
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-darwin.patch
@@ -0,0 +1,72 @@
+--- configure.in
++++ configure.in
+@@ -183,9 +183,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -728,6 +725,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     SHLIB_SUFFIX="so"
+     ;;
+@@ -1145,6 +1145,13 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    SHLIB_SUFFIX=".dylib"
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"
+--- configure
++++ configure
+@@ -1279,9 +1279,6 @@
+       blt_lib_prefix=""
+     fi
+     ;;
+-  *-*-macosx)
+-    blt_platform="macosx"
+-    ;;
+   *)
+     blt_platform="unix"
+     ;;
+@@ -3396,6 +3393,9 @@
+   *-hpux*)
+     SHLIB_SUFFIX="sl"
+     ;;
++  *-darwin*)
++    SHLIB_SUFFIX="dylib"
++    ;;
+   *)
+     SHLIB_SUFFIX="so"
+     ;;
+@@ -3943,6 +3943,13 @@
+     LDFLAGS=""
+     ;;
+ 
++  *-darwin*)
++    SHLIB_CFLAGS=""
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-dynamiclib -install_name $(libdir)/$@'
++    SHLIB_SUFFIX=".dylib"
++    ;;
++
+   *-dgux*)
+     SHLIB_CFLAGS="-K PIC"
+     SHLIB_LD="cc"
diff --git a/dev-tcltk/blt/files/blt-2.4z-gbsd.patch b/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
new file mode 100644
index 000000000000..ffdadf1746e5
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
@@ -0,0 +1,54 @@
+Detect correctly Gentoo/*BSD CHOSTS:
+- *-*-freebsd* means tcl/tk libs will be like libtcl85.so, instead of
+  libtcl8.5.so
+- *-gentoo-*bsd means this is a Gentoo/*BSD system which uses the same toolchain
+  as linux, so we link in the same way.
+
+--- blt2.4z-8.5.2/configure.old	2012-05-06 18:11:45.000000000 -0400
++++ blt2.4z-8.5.2/configure	2012-05-06 18:15:25.000000000 -0400
+@@ -3376,7 +3376,7 @@
+ fi
+ 
+ case $target in
+-  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
++  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
+     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+@@ -4079,6 +4079,12 @@
+     EXTRA_LIB_SPECS="-ldl"
+     ;;
+ 
++  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
++    SHLIB_CFLAGS="-fPIC"
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
++    ;;
++
+   *-netbsd*|*-freebsd*|*-openbsd*)
+     # Not available on all versions:  check for include file.
+     ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+--- blt2.4z-8.5.2/configure.in.old	2012-05-06 18:11:47.000000000 -0400
++++ blt2.4z-8.5.2/configure.in	2012-05-06 18:15:08.000000000 -0400
+@@ -708,7 +708,7 @@
+ fi
+ 
+ case $target in
+-  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
++  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
+     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+@@ -1241,6 +1241,12 @@
+     EXTRA_LIB_SPECS="-ldl"
+     ;;
+ 
++  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
++    SHLIB_CFLAGS="-fPIC"
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
++    ;;
++
+   *-netbsd*|*-freebsd*|*-openbsd*)
+     # Not available on all versions:  check for include file.
+     AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
diff --git a/dev-tcltk/blt/files/blt-2.4z-ldflags.patch b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
new file mode 100644
index 000000000000..bc795d060de8
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-ldflags.patch
@@ -0,0 +1,30 @@
+diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in
+index 5d93e82..db14156 100644
+--- a/src/shared/Makefile.in
++++ b/src/shared/Makefile.in
+@@ -18,7 +18,7 @@ SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@
+ SHLIB_TCL_ONLY_LIB_SPECS = @SHLIB_TCL_ONLY_LIB_SPECS@ 
+ SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ 
+ SHLIB_LD =	@SHLIB_LD@
+-LDFLAGS =	@LDFLAGS@ @LD_RUN_PATH@
++LDFLAGS +=	@LDFLAGS@
+ 
+ prefix =	@prefix@
+ exec_prefix =	@exec_prefix@
+@@ -144,14 +144,14 @@ $(lib_so): $(OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DBLT_LIBRARY=\"$(scriptdir)\" \
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
+ 		$(SHLIB_LIB_SPECS)
+ 
+ $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
+ 		$(SHLIB_TCL_ONLY_LIB_SPECS)
+ 
+ install: mkdirs install-lib install-demo
diff --git a/dev-tcltk/blt/files/blt-2.4z-linking.patch b/dev-tcltk/blt/files/blt-2.4z-linking.patch
new file mode 100644
index 000000000000..b5a5359171d3
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-linking.patch
@@ -0,0 +1,21 @@
+diff --git a/src/shared/Makefile.in b/src/shared/Makefile.in
+index db14156..a06111f 100644
+--- a/src/shared/Makefile.in
++++ b/src/shared/Makefile.in
+@@ -145,14 +145,14 @@ $(lib_so): $(OBJS)
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+ 	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(OBJS) \
+-		$(SHLIB_LIB_SPECS)
++		$(SHLIB_LIB_SPECS) $(LIBS)
+ 
+ $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
+ 		$(srcdir)/bltInit.c
+ 	$(RM) $@
+ 	$(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
+-		$(SHLIB_TCL_ONLY_LIB_SPECS)
++		$(SHLIB_TCL_ONLY_LIB_SPECS)  $(LIBS)
+ 
+ install: mkdirs install-lib install-demo
+ 
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
new file mode 100644
index 000000000000..1ff4fed5f51b
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile2.patch
@@ -0,0 +1,18 @@
+Source: mescalinum
+Upstream: N/A
+Reason: fix broken $DESTDIR support in Makefile
+--- Makefile.in.orig	2008-10-26 14:36:22.000000000 +0100
++++ Makefile.in	2008-10-26 14:37:04.000000000 +0100
+@@ -47,9 +47,9 @@ install-all:
+ 	(cd library; $(MAKE) install)
+ 	(cd man; $(MAKE) install)
+ 	(cd demos; $(MAKE) install)
+-	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir)
+-	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir)
++	$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \
diff --git a/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
new file mode 100644
index 000000000000..c7065df39753
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-r4-fix-makefile3.patch
@@ -0,0 +1,14 @@
+Source: mescalinum
+Upstream: N/A
+Reason: fix broken $DESTDIR support in library/Makefile
+--- library/Makefile.in.orig	2008-10-26 14:30:28.000000000 +0100
++++ library/Makefile.in	2008-10-26 14:31:40.000000000 +0100
+@@ -58,7 +58,7 @@ install: mkdirs pkgIndex
+ 	for i in $(miscFiles) ; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
+ 	done 
+-	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
+ 
+ mkdirs:
+ 	@for i in $(instdirs) ; do \
diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch
new file mode 100644
index 000000000000..c8637b9c7c45
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-tcl8.5-fixpkgruntime.patch
@@ -0,0 +1,66 @@
+--- src/bltInit.c.orig	2008-05-29 00:05:10.000000000 +0200
++++ src/bltInit.c	2008-05-29 00:26:40.000000000 +0200
+@@ -413,7 +413,7 @@ Blt_Init(interp)
+ 	 * Check that the versions of Tcl that have been loaded are
+ 	 * the same ones that BLT was compiled against.
+ 	 */
+-	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) {
++	if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+ 	    return TCL_ERROR;
+ 	}
+ 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
+@@ -458,16 +458,23 @@ Blt_Init(interp)
+ 	register Tcl_AppInitProc **p;
+ 	Tcl_Namespace *nsPtr;
+ 
++	if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
++		return TCL_OK;
++	}
++
++#if 0
+ #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 
+ 	if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) {
+ 	    return TCL_OK;
+-	} 
++	}
+ #else
+ 	if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, EXACT) == NULL) {
+ 	    Tcl_ResetResult(interp);
+ 	    return TCL_OK;
+ 	} 
+ #endif
++#endif
++
+ 	nsPtr = Tcl_CreateNamespace(interp, "blt::tile", NULL, 
+ 			    (Tcl_NamespaceDeleteProc *) NULL);
+ 	if (nsPtr == NULL) {
+@@ -507,7 +514,7 @@ Blt_Init(interp)
+ 	 * Check that the versions of Tcl that have been loaded are
+ 	 * the same ones that BLT was compiled against.
+ 	 */
+-	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) {
++	if (Tcl_InitStubs(interp, TCL_VERSION, EXACT) == NULL) {
+ 	    return TCL_ERROR;
+ 	}
+ 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
+@@ -543,6 +550,11 @@ Blt_Init(interp)
+     if (!tkLoaded) {
+ 	register Tcl_AppInitProc **p;
+ 
++	if (Tk_InitStubs(interp, TK_VERSION, 1) == NULL) {
++		return TCL_OK;
++	}
++
++#if 0
+ #if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 
+ 	if (Tcl_PkgPresent(interp, "Tk", TK_VERSION, EXACT) == NULL) {
+ 	    return TCL_OK;
+@@ -553,6 +565,8 @@ Blt_Init(interp)
+ 	    return TCL_OK;
+ 	} 
+ #endif
++#endif
++
+ 	/* Initialize the BLT commands that use Tk too. */
+ 	for (p = tkCmds; *p != NULL; p++) {
+ 	    if ((**p) (interp) != TCL_OK) {
diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
new file mode 100644
index 000000000000..8721940af2c3
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
@@ -0,0 +1,86 @@
+ src/bltScrollbar.c | 2 +-
+ src/bltTed.c       | 6 +++---
+ src/bltVecMath.c   | 8 ++++----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/bltScrollbar.c b/src/bltScrollbar.c
+index 69662de..731e37b 100644
+--- a/src/bltScrollbar.c
++++ b/src/bltScrollbar.c
+@@ -534,7 +534,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv)
+ 	} else {
+ 	    fraction = ((double)pixels / (double)barWidth);
+ 	}
+-	sprintf(interp->result, "%g", fraction);
++	sprintf(Tcl_GetStringResult(interp), "%g", fraction);
+     } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
+ 	int x, y, pos, barWidth;
+ 	double fraction;
+diff --git a/src/bltTed.c b/src/bltTed.c
+index 64c43e8..832ef9c 100644
+--- a/src/bltTed.c
++++ b/src/bltTed.c
+@@ -1504,7 +1504,7 @@ EditOp(dataPtr, interp, argc, argv)
+ 	tablePtr->flags |= ARRANGE_PENDING;
+ 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+     }
+-    interp->result = Tk_PathName(tedPtr->tkwin);
++    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+     tedPtr->flags |= LAYOUT_PENDING;
+     EventuallyRedraw(tedPtr);
+     return TCL_OK;
+@@ -1678,7 +1678,7 @@ SelectOp(dataPtr, interp, argc, argv)
+ 	    tedPtr->activeRectArr[4].width = grip - 1;
+ 	    tedPtr->activeRectArr[4].height = grip - 1;
+ 
+-	    interp->result = Tk_PathName(entryPtr->tkwin);
++	    Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE);
+ 	    active = 1;
+ 	    break;
+ 	}
+@@ -1751,7 +1751,7 @@ RepOp(dataPtr, interp, argc, argv)
+ 	tablePtr->flags |= ARRANGE_PENDING;
+ 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+     }
+-    interp->result = Tk_PathName(tedPtr->tkwin);
++    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+     tedPtr->flags |= LAYOUT_PENDING;
+     EventuallyRedraw(tedPtr);
+     return TCL_OK;
+diff --git a/src/bltVecMath.c b/src/bltVecMath.c
+index dc37af8..5117f63 100644
+--- a/src/bltVecMath.c
++++ b/src/bltVecMath.c
+@@ -764,20 +764,20 @@ MathError(interp, value)
+     if ((errno == EDOM) || (value != value)) {
+ 	Tcl_AppendResult(interp, "domain error: argument not in valid range",
+ 	    (char *)NULL);
+-	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
++	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
+ 	    (char *)NULL);
+     } else if ((errno == ERANGE) || IS_INF(value)) {
+ 	if (value == 0.0) {
+ 	    Tcl_AppendResult(interp, 
+ 			     "floating-point value too small to represent",
+ 		(char *)NULL);
+-	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
++	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp),
+ 		(char *)NULL);
+ 	} else {
+ 	    Tcl_AppendResult(interp, 
+ 			     "floating-point value too large to represent",
+ 		(char *)NULL);
+-	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
++	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp),
+ 		(char *)NULL);
+ 	}
+     } else {
+@@ -786,7 +786,7 @@ MathError(interp, value)
+ 	sprintf(buf, "%d", errno);
+ 	Tcl_AppendResult(interp, "unknown floating-point error, ",
+ 	    "errno = ", buf, (char *)NULL);
+-	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
++	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp),
+ 	    (char *)NULL);
+     }
+ }
diff --git a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
new file mode 100644
index 000000000000..f956c098138e
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
@@ -0,0 +1,20 @@
+--- src/tkButton.c.orig	2013-01-04 23:24:45.000000000 -0500
++++ src/tkButton.c	2013-01-04 23:28:29.000000000 -0500
+@@ -526,8 +526,6 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+ 
+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
+-
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, 
+ 	int padX, int padY, int innerWidth, int innerHeight, int *xPtr, 
+@@ -1890,7 +1888,7 @@
+ 	}
+     }
+     if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
+-	return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++	return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
+     }
+     return TCL_OK;
+ }
diff --git a/dev-tcltk/blt/files/blt2.4z-64bit.patch b/dev-tcltk/blt/files/blt2.4z-64bit.patch
new file mode 100644
index 000000000000..9f1c3c975eef
--- /dev/null
+++ b/dev-tcltk/blt/files/blt2.4z-64bit.patch
@@ -0,0 +1,24 @@
+--- blt2.4z/src/bltTree.c.64bit-fixes	2002-09-29 07:44:12.000000000 +0200
++++ blt2.4z/src/bltTree.c	2003-07-31 12:22:53.000000000 +0200
+@@ -95,17 +95,16 @@ static Value *TreeNextValue _ANSI_ARGS_(
+  */
+ 
+ #define REBUILD_MULTIPLIER	3
++#define START_LOGSIZE		5 /* Initial hash table size is 32. */
++#define MAX_LIST_VALUES		20 /* Convert to hash table when node
++				    * value list gets bigger than this
++				    * many values. */
+ 
+ #if (SIZEOF_VOID_P == 8)
+ #define RANDOM_INDEX(i)		HashOneWord(mask, downshift, i)
+ #define BITSPERWORD		64
+ #else 
+ 
+-#define START_LOGSIZE		5 /* Initial hash table size is 32. */
+-#define MAX_LIST_VALUES		20 /* Convert to hash table when node
+-				    * value list gets bigger than this
+-				    * many values. */
+-
+ /*
+  * The following macro takes a preliminary integer hash value and
+  * produces an index into a hash tables bucket list.  The idea is
diff --git a/dev-tcltk/blt/metadata.xml b/dev-tcltk/blt/metadata.xml
new file mode 100644
index 000000000000..549667e75d56
--- /dev/null
+++ b/dev-tcltk/blt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">blt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/bwidget-1.9.8 b/dev-tcltk/bwidget-1.9.8
deleted file mode 100644
index 9c6a0d9e6949..000000000000
--- a/dev-tcltk/bwidget-1.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tk:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=High-level widget set for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://tcllib.sourceforge.net/
-IUSE=doc test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=tcltk
-RDEPEND=dev-lang/tk:0
-SLOT=0
-SRC_URI=mirror://sourceforge/project/tcllib/BWidget/1.9.8/bwidget-1.9.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=afb211d6d94dfb9d0fff63b7ac14ebb6
diff --git a/dev-tcltk/bwidget-1.9.9 b/dev-tcltk/bwidget-1.9.9
deleted file mode 100644
index edc12f5cf140..000000000000
--- a/dev-tcltk/bwidget-1.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tk:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=High-level widget set for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://tcllib.sourceforge.net/
-IUSE=doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=tcltk
-RDEPEND=dev-lang/tk:0
-SLOT=0
-SRC_URI=mirror://sourceforge/project/tcllib/BWidget/1.9.9/bwidget-1.9.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=666d5f727cf1be214a7f4e3255c4fb4f
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
new file mode 100644
index 000000000000..f0208b640da8
--- /dev/null
+++ b/dev-tcltk/bwidget/Manifest
@@ -0,0 +1,6 @@
+AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
+DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262
+DIST bwidget-1.9.9.tar.gz 243001 BLAKE2B 31935584e5c6737b143e67113f7d5fb34450ea5bf7852f3c72691abcb1545752f1607945377ac1cb68e5bb256aabc8f92aa193d2a63149ab3de0b74c074409d2 SHA512 6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042
+EBUILD bwidget-1.9.8.ebuild 806 BLAKE2B 5d0a6379d916f9cc1b9d1eef51c640b632d0e754934aebde09a4cfcb86c1748ef3c994db845826c456056dd770d2154f4b0e6864db55f5eb94d866a270c9d189 SHA512 385c1991d0b8e76dacf9aefbdd92ad3ffcbd3adffdf305db2ea006587ab21aa57f56642c04eae8ccab0590e247f7497dece02183315e5c1326d50780964aad2e
+EBUILD bwidget-1.9.9.ebuild 829 BLAKE2B 0eb7f0623c313d33dd2a9d92cf47e8073f063e230ce0ee4a1e2bc254c681e838696b4ccc06b33dff6a06c61db148b6af95641b951329641b10474c5ab96558c6 SHA512 a7b07e56b344bdc6336e0c7c2ca24c2afe2135838058cab0c1b3c34d71ea2d67b367e294ffcf7bde861b1e23dfa3335fc580cabd78f7bf068db07af6584240d5
+MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.8.ebuild b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild
new file mode 100644
index 000000000000..f2838cb8f07f
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib virtualx
+
+MY_PN=${PN/bw/BW}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-level widget set for Tcl/Tk"
+HOMEPAGE="http://tcllib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-test.patch
+}
+
+src_test() {
+	VIRTUALX_COMMAND=tclsh
+	virtualmake tests/entry.test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *.tcl
+	doins -r images lang
+
+	insinto /usr/share/doc/${PF}/
+	doins -r demo
+	dodoc ChangeLog README.txt
+
+	use doc && dohtml BWman/*
+}
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
new file mode 100644
index 000000000000..c7518e156e9c
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib virtualx
+
+MY_PN=${PN/bw/BW}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-level widget set for Tcl/Tk"
+HOMEPAGE="http://tcllib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.8-test.patch
+}
+
+src_test() {
+	VIRTUALX_COMMAND=tclsh
+	virtualmake tests/entry.test
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *.tcl
+	doins -r images lang
+
+	insinto /usr/share/doc/${PF}/
+	doins -r demo
+	dodoc ChangeLog README.txt
+
+	use doc && dohtml BWman/*
+}
diff --git a/dev-tcltk/bwidget/files/bwidget-1.9.8-test.patch b/dev-tcltk/bwidget/files/bwidget-1.9.8-test.patch
new file mode 100644
index 000000000000..077abf308b88
--- /dev/null
+++ b/dev-tcltk/bwidget/files/bwidget-1.9.8-test.patch
@@ -0,0 +1,16 @@
+ tests/entry.test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/entry.test b/tests/entry.test
+index 4bc3a5f..727a7d8 100644
+--- a/tests/entry.test
++++ b/tests/entry.test
+@@ -65,7 +65,7 @@ destroy .e
+ 
+ test Entry-2.1 {Entry} {
+     list [catch {Entry} msg] $msg
+-} {1 {wrong # args: should be "Entry path ..."}}
++} {1 {wrong # args: should be "Entry path ?arg ...?"}}
+ test Entry-2.2 {Entry} {
+     list [catch {Entry gorp} msg] $msg
+ } {1 {bad window path name "gorp"}}
diff --git a/dev-tcltk/bwidget/metadata.xml b/dev-tcltk/bwidget/metadata.xml
new file mode 100644
index 000000000000..f5ca0ddf0adf
--- /dev/null
+++ b/dev-tcltk/bwidget/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tcllib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/ck-8.0-r4 b/dev-tcltk/ck-8.0-r4
deleted file mode 100644
index e476fb48f763..000000000000
--- a/dev-tcltk/ck-8.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=dev-lang/tk sys-libs/ncurses[gpm] sys-libs/gpm virtual/pkgconfig
-DESCRIPTION=A curses based toolkit for tcl
-EAPI=5
-HOMEPAGE=http://www.ch-werner.de/ck/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk sys-libs/ncurses[gpm] sys-libs/gpm
-SLOT=0
-SRC_URI=http://www.ch-werner.de/ck/ck8.0.tar.gz https://dev.gentoo.org/~jlec/distfiles/ck-8.0-tcl8.6.patch.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2899d12e73ba04b63f91cd3a7a76556
diff --git a/dev-tcltk/ck/Manifest b/dev-tcltk/ck/Manifest
new file mode 100644
index 000000000000..55093db5edd2
--- /dev/null
+++ b/dev-tcltk/ck/Manifest
@@ -0,0 +1,5 @@
+AUX ck-8.0-gentoo.patch 4453 BLAKE2B bb2e0c031618e740381c42ae1c621e7c825bd9258b8309c79b971b2be6a63747672326f48bcb731220ed000a7ab1a8e7d0d800ab05c1a6eeb36164dccbf4bbde SHA512 cfe65801f1c91f123b580cc08759959be6060799721e688a4d2b11e73879f1b3c41d0b8f8192dff1a0e93d921f38737b283a272f92e7b740cc10ec7bd19c19d6
+DIST ck-8.0-tcl8.6.patch.xz 12836 BLAKE2B bf3596a921553c17a9cc5c40fec966464dd6f69f1f083e9be881e42ea968ff28e632c7ec9b942b06ddf69830d42b88fb9101830eefd509822a5681115daabe8f SHA512 55682b9490ac5470ef14213f0dac3fa10139a13a7e3d915773c50285038b3b566c140fcc5f4721a091744e45bbef405c2ee3ee22daf71a3a82148acba28b0dde
+DIST ck8.0.tar.gz 400262 BLAKE2B 068fc90f1ae8397540a29e6200c2a9e3e42b297489e3181f26d12e992b31218f2e81489bd84a36df9b8448d6f3ea279728e9cb063b6835ef35f9c0872d8793ea SHA512 68d92be354e5ec24830cc9a20d1cbb5a27d4e04369ceecf6fdad7759da3d9b4909970bf54abdf5f5b015fd0d08b8680a33cdcdf468b9007afc21e69c7381b262
+EBUILD ck-8.0-r4.ebuild 920 BLAKE2B 923b9d051677f79ba555e341d496e6d8e89bf1a6c41d374ced6e5dbf7c46bafe3c9c67eb355241ab9be4a42a0956c24a611b49e85924fca0f43b3b9ff91aaf83 SHA512 7d8b412006a4ee28fefaa2521684db3fafd52b885a4fff19349168dbe51ab1bac1e4c863e2d1c93cc19949adb3076b4d7d3c8f50a78ac4c50de72ce71f7a8ad2
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/ck/ck-8.0-r4.ebuild b/dev-tcltk/ck/ck-8.0-r4.ebuild
new file mode 100644
index 000000000000..78193f8a902b
--- /dev/null
+++ b/dev-tcltk/ck/ck-8.0-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P=${PN}${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A curses based toolkit for tcl"
+HOMEPAGE="http://www.ch-werner.de/ck/"
+SRC_URI="
+	http://www.ch-werner.de/ck/${MY_P}.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${P}-tcl8.6.patch.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/tk
+	sys-libs/ncurses[gpm]
+	sys-libs/gpm
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${WORKDIR}"/${P}-tcl8.6.patch
+	sed \
+		-e "/^LIB_INSTALL_DIR/s:lib$:$(get_libdir):g" \
+		-i Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-shared
+}
+
+src_compile() {
+	emake \
+		CURSES_LIB_SWITCHES="$($(tc-getPKG_CONFIG) --libs ncursesw) -lgpm"
+}
diff --git a/dev-tcltk/ck/files/ck-8.0-gentoo.patch b/dev-tcltk/ck/files/ck-8.0-gentoo.patch
new file mode 100644
index 000000000000..727f7e8b5356
--- /dev/null
+++ b/dev-tcltk/ck/files/ck-8.0-gentoo.patch
@@ -0,0 +1,133 @@
+ Makefile.in |   40 ++++++++++++++++------------------------
+ 1 files changed, 16 insertions(+), 24 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 00960d9..16d4123 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,9 +29,9 @@ exec_prefix =		@exec_prefix@
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+ # to be different than those used for actually reference files at
+-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
++# run-time.  DESTDIR is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++DESTDIR =
+ 
+ # Directory from which applications will reference the library of Tcl
+ # scripts (note: you can set the CK_LIBRARY environment variable at
+@@ -39,22 +39,22 @@ INSTALL_ROOT =
+ CK_LIBRARY =		$(prefix)/lib/ck$(VERSION)
+ 
+ # Path name to use when installing library scripts:
+-SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(CK_LIBRARY)
++SCRIPT_INSTALL_DIR =	$(DESTDIR)$(CK_LIBRARY)
+ 
+ # Directory in which to install the archive libck*:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/lib
+ 
+ # Directory in which to install the program cwsh:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
+ 
+ # Directory from which the program cwsh should be referenced by scripts:
+ BIN_DIR =		$(exec_prefix)/bin
+ 
+ # Directory in which to install the include file ck.h:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR =	$(DESTDIR)$(prefix)/include
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(DESTDIR)$(prefix)/share/man
+ 
+ # Directory in which to install manual entry for cwsh:
+ MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
+@@ -96,7 +96,7 @@ LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(CURSES_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+-CFLAGS = -O
++#CFLAGS = -O
+ 
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
+@@ -231,14 +231,14 @@ configInfo: Makefile
+ 	@echo "CK_CURSES_INCLUDES = ${CURSES_INCLUDES}" >> configInfo
+ 	@echo "CK_LIBS = ${CURSES_LIB_SWITCHES} @LIBS@" >> configInfo
+ 
+-install: install-binaries install-libraries
++install: install-man install-binaries install-libraries
+ 
+ install-binaries: $(CK_LIB_FILE) cwsh
+ 	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -251,12 +251,12 @@ install-binaries: $(CK_LIB_FILE) cwsh
+ 	@$(INSTALL_PROGRAM) cwsh $(BIN_INSTALL_DIR)/cwsh
+ 
+ install-libraries:
+-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
++	@for i in $(DESTDIR)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
+ 		$(SCRIPT_INSTALL_DIR) ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -270,13 +270,13 @@ install-libraries:
+ 	    done;
+ 
+ install-demos:
+-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
++	@for i in $(DESTDIR)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
+ 		$(SCRIPT_INSTALL_DIR)/demos \
+ 		$(SCRIPT_INSTALL_DIR)/demos/images ; \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -301,11 +301,11 @@ install-demos:
+ 	    done;
+ 
+ install-man:
+-	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
++	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR); \
+ 	    do \
+ 	    if [ ! -d $$i ] ; then \
+ 		echo "Making directory $$i"; \
+-		mkdir $$i; \
++		mkdir -p $$i; \
+ 		chmod 755 $$i; \
+ 		else true; \
+ 		fi; \
+@@ -326,14 +326,6 @@ install-man:
+ 		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
+ 	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
+ 	    done;
+-	@cd $(SRC_DIR)/doc; for i in *.n; \
+-	    do \
+-	    echo "Installing doc/$$i"; \
+-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
+-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
+-	    done;
+ 
+ Makefile: $(SRC_DIR)/Makefile.in
+ 	$(SHELL) config.status
diff --git a/dev-tcltk/ck/metadata.xml b/dev-tcltk/ck/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/ck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/combobox-2.3-r1 b/dev-tcltk/combobox-2.3-r1
deleted file mode 100644
index 2c9a13808bf9..000000000000
--- a/dev-tcltk/combobox-2.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A combobox megawidget
-EAPI=5
-HOMEPAGE=http://www1.clearlight.com/~oakley/tcl/combobox/index.html
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=freedist
-RDEPEND=dev-lang/tcl:0=
-SLOT=0
-SRC_URI=http://www1.clearlight.com/~oakley/tcl/combobox/combobox-2.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=24e3b302b9bd76f3a0fa5c85de41bd6d
diff --git a/dev-tcltk/combobox/Manifest b/dev-tcltk/combobox/Manifest
new file mode 100644
index 000000000000..66dc9c18048c
--- /dev/null
+++ b/dev-tcltk/combobox/Manifest
@@ -0,0 +1,3 @@
+DIST combobox-2.3.tar.gz 37327 BLAKE2B 2d89eb45099d3ab2b4c40d54c9da4ce484df09c3562abb0a50ef1850a43290b7221aa7c9eacdedbeea6b08b9022b0f512ab77aaec8349d34d7fb43d771f2d7db SHA512 6c85ed671ad64d671630bba09cbcbbcecee91d0ed77a63eee60b1b1ae12caf6312ab1da9a1cbb8ac949136ac37889c20f4dbd0097e41c8eeb3b018ebbafcf36e
+EBUILD combobox-2.3-r1.ebuild 533 BLAKE2B a369baef38ebc607ad3c0e970aad3b3fbd716ba57cd6ff297de14dd596253637c1d3f19cf1a04ea8702ca8f1054fc7fb169b511a3e93303d5cd6124562edb8cb SHA512 793158090b58f4ec89cc41c7b8493a96883d71c548d542bc9b0d7d62a9f7c4030afb72ca7e35214412a522ea3fa2dd53d16071e43374e10ef21882b64e6e2893
+MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-tcltk/combobox/combobox-2.3-r1.ebuild b/dev-tcltk/combobox/combobox-2.3-r1.ebuild
new file mode 100644
index 000000000000..18deabbbf549
--- /dev/null
+++ b/dev-tcltk/combobox/combobox-2.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="A combobox megawidget"
+HOMEPAGE="http://www1.clearlight.com/~oakley/tcl/combobox/index.html"
+SRC_URI="http://www1.clearlight.com/~oakley/tcl/combobox/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/tcl:0="
+DEPEND=""
+
+src_install() {
+	insinto /usr/$(get_libdir)/${P}
+	doins *tcl *tmml *n
+	dodoc *txt
+	dohtml *html
+}
diff --git a/dev-tcltk/combobox/metadata.xml b/dev-tcltk/combobox/metadata.xml
new file mode 100644
index 000000000000..8425c0d53cb0
--- /dev/null
+++ b/dev-tcltk/combobox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/expect-5.45 b/dev-tcltk/expect-5.45
deleted file mode 100644
index 76af559a796a..000000000000
--- a/dev-tcltk/expect-5.45
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-lang/tcl-8.2:0[threads?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=tool for automating interactive applications
-EAPI=5
-HOMEPAGE=http://expect.nist.gov/
-IUSE=debug doc threads
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.2:0[threads?]
-SLOT=0
-SRC_URI=mirror://sourceforge/expect/expect5.45.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2342c0abcd520cffa14cf3dbd3d2674
diff --git a/dev-tcltk/expect-lite-4.6.1 b/dev-tcltk/expect-lite-4.6.1
deleted file mode 100644
index e9df03e6bd85..000000000000
--- a/dev-tcltk/expect-lite-4.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.6.1.tar.gz
-_md5_=33209fa987047cb6b4b7d143772328d1
diff --git a/dev-tcltk/expect-lite-4.7.2 b/dev-tcltk/expect-lite-4.7.2
deleted file mode 100644
index 023fd0fe467a..000000000000
--- a/dev-tcltk/expect-lite-4.7.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=0
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.7.2.tar.gz
-_md5_=8cad9402221c564014ba3d56457e3238
diff --git a/dev-tcltk/expect-lite-4.8.0 b/dev-tcltk/expect-lite-4.8.0
deleted file mode 100644
index 8b58dd7fc735..000000000000
--- a/dev-tcltk/expect-lite-4.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=quick and easy command line automation tool built on top of expect
-EAPI=4
-HOMEPAGE=http://expect-lite.sourceforge.net/
-IUSE=debug examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
-SLOT=0
-SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.8.0.tar.gz
-_md5_=ed8375c6bf9db80fdf9ba402edd6fa1b
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
new file mode 100644
index 000000000000..653d2ae7b2a9
--- /dev/null
+++ b/dev-tcltk/expect-lite/Manifest
@@ -0,0 +1,7 @@
+DIST expect-lite_4.6.1.tar.gz 142875 BLAKE2B 9e7143d78d68338c4d6ec2858f3a24c5b5330193bfc064c27b190bf6ac7b01e53340e48006f5313cb301b6f6f9f858e818ead8fbe6117ba9ee8c6035b9f9b059 SHA512 a250f34472dad6c44149edf85d35f7ea159e0673aa5619864a71eb78003d0c1a2ec3d25505618f616d12d82d50bda8039a239b443014b43b2387059e6b6eb7d6
+DIST expect-lite_4.7.2.tar.gz 145084 BLAKE2B 053f26ceaa98cde7bfe680f3076cdcd5391cfb6483c6ec0d0c9bcdf1f51e4b53c6429cef50a10915cbb01955fbee77bb6075bde612b6299bfd95357ab88f7408 SHA512 1f635f87fb53624f687477bae41edd37474c5358de368af8065d4222181ed4a5efdb55c8fda47e1f1b4c163fa2a423e7d84a7da8415b17cd250417432ee0fc5b
+DIST expect-lite_4.8.0.tar.gz 148917 BLAKE2B 0aeba8356c41f740807b914941c58a7ed26cc826ce2e297c5275b4f9a8c227437b2120d74f60229274aa56858ce03021245ef218e8d75a64cc6508f43b3afe2b SHA512 b4956dbcdde1e5648a51be99069069be6ff2ae6fb7a67116a35bbbb8786228920e9177bd1b14d0ac3dd0a8ebdd6fa523c62bb7f23c84407ebe73abe3523e43c0
+EBUILD expect-lite-4.6.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
+EBUILD expect-lite-4.7.2.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
+EBUILD expect-lite-4.8.0.ebuild 609 BLAKE2B 03e0ccd1544a9c4dff58d7b5e02bef9a5878ddac6e5361725357aded02e4ee164a09a2f08991872ee273302f33ff8251718dd2e744568dd56a81da2c1e017e13 SHA512 659555ec0eb741831fd52046fd335c297046033111102b37591bcc87118a263e1b77649af5ec9fa30db0c81ad32fd74058f7fb50a61e46e4c319ed4acf165b67
+MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild b/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild
new file mode 100644
index 000000000000..4440e9994297
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="quick and easy command line automation tool built on top of expect"
+HOMEPAGE="http://expect-lite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug examples"
+
+RDEPEND="dev-tcltk/expect
+	debug? ( dev-tcltk/tclx )"
+
+S=${WORKDIR}/${PN}.proj
+
+src_install() {
+	dobin ${PN} || die
+	doman man/* || die
+	dodoc bashrc ChangeLog README
+	dohtml Docs/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/* || die
+	fi
+}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild b/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild
new file mode 100644
index 000000000000..c460f1458eef
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="quick and easy command line automation tool built on top of expect"
+HOMEPAGE="http://expect-lite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples"
+
+RDEPEND="dev-tcltk/expect
+	debug? ( dev-tcltk/tclx )"
+
+S=${WORKDIR}/${PN}.proj
+
+src_install() {
+	dobin ${PN} || die
+	doman man/* || die
+	dodoc bashrc ChangeLog README
+	dohtml Docs/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/* || die
+	fi
+}
diff --git a/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild
new file mode 100644
index 000000000000..37fb9d98e18b
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="quick and easy command line automation tool built on top of expect"
+HOMEPAGE="http://expect-lite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples"
+
+RDEPEND="dev-tcltk/expect
+	debug? ( dev-tcltk/tclx )"
+
+S=${WORKDIR}/${PN}.proj
+
+src_install() {
+	dobin ${PN}
+	doman man/*
+	dodoc bashrc ChangeLog README
+	dohtml Docs/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/dev-tcltk/expect-lite/metadata.xml b/dev-tcltk/expect-lite/metadata.xml
new file mode 100644
index 000000000000..2026e6cc1d87
--- /dev/null
+++ b/dev-tcltk/expect-lite/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<use>
+		<flag name="debug">pull in packages needed for runtime interactive debugger</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">expect-lite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
new file mode 100644
index 000000000000..3d883e319e5c
--- /dev/null
+++ b/dev-tcltk/expect/Manifest
@@ -0,0 +1,8 @@
+AUX expect-5.44.1.15-ldflags.patch 360 BLAKE2B d479931cb0d8621d196b8dac3b0f7134f2998061e26f39d06165d71dc00c15895290edf552ee1258c5f988845e6a0b3c5d1df3c694433ef185689ff1d41a96d6 SHA512 36c62ec8043249ae0b9b0c4470937cc99b31c4845d5e67e37403f7e9d97be9edb37dc0a5c8abd2df50cace62b0d87303dbc62fdd2a3e87b501d2b983460ab75f
+AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311f61b70e4e45daaa01e7d1165f04bdba7232e36e1c5ac409faf99cb8a03f5227c829bd93cc00d248129e2ebdaccae8657cb11d1 SHA512 886d378caa8d63add7d4ac73c90b53b4b30d642a2a5cf06c80aad87f57d49a3362bf506fe12f6aade77c56b8b4c83ffe18138143cdf0fe5d7e9e2d673f2bc6d5
+AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
+AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
+AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
+DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
+EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
+MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
new file mode 100644
index 000000000000..bfcd37e9d3e4
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+IUSE="debug doc threads"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+	# stops any example scripts being installed by default
+	sed -i \
+		-e 's/^SCRIPT_LIST[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS_MANPAGES[[:space:]]*=/_&/' \
+		Makefile.in || die
+
+	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+}
+
+src_configure() {
+	# the 64bit flag is useless ... it only adds 64bit compiler flags
+	# (like -m64) which the target toolchain should already handle
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-64bit \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols mem)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto examples
+		dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+	fi
+}
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch b/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch
new file mode 100644
index 000000000000..be3641c2105c
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.44.1.15-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index cc2c79b..1083eaf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -148,7 +148,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(LDFLAGS)
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch b/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
new file mode 100644
index 000000000000..f5470aadb88e
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
@@ -0,0 +1,13 @@
+Add install_name (soname)
+
+--- tclconfig/tcl.m4
++++ tclconfig/tcl.m4
+@@ -1703,7 +1703,7 @@
+ 	    ])
+ 	    # TEA specific: link shlib with current and compatiblity version flags
+ 	    vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
+-	    SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
++	    SHLIB_LD="${SHLIB_LD} -install_name \$(pkglibdir)/\$(PKG_LIB_FILE) -current_version ${vers:-0} -compatibility_version ${vers:-0}"
+ 	    SHLIB_SUFFIX=".dylib"
+ 	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
+ 	    AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \
diff --git a/dev-tcltk/expect/files/expect-5.45-format-security.patch b/dev-tcltk/expect/files/expect-5.45-format-security.patch
new file mode 100644
index 000000000000..c623264be27a
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-format-security.patch
@@ -0,0 +1,18 @@
+ exp_clib.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/exp_clib.c b/exp_clib.c
+index 172c05e..c86dda4 100644
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1476,8 +1476,8 @@ expDiagLogU(str)
+      char *str;
+ {
+   if (exp_is_debugging) {
+-    fprintf(stderr,str);
+-    if (exp_logfile) fprintf(exp_logfile,str);
++    fprintf(stderr,"%s", str);
++    if (exp_logfile) fprintf(exp_logfile,"%s", str);
+   }
+ }
+ 
diff --git a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
new file mode 100644
index 000000000000..5ae9c26adb88
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
@@ -0,0 +1,26 @@
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1634,20 +1634,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_LD="${CC} -shared"
+ 	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
+ 	    SHLIB_SUFFIX=".so"
+-	    LDFLAGS=""
++	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "${TCL_THREADS}" = "1"], [
+ 		# The -pthread needs to go in the LDFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+ 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+-	    # Version numbers are dot-stripped by system policy.
+-	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
+ 	    CFLAGS_OPTIMIZE="-Os"
diff --git a/dev-tcltk/expect/files/expect-5.45-headers.patch b/dev-tcltk/expect/files/expect-5.45-headers.patch
new file mode 100644
index 000000000000..98330211b328
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-headers.patch
@@ -0,0 +1,92 @@
+https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
+--- a/configure.in
++++ b/configure.in
+@@ -133,6 +133,8 @@ AC_CHECK_HEADER(sys/fcntl.h,     AC_DEFINE(HAVE_SYS_FCNTL_H))
+ AC_CHECK_HEADER(sys/ptem.h,      AC_DEFINE(HAVE_SYS_PTEM_H))
+ AC_CHECK_HEADER(sys/strredir.h,  AC_DEFINE(HAVE_STRREDIR_H))
+ AC_CHECK_HEADER(sys/strpty.h,    AC_DEFINE(HAVE_STRPTY_H))
++AC_CHECK_HEADER(pty.h,           AC_DEFINE(HAVE_PTY_H))
++AC_CHECK_HEADER(libutil.h,       AC_DEFINE(HAVE_LIBUTIL_H))
+ 
+ AC_MSG_CHECKING([for sys/bsdtypes.h])
+ if test "ISC_${ISC}" = "ISC_1"   ;    then
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -15,6 +15,12 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ 
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+--- a/exp_trap.c
++++ b/exp_trap.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+--- a/pty_termios.c
++++ b/pty_termios.c
+@@ -9,6 +9,14 @@
+ 
+ #include <stdio.h>
+ #include <signal.h>
++#include <string.h>
++#ifdef HAVE_PTY_H
++#include <pty.h>
++#endif
++#ifdef HAVE_LIBUTIL_H
++#include <sys/types.h>
++#include <libutil.h>
++#endif
+ 
+ #if defined(SIGCLD) && !defined(SIGCHLD)
+ #define SIGCHLD SIGCLD
+@@ -100,6 +100,7 @@
+ 
+ #include "exp_tty_in.h"
+ #include "exp_rename.h"
++#include "exp_int.h"
+ #include "exp_pty.h"
+ 
+ void expDiagLog();
+--- a/exp_chan.c
++++ b/exp_chan.c
+@@ -34,6 +34,7 @@
+ #include "exp_rename.h"
+ #include "exp_prog.h"
+ #include "exp_command.h"
++#include "exp_event.h"
+ #include "exp_log.h"
+ #include "tcldbg.h" /* Dbg_StdinMode */
+ 
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1955,6 +1955,7 @@
+ 
+ #include "expect.h"
+ #include "exp_int.h"
++EXTERN void		exp_init_tty _ANSI_ARGS_((void));
+ 
+ /* exp_glob.c - expect functions for doing glob
+  *
+--- a/exp_tty.h
++++ b/exp_tty.h
+@@ -17,6 +17,7 @@
+ 
+ void exp_tty_raw(int set);
+ void exp_tty_echo(int set);
++int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+ void exp_tty_break(Tcl_Interp *interp, int fd);
+ int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+ int exp_israw(void);
diff --git a/dev-tcltk/expect/metadata.xml b/dev-tcltk/expect/metadata.xml
new file mode 100644
index 000000000000..67378c136485
--- /dev/null
+++ b/dev-tcltk/expect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">expect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/itcl-3.4.1 b/dev-tcltk/itcl-3.4.1
deleted file mode 100644
index b7c9993647d4..000000000000
--- a/dev-tcltk/itcl-3.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=<dev-lang/tcl-8.6:0=
-DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=<dev-lang/tcl-8.6:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5e73bd9adc495e45bfc3a7ab221a3c5a
diff --git a/dev-tcltk/itcl-4.0.3 b/dev-tcltk/itcl-4.0.3
deleted file mode 100644
index a98b164f9d34..000000000000
--- a/dev-tcltk/itcl-4.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/tcl-8.6:0=
-DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.6:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.0.3/itcl4.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=db443b7ebf636c73dc66cc2ad4d5fa3e
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
new file mode 100644
index 000000000000..b557f404a55a
--- /dev/null
+++ b/dev-tcltk/itcl/Manifest
@@ -0,0 +1,5 @@
+DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f29701f003873d59fa8e75074b1601dd907d94e5a9f680e05b18493d5782d6a4ddbb56d7df9ff85c8d5b17ecf SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0
+DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
+EBUILD itcl-3.4.1.ebuild 1031 BLAKE2B bca3f59f758e7e5aa2924a70ebf30673607c5e4944737c314f9741ca1115849450315d0c64a9ebcc2fdb78bb9e0c83ce2bd1e79da7a0d24b6697daa829e7468d SHA512 43778440a2847a4d59667a132f70efc2dd73108481a20cb6603d43fed0b77eb58940e800acf065ce031102531a236b47d119f957bc05fd30deae682a55d6de78
+EBUILD itcl-4.0.3.ebuild 1726 BLAKE2B 342bed309f2e5bd3d22121d0437216afca28d7fb0060949e61a7d92ab61d4883de83eac923028344c6e6245bd1ba19a8c408d73e36ca14b676531a93cb672142 SHA512 6794f499a6539243e8f899b8de7e39310e30487aaa2b0c8296fa2fe4878d9dccdfbd3f97ebc3f4de2bbe4894a0298712b14ca2db351c7828849748679aa8af0b
+MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itcl/itcl-3.4.1.ebuild b/dev-tcltk/itcl/itcl-3.4.1.ebuild
new file mode 100644
index 000000000000..7e388fa77158
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-3.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib versionator
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="<dev-lang/tcl-8.6:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_compile() {
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+			"${S}"/Makefile || die 'sed failed'
+	fi
+
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itcl/itcl-4.0.3.ebuild b/dev-tcltk/itcl/itcl-4.0.3.ebuild
new file mode 100644
index 000000000000..56791fe41ee6
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.0.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib versionator
+
+MY_P="${PN}${PV}"
+TCL_VER="8.6.2"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%20${PV}/${MY_P}.tar.gz"
+#SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%204.0.2/itcl4.0.2.tar.gz"
+#SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/tcl-8.6:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+# somehow broken
+#RESTRICT=test
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--disable-rpath
+}
+
+src_compile() {
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+			"${S}"/Makefile || die 'sed failed'
+	fi
+
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	sed \
+		-e "/BUILD_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_PATH/s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-e "/INCLUDE_SPEC/s:${S}/generic:${EPREFIX}/usr/include:g" \
+		-e "s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-i "${ED}"/usr/$(get_libdir)/${MY_P}/itclConfig.sh || die
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-3)/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itcl/metadata.xml b/dev-tcltk/itcl/metadata.xml
new file mode 100644
index 000000000000..d3074de5e0e4
--- /dev/null
+++ b/dev-tcltk/itcl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">incrtcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/itk-3.4.1 b/dev-tcltk/itk-3.4.1
deleted file mode 100644
index c86353e1ee21..000000000000
--- a/dev-tcltk/itk-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=<dev-lang/tk-8.6:= =dev-tcltk/itcl-3.4* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://incrtcl.sourceforge.net/
-IUSE=test
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=<dev-lang/tk-8.6:= =dev-tcltk/itcl-3.4*
-SLOT=0
-SRC_URI=mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4.1/itk3.4.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=a2664522214c9f515fcc787cb32da6d8
diff --git a/dev-tcltk/itk-4.0.0 b/dev-tcltk/itk-4.0.0
deleted file mode 100644
index f00980cee148..000000000000
--- a/dev-tcltk/itk-4.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0*
-SLOT=0
-SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%204.0.0/itk4.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e47b896006d5040e959f080341d594f9
diff --git a/dev-tcltk/itk-4.0.1 b/dev-tcltk/itk-4.0.1
deleted file mode 100644
index 4594067e731c..000000000000
--- a/dev-tcltk/itk-4.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Object Oriented Enhancements for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://incrtcl.sourceforge.net/
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/tk-8.6:= =dev-tcltk/itcl-4.0*
-SLOT=0
-SRC_URI=mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%204.0.1/itk4.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=71782f21c7e1fca7f9bdcd97f5ef4dd1
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
new file mode 100644
index 000000000000..510fba346076
--- /dev/null
+++ b/dev-tcltk/itk/Manifest
@@ -0,0 +1,7 @@
+DIST itk3.4.1.tar.gz 182311 BLAKE2B e1db1b9f7e6e8c5b93eec5bb29fc24af7e6cc5cb3f209df346f03553d3fe7248614c9bb10e2ababd93ea56c63963c1db4ee65bedbae8c279fbe84b6d0eaad3f9 SHA512 4680db81a0212e695cfe2c40cabe6dceb94520cf3ee06e2e332f12316838726da14c0b925b117ea351aa14fd2d695f361bcb4062743c66099ef783ae31ab37ef
+DIST itk4.0.0.tar.gz 177838 BLAKE2B 6bb975c414d40c81bac4b8651ce89f0d84d712114e6f60e1555071d2079f778850f4de7df1a79254db1d1152e8d43f261e0bf9827737fb69abb2801e72d72d6d SHA512 4fd993e3683376bd2852a19e8ac63ec20a9319f3987737a32f7af78b645ff27416b18572b7e30fc1e41a5e4e06ac064280fd86d979738ca9906e2605069c51f3
+DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
+EBUILD itk-3.4.1.ebuild 1330 BLAKE2B 02307199e9565cd87b22ff4e0cc2a5d3e10c035587defed7cd1743fd1d2d7186a01f991c57171e2bdf2ad12b816fe3a37efa279206c732cf1a79e3f1aa159f7d SHA512 07d5a24d0e729ee3f80bf06eb9428da7c2ef7ce838fb7a205db54da28561861b44e2eb4b2fcae9b9c283d1666689a56fb0cb9d0dd8a39c66bf881aef867e9751
+EBUILD itk-4.0.0.ebuild 1467 BLAKE2B 67528687897aca81a858c904d33b1602126a25a4d89e3329dde95e1ef53e7a15850e8571cf45cf4472bab35d6db04f868edc33894b21d5e189f690efe8874839 SHA512 af6ce3adeaaf8da94dae5b9c459c9ab5a13a3f8276127470007ef9ca40147d9727fdcce7db161cf46e8e1a8671aa821118af15c643b8db1454d733a4896ce4fe
+EBUILD itk-4.0.1.ebuild 1468 BLAKE2B 5723a3c973ddbd57fc83e85fd552ec86e12a8d21cf7dc61b9e2239f7b308565d86edf110cf9570dbd03b277d8e50ac73f9aac386d103daad1563bfbe846c7e7d SHA512 0f7947165de490aa43e3902fdea7d2f8d272be30ca43124276f4c6b148a99c96ab5efb0f718acd864676a23e60d388d58803acf22928d26869c427c11ba9c5db
+MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itk/itk-3.4.1.ebuild b/dev-tcltk/itk/itk-3.4.1.ebuild
new file mode 100644
index 000000000000..c3275997968b
--- /dev/null
+++ b/dev-tcltk/itk/itk-3.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib versionator virtualx
+
+MY_PV=${PV/_beta/b}
+ITCL_VERSION="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PV}/${PN}${PV}.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	<dev-lang/tk-8.6:=
+	=dev-tcltk/itcl-3.4*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}$(get_version_component_range 1-2)"
+
+src_prepare() {
+	#epatch "${FILESDIR}"/${P}-install_data.patch
+	mv configure.{in,ac} || die
+	AT_M4DIR=.. eautoconf
+	sed 's:-pipe::g' -i configure || die
+}
+
+src_configure() {
+	source "${EPREFIX}"/usr/$(get_libdir)/itclConfig.sh || die
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tkinclude="${EPREFIX}"/usr/include \
+		--with-x
+}
+
+src_compile() {
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_test() {
+	Xemake test
+}
+
+src_install() {
+	default
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itk/itk-4.0.0.ebuild b/dev-tcltk/itk/itk-4.0.0.ebuild
new file mode 100644
index 000000000000..2c400ce80471
--- /dev/null
+++ b/dev-tcltk/itk/itk-4.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib versionator
+
+MY_PV=${PV/_beta/b}
+ITCL_VERSION="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
+#SRC_URI="mirror://sourceforge/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-lang/tk-8.6:=
+	=dev-tcltk/itcl-${ITCL_VERSION}*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${MY_PV}"
+
+src_prepare() {
+#	epatch "${FILESDIR}"/${P}-install_data.patch
+	AT_M4DIR=.. eautoconf
+	sed 's:-pipe::g' -i configure || die
+}
+
+src_configure() {
+	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tkinclude="${EPREFIX}"/usr/include \
+		--with-itcl="${ITCL_SRC_DIR}" \
+		--with-x
+}
+
+src_compile() {
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc license.terms
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itk/itk-4.0.1.ebuild b/dev-tcltk/itk/itk-4.0.1.ebuild
new file mode 100644
index 000000000000..82252d1377cd
--- /dev/null
+++ b/dev-tcltk/itk/itk-4.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib versionator
+
+MY_PV=${PV/_beta/b}
+ITCL_VERSION="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%20${MY_PV}/${PN}${MY_PV}.tar.gz"
+#SRC_URI="mirror://sourceforge/%5Bincr%20Tcl_Tk%5D-4-source/Itcl%20${MY_PV}/${PN}${MY_PV}.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-lang/tk-8.6:=
+	=dev-tcltk/itcl-${ITCL_VERSION}*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${MY_PV}"
+
+src_prepare() {
+#	epatch "${FILESDIR}"/${P}-install_data.patch
+	mv configure.{in,ac} || die
+	AT_M4DIR=.. eautoconf
+	sed 's:-pipe::g' -i configure || die
+}
+
+src_configure() {
+	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tkinclude="${EPREFIX}"/usr/include \
+		--with-itcl="${ITCL_SRC_DIR}" \
+		--with-x
+}
+
+src_compile() {
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	dodoc license.terms
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}${MY_PV}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itk/metadata.xml b/dev-tcltk/itk/metadata.xml
new file mode 100644
index 000000000000..d3074de5e0e4
--- /dev/null
+++ b/dev-tcltk/itk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">incrtcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/iwidgets-4.0.1 b/dev-tcltk/iwidgets-4.0.1
deleted file mode 100644
index 633624618851..000000000000
--- a/dev-tcltk/iwidgets-4.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-tcltk/itcl-3.2.1 >=dev-tcltk/itk-3.3-r1
-DESCRIPTION=Widget collection for incrTcl/incrTk
-EAPI=0
-HOMEPAGE=http://incrtcl.sourceforge.net/itcl/
-KEYWORDS=~alpha amd64 ia64 ppc sparc x86
-LICENSE=HPND Old-MIT tcltk
-RDEPEND=>=dev-tcltk/itcl-3.2.1 >=dev-tcltk/itk-3.3-r1
-SLOT=0
-SRC_URI=mirror://sourceforge/incrtcl/iwidgets4.0.1.tar.gz mirror://sourceforge/incrtcl/itcl3.2.1_src.tgz
-_md5_=1f5672e6addee8513f2f0fcaa91ce8a8
diff --git a/dev-tcltk/iwidgets-4.0.1-r3 b/dev-tcltk/iwidgets-4.0.1-r3
deleted file mode 100644
index 277a3bf063bf..000000000000
--- a/dev-tcltk/iwidgets-4.0.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-tcltk/itcl-3.2.1 >=dev-tcltk/itk-3.2.1
-DESCRIPTION=Widget collection for incrTcl/incrTk
-EAPI=4
-HOMEPAGE=http://incrtcl.sourceforge.net/itcl/
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=HPND Old-MIT tcltk
-RDEPEND=>=dev-tcltk/itcl-3.2.1 >=dev-tcltk/itk-3.2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/incrtcl/iwidgets4.0.1.tar.gz mirror://sourceforge/incrtcl/itcl3.2.1_src.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a230a99bc79e27b8be9b2b2aae5358aa
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
new file mode 100644
index 000000000000..8123a9076937
--- /dev/null
+++ b/dev-tcltk/iwidgets/Manifest
@@ -0,0 +1,6 @@
+AUX 4.0.1-path.patch 2376 BLAKE2B 18e3ef4be48239fe1ec4f819f9aadadd3351567eed2dd072dcf7f8c07e5acaa1cdf1b6771b3492ca583fd695af0c7473672e2518e0583da9db4d83110057b02b SHA512 1216beb6aad68591026e508827b062bcf2a547b76eac25b731f59ab0cf4b7b2c0a31a3c427e904ca9fec118f2db970d53a7aa81aa73a4b551fce3ec396625cc0
+DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
+DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
+EBUILD iwidgets-4.0.1-r3.ebuild 1419 BLAKE2B a8495945962f96b14c526b271db1c1df5ba685f6306e25aeb32945b16eb4bd4c25cb394fb8bb00fd9a640b45fe41dbf60ade547b2e5a3083ae4a22567acc0a6c SHA512 4604df9afa1eb983f9ec9c7a580fa244273ab9d98945698587ee629f068dd3b7cc27b9f3e3ae918d1f2bd95ee4d1807eb1fd2d2c972201a0c1f4ed8fe789c1d2
+EBUILD iwidgets-4.0.1.ebuild 863 BLAKE2B 6d4adbb993dd99a0a0b4e1924c7e8f23296430f17d78fbbb9e122bf58949e62b2bbfbc8915ce327b9a76c2d71b280f1293188a06999839d1948d472c361c2dc6 SHA512 1920f61dd8b29a1b8621aa61f802ed0006983f4b4528233219cfbade9e0a7aa89d634365e112b6925a584e2fea3cf2f84e19d4ad26ad12a55a3b57238262bd14
+MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
new file mode 100644
index 000000000000..095d9ed81e1c
--- /dev/null
+++ b/dev-tcltk/iwidgets/files/4.0.1-path.patch
@@ -0,0 +1,63 @@
+--- iwidgets4.0.1/Makefile.in
++++ iwidgets4.0.1/Makefile.in
+@@ -30,6 +30,7 @@
+ 
+ srcdir = @srcdir@
+ bindir = @bindir@
++mandir = @mandir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -48,7 +49,9 @@
+ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+ 
+ # Top-level directory in which to install manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)/mann
++
++DATA_DIR = $(INSTALL_ROOT)$(prefix)/share/iwidgets$(IWIDGETS_VERSION)
+ 
+ # Directory containing Tcl source code (for library used during test):
+ TCL_SRC_DIR = @TCL_SRC_DIR@
+@@ -135,26 +138,26 @@
+ 	    done;
+ 
+ install-demos:
+-	@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR)/demos/images $(SCRIPT_INSTALL_DIR)/demos/html
+-	@echo "Installing demos from $(srcdir)/demos into $(SCRIPT_INSTALL_DIR)/demos"
++	@$(MKINSTALLDIRS) $(DATA_DIR)/demos/images $(DATA_DIR)/demos/html
++	@echo "Installing demos from $(srcdir)/demos into $(DATA_DIR)/demos"
+ 	@for i in $(srcdir)/demos/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_SCRIPT) $$i $(SCRIPT_INSTALL_DIR)/demos; \
++	        $(INSTALL_SCRIPT) $$i $(DATA_DIR)/demos; \
+ 	    fi; \
+ 	    done;
+-	@echo "Installing images from $(srcdir)/demos/images into $(SCRIPT_INSTALL_DIR)/demos/images"
++	@echo "Installing images from $(srcdir)/demos/images into $(DATA_DIR)/demos/images"
+ 	for i in $(srcdir)/demos/images/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/images; \
++	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/images; \
+ 	    fi; \
+ 	    done;
+-	@echo "Installing html man pages from $(srcdir)/demos/html into $(SCRIPT_INSTALL_DIR)/demos/html"
++	@echo "Installing html man pages from $(srcdir)/demos/html into $(DATA_DIR)/demos/html"
+ 	for i in $(srcdir)/demos/html/*; \
+ 	    do \
+ 	    if [ -f $$i ] ; then \
+-	        $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/demos/html; \
++	        $(INSTALL_DATA) $$i $(DATA_DIR)/demos/html; \
+ 	    fi; \
+ 	    done;
+ 
+@@ -169,7 +172,6 @@
+ 	        $$i > $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
+ 	    chmod 444 $(MAN_INSTALL_DIR)/`basename iwidgets_$$i`; \
+ 	    done;
+-	$(INSTALL_DATA) $(srcdir)/license.terms $(SCRIPT_INSTALL_DIR)
+ 
+ Makefile: $(srcdir)/Makefile.in
+ 	$(SHELL) config.status
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
new file mode 100644
index 000000000000..1c42bf9071a0
--- /dev/null
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+ITCL_MY_P="itcl3.2.1"
+
+DESCRIPTION="Widget collection for incrTcl/incrTk"
+HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
+SRC_URI="
+	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
+	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
+
+LICENSE="HPND Old-MIT tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	>=dev-tcltk/itcl-3.2.1
+	>=dev-tcltk/itk-3.2.1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-path.patch
+	sed \
+		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
+		-i Makefile.in || die
+
+	# Bug 115470
+	rm doc/panedwindow.n
+}
+
+src_configure() {
+	econf \
+		--with-itcl="${WORKDIR}/${ITCL_MY_P}" \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# parallel borks #177088
+	emake -j1 INSTALL_ROOT="${D}" install
+
+	dodoc CHANGES ChangeLog README
+
+	# bug 247184 - iwidget installs man pages in /usr/man
+#	mkdir -p "${ED}"/usr/share/man/mann
+#	mv "${ED}"/usr/man/mann/* "${ED}"/usr/share/man/mann/
+#	rm -rf "${ED}"/usr/man
+
+	# demos are in the wrong place:
+#	mkdir -p "${ED}/usr/share/doc/${PF}"
+#	mv "${ED}/usr/$(get_libdir)/${MY_P}/demos" "${ED}/usr/share/doc/${PF}/"
+}
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
new file mode 100644
index 000000000000..a3b02f1740f0
--- /dev/null
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+MY_P=${PN}${PV}
+ITCL_MY_PN="itcl"
+ITCL_MY_PV="3.2.1"
+ITCL_MY_P="${ITCL_MY_PN}${ITCL_MY_PV}"
+
+DESCRIPTION="Widget collection for incrTcl/incrTk"
+HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
+SRC_URI="
+	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
+	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
+
+LICENSE="HPND Old-MIT tcltk"
+SLOT="0"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+DEPEND="
+	>=dev-tcltk/itcl-3.2.1
+	>=dev-tcltk/itk-3.3-r1"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} --with-itcl=${WORKDIR}/${ITCL_MY_P}"
+	econf ${myconf}
+}
+
+src_install() {
+	einstall || die "einstall failed"
+	dodoc CHANGES ChangeLog README || die
+	# Bug 115470
+	rm doc/panedwindow.n
+	doman doc/*.n || die
+}
diff --git a/dev-tcltk/iwidgets/metadata.xml b/dev-tcltk/iwidgets/metadata.xml
new file mode 100644
index 000000000000..d3074de5e0e4
--- /dev/null
+++ b/dev-tcltk/iwidgets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">incrtcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/metadata.xml b/dev-tcltk/metadata.xml
new file mode 100644
index 000000000000..0fadf10b5e15
--- /dev/null
+++ b/dev-tcltk/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-tcltk category contains Tcl- and Tk-related libraries and tools.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-tcltk enthält Bibliotheken und Werkzeuge für Tcl und Tk.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-tcltk contiene herramientas y librerías referentes
+		a Tcl y Tk.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-tcltkカテゴリーにはTclとTkに関連したライブラリーとツールが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-tcltk categorie bevat bibliotheken en hulpmiddelen voor het gebruik van de
+		programmeertalen Tcl en Tk.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-tcltk chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Tcl/Tk.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-tcltk contiene utilità e librerie per Tcl e Tk.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-tcltk contém bibliotecas e ferramentas
+		referentes a Tcl e Tk.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-tcltk zawiera biblioteki i narzędzia związane z Tcl i Tk.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-tcltk/mysqltcl-3.05 b/dev-tcltk/mysqltcl-3.05
deleted file mode 100644
index 737c0a01f6bc..000000000000
--- a/dev-tcltk/mysqltcl-3.05
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tcl:0 >=virtual/mysql-4.1
-DESCRIPTION=TCL MySQL Interface
-EAPI=4
-HOMEPAGE=http://www.xdobry.de/mysqltcl/
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=HPND
-RDEPEND=dev-lang/tcl:0 >=virtual/mysql-4.1
-SLOT=0
-SRC_URI=http://www.xdobry.de/mysqltcl/mysqltcl-3.05.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd9460c8f12a34ed4822cd70a3dab3db
diff --git a/dev-tcltk/mysqltcl-3.052 b/dev-tcltk/mysqltcl-3.052
deleted file mode 100644
index 246c267f83b1..000000000000
--- a/dev-tcltk/mysqltcl-3.052
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/tcl:0= virtual/mysql:0=
-DESCRIPTION=TCL MySQL Interface
-EAPI=6
-HOMEPAGE=http://www.xdobry.de/mysqltcl/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=HPND
-RDEPEND=dev-lang/tcl:0= virtual/mysql:0=
-SLOT=0
-SRC_URI=http://www.xdobry.de/mysqltcl/mysqltcl-3.052.tar.gz
-_md5_=35d0b535ad3c2eedda47033e26a88595
diff --git a/dev-tcltk/mysqltcl/Manifest b/dev-tcltk/mysqltcl/Manifest
new file mode 100644
index 000000000000..e363e1347984
--- /dev/null
+++ b/dev-tcltk/mysqltcl/Manifest
@@ -0,0 +1,6 @@
+AUX mysqltcl-3.05-ldflags.patch 448 BLAKE2B 7c0bb9294a96c870ffe4ecd0d3f401936695221fceee5a7a2b43aec8097a09849f8daf3e33e987a1492fb34f7c67a7aba5fe8ad3ef9bf2aabcc91c1f39f08315 SHA512 c253797952c5abe6633e9eb1394a1e5c2d6bd88f3c74f5f367a139b6de71fb22a645717c86d0d61a68b33a01240940e0347d184623ed1b889defea58c3c8ee79
+DIST mysqltcl-3.05.tar.gz 198755 BLAKE2B 56e9ce305167d4005138154111410ce46af1e57f72490cb83d854f12519cf1464ae6523bb0fb36b0884ce23e2d6611a044f70fc8e7c3522bc6648ebad539909c SHA512 14e0196b2fce08d97b085bcf25357a72797e9566578a6c0674a76e4402a704b43919b1ce8360d55719a6f2a36c6f68f3762dd23a9f737b7cf9f6537a00acb7ef
+DIST mysqltcl-3.052.tar.gz 187781 BLAKE2B 0fe9b145556de22364187de980d737cae99a5a18763b1e3b28e4aa849f7b0b30be543cfa956c37b15e756f75ec5804e92b8b452410d542c3c3390e52d88d0419 SHA512 f5af18ad9bbaedb1fdcdbaa326b5c4cc3f754b14ee9bdf9cbfa0e1a44227ec918426022aaa0f26a71fa1a3bce6b6d8d75f8612de7f540f287fd418088c91fddf
+EBUILD mysqltcl-3.05.ebuild 660 BLAKE2B 7efba23c541ba270f95129635fbba29fdbb4eebeabe522ceb64dffc9db88a34b9809e99f1db6ed6e65ea0d165b6d910dcbce4e2c5c835719090a794765036615 SHA512 ec478b9755395e113a8b7345a52414167230f06e28694e443b60df8062152e7bcb248dee197bc9b402c91c4be5ed38fda80410b9814eca1a4abc38d77d585fe0
+EBUILD mysqltcl-3.052.ebuild 656 BLAKE2B e6074209eba48baaf30f2edfcf6610694d7d9b17c8c3d046c242614d8e8db189d134ebc561505226f8b944f54f462e4ed86582c2a0d27e337ac1c7af981e8789 SHA512 c31bdba59fe5b316cf29c54cf34a801614fae431a1b5ac9a6f86690b91d8ed63be692e35dbc27bfb1a08b1f28c9f1a2fd99bb05aab2ca00303b1344d9334975f
+MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-tcltk/mysqltcl/files/mysqltcl-3.05-ldflags.patch b/dev-tcltk/mysqltcl/files/mysqltcl-3.05-ldflags.patch
new file mode 100644
index 000000000000..5aa440332153
--- /dev/null
+++ b/dev-tcltk/mysqltcl/files/mysqltcl-3.05-ldflags.patch
@@ -0,0 +1,16 @@
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 0552d56..e32a0b4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -107,7 +107,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(LDFLAGS)
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ @MYSQL_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/mysqltcl/metadata.xml b/dev-tcltk/mysqltcl/metadata.xml
new file mode 100644
index 000000000000..709689b06053
--- /dev/null
+++ b/dev-tcltk/mysqltcl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/mysqltcl/mysqltcl-3.05.ebuild b/dev-tcltk/mysqltcl/mysqltcl-3.05.ebuild
new file mode 100644
index 000000000000..6de346fcd25d
--- /dev/null
+++ b/dev-tcltk/mysqltcl/mysqltcl-3.05.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib
+
+DESCRIPTION="TCL MySQL Interface"
+HOMEPAGE="http://www.xdobry.de/mysqltcl/"
+SRC_URI="http://www.xdobry.de/mysqltcl/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tcl:0
+	>=virtual/mysql-4.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i 's/-pipe//g;s/-O2//g;s/-fomit-frame-pointer//g' configure || die
+}
+
+src_configure() {
+	econf --with-mysql-lib=/usr/$(get_libdir)/mysql
+}
+
+src_install() {
+	default
+	dohtml doc/mysqltcl.html
+}
diff --git a/dev-tcltk/mysqltcl/mysqltcl-3.052.ebuild b/dev-tcltk/mysqltcl/mysqltcl-3.052.ebuild
new file mode 100644
index 000000000000..3dd15444e78b
--- /dev/null
+++ b/dev-tcltk/mysqltcl/mysqltcl-3.052.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="TCL MySQL Interface"
+HOMEPAGE="http://www.xdobry.de/mysqltcl/"
+SRC_URI="http://www.xdobry.de/mysqltcl/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tcl:0=
+	virtual/mysql:0="
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-3.05-ldflags.patch )
+HTML_DOCS=( doc/mysqltcl.html )
+
+src_prepare() {
+	default_src_prepare
+	sed -i 's/-pipe//g;s/-O2//g;s/-fomit-frame-pointer//g' configure || die
+}
+
+src_configure() {
+	econf --with-mysql-lib=$(mysql_config --variable=pkglibdir)
+}
diff --git a/dev-tcltk/scwoop-4.1 b/dev-tcltk/scwoop-4.1
deleted file mode 100644
index 49d83d4e0da3..000000000000
--- a/dev-tcltk/scwoop-4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-tcltk/tcllib
-DESCRIPTION=Simple Composite Widget Object Oriented Package
-EAPI=0
-HOMEPAGE=http://jfontain.free.fr/scwoop41.htm
-KEYWORDS=x86 amd64 ~ppc
-LICENSE=jfontain
-RDEPEND=dev-tcltk/tcllib
-SLOT=0
-SRC_URI=http://jfontain.free.fr/scwoop-4.1.tar.gz
-_md5_=952d8e0fd603e3e9e753af7b7ff592d4
diff --git a/dev-tcltk/scwoop/Manifest b/dev-tcltk/scwoop/Manifest
new file mode 100644
index 000000000000..6fc90112b597
--- /dev/null
+++ b/dev-tcltk/scwoop/Manifest
@@ -0,0 +1,3 @@
+DIST scwoop-4.1.tar.gz 86368 BLAKE2B 3bd736e2f3aad4b6ca10582e78c0b6bafdb8314577c6176ca386f98074d1ecc81151fe724423e09a6c2fa553d9ecee7f246b4297f74e42c78539f1ef169f2c6b SHA512 8fd3fc01bd133aa155b45dcc5a821986aa72115fe248e0382611604f9e23596506f0d34ac331c4824bfd84dce7958b7a10186551604a0614572ee4e84fa3be21
+EBUILD scwoop-4.1.ebuild 550 BLAKE2B ec0a0a15173413351344e1424eeec48b69e3f78be7b602f639257ee99b1d4ef45db898b15a1bb74f2b71b3cc7120df4749b2675eb2fae7d65218a1e13a48bc4e SHA512 fec97fd192edc1faff84102c1ab14e5490c9b8e092c9093901e033f219b260d8436fd3584c2afaade0d01d9b09097edbd2bf4af42ee7d19a455f486733bdbfc1
+MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/scwoop/metadata.xml b/dev-tcltk/scwoop/metadata.xml
new file mode 100644
index 000000000000..d836ed383e14
--- /dev/null
+++ b/dev-tcltk/scwoop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/scwoop/scwoop-4.1.ebuild b/dev-tcltk/scwoop/scwoop-4.1.ebuild
new file mode 100644
index 000000000000..2c5176dbb836
--- /dev/null
+++ b/dev-tcltk/scwoop/scwoop-4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Simple Composite Widget Object Oriented Package"
+HOMEPAGE="http://jfontain.free.fr/scwoop41.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.gz"
+
+LICENSE="jfontain"
+KEYWORDS="x86 amd64 ~ppc"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-tcltk/tcllib"
+
+src_install() {
+	dodir /usr/lib/scwoop
+	./instapkg.tcl "${D}"/usr/lib/scwoop || die
+
+	dodoc CHANGES CONTENTS COPYRIGHT INSTALL README TODO
+	dohtml scwoop.htm
+	docinto demo
+	dodoc demo*
+}
diff --git a/dev-tcltk/snack-2.2.10-r6 b/dev-tcltk/snack-2.2.10-r6
deleted file mode 100644
index 2c08db80bf08..000000000000
--- a/dev-tcltk/snack-2.2.10-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) vorbis? ( media-libs/libvorbis ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=The Snack Sound Toolkit (Tcl)
-EAPI=5
-HOMEPAGE=http://www.speech.kth.se/snack/
-IUSE=alsa examples python threads vorbis python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) vorbis? ( media-libs/libvorbis ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51c6d0f0061f093d36a7e91fb76153b3
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
new file mode 100644
index 000000000000..c4dceb3a8ce9
--- /dev/null
+++ b/dev-tcltk/snack/Manifest
@@ -0,0 +1,6 @@
+AUX alsa-undef-sym.patch 1225 BLAKE2B 330c8e3da69aebe63fff74cdf32ab5fce303d6f2ffc2f5a06d9d2e406064e2758527cf3891a43d9971509c52a2fdcb30a1c1798f41a9c6f7d12004cceb53d68b SHA512 2f925029ca7ebcf0028beb2c303d07831879d9750b5f4f463a8d463964301d0182650b9ad50b103be6c0e5eb4cb58a19e02496b7afee8531dcb2c132a292ff97
+AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70fa7dec4dcbc5e63931aee58ad1f021e0a47f0bfdc7a52e69693bf32bae618a49f5c35c757694dd14984ebc79cd62acce2bda7 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8
+AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a
+DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
+EBUILD snack-2.2.10-r6.ebuild 2012 BLAKE2B db70db5649537e2a4fb3d4484eafd6366e016b384415ec40330c4ff345c934c8554fdd34a91734c074d37096401ae883ad8d359deeeb6fb465950c16157cb0bf SHA512 30849b4e77e6177d41d32004ad1026ef44a57d654d25e583ebe6e7a16a08d0224ea3a79e0df62c7238b19b3d92fb1ab51325404e7f1e5e324208e3ccbeb13d62
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/files/alsa-undef-sym.patch b/dev-tcltk/snack/files/alsa-undef-sym.patch
new file mode 100644
index 000000000000..77a222754fe1
--- /dev/null
+++ b/dev-tcltk/snack/files/alsa-undef-sym.patch
@@ -0,0 +1,49 @@
+--- unix/jkAudIO_alsa.c   2005-12-14 12:29:38.000000000 +0100
++++ unix/jkAudIO_alsa.c   2008-09-01 22:51:20.000000000 +0200
+@@ -49,6 +49,8 @@
+ 
+ static int minNumChan = 1;
+ 
++static snd_pcm_uframes_t hw_bufsize = 0;
++
+ int
+ SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
+           int nchannels, int encoding)
+@@ -135,6 +137,9 @@
+     Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
+     return TCL_ERROR;
+   }
++
++  snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize);
++
+   snd_pcm_hw_params_free(hw_params);
+   snd_pcm_prepare(A->handle);
+   if (A->mode == RECORD) {
+@@ -202,6 +207,8 @@
+   int i;
+   static char buf[64];
+ 
++  return;
++      
+   if (A->debug > 1) Snack_WriteLog("  Enter SnackAudioPost\n");
+ 
+   for (i = 0; i < 1000; i++) {
+@@ -267,12 +274,14 @@
+ long
+ SnackAudioPlayed(ADesc *A)
+ {
+-  long avail = _snd_pcm_mmap_hw_ptr(A->handle);
++  // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
++  long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
++  // long avail = _snd_pcm_mmap_hw_ptr(A->handle);
+   
+-  if (avail < 0)
+-    avail = 0;
++  if (played < 0)
++   return 0;
+ 
+-  return (avail+A->nPlayed);
++  return (played);
+ }
+ 
+ void 
+\ No newline at end of file
diff --git a/dev-tcltk/snack/files/snack-2.2.10-CVE-2012-6303-fix.patch b/dev-tcltk/snack/files/snack-2.2.10-CVE-2012-6303-fix.patch
new file mode 100644
index 000000000000..6326e8a48d04
--- /dev/null
+++ b/dev-tcltk/snack/files/snack-2.2.10-CVE-2012-6303-fix.patch
@@ -0,0 +1,19 @@
+diff -up snack2.2.10/generic/jkSoundFile.c.CVE20126303 snack2.2.10/generic/jkSoundFile.c
+--- snack2.2.10/generic/jkSoundFile.c.CVE20126303	2013-01-02 11:26:15.496231056 -0500
++++ snack2.2.10/generic/jkSoundFile.c	2013-01-02 11:27:26.134250662 -0500
+@@ -1798,7 +1798,14 @@ static int
+ GetHeaderBytes(Sound *s, Tcl_Interp *interp, Tcl_Channel ch, char *buf, 
+ 	       int len)
+ {
+-  int rlen = Tcl_Read(ch, &buf[s->firstNRead], len - s->firstNRead);
++  int rlen;
++
++  if (len > max(CHANNEL_HEADER_BUFFER, HEADBUF)){
++    Tcl_AppendResult(interp, "Excessive header size", NULL);
++    return TCL_ERROR;
++  }
++
++  rlen = Tcl_Read(ch, &buf[s->firstNRead], len - s->firstNRead);
+ 
+   if (rlen < len - s->firstNRead){
+     Tcl_AppendResult(interp, "Failed reading header bytes", NULL);
diff --git a/dev-tcltk/snack/files/snack-2.2.10-darwin.patch b/dev-tcltk/snack/files/snack-2.2.10-darwin.patch
new file mode 100644
index 000000000000..8c6dc5285863
--- /dev/null
+++ b/dev-tcltk/snack/files/snack-2.2.10-darwin.patch
@@ -0,0 +1,28 @@
+* grobian@gentoo.org: need all symbols to be satisfied, need
+  install_name for actual usage
+
+--- unix/Makefile.in
++++ unix/Makefile.in
+@@ -35,7 +35,7 @@
+ 
+ LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
+ 
+-LIBSN     = -lc @TK_LIBS@ @ALIB@ @TCL_LIB_SPEC@ @TK_LIB_SPEC@
++LIBSN     = -lc -lX11 -ltk @TK_LIBS@ @ALIB@ @TCL_LIB_SPEC@ @TK_LIB_SPEC@
+ 
+ SHLIB_LD     = @SHLIB_LD@
+ SHLIB_SUFFIX = @SHLIB_SUFFIX@
+@@ -158,11 +158,11 @@
+ 	$(CC) -c $(CFLAGS) $(GENERIC_DIR)/snackStubLib.c
+ 
+ libsound${SHLIB_SUFFIX}: ${OBJSO}
+-	${SHLIB_LD} ${OBJSO} ${LIBSO} -o libsound${SHLIB_SUFFIX} 
++	${SHLIB_LD} ${OBJSO} ${LIBSO} -install_name $(SNACK_INSTALL_PATH)/snack${VERSION}/libsound${SHLIB_SUFFIX} -o libsound${SHLIB_SUFFIX} 
+ 	sed s/.dll/${SHLIB_SUFFIX}/ < $(UNIX_DIR)/pkgIndex.tcl.dll > pkgIndex.tcl
+ 
+ libsnack${SHLIB_SUFFIX}: ${OBJSN}
+-	${SHLIB_LD} ${OBJSN} ${LIBSN} -o libsnack${SHLIB_SUFFIX} 
++	${SHLIB_LD} ${OBJSN} ${LIBSN} -install_name $(SNACK_INSTALL_PATH)/snack${VERSION}/libsnack${SHLIB_SUFFIX} -o libsnack${SHLIB_SUFFIX} 
+ 	sed s/.dll/${SHLIB_SUFFIX}/ < $(UNIX_DIR)/pkgIndex.tcl.dll > pkgIndex.tcl
+ 
+ stublib: ${OBJSNST}
diff --git a/dev-tcltk/snack/metadata.xml b/dev-tcltk/snack/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/snack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/snack/snack-2.2.10-r6.ebuild b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
new file mode 100644
index 000000000000..d7af7b86d79e
--- /dev/null
+++ b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit autotools autotools-utils distutils-r1 multilib
+
+DESCRIPTION="The Snack Sound Toolkit (Tcl)"
+HOMEPAGE="http://www.speech.kth.se/snack/"
+SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+SLOT="0"
+IUSE="alsa examples python threads vorbis"
+
+RESTRICT="test" # Bug 78354
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	alsa? ( media-libs/alsa-lib )
+	python? ( ${PYTHON_DEPS} )
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/unix"
+
+#PYTHON_MODNAME="tkSnack.py"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/alsa-undef-sym.patch
+	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
+	)
+
+src_prepare() {
+	# adds -install_name (soname on Darwin)
+	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
+
+	sed \
+		-e "s:ar cr:$(tc-getAR) cr:g" \
+		-e "s:-O:${CFLAGS}:g" \
+		-i Makefile.in || die
+
+	cd .. || die
+
+	autotools-utils_src_prepare
+
+	sed \
+		-e 's|^\(#define roundf(.*\)|//\1|' \
+		-i generic/jkFormatMP3.c || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--includedir="${EPREFIX}"/usr/include
+		)
+
+	use alsa && myconf+=( --enable-alsa )
+	use threads && myconf+=( --enable-threads )
+
+	use vorbis && \
+		myconf+=( --with-ogg-include="${EPREFIX}"/usr/include ) && \
+		myconf+=( --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir) )
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use python ; then
+		cd "${S}"/../python || die
+		distutils-r1_src_install
+	fi
+
+	cd "${S}"/.. || die
+
+	dohtml doc/*
+
+	if use examples ; then
+		docinto examples
+		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
+		dodoc -r demos/tcl
+
+		use python && dodoc -r demos/python
+	fi
+}
diff --git a/dev-tcltk/tablelist-5.8 b/dev-tcltk/tablelist-5.8
deleted file mode 100644
index f197b718deda..000000000000
--- a/dev-tcltk/tablelist-5.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Multi-Column Listbox Package
-EAPI=5
-HOMEPAGE=http://www.nemethi.de/tablelist/index.html
-IUSE=examples doc
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=tablelist
-RDEPEND=dev-lang/tcl:0
-SLOT=0
-SRC_URI=http://www.nemethi.de/tablelist/tablelist5.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c38a2d4ff6ab6d298a2d9879a9065f94
diff --git a/dev-tcltk/tablelist/Manifest b/dev-tcltk/tablelist/Manifest
new file mode 100644
index 000000000000..e3a4d1e0624d
--- /dev/null
+++ b/dev-tcltk/tablelist/Manifest
@@ -0,0 +1,3 @@
+DIST tablelist5.8.tar.gz 416416 BLAKE2B 04372aab25af72d331da342aa85f49238ee39fe15da3f1f418e5345561b8feb6b6974b3a956f6d8d49063767030d60f01ce5207caa446b8f1936667aaca0155a SHA512 9c8e3577ae0e89291450c7ecccbbb042417d9a24255489e9257eae2b48454cbef4ec759949ddfc8d73123260da3fc506e01acf6c15e113e5112ed15c014d6833
+EBUILD tablelist-5.8.ebuild 663 BLAKE2B 7a34e883f735ff7b5e8a9c2f77126882e9108a2db6cafd5eb95dbc90aa9c6b810571516eb838616103d325983f3801685b30cdca65e07d47ce7837dfbfaed8d3 SHA512 1e9b61a0ede9169eff9a24e54d782a614c6b738afbfdac623d1fdc1b54c9d306699cc426d3fc4b330793a393ca2f27ba2d99b82c401d99b4e45265a7da441047
+MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-tcltk/tablelist/metadata.xml b/dev-tcltk/tablelist/metadata.xml
new file mode 100644
index 000000000000..8425c0d53cb0
--- /dev/null
+++ b/dev-tcltk/tablelist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tablelist/tablelist-5.8.ebuild b/dev-tcltk/tablelist/tablelist-5.8.ebuild
new file mode 100644
index 000000000000..13227dd19379
--- /dev/null
+++ b/dev-tcltk/tablelist/tablelist-5.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Multi-Column Listbox Package"
+HOMEPAGE="http://www.nemethi.de/tablelist/index.html"
+SRC_URI="http://www.nemethi.de/tablelist/${MY_P}.tar.gz"
+
+LICENSE="tablelist"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="examples doc"
+
+RDEPEND="dev-lang/tcl:0"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${MY_P}
+	doins -r ${PN}* pkgIndex.tcl scripts
+	use doc && dohtml doc/*
+	use examples && insinto /usr/share/${PN} && doins -r demos
+	dodoc README.txt
+}
diff --git a/dev-tcltk/tcl-mccp-0.6 b/dev-tcltk/tcl-mccp-0.6
deleted file mode 100644
index 3bcfb542dc94..000000000000
--- a/dev-tcltk/tcl-mccp-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl:0= >=app-portage/elt-patches-20170422
-DESCRIPTION=mccp extension to TCL
-EAPI=5
-HOMEPAGE=http://tcl-mccp.sf.net/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/tcl-mccp/tcl-mccp-0.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0d0a7ad580f23c3b018884f002ec7e3
diff --git a/dev-tcltk/tcl-mccp/Manifest b/dev-tcltk/tcl-mccp/Manifest
new file mode 100644
index 000000000000..36ed3f2a038f
--- /dev/null
+++ b/dev-tcltk/tcl-mccp/Manifest
@@ -0,0 +1,4 @@
+AUX tcl-mccp-0.6-flags.patch 542 BLAKE2B 79b55fa8fc3ec3a7a7db8070699b426ca50fb7d76dc6185a141e0490d430cc84ba8ca8eb131f5b6f3745a1c3ddd9125b88e739491aaaae6089a1e1a6e28849b0 SHA512 c89c93b56ad2fc5d30ab79b968e79ac4eb737b1e545108e4f1d76828418f5e5d3f38505ea4a0a2adbbc676f8f7e1e40eda0e6e2c4c79238087096b44cb690886
+DIST tcl-mccp-0.6.tar.gz 167446 BLAKE2B 6ebd6fb6fbaa8cd8c6438dd21e38fd19fca47c1e0c7e96c33fc183e7be2d2c42fbfb2b3225e49243c941a1f018d6efbef3183ef736a52117e2e3cf01d1698aec SHA512 d3f77b49454dc4f838b91d95146c71d6f8d46d293743b46b551e9217a92a9f6b03b26400cc21faf9bb22a0a0f92123b25f9b284453f756654e87b82201c395e6
+EBUILD tcl-mccp-0.6.ebuild 441 BLAKE2B a9a4b3c36307456c8872a65980ab51e160797c37b1e1c7d09a5f1a506851967472c2641baa405ce0f5964d708042d716c8a741979684615aea082d3580edb97d SHA512 631f610b198deeb1df7ca90c39ec0b4ba5d0484e169701bee00ab77b808d89cb36d2807fa04811b0c7bcd882686c379d8956da7838b45389e9df2722b6c5b771
+MISC metadata.xml 331 BLAKE2B c997cc555632151748b711b082971ca85a7fc9649144465ca0d8b4ab32656f039eedffc742aace78ac6f32cd1fadae2ed9c55f4eb134946d4d539cca7c9e0a6b SHA512 b22d31f4f4502cd2efa5aeee0914277c7b3fe45967ed231b2514f26cad2b86ea03beb19b60e88c2a5fce6c26833bdf50d2b5aafd554af98fc0a7c976942c46d9
diff --git a/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch b/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch
new file mode 100644
index 000000000000..b3b563d3d7c1
--- /dev/null
+++ b/dev-tcltk/tcl-mccp/files/tcl-mccp-0.6-flags.patch
@@ -0,0 +1,18 @@
+ Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 956887d..4af7a06 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -91,8 +91,8 @@ lib_LTLIBRARIES = libtcl-mccp.la
+ libtcl_mccp_la_SOURCES = MCCP.c mccpDecompress.c
+ lib_DATA = pkgIndex.tcl
+ 
+-CFLAGS := -Wall -I $(TCL_PREFIX)/include -lz
+-LIBS := $(TCL_STUB_LIB_SPEC) 
++CFLAGS += -Wall -I $(TCL_PREFIX)/include
++LIBS += $(TCL_STUB_LIB_SPEC) -lz
+ 
+ # FIXME: is this the right way to mofify libdir?
+ libdir = @libdir@/tcl-mccp
diff --git a/dev-tcltk/tcl-mccp/metadata.xml b/dev-tcltk/tcl-mccp/metadata.xml
new file mode 100644
index 000000000000..368a0ae4c4a9
--- /dev/null
+++ b/dev-tcltk/tcl-mccp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tcl-mccp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild b/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
new file mode 100644
index 000000000000..8af98e3f15c7
--- /dev/null
+++ b/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="mccp extension to TCL"
+HOMEPAGE="http://tcl-mccp.sf.net/"
+SRC_URI="mirror://sourceforge/tcl-mccp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
diff --git a/dev-tcltk/tcl3d-0.4.0 b/dev-tcltk/tcl3d-0.4.0
deleted file mode 100644
index ba3f385644c5..000000000000
--- a/dev-tcltk/tcl3d-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/swig-1.3.19
-DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=5
-HOMEPAGE=http://www.tcl3d.org
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.tcl3d.org/download/tcl3d-0.4.0.distrib/tcl3d-src-0.4.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87b549d9c9b4158df1e28162273b585d
diff --git a/dev-tcltk/tcl3d-0.4.0-r1 b/dev-tcltk/tcl3d-0.4.0-r1
deleted file mode 100644
index f864eed82b13..000000000000
--- a/dev-tcltk/tcl3d-0.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/swig-1.3.19
-DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=5
-HOMEPAGE=http://www.tcl3d.org
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.tcl3d.org/download/tcl3d-0.4.0.distrib/tcl3d-src-0.4.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9407932200ea3b975fa6fafb8cbd001b
diff --git a/dev-tcltk/tcl3d-0.5.0 b/dev-tcltk/tcl3d-0.5.0
deleted file mode 100644
index a2c48a903829..000000000000
--- a/dev-tcltk/tcl3d-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/swig-1.3.38:0= dev-lang/tk:0= dev-lang/tcl:0= dev-games/ode dev-games/openscenegraph media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu
-DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=6
-HOMEPAGE=http://www.tcl3d.org
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.tcl3d.org/download/tcl3d-0.5.0.distrib/tcl3d-src-0.5.0.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=540a58842663e7e6692a0eafe3f1a932
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
new file mode 100644
index 000000000000..68454ee8b48a
--- /dev/null
+++ b/dev-tcltk/tcl3d/Manifest
@@ -0,0 +1,7 @@
+AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
+DIST tcl3d-src-0.4.0.zip 1501305 BLAKE2B 61fe35df0bf5624ef5fbd7fa029b8ad7a23ed6304bd5da8b8bb035b94ad6311ad3868793b7ea5a464d990cfaee98af88ef6d398dddbdba4e89d894005e5ce9ed SHA512 a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5
+DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
+EBUILD tcl3d-0.4.0-r1.ebuild 1333 BLAKE2B d07d4f56b7cea8ef7f5d03211be9a3a5bbd5e9a3e0d71b4dcff726a29ceb7fd85eaf372f820edd88987200adfbd285793bc6a47e343d39cb308c8186b2bf6e3d SHA512 541ab991db6ee8c54838abe091d6574cfa45afc7529d0a6bc2da58370369f0b11bc633ea8ef216a4910a35d4a43e9b6b2b2ebba93bde29e70b01975780a87646
+EBUILD tcl3d-0.4.0.ebuild 1332 BLAKE2B 2d958e54233102755773f21b394acf30c79c6489df5bed1bfea5ab657223eb667465a8fda07f5ec1d48a35a0528dd03822233786ba97086f7059e4f4e592d28f SHA512 7bcb8c5cadb7720734b3b8bf69417840f7af75d300b53c822609207efe1f82ab428c41872218dc0d2efbf20b2df701398c908c2da0d073695a0fbdaaf276bd93
+EBUILD tcl3d-0.5.0.ebuild 1596 BLAKE2B 235282d16ec37e5bb50ef2fb0a1b789365a723915a47c8c85b9ed595ba307e76abcfa1b979b4114a2afd1ff4b299e91f6d93644ca66152435e37461c72961b7f SHA512 329a86fa856a055bf1a68b9e9c650ccf15da85491a1c64b733009c0bb01af05c2e892fc69890625980e714b5facf205dfc3778361c3dab43fdf7f8511b052899
+MISC metadata.xml 1103 BLAKE2B b5528e54e960a114a53f560125ffdb30e45bf2dd2e9376a3d296d1734a40a8782b9e10e64cd50a80cd38b0f72cad7afe651c053c636f553f3c881cfc56a1f394 SHA512 8b5a1142c700c1319ce44617f1f4fe81475df16d3be90f5a8774c72cabab5fce196821d95d957bed2009454295edd868ad03c67fe0b8b8953f3338b197c53fa7
diff --git a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch
new file mode 100644
index 000000000000..58efa18acdb2
--- /dev/null
+++ b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch
@@ -0,0 +1,72 @@
+diff -ru tcl3d/config_Linux tcl3d-m/config_Linux
+--- tcl3d/config_Linux	2010-08-30 15:57:56.000000000 -0400
++++ tcl3d-m/config_Linux	2016-10-30 13:28:34.080601812 -0400
+@@ -74,6 +74,8 @@
+ TKINCDIR     = $(TKDIR)/include
+ TCLLIBDIR    = $(TCLDIR)/lib
+ TKLIBDIR     = $(TKDIR)/lib
++TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include
++TKLIBINCDIR  = $(TCLLIBDIR)/tk$(TCLVERSION)/include
+ TCLSTUBLIBS  = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT)
+ TCLSTDLIBS   = $(TKLIBDIR)/libtk$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(LIBEXT)
+ TCLSH        = tclsh$(TCLVERSION)
+@@ -84,7 +86,13 @@
+ CPDIR        = csh -f cpdir
+ MKDIR        = mkdir -p
+ 
+-INCL   = -I. -I$(TCLINCDIR)
++INCL   = \
++		-I. \
++		-I$(TCLINCDIR) \
++		-I$(TCLLIBINCDIR)/generic \
++		-I$(TCLLIBINCDIR)/unix \
++		-I$(TKLIBINCDIR)/generic \
++		-I$(TKLIBINCDIR)/unix
+ 
+ ifdef WITH_STUBS
+ TCLLIBS = $(TCLSTUBLIBS)
+diff -ru tcl3d/config_Linux64 tcl3d-m/config_Linux64
+--- tcl3d/config_Linux64	2010-12-30 16:06:48.000000000 -0500
++++ tcl3d-m/config_Linux64	2016-10-30 13:08:33.326771912 -0400
+@@ -74,6 +74,8 @@
+ TKINCDIR     = $(TKDIR)/include
+ TCLLIBDIR    = $(TCLDIR)/lib64
+ TKLIBDIR     = $(TKDIR)/lib64
++TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include
++TKLIBINCDIR  = $(TCLLIBDIR)/tk$(TCLVERSION)/include
+ TCLSTUBLIBS  = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT)
+ TCLSTDLIBS   = $(TKLIBDIR)/libtk$(TCLVERSION)$(SHLIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(SHLIBEXT)
+ TCLSH        = tclsh$(TCLVERSION)
+@@ -84,7 +86,13 @@
+ CPDIR        = csh -f cpdir
+ MKDIR        = mkdir -p
+ 
+-INCL   = -I. -I$(TCLINCDIR)
++INCL   = \
++		-I. \
++		-I$(TCLINCDIR) \
++		-I$(TCLLIBINCDIR)/generic \
++		-I$(TCLLIBINCDIR)/unix \
++		-I$(TKLIBINCDIR)/generic \
++		-I$(TKLIBINCDIR)/unix
+ 
+ ifdef WITH_STUBS
+ TCLLIBS = $(TCLSTUBLIBS)
+diff -ru tcl3d/tcl3dOsg/Makefile tcl3d-m/tcl3dOsg/Makefile
+--- tcl3d/tcl3dOsg/Makefile	2010-09-30 16:20:28.000000000 -0400
++++ tcl3d-m/tcl3dOsg/Makefile	2016-10-30 13:12:53.367593401 -0400
+@@ -308,12 +308,13 @@
+     OPT += /Od
+ endif
+ CFLAGS = $(OPT) $(PPDEFS) -I$(GL_INCDIR) -Iinclude $(INCL)   
++CXXFLAGS = -fpermissive
+ 
+ .SUFFIXES:                    # Delete the default suffixes.
+ .SUFFIXES: .cpp $(OBJEXT) .h  # Install our own suffixes.
+ 
+ .cpp$(OBJEXT):
+-	$(CXX) $(CFLAGS) $<
++	$(CXX) $(CFLAGS) $(CXXFLAGS) $<
+ 
+ all: osg osganimation osgdb osgfx osgga osgmanipulator osgopenthreads \
+      osgparticle osgsim osgshadow osgterrain osgtext osgutil osgviewer \
diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml
new file mode 100644
index 000000000000..851c8cbb0582
--- /dev/null
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
+<longdescription>
+Tcl3D offers the 3D functionality of OpenGL and other 3D libraries at the Tcl scripting level.
+The Tcl3D package currently consists of the following modules:
+
+Tcl3D core module
+tcl3dOgl 	Enhanced Togl widget, a Tk widget for displaying OpenGL content.
+	Wrapper for core OpenGL functionality (GL Version 3.0, GLU Version 1.2) and OpenGL extensions.
+	Tcl3D utility library: Math functions, standard shapes, stop watch, demo support.
+
+Tcl3D optional modules
+tcl3dCg 	Wrapper for NVidia's Cg shading language. *
+tcl3dSDL 	Wrapper for the Simple DirectMedia Library.
+tcl3dFTGL 	Wrapper for the OpenGL Font Rendering Library.
+tcl3dGl2ps 	Wrapper for the OpenGL To Postscript library. *
+tcl3dOde 	Wrapper for the Open Dynamics Engine.
+tcl3dOsg    Wrapper for OpenSceneGraph
+tcl3dGauges 	Tcl3D package for displaying gauges.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..c424262b15bb
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
+HOMEPAGE="http://www.tcl3d.org"
+SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-games/ode
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.19"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
+	sed -i \
+		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
+		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
+		config_Linux* || die
+
+	# fix libSDL link
+	sed -i \
+		-e 's:-lSDL-1\.2:-lSDL:g' \
+		tcl3dSDL/Makefile || die
+}
+
+src_compile() {
+	append-flags -mieee-fp -ffloat-store -fPIC
+	use debug || append-flags -DNDEBUG
+
+	emake \
+		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
+		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
+		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
+}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
new file mode 100644
index 000000000000..349309c5a5ad
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
+HOMEPAGE="http://www.tcl3d.org"
+SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-games/ode
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.19"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
+	sed -i \
+		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
+		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
+		config_Linux* || die
+
+	# fix libSDL link
+	sed -i \
+		-e 's:-lSDL-1\.2:-lSDL:g' \
+		tcl3dSDL/Makefile || die
+}
+
+src_compile() {
+	append-flags -mieee-fp -ffloat-store -fPIC
+	use debug || append-flags -DNDEBUG
+
+	emake \
+		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
+		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
+		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr$(get_libdir)" install
+}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
new file mode 100644
index 000000000000..e9a64f8be868
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
+HOMEPAGE="http://www.tcl3d.org"
+SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=dev-lang/swig-1.3.38:0=
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	dev-games/ode
+	dev-games/openscenegraph
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
+
+src_prepare() {
+	default
+
+	local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}"
+
+	einfo "Configuring for Tcl ${_TCL_FV}"
+	sed -i \
+		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${_TCL_V[0]}':' \
+		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${_TCL_V[1]}':' \
+		config_Linux* || die
+
+	# Fix libSDL link
+	sed -i -e 's:-lSDL-1\.2:-lSDL:g' tcl3dSDL/Makefile || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	use debug || append-flags -DNDEBUG
+
+	# Restricting build to -j1 since it seems that if we build it in parallel,
+	# it fails with the "tcl3dOsg" project attempting to import glewdefs.i,
+	# and not finding it.
+	emake \
+		-j1 \
+		INSTDIR="/usr" \
+		OPT="${CFLAGS}" \
+		CC="$(tc-getCC) -c" \
+		CXX="$(tc-getCXX) -c" \
+		LD="$(tc-getLD)" \
+		WRAP_FTGL=1 \
+		WRAP_SDL=1 \
+		WRAP_GL2PS=0 \
+		WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
+}
diff --git a/dev-tcltk/tcllib-1.15-r2 b/dev-tcltk/tcllib-1.15-r2
deleted file mode 100644
index b36a36efe912..000000000000
--- a/dev-tcltk/tcllib-1.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tcl:0= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tcl Standard Library
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/software/tcllib/
-IUSE=examples test
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0=
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/tcllib-1.15-patchset.tar.xz mirror://sourceforge/tcllib/tcllib-1.15.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=dccb854bce044bad010a0c1c0701a2eb
diff --git a/dev-tcltk/tcllib-1.16 b/dev-tcltk/tcllib-1.16
deleted file mode 100644
index 56d52fa94153..000000000000
--- a/dev-tcltk/tcllib-1.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tcl:0= dev-tcltk/tdom test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Tcl Standard Library
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/software/tcllib/
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
-SLOT=0
-SRC_URI=mirror://sourceforge//project/tcllib/tcllib/1.16/Tcllib-1.16.tar.bz2 https://dev.gentoo.org/~mgorny/dist/tcllib-1.16-patchset.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=9b06beba23038f29a57ebc0b96c9c7d5
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
new file mode 100644
index 000000000000..ee9bc0760c01
--- /dev/null
+++ b/dev-tcltk/tcllib/Manifest
@@ -0,0 +1,7 @@
+DIST Tcllib-1.16.tar.bz2 6089076 BLAKE2B d3b2d439689320e85a2a31f9dcd7bbb23af6d54eec299cb2b4248b961f98de95a878cc20c2bca712f907f6359ae6152d912e849a47d9394910b9278ff748d617 SHA512 5e0656c178c0fae907c101b5324f04ba1bb5c26f4d1015868194dbb393e88a281ecf66bc4701167db24ddb526b87acfd88223e0e9e6db1f9d0ffb919b3372752
+DIST tcllib-1.15-patchset.tar.xz 16164 BLAKE2B 590f6ea38aa2cf98e80011591d5bf06f27d4ca2af03b2e633a2752c184d2c1d78cc22f9b8472a2e5af7052cbb742a22fec0d487974a7599e4d4081bd5e80dcfe SHA512 85507cd00692138ea3c791f88bf4bbdadefa91168a55aebd1da7a89a9de37c3352be27db25bfdb7478dfc90865f906b290fdcbd858be0c01e3502f0446f03262
+DIST tcllib-1.15.tar.bz2 5030648 BLAKE2B 9731be4282bc3b3b0bb56021c3f0a7943ff4163d04ae397b1e0543cbce0642cbf5f64b66c57348a932d9e29c53273223998f2d8b0b087ff7ac679191e8a35ece SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4
+DIST tcllib-1.16-patchset.tar.xz 5484 BLAKE2B b7dc4cd1045cc88e7cc85412734cd036a77af276635e20ff7df207bf5296df63f9c4b1374957f2d01ef278daabdb1b7bb5cb1bb9e3d2a4e0100be02d23ddbb2a SHA512 1bb3b7ed698a77502eecc7ae9fe28b0370770d08235994fd083828af4e87aee49f60c529774bf54dc339122b68fc1841acdd05b27f95ef78145934268567fc03
+EBUILD tcllib-1.15-r2.ebuild 1140 BLAKE2B 1940b47a251d6e926b2c620afb4a5d2afe2330f63efd230c1f52e0bc05b4dc5fe5129213fcf98692064a869dc402276f1904fc8ab21d3492dfc30fbcd3bf9301 SHA512 dd44b82ea8f1906a4f47729724cc72960b298d7a6c86274843a6547fdb06b470a599b63c7c5269d47bec4a6517eb2501cb19dc09e1764f0e0320c1eac63f4088
+EBUILD tcllib-1.16.ebuild 1182 BLAKE2B 1e369addfe894eda1943f3a1d8458ddfe59d88a0622f669806d56888f75a96af2da95d0267ef3e731471f4babac8c9f435401dfb64a6eec883a778d7ec0cd32b SHA512 fd627a444c181de59c0cbef0521ebe1cda3e8df74a45de29badf1393d122cb529c316e058a3b2930cf72c1de376e591712c377841a3c7fd583a110db20a96c25
+MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/metadata.xml b/dev-tcltk/tcllib/metadata.xml
new file mode 100644
index 000000000000..f5ca0ddf0adf
--- /dev/null
+++ b/dev-tcltk/tcllib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tcllib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
new file mode 100644
index 000000000000..9b88517a4413
--- /dev/null
+++ b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils virtualx
+
+DESCRIPTION="Tcl Standard Library"
+HOMEPAGE="http://www.tcl.tk/software/tcllib/"
+SRC_URI="
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz
+	mirror://sourceforge/tcllib/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="dev-lang/tcl:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( DESCRIPTION.txt STATUS )
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patchset/${P}-tcl8.6-test.patch
+	"${WORKDIR}"/${P}-patchset/${P}-test.patch
+	"${WORKDIR}"/${P}-patchset/${P}-manpage-rename.patch
+	"${WORKDIR}"/${P}-patchset/${P}-XSS-vuln.patch
+)
+
+src_prepare() {
+	has_version ">=dev-lang/tcl-8.6" && \
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-tcl8.6-test-2.patch )
+	epatch "${PATCHES[@]}"
+}
+
+src_test() {
+	Xemake test_batch
+}
+
+src_install() {
+	default
+
+	dodoc devdoc/*.txt
+
+	dohtml devdoc/*.html
+	if use examples ; then
+		for f in $(find examples -type f); do
+			docinto $(dirname $f)
+			dodoc $f
+		done
+	fi
+}
diff --git a/dev-tcltk/tcllib/tcllib-1.16.ebuild b/dev-tcltk/tcllib/tcllib-1.16.ebuild
new file mode 100644
index 000000000000..d0d5ac1e3691
--- /dev/null
+++ b/dev-tcltk/tcllib/tcllib-1.16.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils virtualx
+
+MY_PN=Tcllib
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Tcl Standard Library"
+HOMEPAGE="http://www.tcl.tk/software/tcllib/"
+SRC_URI="mirror://sourceforge//project/${PN}/${PN}/${PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	dev-tcltk/tdom
+	"
+DEPEND="${RDEPEND}"
+
+DOCS=( DESCRIPTION.txt STATUS )
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${WORKDIR}"/${P}-patchset/${P}-XSS-vuln.patch )
+
+src_prepare() {
+	has_version ">=dev-lang/tcl-8.6" && \
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-test.patch )
+	epatch "${PATCHES[@]}"
+
+	sed \
+		-e '/testsNeedTcl/s:8.5:8.6:g' \
+		-i modules/tar/tar.test || die
+}
+
+src_test() {
+	Xemake test_batch
+}
+
+src_install() {
+	default
+
+	dodoc devdoc/*.txt
+
+	dohtml devdoc/*.html
+	if use examples ; then
+		for f in $(find examples -type f); do
+			docinto $(dirname $f)
+			dodoc $f
+		done
+	fi
+}
diff --git a/dev-tcltk/tclperl-3.2-r1 b/dev-tcltk/tclperl-3.2-r1
deleted file mode 100644
index 2a9c1131a7cf..000000000000
--- a/dev-tcltk/tclperl-3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0
-DESCRIPTION=Perl package for Tcl
-EAPI=5
-HOMEPAGE=http://jfontain.free.fr/tclperl.htm
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/tcl-8.3.3:0 >=dev-lang/perl-5.6.0
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tclperl-3.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4338eb3731dd94a147d0a7b0b27ed286
diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
new file mode 100644
index 000000000000..5df6c9b87eb7
--- /dev/null
+++ b/dev-tcltk/tclperl/Manifest
@@ -0,0 +1,3 @@
+DIST tclperl-3.2.tar.bz2 11765 BLAKE2B 408bfa98a706edfed45d57183f2152bfdc9e0a8fa7b53b3d612f1d15e3e3733fc1eb6ef8df501a28446429ec78912b937f143ce43d23ceebc2ced58c6668a6f5 SHA512 aed6fb4b0275cf75e6024336e81e3cd1502d82ae697e79b6142d2f9b3cfb0891541cc585fa83d6219632f11d6eda43b141d009caf5fe7433b2b2ca92aa875c00
+EBUILD tclperl-3.2-r1.ebuild 915 BLAKE2B dd47e4152e19af3e0153c679e7794c77701fb33d28773c5164c33ef66a5cbf34a4ca24c883c8dcdf9317e5dbd34a7744f44587be5795ba29584c47d3b1a2c85f SHA512 aefa222e5c8b1c3dec21158a955e57bbb344f0aed7af2b07140fe1317beb1814379b563d35ff5fa43e554e107d470254daadadf436cef7da39a3349e883fc0db
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclperl/metadata.xml b/dev-tcltk/tclperl/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/tclperl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
new file mode 100644
index 000000000000..b151af67051a
--- /dev/null
+++ b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Perl package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/tcl-8.3.3:0
+	>=dev-lang/perl-5.6.0"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	append-flags -fPIC
+
+	# ./build.sh
+	perl Makefile.PL || die
+	emake OPTIMIZE="${CFLAGS}" Tcl.o
+
+	$(tc-getCC) -shared ${LDFLAGS} ${CFLAGS} -o tclperl.so.${PV} -DUSE_TCL_STUBS \
+		tclperl.c tclthread.c `perl -MExtUtils::Embed -e ccopts -e ldopts` \
+		/usr/$(get_libdir)/libtclstub`echo 'puts $tcl_version' | tclsh`.a Tcl.o || die
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/${P}
+	doexe tclperl.so.${PV}
+	doexe pkgIndex.tcl
+
+	dodoc CHANGES README
+	dohtml tclperl.htm
+}
diff --git a/dev-tcltk/tclpython-4.1-r4 b/dev-tcltk/tclpython-4.1-r4
deleted file mode 100644
index b13f03910b41..000000000000
--- a/dev-tcltk/tclpython-4.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-lang/tcl:0=
-DESCRIPTION=Python package for Tcl
-EAPI=5
-HOMEPAGE=http://jfontain.free.fr/tclpython.htm
-IUSE=python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-lang/tcl:0=
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tclpython-4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a85f49de24f96e4a39d1f28e1a774c28
diff --git a/dev-tcltk/tclpython-4.1-r6 b/dev-tcltk/tclpython-4.1-r6
deleted file mode 100644
index ed5eb2935d32..000000000000
--- a/dev-tcltk/tclpython-4.1-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-lang/tcl:0= sys-libs/binutils-libs
-DESCRIPTION=Python package for Tcl
-EAPI=5
-HOMEPAGE=http://jfontain.free.fr/tclpython.htm
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-lang/tcl:0= sys-libs/binutils-libs
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tclpython-4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa2ef4a719c75147612115b4f959281a
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
new file mode 100644
index 000000000000..42240d29b5ea
--- /dev/null
+++ b/dev-tcltk/tclpython/Manifest
@@ -0,0 +1,5 @@
+AUX tclpython-4.1-python-3.patch 8863 BLAKE2B 6c1c2fa8f29240b6703911fde24519961f740cdac0d331cea7df3fb90fed769319ca0c00422ebe58275be90584c28debdf906f1b8c923e96d0c834a2af621077 SHA512 530d057501ef72e7f28cfff1f0af2076b93739085154fc4d20a5b59b26e33d1418bf694093b05e840055734438232dd9414ba0262720fb4bd2e35249769b24e7
+DIST tclpython-4.1.tar.bz2 10580 BLAKE2B 98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608 SHA512 5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54
+EBUILD tclpython-4.1-r4.ebuild 1264 BLAKE2B b747d07338d133dd6962695bd92c4499dfca8182d1b2d9befd6aeba8125880fbe7807e6bcf33d113af32a08d2c980a41f557a5039ba659e3624bd9bb50aafe0f SHA512 7041ef994f59b536fca064a5aaf455ba1a7e67b0a96e9e619b7d47f493f875eed5275816b94f56fe3a82f53dbaaf530cca12b16e9eeca6aae704b2b4e1377900
+EBUILD tclpython-4.1-r6.ebuild 1296 BLAKE2B eefd716b5ee7896ab7044d57836cd0cb20e5a9b3a6b8b6b8fa0613b93d23bc21c51b1e8783feba480fd4d430c32e2759fc9e85d75727243e58b49ad4ce496c3b SHA512 ea7b582fbc1796eaaf6195868f1c31c2fdef6d7fe1c7df87437fafc0a48e86110dda9a80dd34b40347356d0cfe4ec58d2021bdd396f23ddeac8914f1bf216c5c
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclpython/files/tclpython-4.1-python-3.patch b/dev-tcltk/tclpython/files/tclpython-4.1-python-3.patch
new file mode 100644
index 000000000000..2a26f647c10e
--- /dev/null
+++ b/dev-tcltk/tclpython/files/tclpython-4.1-python-3.patch
@@ -0,0 +1,229 @@
+--- a/tclpython.c	2006-03-07 16:28:03.000000000 +0300
++++ b/tclpython.c	2014-05-06 23:33:41.713623943 +0400
+@@ -19,13 +19,83 @@
+ $ cc -fpic -I/usr/local/include/tcltk/tcl8.3 -c tclthread.c
+ $ ld -o tclpython.so -Bshareable -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/share/python/config tclpython.o tclthread.o -lpython -lutil -lreadline -ltermcap -lcrypt -lgmp -lgdbm -lpq -lz -ltcl83 -ltk83 -lX11
+ 
++Patched for Python 3 with respect to https://github.com/facebook/fbthrift/blob/master/thrift/lib/py/protocol/fastbinary.c
++
+ */
+ 
+ #include <Python.h>
+ #include <tcl.h>
+-#include <cStringIO.h>
++
++#if PY_MAJOR_VERSION >= 3
++    #define PyInt_FromLong PyLong_FromLong
++    #define PyInt_AsLong PyLong_AsLong
++    #define PyString_FromStringAndSize PyBytes_FromStringAndSize
++#else
++    #include <cStringIO.h>
++#endif
++
+ #include "tclpython.h"
+ 
++// Mostly copied from cStringIO.c
++#if PY_MAJOR_VERSION >= 3
++
++/** io module in python3. */
++static PyObject* Python3IO;
++
++typedef struct {
++  PyObject_HEAD
++  char *buf;
++  Py_ssize_t pos, string_size;
++} IOobject;
++
++#define IOOOBJECT(O) ((IOobject*)(O))
++
++static int
++IO__opencheck(IOobject *self) {
++    if (!self->buf) {
++        PyErr_SetString(PyExc_ValueError,
++                        "I/O operation on closed file");
++        return 0;
++    }
++    return 1;
++}
++
++static PyObject *
++IO_cgetval(PyObject *self) {
++    if (!IO__opencheck(IOOOBJECT(self))) return NULL;
++    assert(IOOOBJECT(self)->pos >= 0);
++    return PyBytes_FromStringAndSize(((IOobject*)self)->buf,
++                                     ((IOobject*)self)->pos);
++}
++#endif
++
++/* -- PYTHON MODULE SETUP STUFF --- */
++
++static PyObject *pythonTclEvaluate(PyObject *self, PyObject *args);
++
++static PyMethodDef tclMethods[] = {
++    {"eval", pythonTclEvaluate, METH_VARARGS, "Evaluate a Tcl script."},
++    {0, 0, 0, 0}                                                                                                      /* sentinel */
++};
++
++#if PY_MAJOR_VERSION >= 3
++struct module_state {
++  PyObject *error;
++};
++
++static struct PyModuleDef TclModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "tcl",
++  NULL,
++  sizeof(struct module_state),
++  tclMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifndef WIN32
+ /* George Petasis, 21 Feb 2006:
+  * The following check cannot be handled correctly
+@@ -66,13 +136,13 @@
+ 
+ static int pythonInterpreter(ClientData clientData, Tcl_Interp *interpreter, int numberOfArguments, Tcl_Obj * CONST arguments[])
+ {
+-    int identifier;
++    intptr_t identifier;
+     PyObject *output;
+     PyObject *message;
+     PyObject *result;
+     PyObject *globals;
+     char *string = 0;
+-    int length;
++    Py_ssize_t length;
+     Tcl_Obj *object;
+     struct Tcl_HashEntry *entry;
+     unsigned evaluate;
+@@ -111,12 +181,22 @@
+     /* choose start token depending on whether this is an evaluation or an execution: */
+     result = PyRun_String(Tcl_GetString(arguments[2]), (evaluate? Py_eval_input: Py_file_input), globals, globals);
+     if (result == 0) {                                                                                        /* an error occured */
++#if PY_MAJOR_VERSION >= 3
++        output = PyObject_CallMethod(Python3IO, "BytesIO", "()");
++#else
+         output = PycStringIO->NewOutput(1024);               /* use a reasonable initial size but big enough to handle most cases */
+-        PySys_SetObject("stderr", output);                                                /* capture all interpreter error output */
++#endif
++        PySys_SetObject("sys.stderr", output);                                                /* capture all interpreter error output */
+         PyErr_Print();                                            /* so that error is printed on standard error, redirected above */
++#if PY_MAJOR_VERSION >= 3
++        message = IO_cgetval(output);
++        string = PyBytes_AsString(message);
++        length = (string == NULL) ? 0 : strlen(string);
++#else
+         message = PycStringIO->cgetvalue(output);
+         string = PyString_AsString(message);
+         length = PyString_Size(message);
++#endif
+         if ((length > 0) && (string[length - 1] == '\n')) length--;              /* eventually remove trailing new line character */
+         object = Tcl_NewObj();
+         Tcl_AppendStringsToObj(object, Tcl_GetString(arguments[0]), ": ", 0);                    /* identify interpreter in error */
+@@ -124,7 +204,11 @@
+         Py_DECREF(output);
+     } else {
+         if (evaluate) {
++#if PY_MAJOR_VERSION >= 3
++            string = PyUnicode_AsUTF8(PyObject_Str(result));
++#else
+             string = PyString_AsString(PyObject_Str(result));
++#endif
+             object = Tcl_NewStringObj(string, -1);                                                    /* return evaluation result */
+         } else                                                                                                         /* execute */
+             object = Tcl_NewObj();                                                   /* always return an empty result or an error */
+@@ -139,9 +223,9 @@
+ 
+ Tcl_Interp *tclInterpreter(CONST char *name)                           /* public function for use in extensions to this extension */
+ {
+-    int identifier;
++    intptr_t identifier;
+ 
+-    if ((sscanf(name, "tcl%u", &identifier) == 0) || (identifier != 0)) {
++    if ((sscanf(name, "tcl%lu", &identifier) == 0) || (identifier != 0)) {
+         return 0;                                                                                                 /* invalid name */
+     } else {
+         return mainInterpreter;                                                                     /* sole available interpreter */
+@@ -188,14 +272,9 @@
+     return Py_BuildValue("s", result);
+ }
+ 
+-static PyMethodDef tclMethods[] = {
+-    {"eval", pythonTclEvaluate, METH_VARARGS, "Evaluate a Tcl script."},
+-    {0, 0, 0, 0}                                                                                                      /* sentinel */
+-};
+-
+ static int newInterpreter(Tcl_Interp *interpreter)
+ {
+-    int identifier;
++    intptr_t identifier;
+     Tcl_Obj *object;
+     int created;
+ #ifdef WITH_THREAD
+@@ -214,19 +293,31 @@
+         return TCL_ERROR;
+     } else {
+         Py_Initialize();                                                                           /* initialize main interpreter */
++#if PY_MAJOR_VERSION >= 3 
++        Python3IO = PyImport_ImportModule("io");
++#else
+         PycString_IMPORT;
++#endif
+     }
+     Tcl_SetHashValue(Tcl_CreateHashEntry(&threadStates, (ClientData)identifier, &created), 0);
+ #else
+     if (existingInterpreters == 0) {
+         Py_Initialize();                                                                           /* initialize main interpreter */
+         PyEval_InitThreads();                                               /* initialize and acquire the global interpreter lock */
++#if PY_MAJOR_VERSION >= 3 
++        Python3IO = PyImport_ImportModule("io");
++#else
+         PycString_IMPORT;
++#endif
+         globalState = PyThreadState_Swap(0);                                                            /* save the global thread */
+     } else {
+         PyEval_AcquireLock();                                           /* needed in order to be able to create a new interpreter */
+     }
++#if PY_MAJOR_VERSION >= 3
++    if (Python3IO == 0) {                                              /* make sure string input/output is properly initialized */
++#else
+     if (PycStringIO == 0) {                                              /* make sure string input/output is properly initialized */
++#endif
+         Tcl_SetResult(interpreter, "fatal error: could not initialize Python string input/output module", TCL_STATIC);
+         return TCL_ERROR;
+     }
+@@ -250,7 +341,11 @@
+     newIdentifier++;
+ #endif
+     existingInterpreters++;
++#if PY_MAJOR_VERSION >= 3
++    tcl = PyModule_Create(&TclModuleDef);
++#else
+     tcl = Py_InitModule("tcl", tclMethods);                                   /* add a new 'tcl' module to the python interpreter */
++#endif
+     Py_INCREF(tcl);
+     PyModule_AddObject(PyImport_AddModule("__builtin__"), "tcl", tcl);
+     return TCL_OK;
+@@ -260,7 +355,7 @@
+ {
+     int index;
+     char *name;
+-    int identifier;
++    intptr_t identifier;
+     struct Tcl_HashEntry *entry;
+     Tcl_Obj *object;
+ #ifdef WITH_THREAD
+@@ -270,7 +365,7 @@
+     for (index = 0; index < numberOfArguments; index++) {
+         name = Tcl_GetString(arguments[index]);                                                  /* interpreter name is "pythonN" */
+         entry = 0;
+-        if (sscanf(name, "python%u", &identifier) == 1) {
++        if (sscanf(name, "python%lu", &identifier) == 1) {
+             identifier = atoi(name + 6);
+             entry = Tcl_FindHashEntry(&threadStates, (ClientData)identifier);
+         }
diff --git a/dev-tcltk/tclpython/metadata.xml b/dev-tcltk/tclpython/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/tclpython/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
new file mode 100644
index 000000000000..d76649cf5f20
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-lang/tcl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_compile() {
+	local cfile="tclpython tclthread"
+	for src in ${cfile}; do
+		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
+		einfo "${compile}"
+		eval "${compile}" || die
+	done
+
+	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_LIBS) -ltcl"
+	einfo "${link}"
+	eval "${link}" || die
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/tclpython
+	doins tclpython.so.${PV} pkgIndex.tcl
+	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
+	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so
+
+	dodoc CHANGES INSTALL README
+	dohtml tclpython.htm
+}
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
new file mode 100644
index 000000000000..6359b225c9ff
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-lang/tcl:0=
+	sys-libs/binutils-libs"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_compile() {
+	local cfile="tclpython tclthread"
+	for src in ${cfile}; do
+		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
+		einfo "${compile}"
+		eval "${compile}" || die
+	done
+
+	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_LIBS) -ltcl"
+	einfo "${link}"
+	eval "${link}" || die
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/tclpython
+	doins tclpython.so.${PV} pkgIndex.tcl
+	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
+	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so
+
+	dodoc CHANGES INSTALL README
+	dohtml tclpython.htm
+}
diff --git a/dev-tcltk/tclreadline-2.1.0-r4 b/dev-tcltk/tclreadline-2.1.0-r4
deleted file mode 100644
index 7814f0264422..000000000000
--- a/dev-tcltk/tclreadline-2.1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl:0= sys-libs/readline:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Readline extension to TCL
-EAPI=5
-HOMEPAGE=http://tclreadline.sf.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/tclreadline/tclreadline-2.1.0.tar.gz mirror://debian/pool/main/t/tclreadline/tclreadline_2.1.0-12.debian.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=742f50156cc2294c9c76832b861c5079
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
new file mode 100644
index 000000000000..81189902920f
--- /dev/null
+++ b/dev-tcltk/tclreadline/Manifest
@@ -0,0 +1,9 @@
+AUX tclreadline-2.1.0-alloc-free.patch 3421 BLAKE2B 76df6d5b1aa2ac89900eeca296ec85f8e16e6076e5447eddcdca9be5bf474b3de886045fef5470101addaf6e81a819e73acbed60ed23ae84e222d922c0e76cca SHA512 52456ed9de43f7a6e646ded04a814e895d40db53ec3c7ce28a9be0eba16d52ebdc7e8eaff76ffc6b7db1db29b8bb0d58908c188fdcf2b2689e28db40046d3517
+AUX tclreadline-2.1.0-gold.patch 458 BLAKE2B 2a9e1c4e3809a03a7539f37b38fa09bcf5f9533555dca8f50817c9f577a90e766cd521a0428b00fba7083d9d7e0098ca9793b3dd57098d0d4c48f236e9d69893 SHA512 91bbf2eb167c33faa02e998bd83da06e3b1e28832700ff79458a2bbc1620920e749985ec6780254a7016e931cca094205224aa3ea3a95effb12dafc1fe9fca45
+AUX tclreadline-2.1.0-rl-executing-macro.patch 3788 BLAKE2B a8f1316c3b3b63832c1bd3d94a12349ae23042ef04b728f12d38efc220c36d657e48992c685a6b0d2dd266904565f4850096aa463099c77d1f11a1b0eb094720 SHA512 f7ba38320c7095b4a8450e24a3ed1a75af6dcd7791c17b5546b36faeb5391b00f389a353838f8ea2b81b25f5d9c5ca1b6ccf7db5e6a30d2e304691db42da67dc
+AUX tclreadline-2.1.0-rl-history-expand.patch 969 BLAKE2B 44b2aaf9f5ea2f518888b338edd04a7b274345af2cd86836b1cb8d101428c98f608eecb3454a51d6ff236d32df068f59db93819c57d1f8d8c5670c99ebe0d7fb SHA512 a015a56413c683e2a41e912891138494f43fd12b5383f9514314d87c9cc353cd95a2ea515978b4d1b0c60d4ab1cc0d1d16d982825949e338c0ac69e84e114304
+AUX tclreadline-2.1.0-rl-prompt.patch 463 BLAKE2B c9faea41e07303d94ec6eb08f4098fd9ca483f47509a1e9a6a791649738cc6b31b2266783b84434b25072f100bc88d1a87c0a765245be305d56fbbdd33aef2b9 SHA512 b547e2077861d39701ed53b485f9758c8e0a636ecba7abfc25aa3fabeaa1337c6e48a08ba51425b95a55bae4021c2aa17e66686ee3836eb31cb6b4d115508073
+DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b9322a13175ca7c713c3981c0abc27967e31a62f3451b5d007569a30a7279be7c2a8f1c7c78e8d0c310964ddba18fa5cb SHA512 bd67a65fe2ec708834fb67fabf2e36e778a6aeeb7a7b69cda298f9e18acc9e03f3a379f81ff7d2d289bfbf1093bc86fecbf96fe5d04a2ca954899cc7df6fe4bf
+DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
+EBUILD tclreadline-2.1.0-r4.ebuild 1848 BLAKE2B 20f63f5ec09196076d03b9c21415c9f010b1c72e08c0e12325a5bd225c7a3d6c6f87c971bf8454063bef080c46e994abc95e9a01e1a2b6e3737a5ebd8eb3fe00 SHA512 456559f0eea55eb24fcda7dee42b5fc153ed229869ab846350898cdf2da92c3e3c8776db20f5064665240d1720277b78619b8670bc590da9f25e0f9f4da4bbc0
+MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch
new file mode 100644
index 000000000000..6694c29f6042
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-alloc-free.patch
@@ -0,0 +1,121 @@
+diff -ur a/tclreadline.c b/tclreadline.c
+--- a/tclreadline.c	2000-09-20 19:44:34.000000000 +0200
++++ b/tclreadline.c	2013-11-18 10:35:13.889610060 +0100
+@@ -343,7 +343,9 @@
+ 		return TCL_ERROR;
+ 	    } else if (3 == objc) {
+-		if (tclrl_custom_completer)
++		if (tclrl_custom_completer) {
+-		    FREE(tclrl_custom_completer);
++		    free(tclrl_custom_completer);
++			tclrl_custom_completer = NULL;
++		}
+ 		if (!blank_line(Tcl_GetStringFromObj(objv[2], 0)))
+ 		    tclrl_custom_completer =
+ 		         stripwhite(strdup(Tcl_GetStringFromObj(objv[2], 0)));
+@@ -378,7 +380,9 @@
+ 		return TCL_ERROR;
+ 	    } else if (3 == objc) {
+-		if (tclrl_eof_string)
++		if (tclrl_eof_string) {
+-		    FREE(tclrl_eof_string);
++		    free(tclrl_eof_string);
++			tclrl_eof_string = NULL;
++		}
+ 		if (!blank_line(Tcl_GetStringFromObj(objv[2], 0)))
+ 		    tclrl_eof_string = 
+ 		        stripwhite(strdup(Tcl_GetStringFromObj(objv[2], 0)));
+@@ -506,10 +510,16 @@
+ 	if (status >= 1) {
+ 	    /* TODO: make this a valid tcl output */
+ 	    printf("%s\n", expansion);
++		free(ptr);
++		free(expansion);
++		return;
+ 	} else if (-1 == status) {
+ 	    Tcl_AppendResult
+ 	    (tclrl_interp, "error in history expansion\n", (char*) NULL);
+ 	    TclReadlineTerminate(TCL_ERROR);
++		free(ptr);
++		free(expansion);
++		return;
+ 	}
+ 	/**
+ 	 * TODO: status == 2 ...
+@@ -544,8 +554,8 @@
+ 	 * tell the calling routines to terminate.
+ 	 */
+ 	TclReadlineTerminate(LINE_COMPLETE);
+-	FREE(ptr);
+-	FREE(expansion);
++	free(ptr);
++	free(expansion);
+     }
+ }
+ 
+@@ -673,7 +683,7 @@
+ 	    strcpy(rl_line_buffer, expansion);
+ 	    rl_end = strlen(expansion);
+ 	    rl_point += strlen(expansion) - oldlen;
+-	    FREE(expansion);
++	    free(expansion);
+ 	    /*
+ 	     * TODO:
+ 	     * because we return 0 == matches,
+@@ -682,7 +690,8 @@
+ 	     */
+ 	    return matches;
+ 	}
+-	FREE(expansion);
++	free(expansion);
++	expansion = NULL;
+     }
+ 
+     if (tclrl_custom_completer) {
+@@ -699,15 +710,19 @@
+ 	state = Tcl_VarEval(tclrl_interp, tclrl_custom_completer,
+ 	    " \"", quoted_text, "\" ", start_s, " ", end_s,
+ 	    " \"", quoted_rl_line_buffer, "\"", (char*) NULL);
+-	FREE(quoted_text);
+-	FREE(quoted_rl_line_buffer);
+ 	if (TCL_OK != state) {
+ 	    Tcl_AppendResult (tclrl_interp, " `", tclrl_custom_completer,
+ 		" \"", quoted_text, "\" ", start_s, " ", end_s,
+ 		" \"", quoted_rl_line_buffer, "\"' failed.", (char*) NULL);
+ 	    TclReadlineTerminate(state);
++		free(quoted_text);
++		free(quoted_rl_line_buffer);
+ 	    return matches;
+ 	}
++	free(quoted_text);
++	quoted_text = NULL;
++	free(quoted_rl_line_buffer);
++	quoted_rl_line_buffer = NULL;
+ 	obj = Tcl_GetObjResult(tclrl_interp);
+ 	status = Tcl_ListObjGetElements(tclrl_interp, obj, &objc, &objv);
+ 	if (TCL_OK != status)
+@@ -715,12 +732,12 @@
+ 
+ 	if (objc) {
+ 	    int i, length;
+-	    matches = (char**) MALLOC(sizeof(char*) * (objc + 1));
++	    matches = (char**) malloc(sizeof(char*) * (objc + 1));
+ 	    for (i = 0; i < objc; i++) {
+ 		matches[i] = strdup(Tcl_GetStringFromObj(objv[i], &length));
+ 		if (1 == objc && !strlen(matches[i])) {
+-		    FREE(matches[i]);
++		    free(matches[i]);
+-		    FREE(matches);
++		    free(matches);
+ 		    Tcl_ResetResult(tclrl_interp); /* clear result space */
+ 		    return (char**) NULL;
+ 		}
+@@ -735,7 +752,7 @@
+ 	     */
+ 	    if (2 == objc && !strlen(matches[1])) {
+ 		i--;
+-		FREE(matches[1]);
++		free(matches[1]);
+ 		rl_completion_append_character = '\0';
+ 	    }
+ 
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
new file mode 100644
index 000000000000..5550c89879c8
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
@@ -0,0 +1,15 @@
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 68d78f1..03dbf06 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,6 +20,7 @@ include_HEADERS = tclreadline.h
+ INCLUDES = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)
+ 
+ ## libtclreadline_la_LIBADD = $(LIBS)
++libtclreadline_la_LIBADD = $(TCL_LIB_SPEC) -lreadline
+ libtclreadline_la_LDFLAGS = -release $(MAJOR).$(MINOR).$(PATCHLEVEL)
+ 
+ tclrldir = @TCLRL_DIR@
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch
new file mode 100644
index 000000000000..683622e0d54c
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-executing-macro.patch
@@ -0,0 +1,128 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2000-12-08 01:45:45.000000000 +0100
++++ b/configure.ac	2013-11-15 13:37:36.490520853 +0100
+@@ -182,29 +182,36 @@
+     [  --with-readline-library=DIR
+ 		  lib spec to readline (e.g. '-L/usr/local/lib -lreadline')],
+     LIBS="$LIBS $withval",
+-    AC_CHECK_LIB(readline, rl_callback_read_char, ,
+-	AC_MSG_RESULT([
+-	    Your readline version does not support readline's alternate interface.
+-	    Please upgrade to readline >= 2.2 and retry.
+-	])
+-	exit
++    AC_SEARCH_LIBS(rl_callback_read_char, readline, ,
++		AC_MSG_RESULT([
++			Your readline version does not support readline's alternate interface.
++			Please upgrade to readline >= 2.2 and retry.
++		])
++		exit
+     )
+ )
+ 
+ 
+ 
+-# check for readline's (macro.c) private variable
+-# _rl_executing_macro.
++# check for readline's rl_executing_macro
++# (could be macro.c's private variable _rl_executing_macro).
+ 
+-AC_MSG_CHECKING([for _rl_executing_macro in -lreadline])
+-AC_TRY_LINK(,[
++AC_CHECK_DECL(rl_executing_macro
++, AC_DEFINE(EXECUTING_MACRO_NAME, rl_executing_macro,
++  [ Define the name of the executing macro variable in libreadline. ])
++, AC_MSG_CHECKING([for _rl_executing_macro in -lreadline])
++  AC_TRY_LINK(,[
+     extern char* _rl_executing_macro;
+     _rl_executing_macro = (char*) 0;
+-],
+-    AC_MSG_RESULT(yes);
++  ]
++  , AC_MSG_RESULT(yes)
+     AC_DEFINE(EXECUTING_MACRO_HACK, 1,
+-    [ Define if _rl_executing_macro is resolved in libreadline. ]),
+-    AC_MSG_RESULT(no))
++    [ Define if EXECUTING_MACRO_NAME is resolved in libreadline. ])
++    AC_DEFINE(EXECUTING_MACRO_NAME, _rl_executing_macro,
++    [ Define the name of the executing macro variable in libreadline. ])
++  , AC_MSG_RESULT(no))
++, [AC_INCLUDES_DEFAULT
++#include "$READLINE_INCLUDE_DIR/readline.h"])
+ 
+ # check for readline's rl_cleanup_after_signal
+ 
+diff -ur a/tclreadline.c b/tclreadline.c
+--- a/tclreadline.c	2000-09-20 19:44:34.000000000 +0200
++++ b/tclreadline.c	2013-11-15 11:09:42.269771129 +0100
+@@ -41,7 +41,7 @@
+  * We need it here to decide, if we should read more
+  * characters from a macro. Dirty, but it should work.
+  */
+-extern char* _rl_executing_macro;
++extern char* EXECUTING_MACRO_NAME;
+ #endif
+ 
+ #include "tclreadline.h"
+@@ -249,14 +249,14 @@
+ 	    tclrl_state = LINE_PENDING;
+ 
+ 	    while (!TclReadlineLineComplete()) {
+-#ifdef EXECUTING_MACRO_HACK
++#ifdef EXECUTING_MACRO_NAME
+ 		/**
+ 		 * check first, if more characters are
+ 		 * available from _rl_executing_macro,
+ 		 * because Tcl_DoOneEvent() will (naturally)
+ 		 * not detect this `event'.
+ 		 */
+-		if (_rl_executing_macro)
++		if (EXECUTING_MACRO_NAME)
+ 		    TclReadlineReadHandler((ClientData) NULL, TCL_READABLE);
+ 		else
+ #endif
+@@ -468,17 +468,17 @@
+ TclReadlineReadHandler(ClientData clientData, int mask)
+ {
+     if (mask & TCL_READABLE) {
+-#ifdef EXECUTING_MACRO_HACK
++#ifdef EXECUTING_MACRO_NAME
+ 	do {
+ #endif
+ 	    rl_callback_read_char();
+-#ifdef EXECUTING_MACRO_HACK
++#ifdef EXECUTING_MACRO_NAME
+ 	    /**
+ 	     * check, if we're inside a macro and
+ 	     * if so, read all macro characters
+ 	     * until the next eol.
+ 	     */
+-	} while (_rl_executing_macro && !TclReadlineLineComplete());
++	} while (EXECUTING_MACRO_NAME && !TclReadlineLineComplete());
+ #endif
+     }
+ }
+@@ -517,12 +517,12 @@
+ 
+ 	Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
+ 
+-#ifdef EXECUTING_MACRO_HACK
++#ifdef EXECUTING_MACRO_NAME
+ 	/**
+ 	 * don't stuff macro lines
+ 	 * into readline's history.
+ 	 */
+-	if(!_rl_executing_macro) {
++	if(!EXECUTING_MACRO_NAME) {
+ #endif
+ 	    /**
+ 	     * don't stuff empty lines
+@@ -537,7 +537,7 @@
+ 	    if (tclrl_last_line)
+ 		free(tclrl_last_line);
+ 	    tclrl_last_line = strdup(expansion);
+-#ifdef EXECUTING_MACRO_HACK
++#ifdef EXECUTING_MACRO_NAME
+ 	}
+ #endif
+ 	/**
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch
new file mode 100644
index 000000000000..6e4d5270e41a
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-history-expand.patch
@@ -0,0 +1,35 @@
+diff -ur a/tclreadline.c b/tclreadline.c
+--- a/tclreadline.c	2013-11-16 20:14:28.876272386 +0100
++++ b/tclreadline.c	2013-11-16 20:14:24.191390550 +0100
+@@ -503,25 +503,22 @@
+ 	char* expansion = (char*) NULL;
+ 	int status = history_expand(ptr, &expansion);
+ 
+-	if (status >= 1) {
++	if (status >= 2) {
+ 	    /* TODO: make this a valid tcl output */
+ 	    printf("%s\n", expansion);
+ 		free(ptr);
+ 		free(expansion);
+ 		return;
+-	} else if (-1 == status) {
++	} else if (status <= -1) {
+ 	    Tcl_AppendResult
+-	    (tclrl_interp, "error in history expansion\n", (char*) NULL);
++	    (tclrl_interp, "error in history expansion: ", expansion, "\n", (char*) NULL);
+ 	    TclReadlineTerminate(TCL_ERROR);
+ 		free(ptr);
+ 		free(expansion);
+ 		return;
+-	}
+-	/**
+-	 * TODO: status == 2 ...
+-	 */
+-
+-	Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
++	} else {
++        Tcl_AppendResult(tclrl_interp, expansion, (char*) NULL);
++    }
+ 
+ #ifdef EXECUTING_MACRO_HACK
+ 	/**
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch
new file mode 100644
index 000000000000..a10a404100d3
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-rl-prompt.patch
@@ -0,0 +1,12 @@
+diff -ur a/tclreadline.c b/tclreadline.c
+--- a/tclreadline.c	2013-11-16 20:14:28.876272386 +0100
++++ b/tclreadline.c	2013-11-16 20:37:47.455986902 +0100
+@@ -234,7 +234,7 @@
+ 
+ 	    rl_callback_handler_install(
+ 			       objc == 3 ? Tcl_GetStringFromObj(objv[2], 0)
+-			       : "%", TclReadlineLineCompleteHandler);
++			       : "% ", TclReadlineLineCompleteHandler);
+ 
+ 	    Tcl_CreateFileHandler(0, TCL_READABLE,
+ 		TclReadlineReadHandler, (ClientData) NULL);
diff --git a/dev-tcltk/tclreadline/metadata.xml b/dev-tcltk/tclreadline/metadata.xml
new file mode 100644
index 000000000000..4d4cdbb530ea
--- /dev/null
+++ b/dev-tcltk/tclreadline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tclreadline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
new file mode 100644
index 000000000000..e668266ef24e
--- /dev/null
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib toolchain-funcs
+
+DEBIAN_PATCH=12
+
+DESCRIPTION="Readline extension to TCL"
+HOMEPAGE="http://tclreadline.sf.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+	dev-lang/tcl:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-alloc-free.patch
+	"${FILESDIR}"/${P}-rl-executing-macro.patch
+	"${FILESDIR}"/${P}-rl-history-expand.patch
+	"${FILESDIR}"/${P}-rl-prompt.patch
+	"${WORKDIR}"/debian/patches/complete_nontcl.patch
+	"${WORKDIR}"/debian/patches/completion_matches.patch
+	"${WORKDIR}"/debian/patches/completion_pbug.patch
+	"${WORKDIR}"/debian/patches/kfreebsd.patch
+	"${WORKDIR}"/debian/patches/link.patch
+	"${WORKDIR}"/debian/patches/manpage.patch
+	"${WORKDIR}"/debian/patches/memuse.patch
+#	"${WORKDIR}"/debian/patches/tclrldir.patch
+	"${WORKDIR}"/debian/patches/tclshpath.patch
+	"${WORKDIR}"/debian/patches/tinfo.patch
+	"${WORKDIR}"/debian/patches/varnames.patch
+
+	)
+
+src_prepare() {
+	sed \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-e "/^TCLRL_LIBDIR/s:lib:$(get_libdir):g" \
+		-i configure.in || die
+	mv configure.{in,ac} || die
+	sed \
+		-e 's:configure.in:configure.ac:g' \
+		-i "${WORKDIR}"/debian/patches/* || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tcl-includes="${EPREFIX}/usr/include"
+		--with-readline-includes="${EPREFIX}/usr/include"
+		--with-readline-library="-lreadline"
+		)
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tclx-8.4.1 b/dev-tcltk/tclx-8.4.1
deleted file mode 100644
index 8f14258d51e1..000000000000
--- a/dev-tcltk/tclx-8.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tcl:0= tk? ( dev-lang/tk:0= )
-DESCRIPTION=A set of extensions to TCL
-EAPI=5
-HOMEPAGE=http://tclx.sourceforge.net
-IUSE=tk threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= tk? ( dev-lang/tk:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tclx/tclx8.4.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=786405c92381291676498c65a1442e11
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
new file mode 100644
index 000000000000..9eafc20e78da
--- /dev/null
+++ b/dev-tcltk/tclx/Manifest
@@ -0,0 +1,5 @@
+AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c0dba904c4ea99cc97f5d360f1c1c4bd98a7bb5a9257c04f28d46ef7203731863b8a166f3878d0d7b4a024ee SHA512 a7fdd81a615222b805ab1dcb85a619b2621a187a39602f5d64dcf36027a1ee6e616328a7463f4cb9b6fe60169c887c925d133dc1df1cb20f9cb419ba13c870f1
+AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
+DIST tclx8.4.1.tar.bz2 330073 BLAKE2B bc9cd45945b1c9b945bcd139bfc52d42fc9bf1bf4251a8bb599ca6ee2b3804bc692aee6038a3cb84de82d24173473a57a8396fa598558f83237f1586cbe59b11 SHA512 faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060
+EBUILD tclx-8.4.1.ebuild 1125 BLAKE2B 9f9d2b64882cd603ff8c6d496f7cc58fe4c8da1f12b33edf53b5b53d3b2994b7676a68158079709719c4377a740d160aba79d2b711cd56585b62d5b0949e2795 SHA512 5877cc6fcfd3e24effcb33932bd404f29dc7061c3e2144b0f16ea2fb9172e4df040d890f0d72a81136df508ee7f24fcc425aa3a557335fd8a74f3ca147b13d79
+MISC metadata.xml 369 BLAKE2B 68bc4793b4b7b60dfe9cbcec22d4a507d8c2885aedffd13004f70395df3c91e4bd54978d5e6480f585b70c0f156c064442e1eb1315a2c662aa6c837d64ef7c8c SHA512 41e47900ed43be6a43a4524ce8071809af04734838eb70fdd1f385283f3857cf7735db6db8131d87a0a0c078d1441d0ac75861c12f14623f3adb8f010da4709a
diff --git a/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
new file mode 100644
index 000000000000..40acfda25fd9
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index b812bbe..069337c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -123,7 +123,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ @LDFLAGS@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tclx/files/tclx-8.4-varinit.patch b/dev-tcltk/tclx/files/tclx-8.4-varinit.patch
new file mode 100644
index 000000000000..08fe7d881191
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-varinit.patch
@@ -0,0 +1,11 @@
+--- tclx8.4/generic/tclXdup.c.varinit	2006-02-03 15:54:38.000000000 -0500
++++ tclx8.4/generic/tclXdup.c	2006-02-03 15:54:53.000000000 -0500
+@@ -202,7 +202,7 @@
+ {
+     Tcl_Channel newChannel;
+     int bindFnum, fnum;
+-    char *srcChannelId, *targetChannelId;
++    char *srcChannelId = NULL, *targetChannelId;
+ 
+     if ((objc < 2) || (objc > 3)) {
+         return TclX_WrongArgs (interp, objv [0],
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
new file mode 100644
index 000000000000..5d29747c91dc
--- /dev/null
+++ b/dev-tcltk/tclx/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>TCL / TK herd</name>
+	</maintainer>
+	<longdescription>Extended TCL</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tclx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
new file mode 100644
index 000000000000..6ce5cc26795d
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib versionator
+
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
+
+LICENSE="BSD"
+IUSE="tk threads"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="
+	dev-lang/tcl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}$(get_version_component_range 1-2)
+
+# tests broken, bug #279283
+RESTRICT="test"
+
+src_prepare() {
+	sed \
+		-e '/CC=/s:-pipe::g' \
+		-i tclconfig/tcl.m4 configure || die
+	epatch \
+		"${FILESDIR}"/${PN}-8.4-varinit.patch \
+		"${FILESDIR}"/${PN}-8.4-ldflags.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk) \
+		$(use_enable threads) \
+		--enable-shared \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)/"
+
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+				"${S}"/Makefile || die 'sed failed'
+	fi
+}
+
+src_install() {
+	default
+	doman doc/*.[n3]
+}
diff --git a/dev-tcltk/tclxml-3.2-r2 b/dev-tcltk/tclxml-3.2-r2
deleted file mode 100644
index 2353737a35e4..000000000000
--- a/dev-tcltk/tclxml-3.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tcltk/tcllib-1.2 dev-libs/expat !dev-tcltk/tcldom
-DESCRIPTION=Pure Tcl implementation of an XML parser
-EAPI=5
-HOMEPAGE=http://tclxml.sourceforge.net/
-IUSE=debug threads
-KEYWORDS=alpha amd64 ppc sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tcltk/tcllib-1.2 dev-libs/expat !dev-tcltk/tcldom
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tclxml/tclxml-3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f81ee695599cb902dc3ca6f159e7a77f
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
new file mode 100644
index 000000000000..61f0df5949b9
--- /dev/null
+++ b/dev-tcltk/tclxml/Manifest
@@ -0,0 +1,5 @@
+AUX tclxml-3.2-fix-implicit-declarations.patch 488 BLAKE2B 1feca37c6c6e87d8c04d884dc6cfcaaacf64eead99f48825cb6473a677161876b3c3be8db6dd04e30195379dbaff2647cfe3cbe8dde4ee3ee9b17d817390100b SHA512 9f8a0c55886c01324e318aec70c99b85f845567a486daddbb897900f242d8a9fec99026c8f6ec7d73e5dca8ee22bf851dc64eab2a83a3a2c959828a24e79e4ca
+AUX tclxml-3.2-format-security.patch 647 BLAKE2B b35232d7b553ee3e95b0a6c1998ad98b50be7198af8383bc5f3e00c6892bac29c257bdce9e04ec783098b878b06736c032b801684d9152b5d8ff1df5c4db771d SHA512 2b76363f015400642f00ce24ef67fd8f7607cd6ed0a63a5768aa343fbe9d6a8af50e15ccebecff813aa0c6d0714d65626c31e2edc860b6b826e52952bb47d435
+DIST tclxml-3.2.tar.gz 757594 BLAKE2B 6ddadb6add6ccba0db55e704ddffafe1c0f22740d27a5c49bf9c8fd00e1592aed46fd1cef49155101ac1544de8559f0d808731c598cf2189ff84a681bbf870e6 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da
+EBUILD tclxml-3.2-r2.ebuild 1125 BLAKE2B d3cd42c73cf80bee139f77ca6c63aa4430d9f6765916a93c598f63f0fa1e6b4fb900229fc5cc927ba83004e3b68c2574138440a00b5c71e2b422d04df339823a SHA512 5c8701ca9bb8deaaefe05d18ead1e727004c2f7fc9464c90c76b28c3c4ed34ee8533cb76dfc30f6eaf84c09a11697e2ebc9a88d14dc541d08d93f3e93b2b74e0
+MISC metadata.xml 329 BLAKE2B 6a79c9f1952fa24494921c92da92aaceae631ec090df7e08b39e8f037330cccff13a537c04340364552ad8a0f9c8aa41e642bf5ccc5ecac5264f4836a696fb06 SHA512 32f679fcef8e5ad247a7e566ccfe9098116d093ce83e7326e744dbfede0eeb47fbcc3de723e135a1dd3733d337de6648632ab1b5191ec2e9135d48a3b2988e5d
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch b/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch
new file mode 100644
index 000000000000..b463306abf1e
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2-fix-implicit-declarations.patch
@@ -0,0 +1,12 @@
+diff -urpN tclxml-3.2.orig/tclxml.c tclxml-3.2/tclxml.c
+--- tclxml-3.2.orig/tclxml.c	2009-06-08 12:56:10.000000000 +0200
++++ tclxml-3.2/tclxml.c	2009-06-08 12:57:24.000000000 +0200
+@@ -20,6 +20,8 @@
+ #include <tclxslt/tclxslt.h>
+ #include <string.h>
+ 
++int Tcldom_libxml2_Init ( Tcl_Interp *interp );
++
+ #define TCL_DOES_STUBS \
+     (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
+     (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
new file mode 100644
index 000000000000..2d13c6575ea6
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
@@ -0,0 +1,16 @@
+ tclxslt-libxslt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tclxslt-libxslt.c b/tclxslt-libxslt.c
+index d943bf7..d18f645 100644
+--- a/tclxslt-libxslt.c
++++ b/tclxslt-libxslt.c
+@@ -1506,7 +1506,7 @@ TclXSLTExtFunction(xpathCtxt, nargs)
+     obj = TclXSLT_ConvertTclObjToXPathObj(extinfo->interp, resultPtr);
+     valuePush(xpathCtxt, obj);
+   } else {
+-    xmlGenericError(xmlGenericErrorContext,
++    xmlGenericError(xmlGenericErrorContext, "%s",
+ 		    Tcl_GetStringFromObj(resultPtr, NULL));
+     /* Need to define a new error code - this is the closest in meaning */
+     xpathCtxt->error = XPATH_UNKNOWN_FUNC_ERROR;
diff --git a/dev-tcltk/tclxml/metadata.xml b/dev-tcltk/tclxml/metadata.xml
new file mode 100644
index 000000000000..47411252c4c4
--- /dev/null
+++ b/dev-tcltk/tclxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tclxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
new file mode 100644
index 000000000000..b0a217d741f6
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Pure Tcl implementation of an XML parser"
+HOMEPAGE="http://tclxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
+
+IUSE="debug threads"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+
+DEPEND="
+	>=dev-lang/tcl-8.2:0
+	>=dev-libs/libxml2-2.6.9
+	dev-libs/libxslt
+	>=dev-tcltk/tcllib-1.2
+	dev-libs/expat
+	!dev-tcltk/tcldom"
+#	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-implicit-declarations.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} \
+		--with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
+		--with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	default
+	dohtml doc/*.html
+}
diff --git a/dev-tcltk/tdom-0.8.3-r4 b/dev-tcltk/tdom-0.8.3-r4
deleted file mode 100644
index 3213c68c90b3..000000000000
--- a/dev-tcltk/tdom-0.8.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl:0= dev-libs/expat >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
-EAPI=5
-HOMEPAGE=https://tdom.github.com/
-IUSE=static-libs threads
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-1.1
-RDEPEND=dev-lang/tcl:0= dev-libs/expat
-SLOT=0
-SRC_URI=mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9c7eaef004446f996a0b06058cd2851
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
new file mode 100644
index 000000000000..4b5fdeb0417b
--- /dev/null
+++ b/dev-tcltk/tdom/Manifest
@@ -0,0 +1,8 @@
+AUX tdom-0.8.2-tnc.patch 2806 BLAKE2B 69e00242eba8096a8d28fe3218e1d0b441e567185ca5d208633a4d68deeb160d5d5d108749df0fd0c1d9ea6df9d054919d5d4bf6ecd4bf9c389e94f15c5323cc SHA512 b111a75abf35dd7acf813e05295e51633d30e12d20250f21905eec021ea64194d116a9869b2eac882da49f6a9037d3b1b6e23b30091b9bc92cd2bed91d7c8177
+AUX tdom-0.8.2.patch 2036 BLAKE2B d19a9a1f7b2095d5c0ce3684ecdacc0328ba82ddf6488d7fd3bbb2d1f0f777f6f7739ca0cca50a00825ea7ea3405415c61c738d49ed092bbbe17af165356dfee SHA512 f86d07835de0274072243ff347123edba075d46e0e3da246d75f378d9dfcff3cc4e338f6d26449f15610db4bf1256b5e3890ac9b5f2b3d3c5edd24dcfd8120b5
+AUX tdom-0.8.3-expat.patch 2512 BLAKE2B a97637e5e65ac2711cb4be392e2269fd17bfd2a2ca83a92d78b9dd064b94492de626264ea67715b315c5c2326f24833d1a57173bd36120ad989cb2985bf3b969 SHA512 110c07c55b2793152819c8da486a72440096876ff871b045d1a4b1d4a0a9e62bac4ccaf02bc83786f309b85f84e9311b6af31b6f4b5e8fb4f8294e6435f6be15
+AUX tdom-0.8.3-soname.patch 963 BLAKE2B 561fbd01681f2ecb5c55325591cc9e3f796dac14ecd1e7d567454df7ed56ea8f45208fd03c611a8816a38c63147dba7c9868493616103cb03014edf32842f3a4 SHA512 ea7f689f3b979fc565947a6b5e2ef6dfd422eee83c98749c4f9f0a213f0a44f3beba211e5c8e1b251e4bc2bbd77a5e4e75476661de5ffeb9d01e8f7bbba05990
+AUX tdom-0.8.3-tcl8.6.patch 764 BLAKE2B ae8abbe0b2b5db8b75f618048ba407bbd2ad97b55a15d61803c2840a2ade88d6c5201d6bb045898ce427b2d375d468a827f5e95e5de74b3768560e28a7a20730 SHA512 4af4a3d712a9f6b57a7a9c6641c7fbef9c1ffd278c2507c067dc43d15102dc2bcc8df8eafc205973c7d7db8f7f9914f98d881877c863b32184c68c6313a466b6
+DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
+EBUILD tdom-0.8.3-r4.ebuild 1941 BLAKE2B 29f8d3925b5ba7bb236a2cfde63cff529cfffd9b0428b8dbbd25752fe70ac89047b62957a3c511c4f8fed4deba6c8e7370d4dbd7b32dcc06a9d036829edbae8e SHA512 34ae9e6aa4bee0bc2dd52593893f4d37227a7d078c1b5653659d8ab83eb90069694363cc8d4912ef0880d7e177d1ba6d9037eb02c3078778980ba0171648d4fb
+MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
new file mode 100644
index 000000000000..7fa200b9ee33
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
@@ -0,0 +1,73 @@
+Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
+--- extensions/tnc/Makefile.in
++++ extensions/tnc/Makefile.in
+@@ -355,29 +355,30 @@
+ #========================================================================
+ 
+ install-lib-binaries: binaries
+-	@mkdir -p $(DESTDIR)$(pkglibdir)
++	@mkdir -p $(DESTDIR)$(libdir)
+ 	@list='$(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
++	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+ 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+ 	    if test "x$$stub" = "xstub"; then \
+-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
+ 	    else \
+-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	    fi; \
+ 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+ 	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+ 		if test -f $$lib; then \
+-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
++		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
++	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+ 		fi; \
+ 	    fi; \
+ 	  fi; \
+ 	done
++	@mkdir -p $(DESTDIR)$(pkglibdir)
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    destp=`basename $$p`; \
+--- extensions/tnc/configure.in
++++ extensions/tnc/configure.in
+@@ -89,7 +89,7 @@
+ if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+     TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
+ else
+-    TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
++    TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
+ fi
+ 
+ #--------------------------------------------------------------------
+--- extensions/tnc/pkgIndex.tcl.in
++++ extensions/tnc/pkgIndex.tcl.in
+@@ -2,4 +2,4 @@
+ 
+ package ifneeded tnc @PACKAGE_VERSION@        \
+     "package require tdom; \
+-     [list load [file join $dir @PKG_LIB_FILE@] tnc]"
++     [list load @PKG_LIB_FILE@ tnc]"
+--- extensions/tnc/Makefile.in
++++ extensions/tnc/Makefile.in
+@@ -160,7 +160,7 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
+ CONFIG_CLEAN_FILES = Makefile
+ 
+ CPPFLAGS	= @CPPFLAGS@
+-LIBS		= @PKG_LIBS@ @LIBS@
++LIBS		= @PKG_LIBS@ @LIBS@ -L../../unix/
+ AR		= @AR@
+ CFLAGS		= @CFLAGS@
+ COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2.patch b/dev-tcltk/tdom/files/tdom-0.8.2.patch
new file mode 100644
index 000000000000..73af7c60e141
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.2.patch
@@ -0,0 +1,52 @@
+Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
+--- Makefile.in
++++ Makefile.in
+@@ -307,7 +307,7 @@
+ 
+ pkgIndex.tcl-hand:
+ 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
+-	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
++	"load $(PKG_LIB_FILE);\
+          source [list [file join $$dir tdom.tcl]]"'\
+ 	) > pkgIndex.tcl
+ 
+@@ -385,29 +385,30 @@
+ #========================================================================
+ 
+ install-lib-binaries: binaries
+-	@mkdir -p $(DESTDIR)$(pkglibdir)
++	@mkdir -p $(DESTDIR)$(libdir)
+ 	@list='$(lib_BINARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
++	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+ 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+ 	    if test "x$$stub" = "xstub"; then \
+-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
+ 	    else \
+-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
+-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
++		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	    fi; \
+ 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
+ 	    if test "x$$ext" = "xdll"; then \
+ 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
+ 		if test -f $$lib; then \
+-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
++		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
++	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+ 		fi; \
+ 	    fi; \
+ 	  fi; \
+ 	done
++	@mkdir -p $(DESTDIR)$(pkglibdir)
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    destp=`basename $$p`; \
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
new file mode 100644
index 000000000000..818850bd8eee
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.in b/configure.in
+index 8e634f2..d9999cf 100644
+--- a/configure.in
++++ b/configure.in
+@@ -72,6 +72,7 @@ AC_CHECK_FUNCS(memmove bcopy)
+ #--------------------------------------------------------------------
+ 
+ TDOM_PATH_AOLSERVER
++TDOM_PATH_EXPAT
+ 
+ #-----------------------------------------------------------------------
+ # __CHANGE__
+@@ -83,10 +84,7 @@ TDOM_PATH_AOLSERVER
+ # and PKG_TCL_SOURCES.
+ #-----------------------------------------------------------------------
+ 
+-TEA_ADD_SOURCES([expat/xmlrole.c     \
+-                 expat/xmltok.c      \
+-                 expat/xmlparse.c    \
+-                 generic/xmlsimple.c \
++TEA_ADD_SOURCES([generic/xmlsimple.c \
+                  generic/utf8conv.c  \
+                  generic/dom.c       \
+                  generic/domhtml.c   \
+@@ -99,7 +97,7 @@ TEA_ADD_SOURCES([expat/xmlrole.c     \
+                  generic/tclexpat.c  \
+                  generic/tdomStubInit.c])
+ TEA_ADD_HEADERS([generic/tdom.h])
+-TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
++TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
+ TEA_ADD_LIBS([${AOL_LIBS}])
+ TEA_ADD_CFLAGS([])
+ TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
+diff --git a/tdom.m4 b/tdom.m4
+index f5ecd98..fcab883 100644
+--- a/tdom.m4
++++ b/tdom.m4
+@@ -216,6 +216,46 @@ AC_DEFUN(TDOM_PATH_AOLSERVER, [
+     fi
+ ])
+ 
++
++AC_DEFUN(TDOM_PATH_EXPAT, [
++    AC_MSG_CHECKING([for expat])
++    AC_ARG_WITH(expat, 
++        AC_HELP_STRING([--with-expat],
++            [directory with expat installation]), , [with_expat=no])
++
++    AC_CACHE_VAL(ac_cv_c_expat,[
++    case $with_expat in
++	no) ;;
++	yes)
++	    for f in /usr/local /usr; do
++	        if test -f "$f/include/expat.h" ; then
++		    ac_cv_c_expat=`(cd $f; pwd)`
++		    break
++		fi
++	    done
++	    ;;
++	*)
++	    if test -f "$with_expat/include/expat.h"; then
++		ac_cv_c_expat=`(cd $with_expat; pwd)`
++	    else
++        	AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
++	    fi
++    esac
++    ])
++    if test x"${ac_cv_c_expat}" = x ; then
++        AC_MSG_RESULT([using local copy])
++	TEA_ADD_SOURCES([expat/xmlrole.c     \
++                 	 expat/xmltok.c      \
++	                 expat/xmlparse.c])
++	TEA_ADD_INCLUDES([-I${srcdir}/expat])
++    else
++        AC_MSG_RESULT([${ac_cv_c_expat}])
++	TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
++	TEA_ADD_LIBS([-lexpat])
++    fi
++])
++
++
+ #------------------------------------------------------------------------
+ # TDOM_PATH_CONFIG --
+ #
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
new file mode 100644
index 000000000000..f742f6e7f5a1
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.in b/Makefile.in
+index d995328..5c17e11 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -108,7 +108,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+ CFLAGS_WARNING	= @CFLAGS_WARNING@
+ CLEANFILES	= @CLEANFILES@
+ EXEEXT		= @EXEEXT@
+-LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
++LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtdom$(PACKAGE_VERSION).so
+ MAKE_LIB	= @MAKE_LIB@
+ MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
+diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
+index f8a332c..01e0ef0 100644
+--- a/extensions/tnc/Makefile.in
++++ b/extensions/tnc/Makefile.in
+@@ -98,7 +98,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+ CFLAGS_WARNING	= @CFLAGS_WARNING@
+ CLEANFILES	= @CLEANFILES@
+ EXEEXT		= @EXEEXT@
+-LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
++LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
+ MAKE_LIB	= @MAKE_LIB@
+ MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
new file mode 100644
index 000000000000..5a805931ca31
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
@@ -0,0 +1,21 @@
+ generic/tcldom.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/generic/tcldom.c b/generic/tcldom.c
+index 91d98c9..0f024b3 100644
+--- a/generic/tcldom.c
++++ b/generic/tcldom.c
+@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked (
+     ret = Tcl_EvalObj(interp, objv[2]);
+     if (ret == TCL_ERROR) {
+         char msg[64 + TCL_INTEGER_SPACE];
++    #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
+                 Tcl_GetString(objv[1]), interp->errorLine);
++    #else
++        sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
++                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
++    #endif
+         Tcl_AddErrorInfo(interp, msg);
+     }
+ 
diff --git a/dev-tcltk/tdom/metadata.xml b/dev-tcltk/tdom/metadata.xml
new file mode 100644
index 000000000000..9b594bd7ea41
--- /dev/null
+++ b/dev-tcltk/tdom/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+  <longdescription>
+tDOM combines high performance XML data processing with easy and
+powerful Tcl scripting functionality. tDOM should be one of the fastest
+ways to manipulate XML with a scripting language and uses very few
+memory: for example, the DOM tree of the XML recommendation in XML
+(160K) needs only about 450K of memory.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
new file mode 100644
index 000000000000..7c60e39bb1b2
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="tDOM-${PV}"
+
+DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
+HOMEPAGE="https://tdom.github.com/"
+#SRC_URI="https://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
+SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs threads"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/"${PN}-0.8.2.patch
+	"${FILESDIR}/"${P}-soname.patch
+	"${FILESDIR}/"${P}-expat.patch
+	"${FILESDIR}/"${PN}-0.8.2-tnc.patch
+	"${FILESDIR}/"${P}-tcl8.6.patch
+	)
+
+src_prepare() {
+	tc-export AR
+	append-libs -lm
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-pipe::g' \
+		-e 's:-fomit-frame-pointer::g' \
+		-e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
+		-i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
+	epatch "${PATCHES[@]}"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		--enable-shared
+		--disable-tdomalloc
+		--with-expat
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir)
+		)
+
+	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
+	cd "${S}"/extensions/tdomhtml &&	econf ${myeconfargs}
+	cd "${S}"/extensions/tnc && econf ${myeconfargs}
+}
+
+src_compile() {
+	local dir
+
+	for dir in "${S}"/unix "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	local dir
+
+	dodoc CHANGES ChangeLog README*
+
+	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake DESTDIR="${D}" install
+		popd > /dev/null
+	done
+
+	if ! use static-libs; then
+		einfo "Removing static libs ..."
+		rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+	fi
+}
diff --git a/dev-tcltk/thread-2.7.1 b/dev-tcltk/thread-2.7.1
deleted file mode 100644
index dd171d7f5b63..000000000000
--- a/dev-tcltk/thread-2.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl:0=[threads] gdbm? ( sys-libs/gdbm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tcl Thread extension
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/
-IUSE=debug gdbm
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0=[threads] gdbm? ( sys-libs/gdbm )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/project/tcl/Tcl/8.6.2/thread2.7.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f36eedf9669095cc6246c25b9b360a1
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
new file mode 100644
index 000000000000..3ca8cc31e337
--- /dev/null
+++ b/dev-tcltk/thread/Manifest
@@ -0,0 +1,3 @@
+DIST thread2.7.1.tar.gz 295134 BLAKE2B 785e832f8acf926f550cbffa3e2383eb6ad7fdbb480830e3c0f56d207375053c865d6eb201361acb8ca2df8951a037603b015f85ab4903d80a92f9d957af9dcd SHA512 18ebd9431b6f6bfb1e6a60797af39db0dee29a16cd457ddab2a18cd5dfd9ef2dea9284ab99238fb05b8284fcc855c2ef8011eb3ed02d7e54d715379d133512dc
+EBUILD thread-2.7.1.ebuild 1090 BLAKE2B d9e090abd0052a457ae17ef1c604781c89d453d9ab70c601ac4b8a728db0efbc1fd4d3a400f3091c0c8f9893a5f400b03c3c6e7730c171e8374ddeb3a8475bec SHA512 4a4ffe65e33c306cc03b79d79c24ff14744b4415b15ef1e2b59e76a8a76524baebe5df8967c75a205de454fdf7ea7e537ea5902a2fb77dbd074a5bd29726defc
+MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-tcltk/thread/metadata.xml b/dev-tcltk/thread/metadata.xml
new file mode 100644
index 000000000000..ec2fb390faa4
--- /dev/null
+++ b/dev-tcltk/thread/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/thread/thread-2.7.1.ebuild b/dev-tcltk/thread/thread-2.7.1.ebuild
new file mode 100644
index 000000000000..3028f887d212
--- /dev/null
+++ b/dev-tcltk/thread/thread-2.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib
+
+MY_P="${PN}${PV}"
+TCL_VER="8.6.2"
+
+DESCRIPTION="Tcl Thread extension"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="debug gdbm"
+
+DEPEND="
+	dev-lang/tcl:0=[threads]
+	gdbm? ( sys-libs/gdbm )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}${PV}
+
+RESTRICT="test"
+
+src_prepare() {
+	# Search for libs in libdir not just exec_prefix/lib
+	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
+		aclocal.m4 || die "sed failed"
+
+	sed -i -e "s/relid'/relid/" tclconfig/tcl.m4 || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-tclinclude="${EPREFIX}/usr/include"
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+	)
+	use gdbm && myconf+=( --with-gdbm )
+	use debug && myconf+=( --enable-symbols )
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tix-8.4.3-r1 b/dev-tcltk/tix-8.4.3-r1
deleted file mode 100644
index fa7912f1be98..000000000000
--- a/dev-tcltk/tix-8.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
-DESCRIPTION=A widget library for Tcl/Tk
-EAPI=5
-HOMEPAGE=http://tix.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tix/Tix8.4.3-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c161dee410bbf2b51ae922e5749382d8
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
new file mode 100644
index 000000000000..3d94164e3034
--- /dev/null
+++ b/dev-tcltk/tix/Manifest
@@ -0,0 +1,6 @@
+AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8e418139ccf4802e8057f198b95a64bc4cac17fc4daa259f925d4b8e831f035a702f2931b80f15d5d67984 SHA512 e220035cc8d71592dfe72e73e1fb92f79f7750b5c8a97d749bdb67aef9488a3684aad7873041ba6054083287c758889cb243d6cac5b83281f738b1392f29a821
+AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd
+AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e
+DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852
+EBUILD tix-8.4.3-r1.ebuild 1376 BLAKE2B 36ed6ae6b88948af499fbf4ed3e972526372e9e4c37cdeabc4e48bb28638bc6f4d52f0b7cd1febdc656aa53ee79ce96d314a57e4615f6461e283314f1f89e6e8 SHA512 3889acc7b693196c1804da46dc20ee9ab60354e2dd11f39ca65465daec1e3934962321b5e21a839a8daef788b4f4f23a2ad5ae6205dd9677f57ca700fa00f1ee
+MISC metadata.xml 326 BLAKE2B 3dd7044d395bacde28195a421c60be7f696572b5e308ecc2e1f8e2012f6a3e1645f849fd67a577bd00f756ab1ed8baa1efce1e64ea3b758fd79a012b9391c9d9 SHA512 dff5470f4f3ea0164cd7bac8ea41ea6589134bd59f8a0992021bcec2962cbaecdfb4f76e68ea417c8b9ec4c573f89dcb109821208d429672dd5467814148aae7
diff --git a/dev-tcltk/tix/files/tix-8.4.3-link.patch b/dev-tcltk/tix/files/tix-8.4.3-link.patch
new file mode 100644
index 000000000000..d2d402dc8e49
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-link.patch
@@ -0,0 +1,11 @@
+--- Tix8.4.2/Makefile.in.link	2006-11-18 04:41:06.000000000 +0100
++++ Tix8.4.2/Makefile.in	2006-11-18 04:43:13.000000000 +0100
+@@ -124,7 +124,7 @@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(CFLAGS) -Wl,-soname=$(PKG_LIB_FILE)
+ SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch
new file mode 100644
index 000000000000..d87cbff7e9a2
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch
@@ -0,0 +1,190 @@
+diff -up Tix8.4.2/generic/tixImgXpm.c_old Tix8.4.2/generic/tixImgXpm.c
+--- Tix8.4.2/generic/tixImgXpm.c_old	2008-01-08 11:53:37.000000000 +0100
++++ Tix8.4.2/generic/tixImgXpm.c	2008-01-08 12:04:49.000000000 +0100
+@@ -45,19 +45,19 @@ static int		ImgXpmConfigureMaster _ANSI_
+ 			    int flags));
+ static int		ImgXpmGetData _ANSI_ARGS_((Tcl_Interp *interp,
+ 			    PixmapMaster *masterPtr));
+-static char ** 		ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
++static CONST84 char **	ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp,
+ 			    char * string, int * numLines_return));
+-static char ** 		ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
++static CONST84 char **	ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp,
+ 			    CONST84 char * id));
+-static char ** 		ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
++static CONST84 char ** 	ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp,
+ 			    char * string, int * numLines_return));
+ static void 		ImgXpmGetPixmapFromData _ANSI_ARGS_((
+ 			    Tcl_Interp * interp,
+ 			    PixmapMaster *masterPtr,
+ 			    PixmapInstance *instancePtr));
+-static char *		GetType _ANSI_ARGS_((char * colorDefn,
++static CONST84 char *	GetType _ANSI_ARGS_((CONST84 char * colorDefn,
+ 			    int  * type_ret));
+-static char *		GetColor _ANSI_ARGS_((char * colorDefn,
++static CONST84 char *	GetColor _ANSI_ARGS_((CONST84 char * colorDefn,
+ 			    char * colorName, int * type_ret));
+ 
+ /*
+@@ -286,7 +286,7 @@ ImgXpmGetData(interp, masterPtr)
+     Tcl_Interp *interp;			/* For reporting errors. */
+     PixmapMaster *masterPtr;
+ {
+-    char ** data = NULL;
++    CONST84 char ** data = NULL;
+     int  isAllocated = 0;	/* do we need to free "data"? */
+     int listArgc;
+     CONST84 char ** listArgv = NULL;
+@@ -363,7 +363,7 @@ ImgXpmGetData(interp, masterPtr)
+     return code;
+ }
+ 
+-static char ** ImgXpmGetDataFromId(interp, id)
++static CONST84 char ** ImgXpmGetDataFromId(interp, id)
+     Tcl_Interp * interp;
+     CONST84 char * id;
+ {
+@@ -378,13 +378,13 @@ static char ** ImgXpmGetDataFromId(inter
+     if (hashPtr == NULL) {
+ 	Tcl_AppendResult(interp, "unknown pixmap ID \"", id,
+ 	    "\"", NULL);
+-	return (char**)NULL;
++	return NULL;
+     } else {
+-	return (char**)Tcl_GetHashValue(hashPtr);
++	return (CONST84 char**)Tcl_GetHashValue(hashPtr);
+     }
+ }
+ 
+-static char ** ImgXpmGetDataFromString(interp, string, numLines_return)
++static CONST84 char ** ImgXpmGetDataFromString(interp, string, numLines_return)
+     Tcl_Interp * interp;
+     char * string;
+     int * numLines_return;
+@@ -392,7 +392,7 @@ static char ** ImgXpmGetDataFromString(i
+     int quoted;
+     char * p, * list;
+     int numLines;
+-    char ** data;
++    CONST84 char ** data;
+ 
+     /* skip the leading blanks (leading blanks are not defined in the
+      * the XPM definition, but skipping them shouldn't hurt. Also, the ability
+@@ -510,17 +510,17 @@ static char ** ImgXpmGetDataFromString(i
+ 
+   error:
+     Tcl_AppendResult(interp, "File format error", NULL);
+-    return (char**) NULL;
++    return NULL;
+ }
+ 
+-static char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
++static CONST84 char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return)
+     Tcl_Interp * interp;
+     char * fileName;
+     int * numLines_return;
+ {
+     FILE * fd = NULL;
+     int size, n;
+-    char ** data;
++    CONST84 char ** data;
+     char *cmdBuffer = NULL;
+     Tcl_DString buffer;			/* initialized by Tcl_TildeSubst */
+ 
+@@ -588,16 +588,16 @@ static char ** ImgXpmGetDataFromFile(int
+ 	ckfree(cmdBuffer);
+     }
+     Tcl_DStringFree(&buffer);
+-    return (char**)NULL;
++    return NULL;
+ }
+ 
+ 
+-static char *
++static CONST84 char *
+ GetType(colorDefn, type_ret)
+-    char * colorDefn;
++    CONST84 char * colorDefn;
+     int  * type_ret;
+ {
+-    char * p = colorDefn;
++    CONST84 char * p = colorDefn;
+ 
+     /* skip white spaces */
+     while (*p && isspace(*p)) {
+@@ -642,9 +642,9 @@ GetType(colorDefn, type_ret)
+ /*
+  * colorName is guaranteed to be big enough
+  */
+-static char *
++static CONST84 char *
+ GetColor(colorDefn, colorName, type_ret)
+-    char * colorDefn;
++    CONST84 char * colorDefn;
+     char * colorName;		/* if found, name is copied to this array */
+     int  * type_ret;
+ {
+@@ -751,7 +751,7 @@ ImgXpmGetPixmapFromData(interp, masterPt
+     }
+ 
+     for (i=0; i<masterPtr->ncolors; i++) {
+-	char * colorDefn;		/* the color definition line */
++	CONST84 char * colorDefn;	/* the color definition line */
+ 	char * colorName;		/* temp place to hold the color name
+ 					 * defined for one type of visual */
+ 	char * useName;			/* the color name used for this
+@@ -842,7 +842,7 @@ ImgXpmGetPixmapFromData(interp, masterPt
+      * Parse the main body of the image
+      */
+     for (i=0; i<masterPtr->size[1]; i++) {
+-	char * p = masterPtr->data[i+lOffset];
++	CONST84 char * p = masterPtr->data[i+lOffset];
+ 
+ 	for (j=0; j<masterPtr->size[0]; j++) {
+ 	    if (masterPtr->cpp == 1) {
+diff -up Tix8.4.2/generic/tixImgXpm.h_old Tix8.4.2/generic/tixImgXpm.h
+--- Tix8.4.2/generic/tixImgXpm.h_old	2008-01-08 12:04:59.000000000 +0100
++++ Tix8.4.2/generic/tixImgXpm.h	2008-01-08 12:05:26.000000000 +0100
+@@ -55,7 +55,7 @@ typedef struct PixmapMaster {
+     int size[2];		/* width and height */
+     int ncolors;		/* number of colors */
+     int cpp;			/* characters per pixel */
+-    char ** data;		/* The data that defines this pixmap 
++    CONST84 char ** data;	/* The data that defines this pixmap 
+ 				 * image (array of strings). It is
+ 				 * converted into an X Pixmap when this
+ 				 * image is instanciated
+diff -up Tix8.4.2/generic/tixInt.h_old Tix8.4.2/generic/tixInt.h
+--- Tix8.4.2/generic/tixInt.h_old	2008-01-08 12:05:53.000000000 +0100
++++ Tix8.4.2/generic/tixInt.h	2008-01-08 12:09:35.000000000 +0100
+@@ -23,6 +23,10 @@
+ #include <tixPort.h>
+ #endif
+ 
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
++
+ /*----------------------------------------------------------------------
+  *
+  *		Tix Display Item Types
+diff -up Tix8.4.2/Makefile.in_old Tix8.4.2/Makefile.in
+--- Tix8.4.2/Makefile.in_old	2008-01-08 11:43:41.000000000 +0100
++++ Tix8.4.2/Makefile.in	2008-01-08 11:46:22.000000000 +0100
+@@ -128,6 +128,7 @@ SHLIB_LD	= @SHLIB_LD@ $(CFLAGS) -Wl,-son
+ SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
++TCL_VERSION	= @TCL_VERSION@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_SRC_DIR	= @TCL_SRC_DIR@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+@@ -294,7 +295,7 @@ VPATH = $(srcdir):$(srcdir)/generic:$(sr
+ 
+ pkgIndex.tcl:
+ 	(\
+-	echo 'if {[catch {package require Tcl 8.4}]} return';\
++	echo 'if {[catch {package require Tcl $(TCL_VERSION)}]} return';\
+ 	echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
+ 	    [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\
+ 	) > pkgIndex.tcl
diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch
new file mode 100644
index 000000000000..0ed17503a56f
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch
@@ -0,0 +1,18 @@
+ generic/tixGrSort.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c
+index 7dee30f..26ec054 100644
+--- a/generic/tixGrSort.c
++++ b/generic/tixGrSort.c
+@@ -447,8 +447,8 @@ SortCompareProc(first, second)
+ 	 * Parse the result of the command.
+ 	 */
+ 
+-	order = strtol(sortInterp->result, &end, 0);
+-	if ((end == sortInterp->result) || (*end != 0)) {
++	order = strtol(Tcl_GetStringResult(sortInterp), &end, 0);
++	if ((end == Tcl_GetStringResult(sortInterp)) || (*end != 0)) {
+ 	    Tcl_ResetResult(sortInterp);
+ 	    Tcl_AppendResult(sortInterp,
+ 		    "comparison command returned non-numeric result",
diff --git a/dev-tcltk/tix/metadata.xml b/dev-tcltk/tix/metadata.xml
new file mode 100644
index 000000000000..1925cd538b7d
--- /dev/null
+++ b/dev-tcltk/tix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
new file mode 100644
index 000000000000..fea8efa756fc
--- /dev/null
+++ b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P="Tix${PV}"
+DESCRIPTION="A widget library for Tcl/Tk"
+HOMEPAGE="http://tix.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+RESTRICT="test"
+
+DEPEND="
+	dev-lang/tk:0=
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	(use x86-macos || use x64-macos) || epatch "${FILESDIR}"/${P}-link.patch
+	sed \
+		-e 's:-Os::g' \
+		-i configure tclconfig/tcl.m4 || die
+	epatch \
+		"${FILESDIR}"/${P}-tcl8.5.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	# Bug 168897
+	doheader generic/tix.h
+	# Bug 201138
+	if use x86-macos || use x64-macos; then
+		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib
+		dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
+	else
+		dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so
+	fi
+
+	dodoc ChangeLog README.txt docs/*.txt
+	dohtml -r index.html ABOUT.html docs/
+}
diff --git a/dev-tcltk/tkTheme-1.0-r2 b/dev-tcltk/tkTheme-1.0-r2
deleted file mode 100644
index da6737b42937..000000000000
--- a/dev-tcltk/tkTheme-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=app-portage/elt-patches-20170422
-DESCRIPTION=Tcl/Tk Theming library
-EAPI=4
-HOMEPAGE=http://www.xmission.com/~georgeps/Tk_Theme/other/
-IUSE=debug examples static-libs threads
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm
-SLOT=0
-SRC_URI=http://www.xmission.com/~georgeps/Tk_Theme/other/tkTheme.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bae14c5d5d2a758a1d197741e377b853
diff --git a/dev-tcltk/tkTheme/Manifest b/dev-tcltk/tkTheme/Manifest
new file mode 100644
index 000000000000..63d5965ae21b
--- /dev/null
+++ b/dev-tcltk/tkTheme/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0-Makefile.in.diff 1072 BLAKE2B 35d998bbf96f7cad05460e37d10e1b77581463839d19311170d77444a9d44c0b9892be78d045f39ac6d61d78262ea82b4631b3d779f1d32c2616d07191477b10 SHA512 eb8e7af60adca22d34cd12dd53ad433d41638bece12e2553555954bd7dd8a762de7053417f69517d1ae30e55c89ac59923b287e3cd2cc419d49695bbb5af6d88
+AUX 1.0-cflags.patch 471 BLAKE2B 85b5dd5cc67b95eeff7289f87249353175fb411069d816ab2ccb19e570246f992bc6103f4852ae6215c4aa17a03084f14c838e1367dcd6c3cfd02f234d40e1d3 SHA512 c32ea520bc4e7cc0d5d2b88ac1f980b16a3f1f154a04a2335084df3aa8c558b0460f924ae6ca54c8cfb1aeb305ae7a4fed3caf066f90725447e055ed2a63dd08
+AUX 1.0-configure.diff 289 BLAKE2B e2678f5a1bb12bf2bb61ff1412ad87af2e683dbf08882e5b2bbfd709be615665ccaf138260a9f136be5ef01ddba0c3f6193b3aa51e9e25f4d3efc182464b7c6b SHA512 710fa8a002f8347f79c56eff146b476a589f4ec7d457324dff86afa398df3c064cd1e053e5cc1ddad92a5252515051b88ba136174c6c5889a654d1649629ac8d
+DIST tkTheme.tgz 335061 BLAKE2B 3a1b3bd7e82f75c5d0566317d268df5a3215e738e67ca5bf1e575abe31f3de5718a5280f3de03067c94b1469f6e1f38691515dadfbac9b3a6cb9e9dee23e1878 SHA512 71988f5a627582092d30f8d825f4e9e60f11c116e40b90bf4d669cad8146d7130e27ca0f83b0650ca7f225016849242815be27e247c8917f892a16447ed40d7c
+EBUILD tkTheme-1.0-r2.ebuild 1032 BLAKE2B fa0d091df6b5db5ab6b9420eff42545cee66eb2936251ecb2f56c47e0a6d2fa56541b9cc968e403b22ea0c265a3dce9d5269a4d919745ecea93055bdeaf521bb SHA512 57e3f73e4223988caeeba2404e89afcb15bc83f6008b8f29c8c58565b2094eb73cb05716de1a7f92554b843b2869f83f09a89857e28bb5d730a95b188253a395
+MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff b/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff
new file mode 100644
index 000000000000..6076a0455c9b
--- /dev/null
+++ b/dev-tcltk/tkTheme/files/1.0-Makefile.in.diff
@@ -0,0 +1,29 @@
+ Makefile.in |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7cf8b1e..c2c7d3b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -428,16 +428,15 @@ mostlyclean distclean maintainer-clean
+ 
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) @PKG_TCL@ @PKG_TCL@/demo
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
+ 	echo	"package ifneeded tkTheme"				   \
+ 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
+-		"[list load $(DESTDIR)$(libdir)/libtkTheme.so]"	   \
+-	    > @PKG_TCL@/pkgIndex.tcl
++		"[list load $(libdir)/libtkTheme.so]"	   \
++	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
+ 	sed -e 's%load .libs/libtkTheme.so%package require tkTheme%' \
+-	    < test.tcl      					     \
++	    < $(srcdir)/test.tcl      					     \
+ 	    | sed -e 's%cd demo/%cd @PKG_TCL@/demo/%'                \
+-	    > @PKG_TCL@/test.tcl
+-	cp demo/* @PKG_TCL@/demo
++	    > $(DESTDIR)@PKG_TCL@/test.tcl
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-tcltk/tkTheme/files/1.0-cflags.patch b/dev-tcltk/tkTheme/files/1.0-cflags.patch
new file mode 100644
index 000000000000..34063d365fd7
--- /dev/null
+++ b/dev-tcltk/tkTheme/files/1.0-cflags.patch
@@ -0,0 +1,18 @@
+ configure |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 373c332..6fc1a14 100755
+--- a/configure
++++ b/configure
+@@ -3341,9 +3341,7 @@ fi
+ 
+ 
+ if test "${SHARED_BUILD}" = "1" ; then
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
+-else
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
++    CFLAGS+=' ${SHLIB_CFLAGS}'
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-tcltk/tkTheme/files/1.0-configure.diff b/dev-tcltk/tkTheme/files/1.0-configure.diff
new file mode 100644
index 000000000000..c73f7dc3aa3f
--- /dev/null
+++ b/dev-tcltk/tkTheme/files/1.0-configure.diff
@@ -0,0 +1,12 @@
+diff -Naur tkTheme.orig/configure tkTheme/configure
+--- tkTheme.orig/configure	2002-08-24 04:19:04.000000000 +0900
++++ tkTheme/configure	2005-06-26 22:26:30.000000000 +0900
+@@ -3472,7 +3472,7 @@
+     
+ 
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/tkTheme
++PKG_TCL=${TCL_PACKAGE_PATH%% *}/tkTheme
+ 
+ 
+ 
diff --git a/dev-tcltk/tkTheme/metadata.xml b/dev-tcltk/tkTheme/metadata.xml
new file mode 100644
index 000000000000..2b168a2f48c6
--- /dev/null
+++ b/dev-tcltk/tkTheme/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild b/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
new file mode 100644
index 000000000000..496c8d524646
--- /dev/null
+++ b/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils  eutils toolchain-funcs
+
+DESCRIPTION="Tcl/Tk Theming library"
+HOMEPAGE="http://www.xmission.com/~georgeps/Tk_Theme/other/"
+SRC_URI="http://www.xmission.com/~georgeps/Tk_Theme/other/${PN}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE="debug examples static-libs threads"
+
+DEPEND="
+	dev-lang/tk
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-Makefile.in.diff
+	"${FILESDIR}"/${PV}-configure.diff
+	"${FILESDIR}"/${PV}-cflags.patch
+	)
+
+src_configure() {
+	tc-export CC
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+		--with-x
+		$(use_with debug symbols)
+		$(use_enable threads)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	insinto /usr/share/${PN}
+	use examples && doins -r demo
+}
diff --git a/dev-tcltk/tkXwin-1.0-r4 b/dev-tcltk/tkXwin-1.0-r4
deleted file mode 100644
index 2e29bd93bcc8..000000000000
--- a/dev-tcltk/tkXwin-1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk[threads?] x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto >=app-portage/elt-patches-20170422
-DESCRIPTION=Tcl/Tk library to detect idle periods of an X session
-EAPI=4
-HOMEPAGE=http://beepcore-tcl.sourceforge.net/
-IUSE=debug static-libs threads
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk[threads?] x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://beepcore-tcl.sourceforge.net/tkXwin-1.0.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a0a4586624a0edaa553acc5860933fb
diff --git a/dev-tcltk/tkXwin/Manifest b/dev-tcltk/tkXwin/Manifest
new file mode 100644
index 000000000000..e57eb7bd8b6b
--- /dev/null
+++ b/dev-tcltk/tkXwin/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0-Makefile.in.diff 796 BLAKE2B 2b7692fc20e703641fe6cfcecedb405132c7d424722e286894f6575d773b97fcafa8250ed46d87ac4cbcb929209327c6090a2424670a772158342e8ecdbc7760 SHA512 12dfd890912242624ff3801cd92f414525e7ddf74e373e2287529f2d84d90a68dc2ab7dcd69cdd22c7e33d9df2c5499e2db7beed3b74e8167a43ee3b1d814267
+AUX tkXwin-1.0-configure.patch 2262 BLAKE2B d082b1a287fe4e7d0673e5a63ea080b14a20baf4da2b0355964a5aa945709512f58bc21ced8c9a151d86f4126763f2944a69e79db584d5e7c557edf7b8969a72 SHA512 1c2ba4e9ecc0781a47e3523b387ed2bee91bf6f255564bfd9af60ab8faf3a4759d848ae5b6cdc612068fee3582413a8e7f792f04c5126578eea92ef8db01a72d
+DIST tkXwin-1.0.tgz 168650 BLAKE2B 6893140bb318f69f0094c4a157245f4fcebb54181b7f8327e790bfa27126a287353798f09427f00573463d54f66c224b98974f61ff5d6018485aa5128af899c4 SHA512 0313ec6fc81c872019a7e247fcaac899d5d584eb8066e7abf1d1feff7bc741de43a9b8a6212ed6dcd12566e8c995bc658360833c692eea5f1b4b5fc199cf2d6e
+EBUILD tkXwin-1.0-r4.ebuild 988 BLAKE2B cc8ae5fa5a7a5f86280030188fdaec6cc258143a572755ca98c82221bb06e271524bd1d4bfea6dace95c2f84b1c948712d4b462a6c5e1c3953f5619386d51b60 SHA512 a660ca99219d0d26015b625949c0125e969713aaa720c63e0d5f34bc99e449e169df7a96a78cb567500817561305222293c9720a623edcf656a069fe96aaa6de
+MISC metadata.xml 335 BLAKE2B e99619731b3c350b6f6dfae93955d886db4b27c68a439c3f497f707ee3695049f705337583b9ee4d8313744ab6649d2f2e74a13c7726440b394f0159dadc54e1 SHA512 e7f2cfb18a80ce750d413c54bd49c92a6bb32faeafb28bf9175f1434b73ec0fe4e1ab878d40d6a554a7671e02bed3ca89f29a04d6515801af706ed5ca8bbd891
diff --git a/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff b/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff
new file mode 100644
index 000000000000..bd10890c719c
--- /dev/null
+++ b/dev-tcltk/tkXwin/files/1.0-Makefile.in.diff
@@ -0,0 +1,21 @@
+--- Makefile.in.orig	2003-02-01 22:03:34.000000000 -0500
++++ Makefile.in	2003-02-01 22:04:39.000000000 -0500
+@@ -432,14 +432,14 @@
+ 
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) @PKG_TCL@
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
+ 	echo	"package ifneeded tkXwin"				   \
+ 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
+-		"[list load $(DESTDIR)$(libdir)/libtkXwin.so]"	   \
+-	    > @PKG_TCL@/pkgIndex.tcl
++		"[list load $(libdir)/libtkXwin.so]"	   \
++	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
+ 	sed -e 's%load .libs/libtkXwin.so%package require tkXwin%' \
+ 	    < test.tcl      					   \
+-	    > @PKG_TCL@/test.tcl
++	    > $(DESTDIR)@PKG_TCL@/test.tcl
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
new file mode 100644
index 000000000000..ac2f84b97f21
--- /dev/null
+++ b/dev-tcltk/tkXwin/files/tkXwin-1.0-configure.patch
@@ -0,0 +1,93 @@
+ configure | 43 +++----------------------------------------
+ 1 file changed, 3 insertions(+), 40 deletions(-)
+
+diff --git a/configure b/configure
+index d92a1bf..d8605a0 100755
+--- a/configure
++++ b/configure
+@@ -823,7 +823,6 @@ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:829: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -839,23 +838,6 @@ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+@@ -2078,7 +2060,6 @@ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+ echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+@@ -2094,24 +2075,6 @@ rm -f conftest*
+ 
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+-
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -3403,9 +3366,9 @@ fi
+ 
+ 
+ if test "${SHARED_BUILD}" = "1" ; then
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
++    CFLAGS+=' ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
+ else
+-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
++    CFLAGS+=' ${CFLAGS_WARNING}'
+ fi
+ 
+ #--------------------------------------------------------------------
+@@ -3534,7 +3497,7 @@ fi
+     
+ 
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin
++PKG_TCL=${libdir}/tkXwin
+ 
+ 
+ 
diff --git a/dev-tcltk/tkXwin/metadata.xml b/dev-tcltk/tkXwin/metadata.xml
new file mode 100644
index 000000000000..7d188a276b89
--- /dev/null
+++ b/dev-tcltk/tkXwin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">beepcore-tcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
new file mode 100644
index 000000000000..471945156f57
--- /dev/null
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils multilib toolchain-funcs
+
+DESCRIPTION="Tcl/Tk library to detect idle periods of an X session"
+HOMEPAGE="http://beepcore-tcl.sourceforge.net/"
+SRC_URI="http://beepcore-tcl.sourceforge.net/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug static-libs threads"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	dev-lang/tk[threads?]
+	x11-libs/libXScrnSaver
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+		"${FILESDIR}"/${PV}-Makefile.in.diff
+		"${FILESDIR}"/${P}-configure.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	tc-export CC AR RANLIB
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+		--enable-gcc
+		--with-x
+		$(use_enable threads)
+		$(use_enable debug symbols)
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tkcon-2.5 b/dev-tcltk/tkcon-2.5
deleted file mode 100644
index 4c0fdef89ed4..000000000000
--- a/dev-tcltk/tkcon-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/tk
-DESCRIPTION=Tk GUI console
-EAPI=0
-HOMEPAGE=http://tkcon.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk
-SLOT=0
-SRC_URI=mirror://sourceforge/tkcon/tkcon-2.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8be7cedc894f021c48239e7ddcbd6c3b
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
new file mode 100644
index 000000000000..2d389433c341
--- /dev/null
+++ b/dev-tcltk/tkcon/Manifest
@@ -0,0 +1,3 @@
+DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
+EBUILD tkcon-2.5.ebuild 681 BLAKE2B 01bb36105f4171fef0b304e7ffdaa7232cdcf42864d65c8de5039ea3f6965114484943a3dbeb2fecc4b37af0929d2fc87a915dd99b297513e8f87259d285c369 SHA512 71a3d592b49e86562499923f6b0087dc31e6a293ace3fca72afacf0528e68739e4efa3f063191e8e4914b21c73b274b30578c195b4367de7f1988c64e292fdad
+MISC metadata.xml 695 BLAKE2B cb5dc622e2500fdac5984ac2e8578acc747b1f7904acddc4419658a767b9c55ce29fdaca7f56dea5496d68f815724bba106b56edaceaf422ef6ccfbc5326081e SHA512 f28fdbee5350ce1169b00081cfd326a2ed108b3f7347d5bef7365adbd6f098ea40cfb2088a3aa20d9cbd9c0bd650318119ef03db0a0a2e8bdf2aee6259544817
diff --git a/dev-tcltk/tkcon/metadata.xml b/dev-tcltk/tkcon/metadata.xml
new file mode 100644
index 000000000000..06799c8ae04f
--- /dev/null
+++ b/dev-tcltk/tkcon/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		tkcon is a replacement for the standard console that comes with
+		Tk. The console itself provides  more features than the standard
+		console. It is meant primarily to aid one when working with the
+		little details inside tcl and tk, giving UNIX users the GUI console
+		provided by default in the Mac and Windows Tk.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tkcon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tkcon/tkcon-2.5.ebuild b/dev-tcltk/tkcon/tkcon-2.5.ebuild
new file mode 100644
index 000000000000..dcf14a871f2d
--- /dev/null
+++ b/dev-tcltk/tkcon/tkcon-2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils multilib
+
+DESCRIPTION="Tk GUI console"
+HOMEPAGE="http://tkcon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-lang/tk"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	local tclver="$(echo 'puts $tcl_version' | tclsh)"
+	local instdir=/usr/$(get_libdir)/tcl${tclver}/${PN}2.5
+	dodir ${instdir}
+	cp -pP pkgIndex.tcl tkcon.tcl "${D}"${instdir} || die
+	dodir /usr/bin
+	dosym ${instdir}/tkcon.tcl /usr/bin/tkcon
+	dodoc README.txt
+	if use doc; then
+		dohtml doc/*
+	fi
+}
diff --git a/dev-tcltk/tkdnd-2.2 b/dev-tcltk/tkdnd-2.2
deleted file mode 100644
index 1e5a18193901..000000000000
--- a/dev-tcltk/tkdnd-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk >=app-portage/elt-patches-20170422
-DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolkit
-EAPI=4
-HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
-IUSE=debug threads X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.2/tkdnd2.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=232b9d66a5569dbb1c35be250cd14d9f
diff --git a/dev-tcltk/tkdnd-2.6 b/dev-tcltk/tkdnd-2.6
deleted file mode 100644
index 0ed7e3a8cd33..000000000000
--- a/dev-tcltk/tkdnd-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk >=app-portage/elt-patches-20170422
-DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolkit
-EAPI=5
-HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
-IUSE=debug threads X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.6/tkdnd2.6-src.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9972ff270cd2d8d4532c2666c0d42ca
diff --git a/dev-tcltk/tkdnd/Manifest b/dev-tcltk/tkdnd/Manifest
new file mode 100644
index 000000000000..084ff15db594
--- /dev/null
+++ b/dev-tcltk/tkdnd/Manifest
@@ -0,0 +1,5 @@
+DIST tkdnd2.2.tar.gz 501708 BLAKE2B 388a488fa6a6f86041182d741e4bb45b3cf86c8feb39de15010dbd21cddb536800cad0df23b5c27afec83bd4550c759534986b24804aefd007f0de4f5ecbf3cf SHA512 96f3b7209d82801b69932531b987cfe2c3367fbaaffd2198afc84bf21643437db8a9958511e31ce2c36896538ff8f8c9237950d0f82b832f7133fb1e5768fd26
+DIST tkdnd2.6-src.tar.gz 180278 BLAKE2B 598bba80e239440eae5e3dade176a015a33f426a387fbd8dcf96fa7b8644665d05cc2e52a86be40e2c40922211b200c484bde7dc69da1b252922ed203740fc87 SHA512 2ce1be9b49c21bc67102575420311c1ec764493315791c8a76313cae6d22846b3049dd85cdc0b2f28592889432b85103b0fa207445f678dbe22f988eb1d6fc87
+EBUILD tkdnd-2.2.ebuild 903 BLAKE2B 21e057ee7ea04b4dca78168dca2b201aa6e9fc92cba4971940016d511ab6d05aa2edcdc07e0c4d751c8f972a3f094f106b7d644c0b8364b95ac8deafafb93768 SHA512 627a72f61f8a7d8e4192851155943bd001b66aed95b7f30f5e7c48d55d180f0fe3e7352d25d7c63fc9045f526872ad0684a473e66af8179e15a8549ff16db15a
+EBUILD tkdnd-2.6.ebuild 907 BLAKE2B 5fa1e858ad0d9b3dba3c1a5d9374b372c3035d69224432ed2e3a281a406296d2bd97cb862662743b1ec69a2b115ef4d3df0c59ab8322a395921193ea229f54e6 SHA512 d5fd89c87195c02ccdef39cd9a2fcacad964c1ae60e61536525ff7f7c407f7ac4c4111f52b56dbed9c95d8c2b2f861d4f87e818f3c08c16a49bc4e9f74aaecc9
+MISC metadata.xml 328 BLAKE2B a8828cf089a520c1cfaa639bc5587d82ceb3681f97ad00a174ceb9331d12cc063ccb0687dd8e53510a1fb2d807153afdcf7a6be7fae1871621fb032c9c8d9e14 SHA512 3130aa488c2f677c91f3b2ba72a2a9e16446865a10f1629ae7e44b810189ceb24cb9cd14d834a71b76609cc9a2e043d8db7560e9446103368084385754cd5045
diff --git a/dev-tcltk/tkdnd/metadata.xml b/dev-tcltk/tkdnd/metadata.xml
new file mode 100644
index 000000000000..2c2d17964dce
--- /dev/null
+++ b/dev-tcltk/tkdnd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tkdnd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tkdnd/tkdnd-2.2.ebuild b/dev-tcltk/tkdnd/tkdnd-2.2.ebuild
new file mode 100644
index 000000000000..3f608bac2cdf
--- /dev/null
+++ b/dev-tcltk/tkdnd/tkdnd-2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils eutils
+
+MY_PN="TkDND"
+
+DESCRIPTION="Extension that adds native drag & drop capabilities to the tk toolkit"
+HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug threads X"
+
+RESTRICT="test"
+
+DEPEND="dev-lang/tk"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P/-/}
+
+src_prepare() {
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-fomit-frame-pointer::g' \
+		-e 's:-pipe::g' \
+		-i configure tclconfig/tcl.m4 || die
+}
+
+src_configure() {
+	local myeconfargs
+	use X && myeconfargs+=( --with-x )
+	use debug && myeconfargs+=( --with-symbols )
+	use threads && myeconfargs+=( --enable-threads )
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tkdnd/tkdnd-2.6.ebuild b/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
new file mode 100644
index 000000000000..77ed496b529b
--- /dev/null
+++ b/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+MY_PN="TkDND"
+
+DESCRIPTION="Extension that adds native drag & drop capabilities to the tk toolkit"
+HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug threads X"
+
+DEPEND="dev-lang/tk"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P/-/}
+
+RESTRICT="test"
+
+src_prepare() {
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-fomit-frame-pointer::g' \
+		-e 's:-pipe::g' \
+		-i configure tclconfig/tcl.m4 || die
+}
+
+src_configure() {
+	local myeconfargs
+	use X && myeconfargs+=( --with-x )
+	use debug && myeconfargs+=( --with-symbols )
+	use threads && myeconfargs+=( --enable-threads )
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tkimg-1.4-r9 b/dev-tcltk/tkimg-1.4-r9
deleted file mode 100644
index c0785ffc090b..000000000000
--- a/dev-tcltk/tkimg-1.4-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:= test? ( x11-apps/xhost media-fonts/font-misc-misc media-fonts/font-cursor-misc ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Adds a lot of image formats to Tcl/Tk
-EAPI=5
-HOMEPAGE=http://tkimg.sourceforge.net/
-IUSE=doc test static-libs test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:=
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/tkimg-1.4-patchset-1.tar.xz mirror://sourceforge/tkimg/1.4/tkimg1.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7e233f7b1f88697eee2ed74925469530
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
new file mode 100644
index 000000000000..a4912066dee0
--- /dev/null
+++ b/dev-tcltk/tkimg/Manifest
@@ -0,0 +1,6 @@
+AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
+AUX tkimg-1.4-png2.patch 1044 BLAKE2B 236e5fa637b4b1cc6c74dd85d4fe73520941af360873b0455ab146c443d844470d6afb67071976cd1850a79e0906b7374947d2c802c8ba85f83682c6ae0f77a5 SHA512 fbf982af5446fc54212745eee8338d5dc4b169f79045963be23a84c7a0ef9e68f54d895156b4f040f6585499f1ead9967ac0ce57106e3ca3615fbaa9adcd1fb7
+DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
+DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1
+EBUILD tkimg-1.4-r9.ebuild 1842 BLAKE2B 470dcd82e9d64a0e809c39679ce8fa602f14d085eba6a665fbb112f0810a216378688a5fdec79e8bd16a6a06f4fa0a6efdac8e6742aa90449e2d674c38debc9d SHA512 35c3e79accf91eb48d577eb019c65125ca4ced5add2c2130599b3d92a8f4970ad1238df0dcf6cc22dadadb51d624338515933a522918b0b3cd1cd39e1f8d1e89
+MISC metadata.xml 436 BLAKE2B 264c09c99797be5f1a242a1146d8552ab4cf632ad404d950829d102b2f3f8a40c5542ff04e9770a4870153843e462298af802e6caaff9e5bbb37abdb32697155 SHA512 d0401ca91110d4ffb90190d7135d3a5e6ef1aa0d3106cd7a84e72e64f3f565ee2ef30ac19aa2f119838a50d9c926132b93f2723a763d25b819db42fc57c16adf
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
new file mode 100644
index 000000000000..23000ac7922c
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-jpeg-9.patch
@@ -0,0 +1,18 @@
+Fix build with jpeg-9, bug #520886
+
+--- a/jpeg/jpeg.c	2010-06-17 15:40:24.000000000 +0200
++++ b/jpeg/jpeg.c	2018-02-07 23:26:38.050073397 +0100
+@@ -53,6 +53,13 @@
+  */
+ 
+ #include "tkimg.h"
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
++#define HAVE_BOOLEAN
+ #include "jpegtcl.h"
+ 
+ static int SetupJPegLibrary(Tcl_Interp *interp);
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
new file mode 100644
index 000000000000..195e9be43fa7
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
@@ -0,0 +1,36 @@
+--- png/png.c.orig	2010-06-17 06:40:24.000000000 -0700
++++ png/png.c	2013-04-23 20:57:32.000000000 -0700
+@@ -332,6 +332,16 @@
+ 	png_set_expand(png_ptr);
+     }
+ 
++    if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, &intent)) {
++	png_set_sRGB(png_ptr, info_ptr, intent);
++    } else if (png_get_gAMA) {
++	double gamma;
++	if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) {
++	    gamma = 0.45455;
++	}
++	png_set_gamma(png_ptr, 1.0, gamma);
++    }
++
+     png_read_update_info(png_ptr,info_ptr);
+     block.pixelSize = png_get_channels(png_ptr, info_ptr);
+     block.pitch = png_get_rowbytes(png_ptr, info_ptr);
+@@ -353,16 +363,6 @@
+ 	block.offset[3] = 0;
+     }
+ 
+-    if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, &intent)) {
+-	png_set_sRGB(png_ptr, info_ptr, intent);
+-    } else if (png_get_gAMA) {
+-	double gamma;
+-	if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) {
+-	    gamma = 0.45455;
+-	}
+-	png_set_gamma(png_ptr, 1.0, gamma);
+-    }
+-
+     png_data= (char **) ckalloc(sizeof(char *) * info_height +
+ 	    info_height * block.pitch);
+ 
diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
new file mode 100644
index 000000000000..b1e9347d617c
--- /dev/null
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The "Img" package adds a lot of image formats to Tcl/Tk.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tkimg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
new file mode 100644
index 000000000000..155c4483e327
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib prefix toolchain-funcs virtualx
+
+MYP="${PN}${PV}"
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${P}-patchset-1.tar.xz
+	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk:=
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0=
+	>=media-libs/libpng-1.6:0=
+	>=sys-libs/zlib-1.2.7:=
+	x11-libs/libX11
+	virtual/jpeg:="
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+# Fails with jpeg-turbo silently, #386253
+#RESTRICT="test"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-jpeg.patch \
+		"${FILESDIR}"/${P}-jpeg-9.patch \
+		"${WORKDIR}"/${P}-tiff.patch \
+		"${WORKDIR}"/${P}-png.patch \
+		"${FILESDIR}"/${P}-png2.patch \
+		"${WORKDIR}"/${P}-zlib.patch
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+	sed \
+		-e 's:-O2 -fomit-frame-pointer::g' \
+		-e 's: -pipe::g' \
+		-i */configure  || die
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_test() {
+	Xemake test || die "Xmake failed"
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+	fi
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/*
+	fi
+}
diff --git a/dev-tcltk/tklib-0.6-r1 b/dev-tcltk/tklib-0.6-r1
deleted file mode 100644
index 017febb3c56e..000000000000
--- a/dev-tcltk/tklib-0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/tk:0 dev-tcltk/tcllib
-DESCRIPTION=Collection of utility modules for Tk, and a companion to Tcllib
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/software/tklib
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk:0 dev-tcltk/tcllib
-SLOT=0
-SRC_URI=http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=6a397dec6188148cf6a6fe290cf2bd92a9190c42 -> tklib-0.6.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9de2e5fe525296a6e368eda89335160e
diff --git a/dev-tcltk/tklib-0.6-r2 b/dev-tcltk/tklib-0.6-r2
deleted file mode 100644
index 017febb3c56e..000000000000
--- a/dev-tcltk/tklib-0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/tk:0 dev-tcltk/tcllib
-DESCRIPTION=Collection of utility modules for Tk, and a companion to Tcllib
-EAPI=5
-HOMEPAGE=http://www.tcl.tk/software/tklib
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/tk:0 dev-tcltk/tcllib
-SLOT=0
-SRC_URI=http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=6a397dec6188148cf6a6fe290cf2bd92a9190c42 -> tklib-0.6.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9de2e5fe525296a6e368eda89335160e
diff --git a/dev-tcltk/tklib/Manifest b/dev-tcltk/tklib/Manifest
new file mode 100644
index 000000000000..dd2cab363a82
--- /dev/null
+++ b/dev-tcltk/tklib/Manifest
@@ -0,0 +1,4 @@
+DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
+EBUILD tklib-0.6-r1.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
+EBUILD tklib-0.6-r2.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tklib/metadata.xml b/dev-tcltk/tklib/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/tklib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tklib/tklib-0.6-r1.ebuild b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
new file mode 100644
index 000000000000..9231c58cf5e7
--- /dev/null
+++ b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
+
+DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
+HOMEPAGE="http://www.tcl.tk/software/tklib"
+SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+IUSE="doc"
+
+RDEPEND="
+	dev-lang/tk:0
+	dev-tcltk/tcllib"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+	if use doc; then
+		emake DESTDIR="${D}" doc
+		dohtml doc/html/*
+	fi
+	dodoc DESCRIPTION.txt README*
+	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
+
+	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
+	mv "${ED}"/usr/bin/dia{,-${PN}} || die
+}
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
new file mode 100644
index 000000000000..9231c58cf5e7
--- /dev/null
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
+
+DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
+HOMEPAGE="http://www.tcl.tk/software/tklib"
+SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+IUSE="doc"
+
+RDEPEND="
+	dev-lang/tk:0
+	dev-tcltk/tcllib"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+	if use doc; then
+		emake DESTDIR="${D}" doc
+		dohtml doc/html/*
+	fi
+	dodoc DESCRIPTION.txt README*
+	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
+
+	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
+	mv "${ED}"/usr/bin/dia{,-${PN}} || die
+}
diff --git a/dev-tcltk/tkpiechart-6.5-r1 b/dev-tcltk/tkpiechart-6.5-r1
deleted file mode 100644
index ebba925348b4..000000000000
--- a/dev-tcltk/tkpiechart-6.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/tk-8.3 dev-tcltk/tcllib
-DESCRIPTION=create and update 2D or 3D pie charts in a Tcl/Tk application
-EAPI=0
-HOMEPAGE=http://jfontain.free.fr/piechart6.htm
-KEYWORDS=amd64 ~ppc x86
-LICENSE=jfontain
-RDEPEND=>=dev-lang/tk-8.3 dev-tcltk/tcllib
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tkpiechart-6.5.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=02429e3ec6c0688a5e1f5457e76eb8e2
diff --git a/dev-tcltk/tkpiechart/Manifest b/dev-tcltk/tkpiechart/Manifest
new file mode 100644
index 000000000000..bf82e058218c
--- /dev/null
+++ b/dev-tcltk/tkpiechart/Manifest
@@ -0,0 +1,3 @@
+DIST tkpiechart-6.5.tar.bz2 38096 BLAKE2B d49f54f693d849c3563d28f4387e65d1f2cd19ec647db7e3aa56d85ffb630ca170113ef81e97eb4e464320d37e6e10c7a8bda5cf19fb478a0609226ea28a77f1 SHA512 828f106be8fe37ab8876c7e0b8ee00dee7f067f21489710653909ba277aed65de169e0f592ce0fedf5bc0ffc584d633d163b1b72fb628c1b2e541e8a850636aa
+EBUILD tkpiechart-6.5-r1.ebuild 635 BLAKE2B ab2a142ede7c225988f16b7a2fe0d3b464d11d64cee352e92c2bb42b5780500f67b80fbc15ebc78629de16b8ab0b0c5fe35bedb296c6cda3030affe9ed291984 SHA512 1633fdf7c61ae34a63388b13ea25ec7b922c3188f0cb3fbb4a4b7cd02077ae7a8e956daf62a816c6ca9909ae26e5d62398dcabde83a09f4d05e6ef3ec74459db
+MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/tkpiechart/metadata.xml b/dev-tcltk/tkpiechart/metadata.xml
new file mode 100644
index 000000000000..d836ed383e14
--- /dev/null
+++ b/dev-tcltk/tkpiechart/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild b/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
new file mode 100644
index 000000000000..ca9a67327bfa
--- /dev/null
+++ b/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit multilib
+
+DESCRIPTION="create and update 2D or 3D pie charts in a Tcl/Tk application"
+HOMEPAGE="http://jfontain.free.fr/piechart6.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="jfontain"
+KEYWORDS="amd64 ~ppc x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/tk-8.3
+	dev-tcltk/tcllib"
+
+src_install() {
+	dodir /usr/$(get_libdir)/tkpiechart
+	./instapkg.tcl "${D}"/usr/$(get_libdir)/tkpiechart || die
+
+	dodoc CHANGES CONTENTS README TODO || die
+	dohtml *.gif *.htm || die
+	docinto demo
+	dodoc demo* || die
+}
diff --git a/dev-tcltk/tkpng-0.9 b/dev-tcltk/tkpng-0.9
deleted file mode 100644
index b28f6c090edf..000000000000
--- a/dev-tcltk/tkpng-0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0= sys-libs/zlib
-DESCRIPTION=Implements support for loading and using PNG images with Tcl/Tk
-EAPI=5
-HOMEPAGE=http://www.muonics.com/FreeStuff/TkPNG/
-IUSE=debug threads
-KEYWORDS=~amd64 ~x86
-LICENSE=tcltk
-RDEPEND=>=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0= sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tkpng/tkpng/0.9/tkpng0.9.tgz
-_md5_=3e458473e945f9780ae6ab83cfd20e58
diff --git a/dev-tcltk/tkpng/Manifest b/dev-tcltk/tkpng/Manifest
new file mode 100644
index 000000000000..1c25fe7cfb3a
--- /dev/null
+++ b/dev-tcltk/tkpng/Manifest
@@ -0,0 +1,3 @@
+DIST tkpng0.9.tgz 127804 BLAKE2B f2377dd8bb3b0161168930d6355202789decbe6e248607cd3828a0553c20644aac05b23b90fdb2324689e30307bdfdb63cd9fb57993ca4d58f1b1108e0d001c6 SHA512 7f832ec19b53ba0f98d3db24d7b7106ae9bb6983d46ee33c46e90a1b152646f2a99ea417c9c6f9bed1f2859ef509510b531d26b3bb81f20d4e291ea1092896fb
+EBUILD tkpng-0.9.ebuild 692 BLAKE2B c826f361d8ecbb56d94e8cc0534a0722accf02e360a2199f50bcffe7d722551ebfd48ac69a6afb6f6cb1ef78359ac57a48b06183edf066dccc8c1a555affa516 SHA512 f095c3842eb3d85ba4fe214d010f7e368e5f8b586c0337073a20e55319652882e25db3400a67c43e10a3003779194a00749e4b185c2dc68a9d8e6a45021fa7a6
+MISC metadata.xml 328 BLAKE2B 5ac22b2f38e072c9c4f26e98bc812b101718b2e4d26abcd5cad898653633b8d46ccaf21696dd246963ff1ebe54f7d24c63a7c40e95703f34cf9c032ebf0d058c SHA512 e8aa8c4a77c92a9ce6961707314d3b806a9ee65584d5e34d1c7f87acf7aa365b63d0131060ddc2db3dd4c816d625a1b705cd7be291938c3245462b500b80f6d0
diff --git a/dev-tcltk/tkpng/metadata.xml b/dev-tcltk/tkpng/metadata.xml
new file mode 100644
index 000000000000..bcd5cf589a25
--- /dev/null
+++ b/dev-tcltk/tkpng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tkpng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tkpng/tkpng-0.9.ebuild b/dev-tcltk/tkpng/tkpng-0.9.ebuild
new file mode 100644
index 000000000000..316297207f53
--- /dev/null
+++ b/dev-tcltk/tkpng/tkpng-0.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Implements support for loading and using PNG images with Tcl/Tk"
+HOMEPAGE="http://www.muonics.com/FreeStuff/TkPNG/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="tcltk"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug threads"
+
+RDEPEND="
+	>=dev-lang/tcl-8.4:0=
+	>=dev-lang/tk-8.4:0=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+# test target in Makefile, but test not shipped
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable amd64 64bit) \
+		$(use_enable threads)
+}
diff --git a/dev-tcltk/tktable-2.10 b/dev-tcltk/tktable-2.10
deleted file mode 100644
index 2fa74c90fb54..000000000000
--- a/dev-tcltk/tktable-2.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/tk-8.0
-DESCRIPTION=full-featured 2D table widget
-EAPI=6
-HOMEPAGE=http://tktable.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tk-8.0
-SLOT=0
-SRC_URI=mirror://sourceforge/tktable/Tktable2.10.tar.gz
-_md5_=e4086f072f03c60a733ea9f194bf79f8
diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest
new file mode 100644
index 000000000000..87b0c805797c
--- /dev/null
+++ b/dev-tcltk/tktable/Manifest
@@ -0,0 +1,3 @@
+DIST Tktable2.10.tar.gz 284135 BLAKE2B ff3a37aac53418e7993a310d38ae23b7ec2673e0b44c118ff558a6c3c3805b39bf77f099287e91298fb4a6afacebde68a09171c6b90ecd11f48ac2a33fa3b312 SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899
+EBUILD tktable-2.10.ebuild 607 BLAKE2B 8f889a1b9e98d73c73fc1348e9d67f0a484e3d53c2bf2c89aac4fdf051a71f1b4d592588e6a0bcb62c90ac21968932479a2740936be02074827044c437f8012c SHA512 6427b6fa66a63b6a8eaed6a80a8b34337c38e26c0dd684b760a5ae27b324578f612a0d99aa8bbb6a3bdbfb643b9e1734dc7694f020ea75e1e9ebc1e26776173c
+MISC metadata.xml 330 BLAKE2B 95cf2505bc7f51f0d04fbfa1facf22cebb33f232121689e2117024ad5c09790f9e518c424669b523205ffe584670287efba5115c7387f3e7319e39a00ea2a425 SHA512 fb035126055cbb4296c92e5ada9ec06baf9873f04b4e4f4dc369d54cdc14979bedc36940396b87c7f8a6c1bd113ceefd585c81ef64c4e1f052216a5a7a266238
diff --git a/dev-tcltk/tktable/metadata.xml b/dev-tcltk/tktable/metadata.xml
new file mode 100644
index 000000000000..fb33b8e74e9d
--- /dev/null
+++ b/dev-tcltk/tktable/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tktable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tktable/tktable-2.10.ebuild b/dev-tcltk/tktable/tktable-2.10.ebuild
new file mode 100644
index 000000000000..cd5658b56b82
--- /dev/null
+++ b/dev-tcltk/tktable/tktable-2.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="Tktable${PV}"
+
+DESCRIPTION="full-featured 2D table widget"
+HOMEPAGE="http://tktable.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tktable/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/tk-8.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+HTML_DOCS=( doc/tkTable.html )
+DOCS=( ChangeLog README.txt release.txt )
+
+src_prepare() {
+	default
+	sed -e '/^install:/{s: install-doc::}' \
+		-e '/^PKG_EXTRA_FILES/{s:=.*:=:}' -i Makefile.in || die
+}
diff --git a/dev-tcltk/tktray-1.3.9 b/dev-tcltk/tktray-1.3.9
deleted file mode 100644
index c17af89c46af..000000000000
--- a/dev-tcltk/tktray-1.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=>=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0= x11-libs/libXext test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=System Tray Icon Support for Tk on X11
-EAPI=5
-HOMEPAGE=https://code.google.com/p/tktray/
-IUSE=debug threads test test
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=tcltk
-RDEPEND=>=dev-lang/tcl-8.4:0= >=dev-lang/tk-8.4:0= x11-libs/libXext
-SLOT=0
-SRC_URI=https://tktray.googlecode.com/files/tktray1.3.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=5ac020357ec1cace5697562d5f51af99
diff --git a/dev-tcltk/tktray/Manifest b/dev-tcltk/tktray/Manifest
new file mode 100644
index 000000000000..7f6f42b9f9ba
--- /dev/null
+++ b/dev-tcltk/tktray/Manifest
@@ -0,0 +1,4 @@
+AUX 1.1-ldflags.patch 371 BLAKE2B a18964ab4a2bcc1e7d3af98a76bb20a0a0993689d353a07b7c8f8296ee956755d3e51f9e7557a362a7bbc51604db3c7b73cb96ecc3c6ac350f313a51d53dbac5 SHA512 d29c06676607eca5fb7a0a0675382a80441117a5a070236329d8f4e8c046a5ade060d7e618740953f4c4c87f432fd661a19e201b737b4273805a48bd0165f553
+DIST tktray1.3.9.tar.gz 134484 BLAKE2B 9edeae9869dc318cd0f98c6585fdef5d903f84f8d32ad0a29fc456ab0eb38615684f7da8a8eb4022c9c40ec24a623c7a189f50d9e17bcbd0a204459e2030b546 SHA512 2c52a343e7f8ff5b7e7bb2e2f1de7766111ce6b47b8ace478a1f2aaa6c28a5b19ec854f2b22511136be1f1da2a87f506932a1d1b893deb3c44a7e47a28609518
+EBUILD tktray-1.3.9.ebuild 779 BLAKE2B a7f7302e3fff1cbd8fba49ba8d16197ccf1333a9017e53409583d1498a406b2179025e690ad5e659424b5eee9a01bd7519b8359d2b3a06113abb673c3641a13e SHA512 41a73581b12ef092c326b20121f476f174a09359ebb94e9f32701b8d6758f0ea4f28d5bb60946e542e86b15443b0951b88edd112825d2a67e4c559da019e45b4
+MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tktray/files/1.1-ldflags.patch b/dev-tcltk/tktray/files/1.1-ldflags.patch
new file mode 100644
index 000000000000..0392face2958
--- /dev/null
+++ b/dev-tcltk/tktray/files/1.1-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9c3945b..c626019 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -107,7 +107,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(CFLAGS) $(LDFLAGS)
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ #TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tktray/metadata.xml b/dev-tcltk/tktray/metadata.xml
new file mode 100644
index 000000000000..227dda5ba584
--- /dev/null
+++ b/dev-tcltk/tktray/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>Gentoo Tcltk Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tktray/tktray-1.3.9.ebuild b/dev-tcltk/tktray/tktray-1.3.9.ebuild
new file mode 100644
index 000000000000..85b005ef2865
--- /dev/null
+++ b/dev-tcltk/tktray/tktray-1.3.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils virtualx
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="System Tray Icon Support for Tk on X11"
+HOMEPAGE="https://code.google.com/p/tktray/"
+SRC_URI="https://tktray.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE="debug threads test"
+
+DEPEND="
+	>=dev-lang/tcl-8.4:0=
+	>=dev-lang/tk-8.4:0=
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.1-ldflags.patch
+}
+
+src_configure() {
+	source /usr/lib/tclConfig.sh
+	CPPFLAGS="-I${TCL_SRC_DIR}/generic ${CPPFLAGS}" \
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
+
+src_test() {
+	Xemake
+}
diff --git a/dev-tcltk/tktreectrl-2.4.1 b/dev-tcltk/tktreectrl-2.4.1
deleted file mode 100644
index c069b1d5cc57..000000000000
--- a/dev-tcltk/tktreectrl-2.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=>=dev-lang/tk-8.4:0= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A flexible listbox widget for Tk
-EAPI=6
-HOMEPAGE=http://tktreectrl.sourceforge.net/
-IUSE=X debug shellicon threads test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=tcltk
-RDEPEND=>=dev-lang/tk-8.4:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/tktreectrl/tktreectrl-2.4.1.tar.gz
-_eclasses_=virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=c98d33726c93060da0227d28206b5bc8
diff --git a/dev-tcltk/tktreectrl/Manifest b/dev-tcltk/tktreectrl/Manifest
new file mode 100644
index 000000000000..b9307b40baeb
--- /dev/null
+++ b/dev-tcltk/tktreectrl/Manifest
@@ -0,0 +1,4 @@
+AUX 2.2.9-as-needed.patch 351 BLAKE2B 3687044d67bfccb7d01c46b7f39a449337ebe4ca6ccaa174e217e26e2ce8f59376f2a6cabb353cc6ab4c2fd1eb921cc34f02770830d78d6e739e26a781c59036 SHA512 636bfe9e6d7aacb3ca3ad843b89fef10dc035cf3f714981b3e7191c8559df7be9fb98cb848244aa0ec3d3ef1c974ef99fa50e781233b3a874eb76cc9a864148e
+DIST tktreectrl-2.4.1.tar.gz 945101 BLAKE2B 8b91d0f264df4ab79f897608e259998139ab3cd3ba9359e1d74a23a174465a468c3bec0c5983764d2e23049d5feb70905066419c7c883007c6aa5e655d50dccd SHA512 5ea3f286326cb9dd32a259f8032c37dd3bfe4c4ecdac878cc8e7a283b542c4eb67a5434c97ecc81b9773f08e55563401a173234452ebf63547c00780e5703c1b
+EBUILD tktreectrl-2.4.1.ebuild 820 BLAKE2B 2bc4f43d9e30d413c2783c88a18da71c79239767b0fa4c2e8089f438f5c2064591678b624056ca96bc9b309a76e16fe1c87df2d14b4a872d2450f5e97e3aa7b7 SHA512 b4c27f219a1250ed1865c9cbca8f8493b59bda052d1c427c1d141ec4f3fc372d6528c601754a66cee4d1163966638e9b873c462a332aa483788f08de0724d8ee
+MISC metadata.xml 363 BLAKE2B 67d01a5054e7bf5b5a3301e850bae7fcf6c061d5358cb19e4fadc7e493b9b45749810b1e233f273f36d9452c3676407845994c574e9b2139eb24575a16436aaf SHA512 bf1d25c20fa8d56bafb78ee43f041cc28de6c94a0cf05fceb030f6c3ef050a3c028a8ebae51b8c46121aa0d5fe67123de15a2e1dd507efe63308bdc4bc8e32a4
diff --git a/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
new file mode 100644
index 000000000000..07a1e36f9316
--- /dev/null
+++ b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2008-02-24 23:22:10.000000000 +0100
++++ b/Makefile.in.new	2009-07-11 23:54:48.000000000 +0200
+@@ -107,7 +107,7 @@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= $(CC) $(LDFLAGS) -shared
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tktreectrl/metadata.xml b/dev-tcltk/tktreectrl/metadata.xml
new file mode 100644
index 000000000000..99bf67dcc9a6
--- /dev/null
+++ b/dev-tcltk/tktreectrl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="shellicon">shellicon  extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">tktreectrl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
new file mode 100644
index 000000000000..c77a6d2b59aa
--- /dev/null
+++ b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit virtualx
+
+DESCRIPTION="A flexible listbox widget for Tk"
+HOMEPAGE="http://tktreectrl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="X debug shellicon threads"
+
+RDEPEND=">=dev-lang/tk-8.4:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/2.2.9-as-needed.patch )
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable shellicon) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols) \
+		$(use_enable X x) \
+		--enable-shared
+}
+
+src_test() {
+	virtx emake test
+}
+
+src_install() {
+	default
+	mv \
+		"${ED}"/usr/lib*/treectrl${PV}/htmldoc \
+		"${ED}"/usr/share/doc/${P}/ || die
+}
diff --git a/dev-tcltk/tkzinc-3.3.6 b/dev-tcltk/tkzinc-3.3.6
deleted file mode 100644
index c1f2979ffaab..000000000000
--- a/dev-tcltk/tkzinc-3.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Tk widget library
-EAPI=5
-HOMEPAGE=http://www.tkzinc.org
-IUSE=debug doc threads
-KEYWORDS=~amd64 ~x86 ~ppc
-LICENSE=LGPL-2
-RDEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
-SLOT=0
-SRC_URI=http://www.tkzinc.org/Packages/Tkzinc-3.3.6plus.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5693c4bb51e0325dcb21891e91d29bf
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
new file mode 100644
index 000000000000..e4c4d893ba49
--- /dev/null
+++ b/dev-tcltk/tkzinc/Manifest
@@ -0,0 +1,5 @@
+AUX 3.3.6-ldflags.patch 552 BLAKE2B ebd7496be2a97cf7325d25a46e272fe287e7bd17d7e8c660f584609057ba6823b75bfbcc611178fa70a66b90d2a699d41b7e6b673ded23db188bba47ecd4d11d SHA512 5ef1d02ac3b6eaffc4c7310e80e27204c5eb0ccc9d6627a5da4598a6b13d20fa1a1eab63194578a56a0650eb07c70879370e64030ccf86caf5226a1d1c6fea7e
+AUX tkzinc-3.3.4-latex.patch 331 BLAKE2B 03697cb54e5c82b7662bd41fc6c0cf35a27c252a849950ffabcdda927d796593a97e3cb4f968b280f0df6478264d9f3e3c532648393c370adb68130b9f255aeb SHA512 20e859529ff20b41193a43baeec4c632107208311de3815795cc2a013741034dac36880d88c11e7dc1c4719259e42a180203c1ac478251ff81eec0e3d7f77ee4
+DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838
+EBUILD tkzinc-3.3.6.ebuild 988 BLAKE2B 239a80fbafcdf86462f89aefde8f0e6d64b8036e2e3569747f47b9b4b3d1025dbf466265bf52c07695a295aee0b7db3072551fdf4b013d4e3e3b5d7344b883e1 SHA512 dab1039d8d10d96ee21ca89a9feb5894865cfe1947a967e98fd849b2fa19d52dee2e379ae76d4e6cd93aecda7295ba5f09a8708b6b520be4d2aca10ef9516f2e
+MISC metadata.xml 252 BLAKE2B 6c4e3a169c57e92842dc5ef7462e8bbc9a0ccae4e58886c00f117732369b30fbe3bc1c6938114f0347a82717ef6df3c2dec6e965e78f61164839b64710914fca SHA512 3120ef58677decf25b1fa664b440335b63625aded86661fd5a49fd9af149c6f829bd7fe88f5a1c8346f1e19ed183a45a42acc6e522ac9de4f4f6609f637fbe7c
diff --git a/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch b/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
new file mode 100644
index 000000000000..903ef9a2eaee
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/3.3.6-ldflags.patch
@@ -0,0 +1,14 @@
+diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
+index 0cbca13..c68af63 100644
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -1447,7 +1447,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD="${CC} -shared"
++	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
new file mode 100644
index 000000000000..6b697a7bfd78
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
@@ -0,0 +1,12 @@
+ doc/refman.tex | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/refman.tex b/doc/refman.tex
+index b384e97..be88fde 100644
+--- a/doc/refman.tex
++++ b/doc/refman.tex
+@@ -1,3 +1,4 @@
++\RequirePackage{ifpdf}
+ \documentclass[11pt,twoside,a4paper]{book}
+ 
+ %----------------------------------------------------------------------
diff --git a/dev-tcltk/tkzinc/metadata.xml b/dev-tcltk/tkzinc/metadata.xml
new file mode 100644
index 000000000000..3f91a1577203
--- /dev/null
+++ b/dev-tcltk/tkzinc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tcltk@gentoo.org</email>
+    <name>TCL / TK Herd</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
new file mode 100644
index 000000000000..14b37ebcd1f6
--- /dev/null
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
+
+DESCRIPTION="A Tk widget library"
+HOMEPAGE="http://www.tkzinc.org"
+SRC_URI="http://www.tkzinc.org/Packages/Tkzinc-${PV}plus.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="debug doc threads"
+
+DEPEND="
+	dev-lang/tk
+	media-libs/glew
+	virtual/opengl
+	doc? ( virtual/latex-base )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Tkzinc-${PV//.}+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PN}-3.3.4-latex.patch
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( BUGS )
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--enable-gl=damage
+		$(use_enable debug symbols)
+		$(use_enable threads)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && emake pdf
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	dohtml -r doc/*
+	use doc && dodoc doc/refman.pdf
+}
diff --git a/dev-tcltk/tls-1.6-r3 b/dev-tcltk/tls-1.6-r3
deleted file mode 100644
index ba158b946525..000000000000
--- a/dev-tcltk/tls-1.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-DESCRIPTION=TLS OpenSSL extension to Tcl
-EAPI=5
-HOMEPAGE=http://tls.sourceforge.net/
-IUSE=tk
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tls/tls1.6-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2990cdcc6ee11a518e003419a418b465
diff --git a/dev-tcltk/tls-1.6.7 b/dev-tcltk/tls-1.6.7
deleted file mode 100644
index 4291fe3662bc..000000000000
--- a/dev-tcltk/tls-1.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-DESCRIPTION=TLS OpenSSL extension to Tcl
-EAPI=5
-HOMEPAGE=http://tls.sourceforge.net/
-IUSE=tk
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tls/tls1.6.7-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3302cf30d19f0e3e09d956ab98e85bea
diff --git a/dev-tcltk/tls-1.7.11 b/dev-tcltk/tls-1.7.11
deleted file mode 100644
index 28c226888a1a..000000000000
--- a/dev-tcltk/tls-1.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-DESCRIPTION=TLS OpenSSL extension to Tcl
-EAPI=6
-HOMEPAGE=http://tls.sourceforge.net/
-IUSE=tk
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/tcl:0= dev-libs/openssl:0= tk? ( dev-lang/tk:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://core.tcl.tk/tcltls/uv/tcltls-1.7.11.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38a378e0308ebe2feec87478be551665
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
new file mode 100644
index 000000000000..8ce053cf7706
--- /dev/null
+++ b/dev-tcltk/tls/Manifest
@@ -0,0 +1,7 @@
+DIST tcltls-1.7.11.tar.gz 158181 BLAKE2B 21955f0f4d750c9b0789b275abd45e77ecc6235b8bf8094cfa18c372ccda53fa28612ff10a87c91a883160f625844364391985363304ea2a5d4ca312471a581d SHA512 7a9aa33d7ed606ba792b4ff5a817a94f880b7204795ac30ab386299ee5850c7dfde920f35056676afa2db23866ad4fc6cb6c6b9e7a7dfba7385f97f447de2e04
+DIST tls1.6-src.tar.gz 168043 BLAKE2B e065f9e9a837d2da861fb52bdfbb0ab9ecf32b6c408e7d0394ab17ccafa2d3a4ee1cfc501a0ff1e9fa01bd4938e15527a74518877813e5cfcbb38d893362c905 SHA512 beaca2653a11924f022e28254cef5071ecb8ab2e2355496d278fcab1bdcc46424aa58d2fe176aea26ec4fbe4416a912b5af8e8e69571c8a5301b7921ecf48383
+DIST tls1.6.7-src.tar.gz 173654 BLAKE2B 50eff220d02c8fb4389a5e0ab3d6f85c61d3bf93a1c6a4ba2c709bb77e821163407ae4f287f16c7548a0405367825cee5da34abf6538d2bf374b23329c2b7129 SHA512 f8dbb7fc9890bcb3e3930cad66209ca67cd68c0aa2288caa6a3bb1fd1ad21444f1eb056b4b4585ec86da64079cd9df72cdd6ff201102820d45e6397d6148d21c
+EBUILD tls-1.6-r3.ebuild 936 BLAKE2B e29b6df49db0ec3563f4cb0e4dadee2c1a8b8032a1e271712d4c86c29e120d52764e7e0f7b75f67e17e266e3d9c663d022d9ffdfcb9a2a65df18f88ffd4aaacb SHA512 ce74439d8dc71ddb256f6b3d34fd80190f7444680e753b30879f642824586543b8aa0baffed42b4f71e86b6fe895efb83d060a805498e37e6d5b0cc7e22efe76
+EBUILD tls-1.6.7.ebuild 943 BLAKE2B ae32359ad6ac1f2042b7bb63ec4d8fae79725dcf401facbc2aadbb5ba0d318e9eedcdb2dd124c607e34aa1c47cfc30ddb87c311f280317fe56835bcb5d22a66e SHA512 fc5fb789d5b89c61b0f3e212b5a40ae321a2d7e8177b3e1c5e3e6d80f98717db4c42b561cde558273bfec491290184d8fde0ac3dd421bdfe91c1d61b70e60c11
+EBUILD tls-1.7.11.ebuild 945 BLAKE2B 05ab852a2d2a4dd4be45449ad83a0eaacad6e887f683e92a925294e74110421c3276cd2f5efd3570a6162ca5cd3ea8d534c882b2995fcdd9b273f54732e888d8 SHA512 e47dd3ab69373e1bdf1597ad40a7068ab48c918978494a4c4e76c6c9419561bd32c49541bc8d3201428f7f876888a63441aff37e4b2e78f8464cc6dcb0edf6dd
+MISC metadata.xml 326 BLAKE2B bb3ebe3febf02967373d484b0685609602c2fe4c229c52d078035c4d8d4ab011a3d5a4e72b46a4d75a4ab01e5fdb6d338c679f1b1033bc6d986f3815696c61c2 SHA512 6e3856770636152cb4cb2d2429dfba4ccdd4f82433903aa828ca23b3dbbe878546f7327a510ecdee93001c1d81dbc9c343c217d09ab08774c697a4b6fb2a0f94
diff --git a/dev-tcltk/tls/metadata.xml b/dev-tcltk/tls/metadata.xml
new file mode 100644
index 000000000000..ba80abe7401c
--- /dev/null
+++ b/dev-tcltk/tls/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tls</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tls/tls-1.6-r3.ebuild b/dev-tcltk/tls/tls-1.6-r3.ebuild
new file mode 100644
index 000000000000..f85cb1f65961
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.6-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="TLS OpenSSL extension to Tcl"
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/openssl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	dohtml tls.htm
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this is ugly, but fixing the makefile mess is even worse
+		local loc=usr/$(get_libdir)/tls1.6/libtls1.6.dylib
+		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+	fi
+}
diff --git a/dev-tcltk/tls/tls-1.6.7.ebuild b/dev-tcltk/tls/tls-1.6.7.ebuild
new file mode 100644
index 000000000000..065cbe9b6ba8
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.6.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="TLS OpenSSL extension to Tcl"
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/openssl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	dohtml tls.htm
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this is ugly, but fixing the makefile mess is even worse
+		local loc=usr/$(get_libdir)/tls1.6/libtls1.6.dylib
+		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+	fi
+}
diff --git a/dev-tcltk/tls/tls-1.7.11.ebuild b/dev-tcltk/tls/tls-1.7.11.ebuild
new file mode 100644
index 000000000000..7b22e45bf9df
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.7.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_P="tcl${PN}-${PV}"
+
+DESCRIPTION="TLS OpenSSL extension to Tcl"
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="https://core.tcl.tk/tcltls/uv/tcl${PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/openssl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	dodoc tls.htm
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this is ugly, but fixing the makefile mess is even worse
+		local loc=usr/$(get_libdir)/tls1.7/libtls1.7.dylib
+		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+	fi
+}
diff --git a/dev-tcltk/togl-2.0-r2 b/dev-tcltk/togl-2.0-r2
deleted file mode 100644
index 2a70756137d9..000000000000
--- a/dev-tcltk/togl-2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/tk virtual/opengl x11-libs/libXmu
-DESCRIPTION=A Tk widget for OpenGL rendering
-EAPI=4
-HOMEPAGE=http://togl.sourceforge.net/
-IUSE=debug +threads
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk virtual/opengl x11-libs/libXmu
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/togl/Togl2.0-src.tar.gz
-_md5_=32249538a75964c6ee17e8298ce8dd65
diff --git a/dev-tcltk/togl/Manifest b/dev-tcltk/togl/Manifest
new file mode 100644
index 000000000000..4b3cffafaeb9
--- /dev/null
+++ b/dev-tcltk/togl/Manifest
@@ -0,0 +1,3 @@
+DIST Togl2.0-src.tar.gz 244968 BLAKE2B f094fb4bba7049470d7f61a2748d4a5baaf47c99c766d96ef8061e254673acf7f2a11555e202ec01f5d6b7a00ae7c275a33981fba5df7f1478f69da17f3180b8 SHA512 2be3062baada848d96b2802582bc5590b215f2ab4dc02c91761e72af2bf8c0ba768a71a2ffb8107bca83b63b7d1321ee83de19b97f83b1c2f0962f9288948b0a
+EBUILD togl-2.0-r2.ebuild 871 BLAKE2B eb08c55e5a7a64ae0eb63ce9620531c91d8ca72147f4711317590fd242465a6cdd0c31b71d5dec9b70a1b8d01f5147f0f97f261c76adabe431c12a8762a54223 SHA512 abfe4987bdb7a2f77f105386d4093bec7aa9e7f0d301ce0871a34535ca92ac9aabae37bf82ab15b1c7587710945677f0ac310b5c852d3f3c3820697165ed1a8a
+MISC metadata.xml 1191 BLAKE2B c421c6f81a32e715643716995a0c336166f1892c46f663bbcd4f910f2c208f9e5249e2820b9df10e22c76111d27bec7d61e4d405ebb9193a9c44166aed58c52b SHA512 890b9b1bb4b9ae4255e9fa24efb01e3f109a8e7675055ef9166a71d9ec1624494d2e5115cf3d8f074f400f805a61a3409558a8f21d544f91e4d8775fb2f3c5ef
diff --git a/dev-tcltk/togl/metadata.xml b/dev-tcltk/togl/metadata.xml
new file mode 100644
index 000000000000..e8e075423cc0
--- /dev/null
+++ b/dev-tcltk/togl/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>Gentoo Tcltk Project</name>
+	</maintainer>
+	<longdescription>
+Togl is a Tk widget for OpenGL rendering. Togl was originally based on
+OGLTK, written by Benjamin Bederson at the University of New Mexico. Togl's
+main features are:
+
+* unifies Microsoft Windows, X11 (Linux/IRIX/...), and Mac OS X Aqua support
+* support for requesting stencil, accumulation, alpha buffers, etc.
+* multiple OpenGL drawing windows
+* simple stereo rendering support
+* simple, portable font support
+* color-index mode support including color allocation functions
+* overlay plane support
+* OpenGL extension testing from Tcl
+* Tcl Extension Architecture (TEA) 3 compliant 
+
+Togl does almost no OpenGL drawing itself, instead it manages OpenGL
+drawing by calling various Tcl commands (a.k.a., callback functions). Those
+commands can be C functions that call OpenGL (in)directly or another Tcl
+package (e.g., Tcl3D).
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">togl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/togl/togl-2.0-r2.ebuild b/dev-tcltk/togl/togl-2.0-r2.ebuild
new file mode 100644
index 000000000000..58d12aadd6c7
--- /dev/null
+++ b/dev-tcltk/togl/togl-2.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+MY_P=Togl${PV}
+
+DESCRIPTION="A Tk widget for OpenGL rendering"
+HOMEPAGE="http://togl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug +threads"
+
+RDEPEND="
+	dev-lang/tk
+	virtual/opengl
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+
+# tests directory is missing
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed \
+		-e 's:-fomit-frame-pointer::g' \
+		-e 's:-O2::g' \
+		-e 's:-pipe::g' \
+		-i configure || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml doc/*
+	dodoc README*
+}
diff --git a/dev-tcltk/vtcl-1.6.0-r1 b/dev-tcltk/vtcl-1.6.0-r1
deleted file mode 100644
index fc46d74196b2..000000000000
--- a/dev-tcltk/vtcl-1.6.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/tk
-DESCRIPTION=Visual Tcl is a high-quality application development environment
-EAPI=0
-HOMEPAGE=http://vtcl.sf.net
-IUSE=doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk
-SLOT=0
-SRC_URI=mirror://sourceforge/vtcl/vtcl-1.6.0.tar.gz
-_md5_=e35c201396e024a652fd357e0d6aa58d
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
new file mode 100644
index 000000000000..61d7d0fb91df
--- /dev/null
+++ b/dev-tcltk/vtcl/Manifest
@@ -0,0 +1,3 @@
+DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a73185d50b56e0c87c88e82e6f368dd3acd7339f3a1875c9cda22123e4df82f6852343da10abac330896c899 SHA512 bfc2ed114af4bee375e820e4b1e47d394a800541eb9917204ef42481a4033927c432d7d2b005d13edd086c7c91bd594908965aae512cc4af9e5654a2bfd296de
+EBUILD vtcl-1.6.0-r1.ebuild 892 BLAKE2B 8bfc231abf18cf6d58d3ac9f68c14dd73b3ead2cf0ae970831a69b832935cde86624bcb9115c8a7734f4a4a8790948bc1a1c0817aab82c76a4cf7ade170aa858 SHA512 d5ed7977f7fc29bbbd0adc515f55f8157979fd80fe08c946b8d764b97d5f0b9a3b26e5a38ccd617f68b97bfe5419c24236f812dd741229a6109c47c8e109d54b
+MISC metadata.xml 320 BLAKE2B fc4506f2388dd451c4b88073e6df61db8024feb95db4cd0641ab28e0264aacb2934980afa86da71304aeceaa0f5b3e7581f8351cd577efeb44718e381441334e SHA512 bc023971a766ee2e121d6f5d22bc0fe38437802957e021ef193770ba386169c344b238c79df9d5d7aa32c2bd1ac7b448c6d688580f8be4a67c1df95cc942b60c
diff --git a/dev-tcltk/vtcl/metadata.xml b/dev-tcltk/vtcl/metadata.xml
new file mode 100644
index 000000000000..d188e1513e7f
--- /dev/null
+++ b/dev-tcltk/vtcl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tcltk@gentoo.org</email>
+		<name>TCL / TK herd</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vtcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..596e52294e4e
--- /dev/null
+++ b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Visual Tcl is a high-quality application development environment"
+HOMEPAGE="http://vtcl.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc"
+DEPEND="dev-lang/tk"
+
+MY_DESTDIR=/usr/share/${PN}
+src_compile() {
+	./configure || die
+	sed -i 's,^\(VTCL_HOME=\).*,\1'${MY_DESTDIR}',g' vtcl	|| die "Path fixing failed."
+	sed -i 's,package require -exact Tk ,package require Tk ,' lib/tkcon.tcl || die "Tcl8.5 patch failed"
+}
+
+src_install() {
+	dodir ${MY_DESTDIR} || die "Directory creation failed."
+	dobin vtcl || die
+	cp -r ./{demo,images,lib,sample,vtcl.tcl} "${D}/${MY_DESTDIR}" || die "Data installation failed."
+	dodoc ChangeLog README
+	use doc && dodoc doc/tutorial.txt
+	use doc && dohtml doc/*html
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-tcltk
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)