gentoo resync : 30.09.2018

17 files changed, 240 insertions, 55 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 6593b97b4a63..a834f0fbffdc 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 3d883e319e5c..74cc65ea4645 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -3,6 +3,9 @@ AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311
 AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
+AUX expect-5.45.4-examples.patch 807 BLAKE2B 7b102a0fc95324d7b2aae343edf1d5ecd914234d89e8d57f2c1cdb64e707b58969552ded0eacd17373de42aa7ab60ef32e4b0f41c389de93c15bcffbe52ffe2c SHA512 6a9d8b713c0c20b630d4c61373afde76924ac00b7057cab9b42c0a7f81bf9712006ef7f81e82523262a429b960cacf6dc7742c835617a69b0c248a2e13131f50
+DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 DIST expect5.45.tar.gz 628808 BLAKE2B d7260d3b2ce1bcd72deef121e1f994f45bfa5397291692d794c9b8ad627d7ac183689ba00ba22f728853ac03b6b083fb6f283dc5c453aa991e04263c217be552 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
+EBUILD expect-5.45.4.ebuild 2179 BLAKE2B 1804f4383356a7a3e0e1f3d2120740d6fd44e9a043392be3925bd854e35f6fef8d89cc4c368dd68f7f7ebe525265514e14bd3ecc0afb8070e35469746379e90d SHA512 ee66f0c8d8c8cb69d022c2e02b06194a1e52c76874fd2fcc835550890c7c0cb100e27a99e06db7857cc9d056015d57f511c7399c712df52082374d1ed2aa8e9b
 EBUILD expect-5.45.ebuild 2323 BLAKE2B a7ddc999f1d2c1b3c8f1a8c5983b94c89e4a4e8dcc3d06e229b63f359d41ea108c3f2d7d92d2427e6ada3fa01c840cc233cc839335d21c41be67cf84378b9808 SHA512 bfef9b4a10fa57845aa223962a457949db55fdcd41fdb507c9413f4fd223bfe37a5cee231394912d0d919dc10641e9f6908cf445e508fc794b5d2dc4c10d3582
 MISC metadata.xml 329 BLAKE2B 9eebe793b4602782f9bd2db8dd7a0cfdfdab3f89400f3ececcf25862220c47e78feebc579b468ae5dc44ae482b8a69f844f141a2f535fbd61dec73f11c8eea83 SHA512 cd5b6144b39381b2b69791171489dd907c3d779ae488b361f744ffacb2459b0c72cb70a72a85dce6bd7a25774e1a42da511dd0d041b25580bf243a515095f3d1
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
new file mode 100644
index 000000000000..7f5402663564
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x64-solaris ~x86-solaris"
+IUSE="debug doc threads"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+
+src_prepare() {
+	default
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+
+	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+}
+
+src_configure() {
+	# the 64bit flag is useless ... it only adds 64bit compiler flags
+	# (like -m64) which the target toolchain should already handle
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-64bit \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols mem)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto examples
+		dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+	fi
+}
diff --git a/dev-tcltk/expect/files/expect-5.45.4-examples.patch b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
new file mode 100644
index 000000000000..10de8821a01a
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45.4-examples.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in	2018-09-26 15:59:09.049279363 +0200
++++ b/Makefile.in	2018-09-26 16:00:00.514427553 +0200
+@@ -32,16 +32,12 @@
+ # SCRIPTS is a target. If this is a problem, just comment out the
+ # SCRIPTS target itself.
+ 
+-SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
+-	passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
+-	tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect \
+-	multixterm
++SCRIPTS = unbuffer
+ 
+ # A couple of the scripts have man pages of their own.
+ # You can delete these too if you don't want'em.
+ 
+-SCRIPTS_MANPAGES = kibitz dislocate xkibitz tknewsbiff unbuffer mkpasswd \
+-	passmass cryptdir decryptdir autoexpect multixterm
++SCRIPTS_MANPAGES = unbuffer
+ 
+ 
+ # allow us to handle null list gracefully, "end_of_list" should not exist
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index 8123a9076937..f73bb1dabbdb 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,6 +1,6 @@
-AUX 4.0.1-path.patch 2376 BLAKE2B 18e3ef4be48239fe1ec4f819f9aadadd3351567eed2dd072dcf7f8c07e5acaa1cdf1b6771b3492ca583fd695af0c7473672e2518e0583da9db4d83110057b02b SHA512 1216beb6aad68591026e508827b062bcf2a547b76eac25b731f59ab0cf4b7b2c0a31a3c427e904ca9fec118f2db970d53a7aa81aa73a4b551fce3ec396625cc0
+AUX 4.0.1-path.patch 2352 BLAKE2B 4868024ece21be33bb69f95fe827591b559ca8e3cbd77d2e7f06d60acbf40495cd69fe175e3845305bc2b0cc59ecc5c817c85b8fc3f5be5d26f9e9e95fc54ea6 SHA512 1ca0d44372ee3e559dc47d773dde0dde3e1db4e8d6966c825143694ab20dc857feb52611d81f0c1ff045f947e282596430e5a3b4e0ceb673c57f8985fa11260f
 DIST itcl3.2.1_src.tgz 427026 BLAKE2B f37612bc21916bfad082d60cd216e28f2e427307e0ea80aa0ca1506c1d247471bfcd20be744a16ef57f5e04db0c34fcc436f2fbe53715462417202377a6cf0e4 SHA512 f6b832f20e53bac66c8bcdbf64aa4aad932ee827fb8059ad2e0dca0c61db01affde6b67c1e0acb331a3837eebcb38282fa7bec90f5d6ed4b65799f4424679f3f
 DIST iwidgets4.0.1.tar.gz 647960 BLAKE2B 3dafbe73a40e4babff574a82b4bd68546f109a52197f15228877950560f8089f95a44da93c3ff2723e2a40f26bac0e00ca4f34099e716591b93e9aba846e4257 SHA512 61d1980eb8beb2821fbd8333f5d1f6faa8bf59d98392fee8d166eef213b27c6b66121d42b8eef64d151e5249009be56076a8cf8bb6635072ee6ee4075858182e
