gentoo resync : 16.09.2020

5 files changed, 28 insertions, 26 deletions

diff --git a/app-misc/vittk/Manifest b/app-misc/vittk/Manifest
index b629c53fb17c..fd4f4e2c1d98 100644
--- a/app-misc/vittk/Manifest
+++ b/app-misc/vittk/Manifest
@@ -1,6 +1,6 @@
-AUX vittk-1.1.1-dirs.patch 2540 BLAKE2B c2b55384c213960476d89aed85b9041d74842eaca87d22e9d1bce2e0e0949c61591b3af82fdf66c38398789536af27dbeb87d5d95a441f85893cb6eef92dd192 SHA512 bd2a32082d22c52d7f5db18795189562b06c7b5178276b2034e5614419879c2c32056a77991ce33f397c743630b38457effb0ed2ad6e5b53c4c160a0f83727ac
-AUX vittk-1.3-configure.patch 831 BLAKE2B 3838841a6ee8bb4fb686a7372740f5759340f8254e54b69986f7c3080e183994dce35408df8067863fad1b36948675b0b9634f7eb9a98c2b9029a313dfefee0f SHA512 b5a8032822643125687e8282b3fb775fb008156674c19485f70ab1aee9424cdc73294978f67f0b04c0dd765903d9be032a807086233b9a5dd1fdd7a04cabb5d8
-AUX vittk-1.3-makefile.patch 3750 BLAKE2B 6f4e3037a785d9b0bc71b7a4aa2eecba5e63805f96fd80668cb1b96d2e598997d698ba0acf0d9739cb6c401af60727e91fd5129567a0377a875ff123da590c73 SHA512 c8d59448ae96f3c25925aa707778079da52ec343e84252c4e03c2f9b6d8a3bffca21f03e0798c9ab7d66994bd6adcd3eded9ae4126ca8cef2a7f8a825e9a1c89
+AUX vittk-1.1.1-dirs.patch 2490 BLAKE2B 7eccfb13df6ca64a2244d45e60d193e1c828ae31e785bad5e35760a5aa2326f71692902907748a0d27eb837d549d115de0c37a2c42e16b0dd1a82775aacaf812 SHA512 67f4ad9f44b06017c5f8fe4370ebfd2d7467abe51223281905ddf8f1a09457ff9fa097226a51d3a0d8034b861d90e6026bf6ac583a46db9f67eac129ad1e01e0
+AUX vittk-1.3-configure.patch 810 BLAKE2B 40e4cc3efc99cf976aaeccc7d075f9a77e2396cfad67aefd2298ff8d9d3d0091ddcd96631f5f05e89340d872861c75c0ba3ea7b2027e31013731fa0b43500452 SHA512 0ac4b5c6a1df2405be3ddf9e87d2a6978db157e1646824ce9baf8f80865e5a59e7185eca6a799cfdc47a6fbe521dec9c27db66fcd6128d0bd224f517b937c4e1
+AUX vittk-1.3-makefile.patch 3729 BLAKE2B 2ba2d2096dd522331e1b7dd719c7d98db80f4b4b25385499a02b87c9b79d7313240a889951cc6612341884a2f180324c640cb592b75b3e6317e4ab9b7d25af7f SHA512 9f284630c003bcdb911f34e2a49a1d8ad3119fa781a9eadd0dda7116220ce2481dd64104258fd90fcef4fad1b49dd2f9be54b1769bef2ec293e487a02890c200
 DIST vittk-1.3.tar.gz 71921 BLAKE2B eae3aeee88f1986fd654307b0bae4fd7bc9c3f86312f82bb3776ee5f8d36b45489aee386762a9c8a1ef67766d75aa01086ab50a4743bffe14910411ccb19dd88 SHA512 feda4eda7780a5a2a51acbc4c4d47ba5b88c3c01c82ae8715e7822700843e0d7de365b786554db59f7e40dbdff6f6bb0083a2126b1b082586504d8d16112af6d
-EBUILD vittk-1.3.ebuild 671 BLAKE2B 60f3e2aee3ba0b8dd88f7026aaa1a6459b04b3632875cf0efc4c1d0ac7cb54d02254abe906d9efb6e17dde1e7b5e3fbede004ea906461a6f31dc638a7fcb18c0 SHA512 d27e434a6fa1d108dcbfd49660b1b9a1728ff5df48fd14bbfa3a307b843f3c550981e94ad521e15537a714e7eb9dff62014658f7c2f88aa3c9fecb2b752dc8d8
+EBUILD vittk-1.3.ebuild 621 BLAKE2B 339c485bbb9e403e7a86d25ee9f9afb5a0a042eb3b7e831100001619480be40d1dd34657d722ad5b904bafa35df4c61c64b249503076788f47d817ddb406c5f4 SHA512 7f21ec4b34af48bdac13d61df6d6f1bc7fe55d03dd9a02f0e2be8a775953544e0c94cf8f7fc9002462233d4fcbd318d2336c722d41eadc68cda44578dc5eb429
 MISC metadata.xml 390 BLAKE2B 894900220ccdd655ebedc4eb754233116f9bd0a4a41ef17f3da95f93a665c9435ce507b0dcf4b27f618b1e7fef88de95fdb47e0f2eeac9bcae969d27928d431a SHA512 22fe059e8490e1a6a338aafcd8257cd121e629ed52cd80a95b8a57061e8ca2b0483f6fe4a5926e85b533ff60d96dfe8d7c6ec31bfc91f2b621ca0ecc86462b79
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/vittk-1.3.ebuild b/app-misc/vittk/vittk-1.3.ebuild
index c53b6a2df04a..bc1c47519edb 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,23 @@ 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
-	eautoreconf
-}
+	default
 
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
+	mv configure.{in,ac} || die
+	eautoreconf
 }