[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tktreectrl/files/, dev-tcltk/tktreectrl/

[Justin Lecher]

commit:     d159cc5387388f5f8b1575a76311dc2c586a67b2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 13:31:33 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 13:35:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d159cc53

dev-tcltk/tktreectrl: Bump to EAPI=6

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch |  4 ++--
 dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild     | 30 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
index 8b6dcea48ac..07a1e36f931 100644
--- a/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
+++ b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2008-02-24 23:22:10.000000000 +0100
-+++ Makefile.in.new	2009-07-11 23:54:48.000000000 +0200
+--- a/Makefile.in	2008-02-24 23:22:10.000000000 +0100
++++ b/Makefile.in.new	2009-07-11 23:54:48.000000000 +0200
 @@ -107,7 +107,7 @@
  RANLIB		= @RANLIB@
  RANLIB_STUB	= @RANLIB_STUB@

diff --git a/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
index 24e9f19a4e3..bd20b2a3182 100644
--- a/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
+++ b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils virtualx
+inherit virtualx
 
 DESCRIPTION="A flexible listbox widget for Tk"
 HOMEPAGE="http://tktreectrl.sourceforge.net/"
@@ -14,28 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="X debug shellicon threads"
 
-RDEPEND=">=dev-lang/tk-8.4"
+RDEPEND=">=dev-lang/tk-8.4:0="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/2.2.9-as-needed.patch
-}
+PATCHES=( "${FILESDIR}"/2.2.9-as-needed.patch )
 
 src_configure() {
 	econf \
-	$(use_enable threads) \
-	$(use_enable shellicon) \
-	$(use_enable amd64 64bit) \
-	$(use_enable debug symbols) \
-	$(use_enable X x) \
-	--enable-shared
+		$(use_enable threads) \
+		$(use_enable shellicon) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols) \
+		$(use_enable X x) \
+		--enable-shared
 }
 
 src_test() {
-	Xemake test
+	virtx emake test
 }
 
 src_install() {
 	default
-	mv "${ED}"/usr/lib*/treectrl${PV}/htmldoc "${ED}"/usr/share/doc/${P}/
+	mv \
+		"${ED}"/usr/lib*/treectrl${PV}/htmldoc \
+		"${ED}"/usr/share/doc/${P}/ || die
 }