gentoo resync : 15.12.2019

27 files changed, 151 insertions, 328 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3d81c8e433f7..3496439154d3 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index f2156be1b78a..ceb8bd41059f 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,6 @@
 AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
 DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262
-EBUILD bwidget-1.9.12.ebuild 801 BLAKE2B 869ae0373ea7beb92f41af2e3a49bdb52a6830335ce3ffeac32dbe8983dc0fe75f341aba3bfbdf36966e95384d48dc9f4175253487f89843e969a7570611c3e7 SHA512 32055dd8d3b5acada2d3c8a331e21fbf987e60ae36c4a3df7ff2b70fe1197f5762f972cc25f5b83e4c8efec739faca0c085d479713db5b9add8c7773fbe3d78f
+EBUILD bwidget-1.9.12.ebuild 800 BLAKE2B 878abc1527396f219063346030c270cbd3c3035f8d34a59867b96459ea2161f4e41078118aaf6328fefacbc40dc123e4baf1f64d68fbcd9d982cd9f5379d86ed SHA512 4ec94c300951c3c14cf3e768b703ec68bdbacc0837ce96347fee6135b1de968825f0bf15a9138b13b0034388e6d98ca5aa259f05362291106f221e23c0fe43b6
 EBUILD bwidget-1.9.8.ebuild 806 BLAKE2B 5d0a6379d916f9cc1b9d1eef51c640b632d0e754934aebde09a4cfcb86c1748ef3c994db845826c456056dd770d2154f4b0e6864db55f5eb94d866a270c9d189 SHA512 385c1991d0b8e76dacf9aefbdd92ad3ffcbd3adffdf305db2ea006587ab21aa57f56642c04eae8ccab0590e247f7497dece02183315e5c1326d50780964aad2e
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
index 5d9460e0a60f..a385c787c3c5 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index 5a03f4d26f11..3979140312f8 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305
-EBUILD iwidgets-4.1.1.ebuild 1367 BLAKE2B 94a1ad634679f2491ece0af278e64a15205c1f19e85117b3d00e1afb769ba11fa35b73ba791db32b36ae1bb655e307690505d90724c5e592794ba3a1b165806d SHA512 5359a49e812534c2bcb8453c7f49a27a0c1c2e3cb2ff47378ef325a60d23a9999aca00423c55ece22b80440c5f0d77458c267b681e502b441f096018f7ae288c
+EBUILD iwidgets-4.1.1.ebuild 1394 BLAKE2B e88cd3cb4d90b64c909fe2c4a39ab80cc5021d09fe4f4ca1eb8d6272e339592049611120e5b8afb1707eb7c38c4cdb9097842313f104f65f75f85074e7198eb1 SHA512 a4e0eb6569c1fd3349e7445a480efa2431b792673fc8a52847729af45ba72f944af91de41101df2c2ebadde1aa83c314ca1793854a43f3ff0952ef93b5abf192
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
index f3deaa38f47b..f1de8e97ed1e 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
@@ -20,6 +20,7 @@ LICENSE="HPND Old-MIT tcltk"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-tcltk/itcl-${ITCL_VER}
diff --git a/dev-tcltk/scwoop/Manifest b/dev-tcltk/scwoop/Manifest
index ef2759d5f9ee..9671511bed9e 100644
--- a/dev-tcltk/scwoop/Manifest
+++ b/dev-tcltk/scwoop/Manifest
@@ -1,4 +1,3 @@
 DIST scwoop-4.1.tar.gz 86368 BLAKE2B 3bd736e2f3aad4b6ca10582e78c0b6bafdb8314577c6176ca386f98074d1ecc81151fe724423e09a6c2fa553d9ecee7f246b4297f74e42c78539f1ef169f2c6b SHA512 8fd3fc01bd133aa155b45dcc5a821986aa72115fe248e0382611604f9e23596506f0d34ac331c4824bfd84dce7958b7a10186551604a0614572ee4e84fa3be21
 EBUILD scwoop-4.1-r1.ebuild 575 BLAKE2B 1a61ebc329825ea22a824ebf8e1366dd54b87c6259050bdb524265ff5a9294f259ed68712490bb9e27b7ce8a09afcea15b2c1c3f057e6e70e067a3eef82c2042 SHA512 f9ffca0e181bf9ffd4e9a9282b8b887c6ff9d8f91cd47862e7e2cd3a6e17a7fec5da9d2e3fa7c4967e0363b7f4fb3efa5a9912d3754607d341940dbd54c09fe2