-EBUILD iwidgets-4.0.1-r3.ebuild 1419 BLAKE2B a8495945962f96b14c526b271db1c1df5ba685f6306e25aeb32945b16eb4bd4c25cb394fb8bb00fd9a640b45fe41dbf60ade547b2e5a3083ae4a22567acc0a6c SHA512 4604df9afa1eb983f9ec9c7a580fa244273ab9d98945698587ee629f068dd3b7cc27b9f3e3ae918d1f2bd95ee4d1807eb1fd2d2c972201a0c1f4ed8fe789c1d2
+EBUILD iwidgets-4.0.1-r3.ebuild 1433 BLAKE2B c866699220a46cbeb18fa09df403e2cea4b8afcfc791f0b2989a035d6fb85c8a19ec7c5ba4c5e0c12dbe71d5a67eeedd651d0252dbe6e4680c23eb49a1eaf422 SHA512 750fd18f58409e9642b7112ea07d23616ba19ce6e2c00df4b7fda62bbf2e7b41c7b4331890c2fb8d10a398c68586f8d6581db206569c13e2f44ec0c81a7af5b0
 EBUILD iwidgets-4.0.1.ebuild 863 BLAKE2B 6d4adbb993dd99a0a0b4e1924c7e8f23296430f17d78fbbb9e122bf58949e62b2bbfbc8915ce327b9a76c2d71b280f1293188a06999839d1948d472c361c2dc6 SHA512 1920f61dd8b29a1b8621aa61f802ed0006983f4b4528233219cfbade9e0a7aa89d634365e112b6925a584e2fea3cf2f84e19d4ad26ad12a55a3b57238262bd14
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/iwidgets/files/4.0.1-path.patch b/dev-tcltk/iwidgets/files/4.0.1-path.patch
index 095d9ed81e1c..5d71eeb64744 100644
--- a/dev-tcltk/iwidgets/files/4.0.1-path.patch
+++ b/dev-tcltk/iwidgets/files/4.0.1-path.patch
@@ -1,5 +1,5 @@
---- iwidgets4.0.1/Makefile.in
-+++ iwidgets4.0.1/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -30,6 +30,7 @@
  
  srcdir = @srcdir@
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
index 1c42bf9071a0..50ecc6a9de46 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils multilib
 
