gentoo resync : 22.10.2018

14 files changed, 257 insertions, 15 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3e6e96c52b4a..a61ccd042c07 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index f0208b640da8..1030083097e1 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,8 @@
 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
 DIST bwidget-1.9.9.tar.gz 243001 BLAKE2B 31935584e5c6737b143e67113f7d5fb34450ea5bf7852f3c72691abcb1545752f1607945377ac1cb68e5bb256aabc8f92aa193d2a63149ab3de0b74c074409d2 SHA512 6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042
+EBUILD bwidget-1.9.12.ebuild 815 BLAKE2B 9a153519bf18659b6af80a9ada5057a04c91b7135eaa4fa79a5ef02155ec5d3ae5457cba193583947b50e35970f19adffe8a037a81b9e4242987b4d528843e60 SHA512 a693e2b2e051545d392ac53be6e887cfc57dc7c9a6750d05b9029ff75530305de658955b252937d4c5d4bdca1db546044a6cb0154c07c2dd7939ad41aa681546
 EBUILD bwidget-1.9.8.ebuild 806 BLAKE2B 5d0a6379d916f9cc1b9d1eef51c640b632d0e754934aebde09a4cfcb86c1748ef3c994db845826c456056dd770d2154f4b0e6864db55f5eb94d866a270c9d189 SHA512 385c1991d0b8e76dacf9aefbdd92ad3ffcbd3adffdf305db2ea006587ab21aa57f56642c04eae8ccab0590e247f7497dece02183315e5c1326d50780964aad2e
-EBUILD bwidget-1.9.9.ebuild 829 BLAKE2B 0eb7f0623c313d33dd2a9d92cf47e8073f063e230ce0ee4a1e2bc254c681e838696b4ccc06b33dff6a06c61db148b6af95641b951329641b10474c5ab96558c6 SHA512 a7b07e56b344bdc6336e0c7c2ca24c2afe2135838058cab0c1b3c34d71ea2d67b367e294ffcf7bde861b1e23dfa3335fc580cabd78f7bf068db07af6584240d5
+EBUILD bwidget-1.9.9.ebuild 847 BLAKE2B afc55b97460c6af79e3fd0aa4ef9836d59fed913d8982de5a91e6c89e1085145c1fd35b72cc1ef50930fdf045f43ab67ae9291b27c19856f338f520f90f84ded SHA512 355727b31213b1c34a399248683222ae3c5788f213f5efb62e2725de8c38c472dfa436b35892826b54363e5a90c85a8ecd82cd1e010511b2a7553614f599236a
 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
