gentoo resync : 15.01.2020

22 files changed, 142 insertions, 296 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3496439154d3..be645fc3056a 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 8d0dfea0aca9..d4468edbbb92 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -4,5 +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-r8.ebuild 2130 BLAKE2B 9cae43ec45a7d78b8598213d8f3fe0ed5a0beb72c8e499e3ce960cfefa1845ea08bfd97c10e822bcf1c72eb9cac1bd52cfcad78c1c590618f6df78f4c26b8afd SHA512 e7a8539fc146f91fd3f109e438f9f3cf69627035efbf4d74d645681cbad198353b50a56953f6b1eccbd4692f181be52b90c6bf169198231e57f3fcd105ac726e
+EBUILD snack-2.2.10-r8.ebuild 2125 BLAKE2B 348e6a6a6ecfecf7d3cfa652d541d82407f81b19aed67c5f8cdc3b334b486df0c65b602408b8f01c5f1f8e6c382efd125434f32294c363aeaf4b0ffcd6a24834 SHA512 b372569057b9d67e238ef4a5fbbc1bf9c4879f85ca6b9eaff32484dbe2ef4f120272b4de31a7e6cbc5e362ad6f14355466dff773d6e4cf99fda4c072487a1aa2
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
index f1916baefb5d..57975a0731d6 100644
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools distutils-r1 multilib virtualx
 
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 745f712fc1d0..2c682edd02b2 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -3,6 +3,6 @@ AUX tclpython-5.0-gentoo.patch 379 BLAKE2B f5f45d701998af7398a074f59bc25cc613b72
 DIST tclpython-4.1.tar.bz2 10580 BLAKE2B 98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608 SHA512 5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
 EBUILD tclpython-4.1-r4.ebuild 1255 BLAKE2B b54520a550d6ce5449b8fcc4124f35d37c0f2f51d0a9d4e23c2ea44342a25ab0834cd51f4c83a7bc99ad9c548fd83335862a625aa835424dd44172ce50b75943 SHA512 0e8f249e76f33f2723aeb87a0b731396b69625fcb81c4c05d27c90dbe41780e0f620a3ba037b94d11a75756681bcd951817cdc49277d79e179d534da7b4ad827
-EBUILD tclpython-4.1-r6.ebuild 1289 BLAKE2B c82e233dd1e4bd0c41aecd35b8bf805b272a8a3826f2d7b38f520aeb57b69bb8b1e5e790d0ddea0553cbb5d03a8657adc69fe1878de4300f43978f8744689b4b SHA512 263109725812999d2b8faf619c4245488c7ddcb3782f810542185bd482acf5cfbbe79e94ea791d94a62726afecef21dc53b17322f382330c22093c7ccb82fdb3
-EBUILD tclpython-5.0.ebuild 1270 BLAKE2B 68cfe2e93983cfb6ca10c05a759a8a36cd3d59c19128a0c13e2a6c24034eed975b004324cd559c75af8e5df7a160ac1d915ea57c9a1a981a7900124c09363aa2 SHA512 1ed85437d107cdbe1043bb0b3dc403064b74e2d20429aba0995bf64873d1db25cc0a96fd3311c6944e4e18d160c1e41e0c30cb721b0a48a2d969f96901476b6a
+EBUILD tclpython-4.1-r6.ebuild 1285 BLAKE2B 5d3ff5d40312c67fa7bf9e1542f7608e3882d2c73da2b98a6221c0c8057d58b253e4af2ad2d1b838aad331907369fe8ad2dfa7b11d94b1b438685eac275f76c2 SHA512 2b41c1d759bf29239ca9f7510aa8d7dc5a7b6387a98746972d2a61d0935651bf1ce6f6b89f4b8897d8cd1bcd8f32b00cf4d6a2a29babb6123e5aa4653d25c769
+EBUILD tclpython-5.0.ebuild 1266 BLAKE2B 162fdbd929090b08fd0f66d8186c539187f6270c2b9b2d7090efac2b3dcfe43dd11296533f0b759d3354bd983dd1a6809cb0d167fe0feb2196003669d15d1cf3 SHA512 5859b729031ac8de2c6301e33c2689bcb8b9f22958d0b8a0348d22599f29c502c76c9439f8a69806b9984df00f3021fb45afb78903134715634e5db27d657f81
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
index abe532c7ac7b..3c865021275b 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild
index 2e9c078d4452..484457e30484 100644
--- a/dev-tcltk/tclpython/tclpython-5.0.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index 81189902920f..1c9425db1f1d 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -6,4 +6,5 @@ AUX tclreadline-2.1.0-rl-prompt.patch 463 BLAKE2B c9faea41e07303d94ec6eb08f4098f
 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
