[gentoo-commits] repo/gentoo:master commit in: app-misc/vittk/, app-misc/vittk/files/

[gentoo-commits] repo/gentoo:master commit in: app-misc/vittk/, app-misc/vittk/files/

[Sam James]

commit:     5d1dcb33063230b483dd1e226e76c25e399a5f11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 01:33:05 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 01:36:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1dcb33

app-misc/vittk: bump to EAPI 7

Closes: https://bugs.gentoo.org/742077
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/vittk/files/vittk-1.1.1-dirs.patch    |  8 ++++----
 app-misc/vittk/files/vittk-1.3-configure.patch |  4 ++--
 app-misc/vittk/files/vittk-1.3-makefile.patch  |  4 ++--
 app-misc/vittk/vittk-1.3.ebuild                | 28 +++++++++++++-------------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app-misc/vittk/files/vittk-1.1.1-dirs.patch b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
index 050d1bcded0..ceee0c5c539 100644
--- a/app-misc/vittk/files/vittk-1.1.1-dirs.patch
+++ b/app-misc/vittk/files/vittk-1.1.1-dirs.patch
@@ -1,5 +1,5 @@
---- vittk-1.1.1.orig/vittk.in
-+++ vittk-1.1.1/vittk.in
+--- a/vittk.in
++++ b/vittk.in
 @@ -17,7 +17,7 @@
  
  set font "@FONT@"
@@ -20,8 +20,8 @@
  }
  
  ReadRcs
---- vittk-1.1.1.orig/vittk.man.in
-+++ vittk-1.1.1/vittk.man.in
+--- a/vittk.man.in
++++ b/vittk.man.in
 @@ -89,13 +89,13 @@
  in Taskwarrior.  At this time, various other parts of the VITtk color
  scheme can only be changed system-wide by altering the variables in

diff --git a/app-misc/vittk/files/vittk-1.3-configure.patch b/app-misc/vittk/files/vittk-1.3-configure.patch
index b45464bfb8b..0973c0b5d43 100644
--- a/app-misc/vittk/files/vittk-1.3-configure.patch
+++ b/app-misc/vittk/files/vittk-1.3-configure.patch
@@ -1,5 +1,5 @@
---- vittk-1.3/configure.in.orig
-+++ vittk-1.3/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -14,11 +14,11 @@
  fi
  AC_SUBST(BASH)

diff --git a/app-misc/vittk/files/vittk-1.3-makefile.patch b/app-misc/vittk/files/vittk-1.3-makefile.patch
index a7148fdf64d..a6fa32adc22 100644
--- a/app-misc/vittk/files/vittk-1.3-makefile.patch
+++ b/app-misc/vittk/files/vittk-1.3-makefile.patch
@@ -1,5 +1,5 @@
---- vittk-1.3/Makefile.in.orig
-+++ vittk-1.3/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,45 +10,45 @@
  	@echo "usage: make install"
  

diff --git a/app-misc/vittk/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3.ebuild
index c53b6a2df04..c94575dfa89 100644
--- a/app-misc/vittk/vittk-1.3.ebuild
+++ b/app-misc/vittk/vittk-1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="A front end for Taskwarrior (app-misc/task)"
 HOMEPAGE="http://taskwarrior.org/wiki/taskwarrior/Vittk"
@@ -12,21 +12,21 @@ SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-lang/tcl:0"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
+	app-misc/task
 	dev-lang/tk:0
-	app-misc/task"
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-1.1.1-dirs.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${PN}-1.1.1-dirs.patch
+	default
 	eautoreconf
 }
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}