@@ -26,8 +26,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PV}-path.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-path.patch
+	default
 	sed \
 		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
 		-i Makefile.in || die
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 68454ee8b48a..345ea61f37ef 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -3,5 +3,5 @@ DIST tcl3d-src-0.4.0.zip 1501305 BLAKE2B 61fe35df0bf5624ef5fbd7fa029b8ad7a23ed63
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
 EBUILD tcl3d-0.4.0-r1.ebuild 1333 BLAKE2B d07d4f56b7cea8ef7f5d03211be9a3a5bbd5e9a3e0d71b4dcff726a29ceb7fd85eaf372f820edd88987200adfbd285793bc6a47e343d39cb308c8186b2bf6e3d SHA512 541ab991db6ee8c54838abe091d6574cfa45afc7529d0a6bc2da58370369f0b11bc633ea8ef216a4910a35d4a43e9b6b2b2ebba93bde29e70b01975780a87646
 EBUILD tcl3d-0.4.0.ebuild 1332 BLAKE2B 2d958e54233102755773f21b394acf30c79c6489df5bed1bfea5ab657223eb667465a8fda07f5ec1d48a35a0528dd03822233786ba97086f7059e4f4e592d28f SHA512 7bcb8c5cadb7720734b3b8bf69417840f7af75d300b53c822609207efe1f82ab428c41872218dc0d2efbf20b2df701398c908c2da0d073695a0fbdaaf276bd93
-EBUILD tcl3d-0.5.0.ebuild 1596 BLAKE2B 235282d16ec37e5bb50ef2fb0a1b789365a723915a47c8c85b9ed595ba307e76abcfa1b979b4114a2afd1ff4b299e91f6d93644ca66152435e37461c72961b7f SHA512 329a86fa856a055bf1a68b9e9c650ccf15da85491a1c64b733009c0bb01af05c2e892fc69890625980e714b5facf205dfc3778361c3dab43fdf7f8511b052899
-MISC metadata.xml 1103 BLAKE2B b5528e54e960a114a53f560125ffdb30e45bf2dd2e9376a3d296d1734a40a8782b9e10e64cd50a80cd38b0f72cad7afe651c053c636f553f3c881cfc56a1f394 SHA512 8b5a1142c700c1319ce44617f1f4fe81475df16d3be90f5a8774c72cabab5fce196821d95d957bed2009454295edd868ad03c67fe0b8b8953f3338b197c53fa7
+EBUILD tcl3d-0.5.0.ebuild 1878 BLAKE2B 785ced313466891f52fb0a06e17fee11abcafb98737da5d5b2efc3121c7ffa92e13ffb1c09794258c2a55ce9479d692faf9edec8d9b8361f2c1bd34adf8f8e1f SHA512 b39e5086385319f9c9f70a515229444ab8d1bd3f93f7d1f971cf1f87bf55a0edcbf3531d099f93d96c1c8381a3aae181c700a68dd9f845eac1be371918ea3aab
+MISC metadata.xml 1311 BLAKE2B 72c200e646b9fddd4b20a266d7d66e967f918e467d413a063af6076cc0fb786b38bf0b61c9ce288f3215b0ec30485cbed4ad3ad35bad48f48c09936eff6f90da SHA512 291f517e0690cb71786359156418f3622ac8e5e86f8d8d33377b967d85bddd4c05fa49dccee56bc2ff719b2ebe45b497304fa5262ec193832b6c3c8f9ca09943
diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml
index 851c8cbb0582..2b1fbebe51e1 100644
--- a/dev-tcltk/tcl3d/metadata.xml
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -5,6 +5,14 @@
 	<email>tcltk@gentoo.org</email>
 	<name>Gentoo Tcltk Project</name>
 </maintainer>
