10 files changed, 138 insertions, 104 deletions
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 21e1a7daec5f..90f0ef97289b 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -1 +1 @@
-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.0.1-datadir.patch b/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
deleted file mode 100644
index 869d8238ea89..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -151,11 +151,11 @@
- EXTRA_DIST = $(klavaro_data)
- else
- @INTLTOOL_DESKTOP_RULE@
--desktopdir = $(prefix)/$(DATADIRNAME)/applications
-+desktopdir = $(datadir)/applications
- desktop_in_file = klavaro.desktop.in
- desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
- @INTLTOOL_XML_RULE@
--appdatadir = $(prefix)/$(DATADIRNAME)/appdata
-+appdatadir = $(datadir)/appdata
- appdata_in_files = klavaro.appdata.xml.in
- appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- DISTCLEANFILES = $(desktop_DATA) \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,7 +20,7 @@
- 
- AM_CPPFLAGS = @GTK_CFLAGS@ \
- 	      -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
--	      -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-+	      -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
- 
- AM_CFLAGS = -Wextra \
- 	    -I$(top_srcdir)/gtkdatabox
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
deleted file mode 100644
index bade41bd6664..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -29,7 +29,7 @@
- 
- klavaro_LDADD = @GTK_LIBS@ \
- 		-lgmodule-2.0 \
--	       	$(top_srcdir)/gtkdatabox/libgtkdataboks.la
-+	       	$(top_builddir)/gtkdatabox/libgtkdataboks.la
- 
- if IS_POSIX
- AM_CFLAGS += -export-dynamic
diff --git a/app-misc/klavaro/files/klavaro-3.0.1-static.patch b/app-misc/klavaro/files/klavaro-3.0.1-static.patch
deleted file mode 100644
index 8dea56970bf1..000000000000
--- a/app-misc/klavaro/files/klavaro-3.0.1-static.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/gtkdatabox/Makefile.am
-+++ b/gtkdatabox/Makefile.am
-@@ -1,4 +1,4 @@
--lib_LTLIBRARIES		= libgtkdataboks.la
-+noinst_LTLIBRARIES		= libgtkdataboks.la
- libgtkdataboks_la_SOURCES= \
- 			gtkdatabox.c\
- 			gtkdatabox_marshal.c\
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/files/klavaro-desktop-keywords.patch b/app-misc/klavaro/files/klavaro-desktop-keywords.patch
deleted file mode 100644
index 5d497480e869..000000000000
--- a/app-misc/klavaro/files/klavaro-desktop-keywords.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
- # 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=keyboard;typing;tutor;CAI;
- 
- Exec=klavaro
- Icon=klavaro
diff --git a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
deleted file mode 100644
index 5a0721302c5c..000000000000
--- a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-BDEPEND="
-	dev-util/intltool
-	dev-util/gtk-builder-convert
-	>=sys-devel/gettext-0.18.3
-"
-RDEPEND="
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-# gtk+3 version needed
-#	x11-libs/gtkdatabox
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-out-of-source.patch
-	"${FILESDIR}"/${P}-static.patch
-	"${FILESDIR}"/${P}-datadir.patch
-	"${FILESDIR}"/${PN}-desktop-keywords.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
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..5e77b6a2178d
--- /dev/null
+++ b/app-misc/klavaro/klavaro-3.13-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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.io/"
+SRC_URI="https://downloads.sourceforge.net/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-ng
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/klavaro/metadata.xml b/app-misc/klavaro/metadata.xml
index 0320234782c0..b836b565da26 100644
--- a/app-misc/klavaro/metadata.xml
+++ b/app-misc/klavaro/metadata.xml
@@ -1,5 +1,5 @@
 <?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 -->
 	<upstream>