6 files changed, 49 insertions, 47 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 050d1bcded01..ceee0c5c5394 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 b45464bfb8b1..0973c0b5d43d 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 a7148fdf64dc..a6fa32adc22c 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/metadata.xml b/app-misc/vittk/metadata.xml
index 3667ce87214b..d850dbdad19c 100644
--- a/app-misc/vittk/metadata.xml
+++ b/app-misc/vittk/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-	A comprehensive front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
-	provides a fullscreen emulated terminal window with modes and commands
-	modeled after the vi editor.
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A comprehensive front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
+		provides a fullscreen emulated terminal window with modes and commands
+		modeled after the vi editor.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-misc/vittk/vittk-1.3-r1.ebuild b/app-misc/vittk/vittk-1.3-r1.ebuild
new file mode 100644
index 000000000000..4cf322908e9a
--- /dev/null
+++ b/app-misc/vittk/vittk-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A front end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://taskwarrior.org/wiki/taskwarrior/Vittk"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/tcl:="
+RDEPEND="
+	${DEPEND}
+	app-misc/task
+	dev-lang/tk:=
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-1.1.1-dirs.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/app-misc/vittk/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3.ebuild
deleted file mode 100644
index c53b6a2df04a..000000000000
--- a/app-misc/vittk/vittk-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="A front end for Taskwarrior (app-misc/task)"
-HOMEPAGE="http://taskwarrior.org/wiki/taskwarrior/Vittk"
-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}
-	dev-lang/tk:0
-	app-misc/task"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${PN}-1.1.1-dirs.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}