gentoo resync : 16.01.2021

4 files changed, 140 insertions, 0 deletions

diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 22cd89b688b9..6fab70382b92 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1,7 +1,11 @@
 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-3.13-datadir.patch 514 BLAKE2B 0e3b3080d211634269588006e46d949b980144b837dc0a3d57fbe663dd7c63d866f7985035629155e76aabae30c451262c8260134225320ffaccf6d31ad8e34d SHA512 5b8707459ebd372834e65edb9497505823970c798fd4a1e6fedf10dd3d37c55f43ad249288b6ab012732a940a9df2e0a58d1c4915de71c984e0d8ff3a36c6271
+AUX klavaro-3.13-desktop-keywords.patch 4364 BLAKE2B 080e88df774c9e29826a1c7e7b7fbcadc96ba06e17ce29b858ec1161f0b11cea1bed84cfea8bd36a19576ed0e3c6894ded9fa9cb2598c376bb0f9981d4cc63f2 SHA512 96b1213c39b5258fef6f7a8adbbcaf1b815a2cb71d55481a7196a8eaf3dcd141c248b57f4586d036381ab1af1234f9606a15e5b91f9f6245bee04cf0b8cf9476
 AUX klavaro-desktop-keywords.patch 420 BLAKE2B 14dea4731492e2c728517053c3c9a15c99e8bca0d36f25d23a6e7dbc9a54e59b5878100ae8924ae78740ff2e7ceb4cbffae1c968eeff8039fb9f539329fd0073 SHA512 f526da8a40a7de95564f9a8edf4176b043aeb3b5ee600691f66ca27a820da1d2f0d87b6c4da45b8a3a3009aeb440a1a24a65f728174ea079e6712e08c3fe5606
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
+DIST klavaro-3.13.tar.bz2 1237015 BLAKE2B f6cf83005217e924ff1ea9a596d1154a3225298142722eb51609411f74444d73cb5d4a98fc11634185c3ca857b566d33396c841cb40f925e2d84b7180c357c57 SHA512 17765be33305a722f8d23006353c5de812075decc7931c596bd8c7efe2d93657687847f007adb4e7f758a535fd3cded36581fd1e9f5b4af7d6d3b441b7245b36
 EBUILD klavaro-3.0.1-r1.ebuild 796 BLAKE2B 97a292a8f3bc57139f3c4b19f7bee582eb53cddcf3377c9a273835ecaeffff2f21a9dd1f9b12aa2f99d33e8fcfe786ba59f6c439f2beccda8ed245157a308ee1 SHA512 5799969ba108bdac5345b6b01539ea4611d7a247c6b8128e208ec0749652181dbb792a45e0abfdc511f77cd67fec3063284823eecf00fc4b4f3bde063d20697e
+EBUILD klavaro-3.13-r1.ebuild 946 BLAKE2B 7c7eeb28abe2a0bf3df1d253148cde9b312d9939033b9ff694f462f2ddd79e160af29b677694b72a81c607b6e627e22cd9fb3b3f6e90a5f5f098270dc4bae643 SHA512 3b9d6134d7f195547e89cf9dba79e3709a41b45383f6d768af16ac2ff99aee2ec4e320f1a9550bee076df7950740e0e2defb199a8ade4b19af8b54a9804877d5
 MISC metadata.xml 245 BLAKE2B a4b272a16070570fe0ba833073cc83891b08d2ec1123961e384d4b5e1cdb945b466da642243ff3197d71fbfa784cdc0f1ad07b906056f8f4618549df6f7a08d7 SHA512 94dab4934d91e76395edcdba99cdc609a3c658d5b72d524a427389f496dc391fb4ff5351b2984c96d2283c64c4090e27a0277efe60dab5a19f8aabd10e51e255