+EBUILD tclreadline-2.1.0-r5.ebuild 1852 BLAKE2B 93d16218228f1b3aa8af5d851b69e3ad346f638031ede94e8732f5b9c50484f406088213e721c12d070d9278e4d4758722b983bbce1234b5693de186a564dbbf SHA512 d186cfa81886c23d28c18862141f2d8f73016fd5aaef6cfed95c6b587d193c4b74c1894be558c3f0d3390bfdb3cdf4bbd0870dd910e1194457cf363127c0a0bd
 MISC metadata.xml 334 BLAKE2B b04f2a6d45f622095b6c4a34a0752583e773c10a7df53c77f02d642dc8ca715a1ab9dbd2ad64122142fd93122b004cd456350774a082cd3f72d0b920eb54e03c SHA512 23517fbebe1eedf4558ec1c04e10774229762eb7279d0bda99f602fac526afd817968bbff0ba23a1ef433684afda85f830ed7f5643b7c9cca22e7d2f66f71691
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
new file mode 100644
index 000000000000..148b7aefd19c
--- /dev/null
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool
+
+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/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
+
+	default
+	eautoreconf
+	elibtoolize --patch-only
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tcl-includes="${EPREFIX}/usr/include" \
+		--with-readline-includes="${EPREFIX}/usr/include" \
+		--with-readline-library="-lreadline"
+}
+
+src_install() {
+	default
+	find "${D}" -name \*.la | xargs rm
+}
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 61f0df5949b9..1324ae6782f0 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,5 +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
+EBUILD tclxml-3.2-r2.ebuild 1103 BLAKE2B d04cf312768bfbe2a255981974eb0a58a41c76793b3bdc4213b2d6650dda807460b09a969ac9ed1636312c3abdb13cdc04060719f218070cdd9d689bdc845c11 SHA512 29ab79d5b1cf3ad71648eeebdf982d96c27059bf9165a40ffcabdf6091342489eccd0eb8050965ad21c3c43eaa21b881fd865e5f63e9072789d9e3423caa8b18
 MISC metadata.xml 329 BLAKE2B 6a79c9f1952fa24494921c92da92aaceae631ec090df7e08b39e8f037330cccff13a537c04340364552ad8a0f9c8aa41e642bf5ccc5ecac5264f4836a696fb06 SHA512 32f679fcef8e5ad247a7e566ccfe9098116d093ce83e7326e744dbfede0eeb47fbcc3de723e135a1dd3733d337de6648632ab1b5191ec2e9135d48a3b2988e5d
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
index b0a217d741f6..3ce23a41c437 100644
--- a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.2-r2.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
@@ -19,8 +19,7 @@ DEPEND="
 	>=dev-libs/libxml2-2.6.9
 	dev-libs/libxslt
 	>=dev-tcltk/tcllib-1.2
