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

["Florian Schmaus" <flow@gentoo.org>]

commit:     ac9dd667df5bf993ae66bd24cffd351aed49d4c0
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 17:44:05 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 17:44:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9dd667

app-misc/klavaro: add 3.13

Closes: https://bugs.gentoo.org/734250
Closes: https://bugs.gentoo.org/831197
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/klavaro/Manifest                          |  1 +
 app-misc/klavaro/files/klavaro-3.13-datadir.patch  | 13 ++++
 .../files/klavaro-3.13-desktop-keywords.patch      | 73 ++++++++++++++++++++++
 app-misc/klavaro/klavaro-3.13.ebuild               | 45 +++++++++++++
 4 files changed, 132 insertions(+)

diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 21e1a7daec5f..ae8b0d97a5f6 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1 +1,2 @@
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
+DIST klavaro-3.13.tar.bz2 1237015 BLAKE2B f6cf83005217e924ff1ea9a596d1154a3225298142722eb51609411f74444d73cb5d4a98fc11634185c3ca857b566d33396c841cb40f925e2d84b7180c357c57 SHA512 17765be33305a722f8d23006353c5de812075decc7931c596bd8c7efe2d93657687847f007adb4e7f758a535fd3cded36581fd1e9f5b4af7d6d3b441b7245b36

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.ebuild b/app-misc/klavaro/klavaro-3.13.ebuild
new file mode 100644
index 000000000000..ccb81f02cfd6
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.13.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature
+
+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() {
+	optfeature "instructions via synthesized speech" app-accessibility/espeak
+}