From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 30 Sep 2018 11:19:18 +0100
Subject: gentoo resync : 30.09.2018

---
 dev-tcltk/tkzinc/Manifest            |  2 +-
 dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild | 43 +++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'dev-tcltk/tkzinc')

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
+}
-- 
cgit v1.2.3