-	dev-libs/expat
-	!dev-tcltk/tcldom"
+	dev-libs/expat"
 #	test? ( dev-tcltk/tclparser )
 RDEPEND="${DEPEND}"
 
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index c9e83c01df95..64f3e24761c2 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,7 +1,3 @@
-DIST thread2.7.1.tar.gz 295134 BLAKE2B 785e832f8acf926f550cbffa3e2383eb6ad7fdbb480830e3c0f56d207375053c865d6eb201361acb8ca2df8951a037603b015f85ab4903d80a92f9d957af9dcd SHA512 18ebd9431b6f6bfb1e6a60797af39db0dee29a16cd457ddab2a18cd5dfd9ef2dea9284ab99238fb05b8284fcc855c2ef8011eb3ed02d7e54d715379d133512dc
-DIST thread2.7.3.tar.gz 291332 BLAKE2B 96e7b03cf22227e85462994a6f955fd04d2e40384e540e7cbf78f93c661611607312eb1ceb195cecbe672ecb53df464f1cff4e9b9768864cfeef6be82595e17e SHA512 0efe8db04ffb1cbe539d1bbc9f82e52df994cf0cb570a2eeb79b6f821ee5d585e0b034b970e793a54c588b08321e5ea286c7b9173a09a5cc573b11fbf00c2888
 DIST thread2.8.2.tar.gz 346222 BLAKE2B 194673b14b3f6b98a46330afa58caaf705feb2d8713606547d0d7e5b18770c5729fd562c81e66b403040622afdbdf62b994bd3ef62678d00915ba48f1eafc786 SHA512 0889f54ba8c76413f0333bdf6f17cca38c4fa8ccfff7e1554a63f38f19471dc72c3afe34d2e38ea00724aa3f0c007051999392a8d188d47265dbf0527dadceea