+<use>
+	<flag name="ode">
+		Enable support for physics engine from <pkg>dev-games/ode</pkg>
+	</flag>
+	<flag name="osg">
+		Enable support for 3D toolkit from <pkg>dev-games/openscenegraph</pkg>
+	</flag>
+</use>
 <longdescription>
 Tcl3D offers the 3D functionality of OpenGL and other 3D libraries at the Tcl scripting level.
 The Tcl3D package currently consists of the following modules:
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index e9a64f8be868..1b0775851245 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,26 +12,25 @@ SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug ode osg sdl truetype"
 
-DEPEND="
-	>=dev-lang/swig-1.3.38:0=
+RDEPEND="dev-lang/tcl:0=
 	dev-lang/tk:0=
-	dev-lang/tcl:0=
-	dev-games/ode
-	dev-games/openscenegraph
-	media-libs/libsdl
-	media-libs/ftgl
-	virtual/opengl
+	x11-libs/libXi
 	x11-libs/libXmu
-"
+	virtual/opengl
+	virtual/glu
+	ode? ( dev-games/ode )
+	osg? ( dev-games/openscenegraph )
+	truetype? ( media-libs/ftgl )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.38:0="
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
 
-src_prepare() {
-	default
-
+src_configure() {
 	local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
 	local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}"
 
@@ -49,6 +48,13 @@ src_compile() {
 	append-flags -fPIC
 	use debug || append-flags -DNDEBUG
 
+	# Configure wrapper
+	local CONFIG_PLUGIN="WRAP_GL2PS="
+	use truetype || CONFIG_PLUGIN+=" WRAP_FTGL="
+	use ode || CONFIG_PLUGIN+=" WRAP_ODE="
+	use osg || CONFIG_PLUGIN+=" WRAP_OSG="
+	use sdl || CONFIG_PLUGIN+=" WRAP_SDL="
+
 	# Restricting build to -j1 since it seems that if we build it in parallel,
 	# it fails with the "tcl3dOsg" project attempting to import glewdefs.i,
 	# and not finding it.
@@ -59,10 +65,7 @@ src_compile() {
 		CC="$(tc-getCC) -c" \
 		CXX="$(tc-getCXX) -c" \
 		LD="$(tc-getLD)" \
-		WRAP_FTGL=1 \
-		WRAP_SDL=1 \
-		WRAP_GL2PS=0 \
-		WRAP_ODE=1
+		${CONFIG_PLUGIN}
 }
 
 src_install() {
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index 3ca8cc31e337..b148fb1fc871 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,3 +1,5 @@
 DIST thread2.7.1.tar.gz 295134 BLAKE2B 785e832f8acf926f550cbffa3e2383eb6ad7fdbb480830e3c0f56d207375053c865d6eb201361acb8ca2df8951a037603b015f85ab4903d80a92f9d957af9dcd SHA512 18ebd9431b6f6bfb1e6a60797af39db0dee29a16cd457ddab2a18cd5dfd9ef2dea9284ab99238fb05b8284fcc855c2ef8011eb3ed02d7e54d715379d133512dc
+DIST thread2.7.3.tar.gz 291332 BLAKE2B 96e7b03cf22227e85462994a6f955fd04d2e40384e540e7cbf78f93c661611607312eb1ceb195cecbe672ecb53df464f1cff4e9b9768864cfeef6be82595e17e SHA512 0efe8db04ffb1cbe539d1bbc9f82e52df994cf0cb570a2eeb79b6f821ee5d585e0b034b970e793a54c588b08321e5ea286c7b9173a09a5cc573b11fbf00c2888
 EBUILD thread-2.7.1.ebuild 1090 BLAKE2B d9e090abd0052a457ae17ef1c604781c89d453d9ab70c601ac4b8a728db0efbc1fd4d3a400f3091c0c8f9893a5f400b03c3c6e7730c171e8374ddeb3a8475bec SHA512 4a4ffe65e33c306cc03b79d79c24ff14744b4415b15ef1e2b59e76a8a76524baebe5df8967c75a205de454fdf7ea7e537ea5902a2fb77dbd074a5bd29726defc
+EBUILD thread-2.7.3.ebuild 888 BLAKE2B 03d56a7e8cf2ab0b01fd157666a13cda269df56ddf7c2632cfa5ae93f6136d4a3a712ae982c53e4abb48bc15e6e41c5d303dd84937ba20c8b74d71cde6ddb6c5 SHA512 b1f901f1ea3cb2117ecd985563e3c07726a64266d0667b375761e8b76013a7dd73df7055cc1533d5d1d759f62b0087bf2a73c0e13f495b5a25c72c9b934e3f9c
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-tcltk/thread/thread-2.7.3.ebuild b/dev-tcltk/thread/thread-2.7.3.ebuild
new file mode 100644
index 000000000000..147853cab232
--- /dev/null
+++ b/dev-tcltk/thread/thread-2.7.3.ebuild
@@ -0,0 +1,41 @@
+# 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 ~x86-fbsd"
+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/tklib/Manifest b/dev-tcltk/tklib/Manifest
index dd2cab363a82..35cddeaa9fb8 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1,4 +1,5 @@
+AUX tklib-0.6-doc.patch 447 BLAKE2B abd5a279a322ef7bbe44b8bcb0faf5729045e04903c2e152b79fbc05086dd7964bc7bc821cc527a9e39422229cb9f6b54fab2802cf32681dc7179d0aa291c664 SHA512 6848833a63898168d23b91a66052e8459b70e22dd5be9b6f938de5b3530473507ad2e65beee2258bbbf6d698d5162dd57af947fa112ccc9d2b678481679157a4
 DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
 EBUILD tklib-0.6-r1.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
-EBUILD tklib-0.6-r2.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
+EBUILD tklib-0.6-r2.ebuild 912 BLAKE2B eb914913be71f2d8af5b2ff6e897023dd23a628a2e0f635d03f32bb5ac3a54151f4e8007667f8ce8fdd697f64bc3dd110260be7f6c46e91c6ad06b29eca90282 SHA512 bec22351d75c0ec70eec68bba344bb1f670ad801e1f365f9c2eb5be49deb2bc6b63f48fd1b91a636383a08b750170432302dff2f3262ea222111892887113723
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tklib/files/tklib-0.6-doc.patch b/dev-tcltk/tklib/files/tklib-0.6-doc.patch
new file mode 100644
index 000000000000..7fea599df526
--- /dev/null
+++ b/dev-tcltk/tklib/files/tklib-0.6-doc.patch
@@ -0,0 +1,14 @@
+--- a/Makefile.in	2018-09-25 09:12:56.269163896 +0200
++++ b/Makefile.in	2018-09-25 09:14:27.437130443 +0200
+@@ -101,9 +101,9 @@
+ 
+ 
+ html-doc:
+-	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` html
++	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc html
+ nroff-doc:
+-	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` nroff
++	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc nroff
+ tmml-doc:
+ 	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` tmml
+ wiki-doc:
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
index 9231c58cf5e7..b8b7f41408e1 100644
--- a/dev-tcltk/tklib/tklib-0.6-r2.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit multilib
 
@@ -21,13 +21,20 @@ RDEPEND="
 	dev-tcltk/tcllib"
 DEPEND="${RDEPEND}"
 
-src_install() {
+PATCHES=( "${FILESDIR}"/${P}-doc.patch )
+
+src_compile() {
 	default
+	use doc && emake doc
+}
+
+src_install() {
+	HTML_DOCS=
 	if use doc; then
-		emake DESTDIR="${D}" doc
-		dohtml doc/html/*
+		HTML_DOCS=doc/html/*
 	fi
-	dodoc DESCRIPTION.txt README*
+	default
+	dodoc DESCRIPTION.txt
 	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
 
 	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
index e4c4d893ba49..bee5f7e8f941 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -1,5 +1,5 @@
 AUX 3.3.6-ldflags.patch 552 BLAKE2B ebd7496be2a97cf7325d25a46e272fe287e7bd17d7e8c660f584609057ba6823b75bfbcc611178fa70a66b90d2a699d41b7e6b673ded23db188bba47ecd4d11d SHA512 5ef1d02ac3b6eaffc4c7310e80e27204c5eb0ccc9d6627a5da4598a6b13d20fa1a1eab63194578a56a0650eb07c70879370e64030ccf86caf5226a1d1c6fea7e
 AUX tkzinc-3.3.4-latex.patch 331 BLAKE2B 03697cb54e5c82b7662bd41fc6c0cf35a27c252a849950ffabcdda927d796593a97e3cb4f968b280f0df6478264d9f3e3c532648393c370adb68130b9f255aeb SHA512 20e859529ff20b41193a43baeec4c632107208311de3815795cc2a013741034dac36880d88c11e7dc1c4719259e42a180203c1ac478251ff81eec0e3d7f77ee4
 DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838
-EBUILD tkzinc-3.3.6.ebuild 988 BLAKE2B 239a80fbafcdf86462f89aefde8f0e6d64b8036e2e3569747f47b9b4b3d1025dbf466265bf52c07695a295aee0b7db3072551fdf4b013d4e3e3b5d7344b883e1 SHA512 dab1039d8d10d96ee21ca89a9feb5894865cfe1947a967e98fd849b2fa19d52dee2e379ae76d4e6cd93aecda7295ba5f09a8708b6b520be4d2aca10ef9516f2e
+EBUILD tkzinc-3.3.6.ebuild 965 BLAKE2B 367cb0545e41c5fa4671ded64a1030102b1f5f1544f0425baad3d9bd4695b2559f5dd6537e67507492b20bee4f027fcc356efb39de7de8df1c8b02b7d11d44b8 SHA512 9767a0d5028cadc76c19eadf1fcc0857db30de8c8db649f5ada987b9be7a047c94ff0ccb53f215282bb4519926abfa265da6cc76a220d4644acd1cfc36da02f4
 MISC metadata.xml 252 BLAKE2B 6c4e3a169c57e92842dc5ef7462e8bbc9a0ccae4e58886c00f117732369b30fbe3bc1c6938114f0347a82717ef6df3c2dec6e965e78f61164839b64710914fca SHA512 3120ef58677decf25b1fa664b440335b63625aded86661fd5a49fd9af149c6f829bd7fe88f5a1c8346f1e19ed183a45a42acc6e522ac9de4f4f6609f637fbe7c
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
index 14b37ebcd1f6..73b6514bd1b0 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A Tk widget library"
 HOMEPAGE="http://www.tkzinc.org"
@@ -17,8 +15,8 @@ KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE="debug doc threads"
 
 DEPEND="
-	dev-lang/tk
-	media-libs/glew
+	dev-lang/tk:=
+	media-libs/glew:=
 	virtual/opengl
 	doc? ( virtual/latex-base )"
 RDEPEND="${DEPEND}"
@@ -30,28 +28,33 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.4-latex.patch
 	)
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+HTML_DOCS='doc/*png doc/*html doc/*css'
 
-DOCS=( BUGS )
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--enable-gl=damage
-		$(use_enable debug symbols)
+	econf \
+		--enable-shared \
+		--enable-gl=damage \
+		$(use_enable debug symbols) \
 		$(use_enable threads)
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && emake pdf
+	default
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake pdf
+	fi
 }
 
 src_install() {
-	autotools-utils_src_install
-
-	dohtml -r doc/*
+	default
 	use doc && dodoc doc/refman.pdf
 }
+
+src_test() {
+	emake test
+}