new file mode 100644
index 000000000000..f13b72b2fa60
--- /dev/null
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/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}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
+
+src_test() {
+	TCLLIBPATH=${S} virtx tclsh 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
+
+	docinto html
+	use doc && dodoc -r BWman/*
+}
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
index c7518e156e9c..7b2f79c479ee 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ src_prepare() {
 
 src_test() {
 	VIRTUALX_COMMAND=tclsh
-	virtualmake tests/entry.test
+	TCLLIBPATH="${S}" virtualmake tests/entry.test
 }
 
 src_install() {
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index 653d2ae7b2a9..c70497c1cdfe 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,7 +1,9 @@
 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
+DIST expect-lite_4.9.0.tar.gz 149560 BLAKE2B 6db5c7f37d996996bcd94ef5e0b7d2d2d592cfd88f56f751c35f53826d3cea473861d332327caf4e9c6950a983b2d907955a7b68e8ea46655e07a8197fbe1f6b SHA512 1a210f5937cf31768a77c9f8d7147be1d8bd3f4e3c68c8941fef7871d22c209c9946aa1f3b2705a0332523439a7e8c9ef7ae3a46d4b5174b5e759bf15dcad4e5
 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
+EBUILD expect-lite-4.9.0.ebuild 637 BLAKE2B 7ce4e71b0660132fbb352e10154191bbd3a2b0b5f508fbc7a5471294e81f5e773f8e058b8d10b369b6cc8c906c807ae60f922bde4012c29e7f967e5ad2de7e6b SHA512 cd40e2f9eacbee0bb7bcdbab7dac8e0cb33ccc460346794e9fe093417944b25adff28c00d53d48e14953248b4e038fcbf1b768e6e2d9a6bd17587ed52761782f
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
new file mode 100644
index 000000000000..5f96fcf7d046
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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
+
+DOCS=(
+	bashrc ChangeLog README
+)
+
+src_install() {
+	default
+
+	docinto html
+	dodoc -r Docs/*
+
+	dobin ${PN}
+	doman man/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index b557f404a55a..1f148f2b08dd 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,5 +1,7 @@
 DIST itcl3.4.1.tar.gz 263316 BLAKE2B ba4a94d2dfe80b095e754d01036b189130918d7f29701f003873d59fa8e75074b1601dd907d94e5a9f680e05b18493d5782d6a4ddbb56d7df9ff85c8d5b17ecf SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0
 DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
+DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 EBUILD itcl-3.4.1.ebuild 1031 BLAKE2B bca3f59f758e7e5aa2924a70ebf30673607c5e4944737c314f9741ca1115849450315d0c64a9ebcc2fdb78bb9e0c83ce2bd1e79da7a0d24b6697daa829e7468d SHA512 43778440a2847a4d59667a132f70efc2dd73108481a20cb6603d43fed0b77eb58940e800acf065ce031102531a236b47d119f957bc05fd30deae682a55d6de78
 EBUILD itcl-4.0.3.ebuild 1726 BLAKE2B 342bed309f2e5bd3d22121d0437216afca28d7fb0060949e61a7d92ab61d4883de83eac923028344c6e6245bd1ba19a8c408d73e36ca14b676531a93cb672142 SHA512 6794f499a6539243e8f899b8de7e39310e30487aaa2b0c8296fa2fe4878d9dccdfbd3f97ebc3f4de2bbe4894a0298712b14ca2db351c7828849748679aa8af0b
+EBUILD itcl-4.1.1.ebuild 1488 BLAKE2B 2619e9a9bcd0914bffea0f6b9d60cf8cc2e84fcf756986fe438d4750eea72d7e0c37535c1210d5061007bb4900413599e6b3300644b064eb14d0a4d62169fd61 SHA512 0e242f7a7cf92520ca2dc5bb7bc18eacdcbe34ac28c75bd79c41e9334c74806c3ac078892e1e59f8c0d866871aacd92b84564c36d87a6d28939ad21a959ef475
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itcl/itcl-4.1.1.ebuild b/dev-tcltk/itcl/itcl-4.1.1.ebuild
new file mode 100644
index 000000000000..ee7ab36d3f3f
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib
+
+MY_P="${PN}${PV}"
+
+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"
+
+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)/${MY_P}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index 510fba346076..833599aadba7 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,7 +1,9 @@
 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
+DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 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
+EBUILD itk-4.1.0.ebuild 1334 BLAKE2B 9b4115c6e2e1843d66856794fca30e50c7d9ab4a33f8a7202dc2e932a0dc05698b1fc8909576833b2946dfb40b419957a6057c17e51ad2909233c3f60231199c SHA512 f261506e22211705a28ae0efebaf7b5af883851de617cfed9f94ee24ea797c6d394d91dd4001e48672967cd5ff315986d0241725cb704f2edbdc6ff85bd50f6e
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
new file mode 100644
index 000000000000..dacfecf0fd08
--- /dev/null
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib virtualx
+
+MY_PV=${PV/_beta/b}
+ITCL_VERSION=$(ver_cut 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"
+
+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() {
+	mv configure.{in,ac} || die
+	AT_M4DIR=.. eautoconf
+	sed 's:-pipe::g' -i configure || die
+	default
+}
+
+src_configure() {
+	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tkinclude="${EPREFIX}"/usr/include \
+		--with-itcl="${ITCL_SRC_DIR}" \
+		--with-x
+}
+
+src_compile() {
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_test() {
+	virtx default
+}
+
+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/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index aac1afa066c0..fffc11c21a79 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,10 +1,10 @@
 AUX 4.0.1-path.patch 2352 BLAKE2B 4868024ece21be33bb69f95fe827591b559ca8e3cbd77d2e7f06d60acbf40495cd69fe175e3845305bc2b0cc59ecc5c817c85b8fc3f5be5d26f9e9e95fc54ea6 SHA512 1ca0d44372ee3e559dc47d773dde0dde3e1db4e8d6966c825143694ab20dc857feb52611d81f0c1ff045f947e282596430e5a3b4e0ceb673c57f8985fa11260f
 DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
-DIST itcl4.0.3.tar.gz 430522 BLAKE2B e1ce0325a501b0227f6ec721927488dff0e2ea323bb8b03b046ce23964b55cdf44d7633f34546b9b0432785e609bb7dddeb3a300cbb2d82a9e4eb70acb1bfd66 SHA512 9736a08f0f33e0afa677a77eb643454908531786435b73314a80d9ee211c06f037eb0de3c2c2608b728253f9ec613a601d76f16f29964eb06b667ecbb3400df4
-DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
+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
 DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
 EBUILD iwidgets-4.0.1-r3.ebuild 1433 BLAKE2B c866699220a46cbeb18fa09df403e2cea4b8afcfc791f0b2989a035d6fb85c8a19ec7c5ba4c5e0c12dbe71d5a67eeedd651d0252dbe6e4680c23eb49a1eaf422 SHA512 750fd18f58409e9642b7112ea07d23616ba19ce6e2c00df4b7fda62bbf2e7b41c7b4331890c2fb8d10a398c68586f8d6581db206569c13e2f44ec0c81a7af5b0
 EBUILD iwidgets-4.0.1.ebuild 863 BLAKE2B 6d4adbb993dd99a0a0b4e1924c7e8f23296430f17d78fbbb9e122bf58949e62b2bbfbc8915ce327b9a76c2d71b280f1293188a06999839d1948d472c361c2dc6 SHA512 1920f61dd8b29a1b8621aa61f802ed0006983f4b4528233219cfbade9e0a7aa89d634365e112b6925a584e2fea3cf2f84e19d4ad26ad12a55a3b57238262bd14
-EBUILD iwidgets-4.1.1.ebuild 1383 BLAKE2B 7e9a6688a40ab5ce1ea5e0468141271e5ba34d6717f457ce609b8f4b2d762e1cefedf6032e3afcdecca3f17228478888ca0435b3f5e97c49fd77dbcc8e24a631 SHA512 d15d3b1977bc0f2e03fc94c9b3f16c2a8b22633e748a2f6250390232a68d31b11b1603c941d1ee57bbd33ad6afbec3caf68b04fd6fbb3e1ab1ae5b74c5d26688
+EBUILD iwidgets-4.1.1.ebuild 1379 BLAKE2B 9796d27b962e07fc20560d9ba507a9344ace0b78bbf9bfb5f0b2981ef5bde7ea4a72171426a0faca1fa75c730f49be13b5aa85f88d5ccd258937470167658ee1 SHA512 928fde4b1485fddf61144e15dc7f7c54b8037b95a7f7f855f62cac0709952803278065e4e226184d1806cd9771fd1d81dae92ba5a60ab6a54564b466fc3e0441
 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 5c4d8362e2ed..728e7f8d1756 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib
+inherit virtualx multilib
 
 BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source"
-ITCL_VER=4.0.3
-ITK_VER=4.0.1
+ITCL_VER=4.1.1
+ITK_VER=4.1.0
 
 DESCRIPTION="Widget collection for incrTcl/incrTk"
 HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
@@ -26,19 +26,16 @@ DEPEND="
 	>=dev-tcltk/itk-${ITK_VER}"
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
-
 src_prepare() {
 	default
 	sed \
 		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
 		-i Makefile.in || die
-	sed -i \
-		-e "/require/s:Itk:itk:" \
-		iwidgets.tcl.in
 
 	# Bug 115470
 	rm doc/panedwindow.n
+
+	rm tests/hierarchy.test || die
 }
 
 src_configure() {
@@ -54,6 +51,10 @@ src_compile() {
 	:
 }
 
+src_test() {
+	virtx default
+}
+
 src_install() {
 	default
 
diff --git a/dev-tcltk/tablelist/Manifest b/dev-tcltk/tablelist/Manifest
index e3a4d1e0624d..b1462478ad96 100644
--- a/dev-tcltk/tablelist/Manifest
+++ b/dev-tcltk/tablelist/Manifest
@@ -1,3 +1,5 @@
 DIST tablelist5.8.tar.gz 416416 BLAKE2B 04372aab25af72d331da342aa85f49238ee39fe15da3f1f418e5345561b8feb6b6974b3a956f6d8d49063767030d60f01ce5207caa446b8f1936667aaca0155a SHA512 9c8e3577ae0e89291450c7ecccbbb042417d9a24255489e9257eae2b48454cbef4ec759949ddfc8d73123260da3fc506e01acf6c15e113e5112ed15c014d6833
+DIST tablelist6.3.tar.gz 551180 BLAKE2B cb9181e052d5c63bf2ada068e31b1ba637001bb4da6ce9303c8227cff20d1a8df3c2bc59689a86593d1de59e54f3b1de534c049930c4f01ab705d24263a9cdf5 SHA512 4a5331a9e84dcfb1ecb025dceb82a188f33d14dc91f960e7dbdf17a9ad14a3700f56f84a1af0edc3ea912f92b167524946e01c8c52fc053d106536658013bfb0
 EBUILD tablelist-5.8.ebuild 663 BLAKE2B 7a34e883f735ff7b5e8a9c2f77126882e9108a2db6cafd5eb95dbc90aa9c6b810571516eb838616103d325983f3801685b30cdca65e07d47ce7837dfbfaed8d3 SHA512 1e9b61a0ede9169eff9a24e54d782a614c6b738afbfdac623d1fdc1b54c9d306699cc426d3fc4b330793a393ca2f27ba2d99b82c401d99b4e45265a7da441047
+EBUILD tablelist-6.3.ebuild 648 BLAKE2B 96c448a392d883e602c9e9fc535e0078ade649faed35e9c2bdbdcd099218dcb5e0783313e4ae87bef741415e2378b0a163ec865c7d2d280cc7fec6290edf449b SHA512 4a132b23e0ee3db223651d09372997be32b04176a8c14d852d419b3972dce151b32fe41c93da63b5bcf93f38ad9612f361eab2fb9f1008805c27686df75cc101
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-tcltk/tablelist/tablelist-6.3.ebuild b/dev-tcltk/tablelist/tablelist-6.3.ebuild
new file mode 100644
index 000000000000..dc1dcd291151
--- /dev/null
+++ b/dev-tcltk/tablelist/tablelist-6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 examples && dodoc -r demos
+	use doc && docinto html && dodoc -r doc/*
+	einstalldocs
+}