-EBUILD thread-2.7.1.ebuild 1080 BLAKE2B 810f4780283bd9646a48a4750ca7ef630d0a9b284d8d63abaafef09211d93d2fb44d7e6987f0cc8f45f79983ef570d1d2fba21cf46dcf3d24e60d6a6d5614734 SHA512 e6457bc33f7a2f43b4a1e4092b93e95bfa54a8a14890c2ddddefe8e01d254f7de0d7b34906a3bb1b146c780dc899b01f85564202cb5c8299d043f52a0edd6f10
-EBUILD thread-2.7.3.ebuild 878 BLAKE2B 6de128dab5cba0705c990a27294f5eafba5e64b29b0901336a6fc7f48542b30f634b0ac457b5150e1ac5b1ac68adeeaf63101ebd16f6e27719d45c3774578618 SHA512 639c886c0c45aacbc85411c626871eff11cf769fc2aaccaef0c41a1829346f506522282ac84c630173c36b21b74bcdf7f5219b068977ae3c0ef68d066498dc0f
-EBUILD thread-2.8.2.ebuild 858 BLAKE2B b176c805aa9f282033dcdb10c31495fbbaa45d76e252c29298fac8066fb5052f4c977f7f4d2e4d1e9f315d7dc11d1b7f488863692f00bff2e8a8d87fdf9dbb4c SHA512 10ffd36754f4b722aeb9499ef31742d05459a6af9b85fa677f6ee05b67a9d394f8b06af13437edbe3fbc25fd0f1a8667da9d3af5c1ceda88ea8674ee5e5929d5
+EBUILD thread-2.8.2.ebuild 852 BLAKE2B 3a4ae25cfe903940a4e9f3f0df6005a9abc6471bfdaef59e5b5183f7ab62ce5d9498b26c9b40b27644a3fddea172aee86f22d23cbbd415438a490daf48777518 SHA512 d638e74b4d596bdda57b6c35d03a5d66e1d931e562934d1c79a886074734bf81051ea83251533b516e06828225cb71e95a2b76be0761fbac264a208937920112
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-tcltk/thread/thread-2.7.1.ebuild b/dev-tcltk/thread/thread-2.7.1.ebuild
deleted file mode 100644
index a114ff1e8df9..000000000000
--- a/dev-tcltk/thread/thread-2.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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"
-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/thread/thread-2.7.3.ebuild b/dev-tcltk/thread/thread-2.7.3.ebuild
deleted file mode 100644
index 4b42c4ef121d..000000000000
--- a/dev-tcltk/thread/thread-2.7.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Tcl Thread extension"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/tcl:0=[threads]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}${PV}
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# 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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-tclinclude="${EPREFIX}/usr/include" \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-}
diff --git a/dev-tcltk/thread/thread-2.8.2.ebuild b/dev-tcltk/thread/thread-2.8.2.ebuild
index 07bff869f9be..391435b3eb03 100644
--- a/dev-tcltk/thread/thread-2.8.2.ebuild
+++ b/dev-tcltk/thread/thread-2.8.2.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/tcl/Thread%20Extension/${PV}/${MY_P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/tcl:0=[threads]"
diff --git a/dev-tcltk/tkdnd/Manifest b/dev-tcltk/tkdnd/Manifest
index e41fab1016de..474996396525 100644
--- a/dev-tcltk/tkdnd/Manifest
+++ b/dev-tcltk/tkdnd/Manifest
@@ -1,3 +1,3 @@
-DIST tkdnd2.8-src.tar.gz 185025 BLAKE2B 3f7c1b728d12c2ad7d7fea82dae1c3f29207b70fd382fb6aa7aa6602602b0a9b5c4604347b9b1aa1faff7c5952d9557046157cb6af4268b56483f7398d4b55e3 SHA512 0cca1783ed4e481565fa23cebc12382f223c8a02f24a2795af3818d56769d265b45e2ce74d2a4a3a8203718bad6426efe37a5382e8376dd6a0820ef81866050e
-EBUILD tkdnd-2.8.ebuild 904 BLAKE2B fcb4a4b846196af1eb40f103c373dd1b2c198942962050535991168b44299b22d7a50f846c8630509a2e686fc93c8b8c9bf28709ded5134b590daf229c3d3d22 SHA512 d8b68152b19d6f0709a296097fe767a3c67de0c4433bfc35331146f764be59b41dec7644918cf92323759ad91bd77f0942a8892507d4d90f4a5e71ba14be955d
+DIST tkdnd-release-test-v2.9.2.tar.gz 573739 BLAKE2B 4e9cae26542cc7774a0faf3d91a8a3f3b3b598735fcdb4e0565be26893514fe2e3f301ecaa7c698913f570b30f37ba0e2e890c6651ceebbc5d6cd9f66caf57c8 SHA512 dd1538ad884e8287d9c90c3b1565b95a047f552a271f921b0d0d7cb7bde8d8d6ad7e8c3247b647c09080c2e23c57ca11c30bde516cf66abcbe1dac6dd0e7cdc7
+EBUILD tkdnd-2.9.2.ebuild 772 BLAKE2B 235909f26406b4885db0f5a75f4bc9944ecb92072362d8296b5d3daa39a26aadafbb211840aca21ab69216f8ac5cd8cd5f7e80fa5988e74d755077be91f035b3 SHA512 fa71e238a2ad4b451bd9ab1dea3e819a8ff5b61d448fb5ae5a14d8353047b58185f0697c9847588ed2961db96c2e9b8b425bb52e8724257c3361126d24fd4106
 MISC metadata.xml 328 BLAKE2B a8828cf089a520c1cfaa639bc5587d82ceb3681f97ad00a174ceb9331d12cc063ccb0687dd8e53510a1fb2d807153afdcf7a6be7fae1871621fb032c9c8d9e14 SHA512 3130aa488c2f677c91f3b2ba72a2a9e16446865a10f1629ae7e44b810189ceb24cb9cd14d834a71b76609cc9a2e043d8db7560e9446103368084385754cd5045
diff --git a/dev-tcltk/tkdnd/tkdnd-2.8.ebuild b/dev-tcltk/tkdnd/tkdnd-2.8.ebuild
deleted file mode 100644
index e1855dc6cd88..000000000000
--- a/dev-tcltk/tkdnd/tkdnd-2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/tkdnd/tkdnd-2.9.2.ebuild b/dev-tcltk/tkdnd/tkdnd-2.9.2.ebuild
new file mode 100644
index 000000000000..efb83f079b83
--- /dev/null
+++ b/dev-tcltk/tkdnd/tkdnd-2.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-release-test-v${PV}
+
+DESCRIPTION="Adds native drag & drop capabilities to tk toolkit"
+HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
+SRC_URI="https://github.com/petasis/tkdnd/archive/${MY_P}.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}/${PN}-${MY_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
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		$(use_enable debug symbols) \
+		$(use_enable threads)
+}
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 613ce9b27748..6eb28b28101f 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,11 +1,7 @@
 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 1910 BLAKE2B 7c6b367b1424bbd647334f62f12638751b96583ce6173d4347e1e834a990003b94e1b58958d89f58470f98540210ad470009910c92a80074056bc7a1f3422faf SHA512 ccb67c6d83901305402a6cd3b6556f1911805303005d5a0c3382823bb242d9fe5810b0d9035e0ee043d4dbe8c92f74f249a4147273cbd948a7c29ed3206c0dae