diff --git a/app-misc/klavaro/files/klavaro-3.13-datadir.patch b/app-misc/klavaro/files/klavaro-3.13-datadir.patch
new file mode 100644
index 000000000000..24071cd7481f
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.13-datadir.patch
@@ -0,0 +1,13 @@
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 727d2e21dced..ee6ba6f8d70b 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -185,7 +185,7 @@ desktopdir = $(datarootdir)/applications
+ desktop_in_file = klavaro.desktop.in
+ desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
+ @INTLTOOL_XML_RULE@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ appdata_in_files = klavaro.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ DISTCLEANFILES = $(desktop_DATA) \
diff --git a/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch
new file mode 100644
index 000000000000..b36da018bec1
--- /dev/null
+++ b/app-misc/klavaro/files/klavaro-3.13-desktop-keywords.patch
@@ -0,0 +1,73 @@
+From 5459092d6044ffbea644cf04ddaa4cf9a6f7c25b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 14 Jan 2022 15:10:17 +0100
+Subject: [PATCH] Add missing semicolon at the end of klavaro.desktop
+
+---
+ data/klavaro.desktop.in | 50 ++++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/data/klavaro.desktop.in b/data/klavaro.desktop.in
+index 6c6deadb1e7a..cf2fc090fd7b 100644
+--- a/data/klavaro.desktop.in
++++ b/data/klavaro.desktop.in
+@@ -3,31 +3,31 @@ _Name=Klavaro
+ _GenericName=Yet another touch typing tutor
+ _Comment=A very flexible and efficient touch typing tutor.
+ # Translators: these are keywords related to the program. CAI above means Computer Aided Instruction. Feel free to add and/or change the keywords in your language.
+-Keywords=keyboard;typing;tutor;CAI
+-Keywords[ar]=keyboard;typing;tutor;CAI;type;لوحة المفاتيح;الكتابة;الكتابة باللمس
+-Keywords[bo]=ཡིག་འཇུག;མཐེབ་སྒྲོམ།;སྦྱོང་བརྡར།;CAI
+-Keywords[ca]=keyboard;typing;tutor;CAI
+-Keywords[cs]=klávesnice;psaní;psací stroj;na psacím stroji;výuka;učení;CUI
+-Keywords[da]=tastatur;blindskrift;øvelse;CAI;maskinskrivning;værktøj
+-Keywords[de]=keyboard;typing;tutor;CAI
+-Keywords[el]=πληκτρολόγιο;πληκτρολόγηση;εκπαίδευση;keyboard;typing;tutor;CAI
+-Keywords[eo]=tajpado;instruilo;gvidilo;ekzercilo
+-Keywords[eu]=giltzadia;mekanografiatzen;CAI
+-Keywords[fr]=clavier;dactylographie;tuteur;EAS
+-Keywords[gl]=teclado;mecanografía;titor;CAI
+-Keywords[hr]=tipkovnica;tipkanje;mentor;CAI;NPR
+-Keywords[hu]=billentyűzet;gépelés;oktató;gépírás;CAI
+-Keywords[it]=tastiera;digitazione;tutor;digitare
+-Keywords[nl]=toetsenbord;typen;blindtypen;typeles;lesprogramma;CAI
+-Keywords[pa]=ਕੀਬੋਰਡ:ਟਾਈਪਿੰਗ:ਸਿਖਿੱਅਕ:CAI
+-Keywords[pl]=klawiatura;pisanie na klawiaturze;nauczyciel;CAI
+-Keywords[pt_BR]=teclado;digitação;tutorial;CAI;aprendizado
+-Keywords[ru]=клавиатура;набор;тренажёр
+-Keywords[sl]=tipkovnica, tipkanje, tutor, računalniško podprto učenje
+-Keywords[sr]=тастатура;куцање;учење;учитељ;КАИ
+-Keywords[sv]=tangentbord;skriva;lära;CAI
+-Keywords[uk]=клавіатура;друк;швидкісний;набір;навчання;уроки;keyboard;typing;tutor;CAI
+-Keywords[vi]=bàn phím;bàn;phím;ban phim;ban;phim;luyện gõ;luyện;luyen;gõ;go;dạy;keyboard;typing;tutorial;CAI
++Keywords=keyboard;typing;tutor;CAI;
++Keywords[ar]=keyboard;typing;tutor;CAI;type;لوحة المفاتيح;الكتابة;الكتابة باللمس;
++Keywords[bo]=ཡིག་འཇུག;མཐེབ་སྒྲོམ།;སྦྱོང་བརྡར།;CAI;
++Keywords[ca]=keyboard;typing;tutor;CAI;
++Keywords[cs]=klávesnice;psaní;psací stroj;na psacím stroji;výuka;učení;CUI;
++Keywords[da]=tastatur;blindskrift;øvelse;CAI;maskinskrivning;værktøj;
++Keywords[de]=keyboard;typing;tutor;CAI;
++Keywords[el]=πληκτρολόγιο;πληκτρολόγηση;εκπαίδευση;keyboard;typing;tutor;CAI;
++Keywords[eo]=tajpado;instruilo;gvidilo;ekzercilo;
++Keywords[eu]=giltzadia;mekanografiatzen;CAI;
++Keywords[fr]=clavier;dactylographie;tuteur;EAS;
++Keywords[gl]=teclado;mecanografía;titor;CAI;
++Keywords[hr]=tipkovnica;tipkanje;mentor;CAI;NPR;
++Keywords[hu]=billentyűzet;gépelés;oktató;gépírás;CAI;
++Keywords[it]=tastiera;digitazione;tutor;digitare;
++Keywords[nl]=toetsenbord;typen;blindtypen;typeles;lesprogramma;CAI;
++Keywords[pa]=ਕੀਬੋਰਡ:ਟਾਈਪਿੰਗ:ਸਿਖਿੱਅਕ:CAI;
++Keywords[pl]=klawiatura;pisanie na klawiaturze;nauczyciel;CAI;
++Keywords[pt_BR]=teclado;digitação;tutorial;CAI;aprendizado;
++Keywords[ru]=клавиатура;набор;тренажёр;
++Keywords[sl]=tipkovnica, tipkanje, tutor, računalniško podprto učenje;
++Keywords[sr]=тастатура;куцање;учење;учитељ;КАИ;
++Keywords[sv]=tangentbord;skriva;lära;CAI;
++Keywords[uk]=клавіатура;друк;швидкісний;набір;навчання;уроки;keyboard;typing;tutor;CAI;
++Keywords[vi]=bàn phím;bàn;phím;ban phim;ban;phim;luyện gõ;luyện;luyen;gõ;go;dạy;keyboard;typing;tutorial;CAI;
+ 
+ Exec=klavaro
+ Icon=klavaro
+-- 
+2.34.1
+
diff --git a/app-misc/klavaro/klavaro-3.13-r1.ebuild b/app-misc/klavaro/klavaro-3.13-r1.ebuild
new file mode 100644
index 000000000000..48acb01a0ffc
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.13-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature xdg-utils
+
+DESCRIPTION="Another free touch typing tutor program"
+HOMEPAGE="https://klavaro.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.3
+"
+RDEPEND="
+	dev-libs/glib:2
+	net-misc/curl
+	x11-libs/gtk+:3
+	>=x11-libs/gtkdatabox-1.0.0
+	x11-libs/pango
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://sourceforge.net/p/klavaro/patches/16/
+	"${FILESDIR}"/${PN}-3.13-datadir.patch
+	# https://sourceforge.net/p/klavaro/patches/17/
+	"${FILESDIR}"/${PN}-3.13-desktop-keywords.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	optfeature "instructions via synthesized speech" app-accessibility/espeak
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}