-EBUILD scwoop-4.1.ebuild 567 BLAKE2B 2b341c5159689a41c2998c6838def9ce31cfa07e4cec2a07bc40c32823f519a904259188ceb306c9d4eb994ccd8d52eccd47147eff09b8af2f5c44606e5321b9 SHA512 c5895a9e034895487ca36bf91f20297e18d48c5687b3744ba2258a6f8b8a6c62f5fcf70be992e87c85b157b41316a8b134fbb8a456e27daa239eec378c6cc5a9
 MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/scwoop/scwoop-4.1.ebuild b/dev-tcltk/scwoop/scwoop-4.1.ebuild
deleted file mode 100644
index 13f55586d5e3..000000000000
--- a/dev-tcltk/scwoop/scwoop-4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="amd64 ~ppc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-tcltk/tcllib"
-RDEPEND="${DEPEND}"
-
-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/Manifest b/dev-tcltk/snack/Manifest
index e6e5b932f843..8d0dfea0aca9 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -4,7 +4,5 @@ AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1
 AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e
 AUX snack-2.2.10-test.patch 8755 BLAKE2B 942832c5c80ef1ab338829a21f296f759dd8a055da58b833e80f6f18d1e31f326b8dcfa85e96248afd24c3e9e80be1612a210a16c79630fe57e4a0a8b048f371 SHA512 3ffe1965b033fa77267c67c6222599c9a3fb72012886f3382c2940bb778b606fbe74a80ce6a4e77e26a95b1fb85e191186689eec8bcccfb5f08e059a97dc5a26
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
-EBUILD snack-2.2.10-r6.ebuild 2006 BLAKE2B 9426dba6ce11ab44d01c1cb3150f7d1583ef37aeea9202524a4751b3d7d5257ba59911ee4a20a43c435a3559fb809e70238003e778fb0b1b05c3b6bee117ba0d SHA512 051af633d6bc065d55d1b2b060d58baf3d8f7d84e6e15ae2f57a6fa169ccce3809ea2e28c20dd15c992559c8d8f659529c55df4a4efc7aefed8e9639fc84d206
-EBUILD snack-2.2.10-r7.ebuild 1933 BLAKE2B 4159c4fb4dec4c69a02d9691657627d1890de8a65066fabbc2cd29ec12ca05b6dea28982f5aaec4ce7973035e28cbf9d147ede0ebcd2185a500603972ba816e3 SHA512 1d5274c315e98a917c491f0dd1d1c9e6eadcea5cd2f1f7f78399218ecb759aab7f00a634836a1aaa9c7cd3f41effe9943618f8f64952d2cd9214dbb793d5734d
-EBUILD snack-2.2.10-r8.ebuild 2107 BLAKE2B c95fbe1173ba7ac07bd438c8872b264c783a6c1b22dcdb9e13847ffcdfaabf2acf682160ec3bc483e1f1037c5493f6ba9422c258a95610dc64b45e57afb84957 SHA512 48f4c45dfb93e24761f09f635d73da93cd0069b173429f6d3164f70b08b69004706556194516001371026ebc032d153b9a0d973ca349d81899e79b5bc6687c43
+EBUILD snack-2.2.10-r8.ebuild 2130 BLAKE2B 9cae43ec45a7d78b8598213d8f3fe0ed5a0beb72c8e499e3ce960cfefa1845ea08bfd97c10e822bcf1c72eb9cac1bd52cfcad78c1c590618f6df78f4c26b8afd SHA512 e7a8539fc146f91fd3f109e438f9f3cf69627035efbf4d74d645681cbad198353b50a56953f6b1eccbd4692f181be52b90c6bf169198231e57f3fcd105ac726e
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/snack-2.2.10-r6.ebuild b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
deleted file mode 100644
index 20852e8f371a..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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="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/snack/snack-2.2.10-r7.ebuild b/dev-tcltk/snack/snack-2.2.10-r7.ebuild
deleted file mode 100644
index eb87e0968a7d..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit autotools 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="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-SLOT="0"
-IUSE="alsa examples python 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"
-
-PATCHES=(
-	"${FILESDIR}"/alsa-undef-sym.patch
-	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
-	)
-
-HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
-
-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 ..
-
-	default
-
-	sed \
-		-e 's|^\(#define roundf(.*\)|//\1|' \
-		-i generic/jkFormatMP3.c || die
-}
-
-src_configure() {
-	local myconf=""
-
-	use alsa && myconf+=" --enable-alsa"
-
-	if use vorbis; then
-		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
-		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--includedir="${EPREFIX}"/usr/include \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		$myconf
-}
-
-src_compile() {
-	default
-}
-
-HTMML_DOCS=""
-
-src_install() {
-	default
-
-	if use python ; then
-		cd "${S}"/../python || die
-		distutils-r1_src_install
-	fi
-
-	cd "${S}"/.. || die
-
-	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/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
index aa1a9c061749..f1916baefb5d 100644
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
@@ -12,9 +12,10 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index f0f4910f80fb..ba5e6021d7d1 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -3,5 +3,5 @@ DIST tcllib-1.15-patchset.tar.xz 16164 BLAKE2B 590f6ea38aa2cf98e80011591d5bf06f2
 DIST tcllib-1.15.tar.bz2 5030648 BLAKE2B 9731be4282bc3b3b0bb56021c3f0a7943ff4163d04ae397b1e0543cbce0642cbf5f64b66c57348a932d9e29c53273223998f2d8b0b087ff7ac679191e8a35ece SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 EBUILD tcllib-1.15-r2.ebuild 1116 BLAKE2B 3135c725e7a4093e1cc81d1bdcc63766cab29191737fc1afefe5ede81198f8b438dc9b3a25c1fe3682090fec4bdef9410fa1cc630c929b198cc41b3042042210 SHA512 8154057edf45d29dcc2f1476a05e46db901c73574d1f5f76072b00849bbab867d1fd877c6126c3e830ff743b6879fb3e2fba47a0a862505631fd030fe5a9ae0b
-EBUILD tcllib-1.19.ebuild 1185 BLAKE2B 77fc79d514ea7a9150c534459d7882ef4a02901531dcf71e229d7d66c16cd541790657d0cc67288f095166d344aec168d828bc530003c3b0db4287d4f5cd1812 SHA512 c50979dac540bdfce7d871418fcfae14a9b1b18b60ef06619611d34588ac3785f8388d0d4d4fde2eb61ac8b9c7603888d1b969cd3d0f62e20952de1000690902
+EBUILD tcllib-1.19.ebuild 1212 BLAKE2B 5a6433d8e0f8416b832b050c856abda3dcab5f76299f4aaae8e0a535d1665423d185fba079053f77bda4c2b7c600abfbc48605e31f5d335f819219b352b6a0e6 SHA512 dde6fa52c1927696b5dd08c42fe57dea052ec8eef997129e876989cbe86ef47d87eded6935d4351a4ed1d82be0e3edb71123a56372fd461a0a4c75b8fbc3c1dd
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index 437db369c486..074b7414f650 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 3e008cae30d8..7ff8c696e856 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -3,8 +3,9 @@ AUX tdom-0.8.2.patch 2036 BLAKE2B d19a9a1f7b2095d5c0ce3684ecdacc0328ba82ddf6488d
 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
+AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a33f0a2f4b97313f5e4db79cd92ec79db179a1ce4d2d93813c3616c6e32c82fd6c6abdc89dac43477fdab1043 SHA512 765ba2e77c48fcb13530e92c483a48e3f57921e4b721cc9149e054c4cbb4a022ac0036c23e88f7b3a8cd7820a056240ab6e2ec2d9cf83e6fe4d8bb1dd01b1b4f
 DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
 DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
 EBUILD tdom-0.8.3-r4.ebuild 1937 BLAKE2B 5b95a705b4fa6308299cf8154b3d60a6cd192b1ce7f2b361dc84b590286922068404568a6bef72070f63e3988bf5929a98b3e11d29361da1b810108aff1afb3d SHA512 05174c0e1e0679415324721b469bfae70e8fdda138f0a6dbd0e57cc449f5a46d000e25bfbc36b03d0dbb46f01cfbc489460dad62485a4f294bd73b851dc818d0
-EBUILD tdom-0.9.1.ebuild 1640 BLAKE2B 6d47645a128e774f84df81903d7f767e255506f7b5ecd57b983a29117800bad6adc36d4320e44eebd929ca69a0afee7790651f65565cffee4e16fa82bf540db9 SHA512 bb236a58024d1ce9c85215cac81fdcae7e115f57ce90f39a017fe878e7b275acfbb7df8c3fbc1589cb51e5f5d14a96d8263f63d5fb680b150df283b7bc013c87
+EBUILD tdom-0.9.1.ebuild 1684 BLAKE2B 34fb96d30c9fea722bd85662dd7aaa0ff2e13000d89538537629ae48c92d1e53b0da6fe39cceabc82e3b75f1969c0972a7a0f0d674e6603f8bc9108bc6187abd SHA512 1d8e54798f6ad93d6a06370495da97464a956e3ec88f4806c8393519a170a6e64d864295f42ec00e4aa700133bc93b13a536088c094600c4101e314482c10f0d
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
new file mode 100644
index 000000000000..918c944b6f69
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4	2019-12-07 22:00:18.094712146 +0100
++++ b/tclconfig/tcl.m4	2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+     AC_SUBST(TCL_STUB_LIB_SPEC)
+ 
+     AC_MSG_CHECKING([platform])
+-    hold_cc=$CC; CC="$TCL_CC"
+     AC_TRY_COMPILE(,[
+ 	    #ifdef _WIN32
+ 		#error win32
+@@ -446,7 +445,6 @@
+ 	    TEA_PLATFORM="windows"
+ 	    AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)	]
+     )
+-    CC=$hold_cc
+     AC_MSG_RESULT($TEA_PLATFORM)
+ 
+     # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.in	2019-12-07 22:06:56.954496437 +0100
++++ b/configure.in	2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+ 
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+ 
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 4f20b7f47608..67ca7a61e0a4 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
 	dev-libs/expat"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
 src_prepare() {
 	append-libs -lm
 	sed \
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index d3e26ed162e0..eb60e59da38b 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,4 +1,3 @@
 DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
 EBUILD tkcon-2.5-r1.ebuild 741 BLAKE2B cb3a8805e2dc72aa954eb2dc8d05f5eabf34d2f1be21d7aa42d9c94bff74c7d4bcf7443346d5bca7a11069d05600c712af6f13e82c1f04ef94c6b3d4f8b85413 SHA512 9d335b762625038b0c21bf949ecb8d5c7566970639adde82f63bd6040cb9f11db5692f2b3e1bc04eab3f6eec98836930a0ce3af5e8823de02893f774c2640168
-EBUILD tkcon-2.5.ebuild 681 BLAKE2B 01bb36105f4171fef0b304e7ffdaa7232cdcf42864d65c8de5039ea3f6965114484943a3dbeb2fecc4b37af0929d2fc87a915dd99b297513e8f87259d285c369 SHA512 71a3d592b49e86562499923f6b0087dc31e6a293ace3fca72afacf0528e68739e4efa3f063191e8e4914b21c73b274b30578c195b4367de7f1988c64e292fdad
 MISC metadata.xml 695 BLAKE2B cb5dc622e2500fdac5984ac2e8578acc747b1f7904acddc4419658a767b9c55ce29fdaca7f56dea5496d68f815724bba106b56edaceaf422ef6ccfbc5326081e SHA512 f28fdbee5350ce1169b00081cfd326a2ed108b3f7347d5bef7365adbd6f098ea40cfb2088a3aa20d9cbd9c0bd650318119ef03db0a0a2e8bdf2aee6259544817
diff --git a/dev-tcltk/tkcon/tkcon-2.5.ebuild b/dev-tcltk/tkcon/tkcon-2.5.ebuild
deleted file mode 100644
index dcf14a871f2d..000000000000
--- a/dev-tcltk/tkcon/tkcon-2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index c89617c6073b..613ce9b27748 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,9 +1,11 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4-png2.patch 1044 BLAKE2B 236e5fa637b4b1cc6c74dd85d4fe73520941af360873b0455ab146c443d844470d6afb67071976cd1850a79e0906b7374947d2c802c8ba85f83682c6ae0f77a5 SHA512 fbf982af5446fc54212745eee8338d5dc4b169f79045963be23a84c7a0ef9e68f54d895156b4f040f6585499f1ead9967ac0ce57106e3ca3615fbaa9adcd1fb7
+DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4-patchset-1.tar.xz 17956 BLAKE2B f6d3e5e5f258434bd02e21271357f2e2013ce7c90f2d1862e8e7ac0f1cf235d39b1713434a00261ec442c1843a70194b4d14081a5d4cec07c8ad6bf45bbf1db3 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
 DIST tkimg1.4.tar.bz2 4912894 BLAKE2B 630ce6b95f42f0883373970ff919493d34cf4a61119af9520702079c6272f9b6ddbc6241197b39ac509d9b2c76c6f3d3bd29944acea4cdc1c82134cba473818a SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1
 EBUILD tkimg-1.4-r9.ebuild 1842 BLAKE2B 470dcd82e9d64a0e809c39679ce8fa602f14d085eba6a665fbb112f0810a216378688a5fdec79e8bd16a6a06f4fa0a6efdac8e6742aa90449e2d674c38debc9d SHA512 35c3e79accf91eb48d577eb019c65125ca4ced5add2c2130599b3d92a8f4970ad1238df0dcf6cc22dadadb51d624338515933a522918b0b3cd1cd39e1f8d1e89
-EBUILD tkimg-1.4.7.ebuild 1912 BLAKE2B 5ee4a18d9411fd7774adcabbe88ba6e751313b1d428765b2f107625734bd41f48ec06fd8c917f0f0647fac1257b930740b8fff4a80e25f98d885470aa6257351 SHA512 3fd65dc5a7eaaca6825c141b17ad3ca88785e51f9d82066510638cd77d2d74fe861b0d4b47e1710ef764c1638cf8de15fd38fda835ab5f46d2ba840f2b4cf1cc
+EBUILD tkimg-1.4.7.ebuild 1910 BLAKE2B 7c6b367b1424bbd647334f62f12638751b96583ce6173d4347e1e834a990003b94e1b58958d89f58470f98540210ad470009910c92a80074056bc7a1f3422faf SHA512 ccb67c6d83901305402a6cd3b6556f1911805303005d5a0c3382823bb242d9fe5810b0d9035e0ee043d4dbe8c92f74f249a4147273cbd948a7c29ed3206c0dae
+EBUILD tkimg-1.4.9.ebuild 2255 BLAKE2B 72c4cbf059238eb2268a4f3468c1df059e6c5abf12c03210e77b20b3d274768c0d41e2844601896dd525ffe04b44599fe169c7f1aa1b2845891353140f9b871c SHA512 0f4a9f01aa5675dc23eca626122efa75586eee39f0236a6e920f8efb7e15a2e3f9604f8c5ab1c65773fe64fee5d9ce026f4e729ed4a2edc5859eac5a27a1ecc9
 MISC metadata.xml 436 BLAKE2B 264c09c99797be5f1a242a1146d8552ab4cf632ad404d950829d102b2f3f8a40c5542ff04e9770a4870153843e462298af802e6caaff9e5bbb37abdb32697155 SHA512 d0401ca91110d4ffb90190d7135d3a5e6ef1aa0d3106cd7a84e72e64f3f565ee2ef30ac19aa2f119838a50d9c926132b93f2723a763d25b819db42fc57c16adf
diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 7166b8609063..107524465fb5 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test static-libs"
 
 RDEPEND="
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
new file mode 100644
index 000000000000..2746c0ba15ec
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib prefix toolchain-funcs virtualx
+
+MYP=Img-${PV}-Source
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
+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 tests
+RESTRICT="test"
+
+S="${WORKDIR}/Img-${PV}"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.4.7-tclconfig.patch
+	"${WORKDIR}"/${PN}-1.4.7-jpeg.patch
+	"${WORKDIR}"/${PN}-1.4.7-zlib.patch
+	"${WORKDIR}"/${PN}-1.4.7-png.patch
+	"${WORKDIR}"/${PN}-1.4.7-tiff.patch
+	"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+)
+
+src_prepare() {
+	edos2unix \
+		libjpeg/jpegtclDecls.h \
+		libjpeg/Makefile.in \
+		zlib/Makefile.in \
+		zlib/zlibtcl.decls \
+		zlib/zlibtclDecls.h \
+		libpng/Makefile.in \
+		libpng/pngtclDecls.h \
+		libtiff/Makefile.in \
+		libtiff/tifftclDecls.h \
+		libtiff/tifftclStubInit.c \
+		tiff/tiff.c \
+		jpeg/jpeg.c
+	default
+	find . -name configure -delete
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+	eautoreconf
+	for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
+		ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
+		(cd $dir; eautoreconf)
+	done
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+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/tkpiechart/Manifest b/dev-tcltk/tkpiechart/Manifest
index 9774b1ff8483..9f44cd646fbd 100644
--- a/dev-tcltk/tkpiechart/Manifest
+++ b/dev-tcltk/tkpiechart/Manifest
@@ -1,4 +1,3 @@
 DIST tkpiechart-6.5.tar.bz2 38096 BLAKE2B d49f54f693d849c3563d28f4387e65d1f2cd19ec647db7e3aa56d85ffb630ca170113ef81e97eb4e464320d37e6e10c7a8bda5cf19fb478a0609226ea28a77f1 SHA512 828f106be8fe37ab8876c7e0b8ee00dee7f067f21489710653909ba277aed65de169e0f592ce0fedf5bc0ffc584d633d163b1b72fb628c1b2e541e8a850636aa
-EBUILD tkpiechart-6.5-r1.ebuild 652 BLAKE2B 974c60337f3534ae2fc09fa580d63f7c40ce689768f27a31d2bf070d1d513ce5162f483be08d1c7fa78a4363bea2c6b5bb3da117aebb8b2c8f068112da3bc90b SHA512 923626c923664b55c8ae1647c7d3df70e7ece59b3f436d43cc4e3583b6e52ee77f08764be10dc2a0ee202f4976fc00e08329b10edab3e21af1d0fbe889499f9c
 EBUILD tkpiechart-6.5-r2.ebuild 653 BLAKE2B fa5fe71aa2d782a4dd20b71c7e7bb34d2b0ca252945ca2a367b257da765ff21780c8ea6793550a62dd28c9110b51b61e5e30b731dd38e00dc7bcda0bc88d0445 SHA512 81745edec916e187ff2d990a1bdd5c55e4bb3685cce52b85a672b028050af2cfa8838bf6f76da442317ba48cad77bf211fc2b2c2ba0b8874902e716b796bc45b
 MISC metadata.xml 249 BLAKE2B d3e8bf26f513e970f3ac032d9caae9692296590cb38e8ff81bc3cdf692492ad4a297d79a7f7adcc6b68f5ba220a1b086d42c70c579a043e104933f51bbb3f49e SHA512 e0b0007b4cfb9cb2af7a9bd33d578bc2bf1819985fa37d2dc8ec14cc1ae2987583d4054ad7497d9cf6c603b33f502bc6ee579ff990daa341b2e0572d585fbea6
diff --git a/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild b/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
deleted file mode 100644
index 4df808b2fe79..000000000000
--- a/dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RDEPEND="${DEPEND}"
-
-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/tktray/Manifest b/dev-tcltk/tktray/Manifest
index 97fdf1c89faf..15eb2a9f43c2 100644
--- a/dev-tcltk/tktray/Manifest
+++ b/dev-tcltk/tktray/Manifest
@@ -1,4 +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 772 BLAKE2B 1909b610b43c625bd53dfaafa5347af4f515cd0905595abf0de3f90974c5dd0d12eb234313f3556a02f589dd23245004e4050b439eda949d0e1968fc4a4c9ac4 SHA512 ef1173f74650e1c847c6ab29bdd20f4715c9d492dc8e6d3182b7d732b1f8c5bc4e28d72a19c51184c653b9713c6d613bddd5cdccbaeb576baf459b1d1ab41ac9
+EBUILD tktray-1.3.9.ebuild 796 BLAKE2B 1f4ef837187d33a1aaf9238e776fd2cdb6b920c8e5c9af4cb72dd57fea4b5680795e9012f76c23596aac29f19dc0b45d19c64816138edd14765f2531882c1486 SHA512 467d2ac7acb5d536bbeeea1f515c3d4b16d007ab9ecb379a808ae79eca96de1c317103b2b8ec3450ae99ffb4c14c33cf3bbdfa85f8993f2b0dc2069c85a9fd4c
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tktray/tktray-1.3.9.ebuild b/dev-tcltk/tktray/tktray-1.3.9.ebuild
index 8b1b102c4bca..3cb9eb4b38ab 100644
--- a/dev-tcltk/tktray/tktray-1.3.9.ebuild
+++ b/dev-tcltk/tktray/tktray-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="tcltk"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="debug threads test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-lang/tcl-8.4:0=
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
index f60c6d8223c5..b1a3c0697c78 100644
--- a/dev-tcltk/vtcl/Manifest
+++ b/dev-tcltk/vtcl/Manifest
@@ -1,4 +1,3 @@
 DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a73185d50b56e0c87c88e82e6f368dd3acd7339f3a1875c9cda22123e4df82f6852343da10abac330896c899 SHA512 bfc2ed114af4bee375e820e4b1e47d394a800541eb9917204ef42481a4033927c432d7d2b005d13edd086c7c91bd594908965aae512cc4af9e5654a2bfd296de
-EBUILD vtcl-1.6.0-r1.ebuild 909 BLAKE2B dba5c0b6716076f01f14e530af42924341493b04a4c40bd963beebe5de8388a02ac5bc5f8eef24a351569c44c81f714056d3577874424f6948028a53c1d3e345 SHA512 002f17f386f98771ad8da4e7b3996e38751114e8b5304362517bbacd62559fbbb06b40fda92c10d6f377d7043bbc45dec8a1191eed58ae6936f12d4a4f60f3b0
 EBUILD vtcl-1.6.0-r2.ebuild 868 BLAKE2B 58abb2091a03ac1735690cdcd03b3269079e86b0f78c00bb926bbd0af5a634b785b3a813c23ccb1bb9fc8abe693141732b632a128f19fc8fdae9d2aaf37b4b5f SHA512 c2734750d2648c7bc569d925632e5508c9f51bfa5d9e8162f7b6e7425f589155c21edb321de9405c8380aef9b19991034a8ec72455ca3db4fd3798647e65fd89
 MISC metadata.xml 320 BLAKE2B fc4506f2388dd451c4b88073e6df61db8024feb95db4cd0641ab28e0264aacb2934980afa86da71304aeceaa0f5b3e7581f8351cd577efeb44718e381441334e SHA512 bc023971a766ee2e121d6f5d22bc0fe38437802957e021ef193770ba386169c344b238c79df9d5d7aa32c2bd1ac7b448c6d688580f8be4a67c1df95cc942b60c
diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
deleted file mode 100644
index 6b09343c4210..000000000000
--- a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-RDEPEND="${DEPEND}"
-
-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
-}