-EBUILD tkimg-1.4.9.ebuild 2255 BLAKE2B 72c4cbf059238eb2268a4f3468c1df059e6c5abf12c03210e77b20b3d274768c0d41e2844601896dd525ffe04b44599fe169c7f1aa1b2845891353140f9b871c SHA512 0f4a9f01aa5675dc23eca626122efa75586eee39f0236a6e920f8efb7e15a2e3f9604f8c5ab1c65773fe64fee5d9ce026f4e729ed4a2edc5859eac5a27a1ecc9
+EBUILD tkimg-1.4.7.ebuild 1904 BLAKE2B faba72f6a1b921eb47c64bb6d630838a2a23e7c615ae6dd28860307382fa9dd91c65b580132765534d501a6ecee3b10975ba7a683c0eec62c73dc36b21635dbc SHA512 c6ca2c1dc26c7c986d4126521c52aa0ed8ec6129fb11ec723e6b2c982270c410e4e019ea313bcd7565d096acd97dbfcee93b27de2b8614048511811d5f78366d
+EBUILD tkimg-1.4.9.ebuild 2250 BLAKE2B 6ac28172b78427829477ff65b3a227519fee5e3d165d224a6b2b81c3ddf1cfc83f22d71334e291852d2d1ae2774856512764dbef451f76783c9acc52d433e110 SHA512 c5d92f64424eaa68b0777cfe8c5e75c68b833b8ce088d652ff0996b72702de9c17f0fa0d6c7829d55f7363efaba9d3d9832564b6ecb954176ce3806135448c4c
 MISC metadata.xml 436 BLAKE2B 264c09c99797be5f1a242a1146d8552ab4cf632ad404d950829d102b2f3f8a40c5542ff04e9770a4870153843e462298af802e6caaff9e5bbb37abdb32697155 SHA512 d0401ca91110d4ffb90190d7135d3a5e6ef1aa0d3106cd7a84e72e64f3f565ee2ef30ac19aa2f119838a50d9c926132b93f2723a763d25b819db42fc57c16adf
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch b/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
deleted file mode 100644
index 195e9be43fa7..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-png2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/tkimg-1.4-r9.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
deleted file mode 100644
index 155c4483e327..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4-r9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
index 107524465fb5..77643a72c844 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
@@ -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="
@@ -75,15 +75,15 @@ src_install() {
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
 		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+		dosym Img${PV}/${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/*
+		docompress -x usr/share/doc/${PF}/demo.tcl
+		dodoc demo.tcl
+		docinto html
+		dodoc -r doc/*
 	fi
 }
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index 2746c0ba15ec..d2c7d256208b 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils multilib prefix toolchain-funcs virtualx
 
@@ -88,15 +88,15 @@ src_install() {
 	# Make library links
 	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
 		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+		dosym Img${PV}/${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/*
+		docompress -x usr/share/doc/${PF}/demo.tcl
+		dodoc demo.tcl
+		docinto html
+		dodoc -r doc/*
 	fi
 }