gentoo (valentine's day) resync : 14.02.2021

6 files changed, 32 insertions, 30 deletions

diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 1c7cd3bd9ca6..7e625f9625ef 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1,7 +1,7 @@
-AUX klavaro-3.0.1-datadir.patch 996 BLAKE2B 5c5835f19bd72378ba79285e900c268e31457489ce2ff6e45a322f5ef4c3ad45f0c8cef9e229b50c30505d6d6dcbddb5ae1fd738fe5c876b4f5092a48593d381 SHA512 2f2547945af46df703a5e9276be0a55f899ab10341f370beb4fee1eb241c235e5ea99f8069e9c8989c4ff42e6b7130741bd8c5a0ed47ce63dbeae1fb3b9a0e8c
-AUX klavaro-3.0.1-out-of-source.patch 334 BLAKE2B d511ce6bafcc56882e42871d3e04b863e5c2f9ab141a15366d7554005ddda3828dade00010603e1f73ecf5200818b9214d2abdb4fddba167a410b3f548e15654 SHA512 d33e2a22e710a24016630b2f61b7804eb5ef49142148047c9d8b9a79a22ed788694c66cc01f68d0ce5be6b581e26fc5f4fe104b8fd68e7b0d9098c29c021b6ad
-AUX klavaro-3.0.1-static.patch 295 BLAKE2B f2a95fd25aa8d931176788523ca7b00c5670a617ed540b6b6409b3a7f47c9f636d7224a62caac2f7760a9aae7ee16052c923485d12727f1286f4c1aed3fd2843 SHA512 9b7bbe2fe977df36afc7ebcb286b71e081c78ec1b72d611d78442250360fb8da2e8c424bcc327194268a39ab8ab1cce2a27be6a182bf7872284432e28a340863
-AUX klavaro-desktop-keywords.patch 488 BLAKE2B b6c34f6bd99f239a8815e58c0b574e70c02890d030c40a055afba0f27d84e180bf61441a5a06e2aad66d992a38edfbc4f97759b32efa7b93f8a3a2b15a188197 SHA512 34ee19f48c34ab5c79afc83eca15b24fe4ee85fee9105926cee9291815f2be0f9d991e740cacced1c27602c23121b03a630db3308f77aa7325c26fe07715f07b
+AUX klavaro-3.0.1-datadir.patch 860 BLAKE2B c30fc29835a4cc2d5c38d2be9a6a836d6c2b762128ca8d6c9a44800d6a89cc6ac46d6bf4c0251bac14e24ea96e636eff28025e7570aa9576da6bc23fd63934cd SHA512 85c06039f4f84eff348b7dabbf6a2eaabd29c7217f608eb77cc38a17cacc13bad4afb676f19f7e08297428f543b094c9a89c7c4a465d680b5334b818f4918410
+AUX klavaro-3.0.1-out-of-source.patch 266 BLAKE2B 7244226db930cabc35bd29e6e6f1a4d84ee65c57576b7d04433f970b03d0b237eee919aefa271fdc5ccb856beca79504786fa8198a4bd3cb6936f45d05ff7ac6 SHA512 74cc5a686a2db2c5b0170b763e13861171c5ebf696b8717a6ca091f9512cb71397c14e7ae41a7ccaa09ed7f4a4e7805926d5f37eaa67ce827787b0326265250b
+AUX klavaro-3.0.1-static.patch 227 BLAKE2B 8ed9f3ee511784c75248a1cb14a06ce09e7a8fdb0b69bb9067cf8afecf225c059915eddb04aaf01a0f305f3f51e6d020b635e2942237c6d76742ad9408338f69 SHA512 30b76f6454302527d043bf3d29b97ac65cdd17bac48d394ce5b9f7c391a9640a976a54ca066b301f23a5f78b200641072513cb4f5eee5a89ac24510fa5b84104
+AUX klavaro-desktop-keywords.patch 420 BLAKE2B 14dea4731492e2c728517053c3c9a15c99e8bca0d36f25d23a6e7dbc9a54e59b5878100ae8924ae78740ff2e7ceb4cbffae1c968eeff8039fb9f539329fd0073 SHA512 f526da8a40a7de95564f9a8edf4176b043aeb3b5ee600691f66ca27a820da1d2f0d87b6c4da45b8a3a3009aeb440a1a24a65f728174ea079e6712e08c3fe5606
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
-EBUILD klavaro-3.0.1.ebuild 844 BLAKE2B 4154666ddb1c451a195fd1b75c8a6ad720a86fadd8c83f26f819d4b459ad63a15b818942fe407088750b14fccb9de6bf31f76ac9c4815aadd6e5ef547b885479 SHA512 3446ddccb68e4915947b809e4edf283dd19f08da7293872e052d39f7071bea1cb60e92b342aaf29c33fa002e4a2f70011adc7371eede1bb2aad0179981245864
+EBUILD klavaro-3.0.1-r1.ebuild 826 BLAKE2B c260dd6808f8812187548b0fc8452c052634a545fd33fcfbd4dbe91aa3a2071258dcb37d23633366a0ee2c12dfeb879610b6dc212a48c195bc57e5da72784041 SHA512 449888bb77c5448627620eb69e225964cd15814dfdc0dd0b3065284a243ad2a0eed131e70e34588426ad5c0e5d69db89c82bc35a39e96d4f6ebffb6810816cc7
 MISC metadata.xml 244 BLAKE2B d00878c0c5edc36629a30cd4005404290bd7eb773d5d715f189d89e05f019b84e0c25dd18c2b8a0010e9737d7c4da343d3fd79db1c196dd01c47bebe2ff30077 SHA512 cba7dce2e4ffc562ca054e00c09dc2d6ef32c8ba4928224c361374f4ae61164624a56ff7778328d624feb4a1de20be8c69f1bc4762f30babbfd67658a78694a4
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
index 21047a197ccb..869d8238ea89 100644
--- a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
+++ b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
@@ -1,5 +1,5 @@
---- data/Makefile.am	2014-12-18 23:16:47.513887559 -0500
-+++ data/Makefile.am	2014-12-18 23:16:59.060609420 -0500
+--- a/data/Makefile.am
++++ b/data/Makefile.am
 @@ -151,11 +151,11 @@
  EXTRA_DIST = $(klavaro_data)
  else
@@ -14,8 +14,8 @@
  appdata_in_files = klavaro.appdata.xml.in
  appdata_DATA = $(appdata_in_files:.xml.in=.xml)
  DISTCLEANFILES = $(desktop_DATA) \
---- src/Makefile.am	2014-12-18 23:17:35.956725053 -0500
-+++ src/Makefile.am	2014-12-18 23:17:45.309501898 -0500
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -20,7 +20,7 @@
  
  AM_CPPFLAGS = @GTK_CFLAGS@ \
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
index 5e4a9d48fbd1..bade41bd6664 100644
--- a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
+++ b/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am	2014-09-05 10:26:56.000000000 -0400
-+++ src/Makefile.am	2014-12-18 21:27:55.443335860 -0500
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -29,7 +29,7 @@
  
  klavaro_LDADD = @GTK_LIBS@ \
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
index 010cd11de005..8dea56970bf1 100644
--- a/app-misc/klavaro/files/klavaro-3.0.1-static.patch
+++ b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
@@ -1,5 +1,5 @@
---- gtkdatabox/Makefile.am	2014-12-18 21:26:18.129806730 -0500
-+++ gtkdatabox/Makefile.am	2014-12-18 21:26:30.528364491 -0500
+--- a/gtkdatabox/Makefile.am
++++ b/gtkdatabox/Makefile.am
 @@ -1,4 +1,4 @@
 -lib_LTLIBRARIES		= libgtkdataboks.la
 +noinst_LTLIBRARIES		= libgtkdataboks.la
diff --git a/app-misc/klavaro/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch
index fbf39ab954be..5d497480e869 100644
--- a/app-misc/klavaro/files/klavaro-desktop-keywords.patch
+++ b/app-misc/klavaro/files/klavaro-desktop-keywords.patch
@@ -1,5 +1,5 @@
---- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500
-+++ data/klavaro.desktop.in	2015-01-07 21:52:56.391720366 -0500
+--- a/data/klavaro.desktop.in
++++ b/data/klavaro.desktop.in
 @@ -2,7 +2,7 @@
  Name=Klavaro
  _Comment=A very flexible and efficient touch typing tutor.
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
index 41246e2a5e58..5a0721302c5c 100644
--- a/app-misc/klavaro/klavaro-3.0.1.ebuild
+++ b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils versionator
-
-MY_P="${PN}-$(delete_version_separator 2)"
+inherit autotools
 
+MY_P="${PN}-$(ver_rs 2 '')"
 DESCRIPTION="Another free touch typing tutor program"
 HOMEPAGE="http://klavaro.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
+BDEPEND="
+	dev-util/intltool
+	dev-util/gtk-builder-convert
+	>=sys-devel/gettext-0.18.3
+"
 RDEPEND="
 	net-misc/curl
 	x11-libs/cairo
@@ -27,17 +29,17 @@ RDEPEND="
 # gtk+3 version needed
 #	x11-libs/gtkdatabox
 
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.3
-	dev-util/gtk-builder-convert
-	"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-out-of-source.patch
 	"${FILESDIR}"/${P}-static.patch
 	"${FILESDIR}"/${P}-datadir.patch
 	"${FILESDIR}"/${PN}-desktop-keywords.patch
-	)
+)
 
-S="${WORKDIR}"/${MY_P}
+src_prepare() {
+	default
+
+	eautoreconf
+}