gentoo resync : 20.10.2021

4 files changed, 60 insertions, 30 deletions

diff --git a/app-misc/kanatest/Manifest b/app-misc/kanatest/Manifest
index c0bc2870344f..bcdbbc7cc8a2 100644
--- a/app-misc/kanatest/Manifest
+++ b/app-misc/kanatest/Manifest
@@ -1,6 +1,8 @@
 AUX kanatest-0.4.8+gtk-2.22.patch 967 BLAKE2B d8e0802faeccdf32449ec49ff6f2a828dbf78663d690ed543a6e5cae20fa651de4e106476408bff623e016fe446f06641cfedba06d3d07031b1705b360c67a24 SHA512 d996ba512c7b10d8971cd5f7ee1bd25517f1847f3f4466e25b3217fbff23c6164ac51e5d29bc4ed6f6e02251e02f00b5d430e004d50b8f00eab468efc4f51def
 AUX kanatest-0.4.8-autoconf.patch 363 BLAKE2B 4f73332578adaeae1d9cd9368e377b76810e1b1c4c2e8fe02f2e647c15b95bd4bd860a24955b27b7ee223a321e0fa88386b45ae47f3786dc4f23a00e1ad7dd39 SHA512 25dff41e539ce5b758799df673735407c13560762a091a886e552c26be4dd7191bcd867523756e1f0b52066c13774ee16d5b1a32deb94e0355a9ae1396d0cf54
 AUX kanatest-0.4.8-cflags.patch 432 BLAKE2B 95da5c15032bf7476814da5b2a8d946f8a65f19e410618a59c3872122f2d9fd8499b1bc273941152034e0860f5700060eb96360012b20ab5a95c058f12bd250f SHA512 7d1d9ffda261a918d37b76fac63e641428c41ac225845cfe58b1bf5e4c8908447c56340f581b918ef55d34754f7b795d4cd0fb1eb03ea6327e43b719a95a367d
+AUX kanatest-0.4.8-desktop-QA.patch 388 BLAKE2B e894bc7497920187e1c9469b93860bfe0cbdf089f05b3392c2137379253085aba22316f8cd126e7a8b8017e90373e66f56cd0bd0f15cf500d54424aea83c0286 SHA512 7cee66cff16552831bb935f93eb2144a6b35ab4563be0750beaf83da95f7cf54292b29d70f92b4b4be9202784c56e5bd082df49d870cd22a5fb89380112a2ca9
+AUX kanatest-0.4.8-format-security.patch 1151 BLAKE2B bffee4a4301b78e92cad399457cb988754380c42c9e880148b3b7c4b01b06f013b623a05941d43f55d580d304d156ff6830322126a1610e2c6bea6cbba2f6f6a SHA512 6d97fbf0fc4e7013e43db609f193efd28eda45e209b70d2310efa1ae525da554c8b59abb514fd5a085973dd0c1532bafca6fc0514b1e8fe6144c5d39d3a6124e
 DIST kanatest-0.4.8.tar.gz 302154 BLAKE2B b5bc8668f2526abef3ec576c5781b16d7c226f744613a38010125bcb1c977f0fc0b58809ba2a468a216f4b4d7b974e0d12693eea9754cc4a0ce75efcedfb1333 SHA512 c52a5e4104c17eae29f03f30abd7f003c83757e04298427112593603eab0edf7d7927b0567a053f2ea3b8aac66921546180c452d84ef6b3cdc2a361f14cbac47
-EBUILD kanatest-0.4.8.ebuild 950 BLAKE2B a3e9df62e38ae30ce582c571cfbf965bc9f36efd25fa5203800b9cacdf056d24ba7bcbebe7486a4360c404f2c46f8d081a7de3bb6b7814dd562adbb683373914 SHA512 73bf94c9e66e22184feb62719a604e99e3333e19a2e07bd69e8d940fdf4a9de51d8652697b265ae5491f4ba557b271b9f6e2adc569ff3e8e763c65600e53b5e5
+EBUILD kanatest-0.4.8.ebuild 767 BLAKE2B 24e1f3f6aadc241150bff453d104db334e9ebc6d7821777d426bd712fb247cf3eb5e09110730e7f18edd56a26c1409d10ecca39b8b4bac0480e022e3857843e7 SHA512 ad7d2b67465a54d5b3dc87ad9f405f14a977015c359448a23278df7e47154d0e2c61f2f676897959a5ada0571f4deeefd06b6d6444f69046cd0c82b8d2e2fb97
 MISC metadata.xml 231 BLAKE2B c2fdc9ca113ea1fb6cb14f865609798058c3443d097117d61de82b4f53e8d293bc187413600b6a6eb3e1c744ae7712bf8c55db53562076e7bc5de5eae0c1f209 SHA512 281ccb55b01108f6fd9953a4fc8723e312c6416b885b11a32d2a0d4d532ebbc361990c814402bc8061e360c02b8074797b1b68ee9a8bc96d37f2cb6455e5949c
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
new file mode 100644
index 000000000000..83169e34a9ad
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
@@ -0,0 +1,16 @@
+--- a/data/kanatest.desktop
++++ b/data/kanatest.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Hiragana and Katakana Test
+ Comment=Hiragana and Katakana drill tool
+ Exec=kanatest
+-Icon=kanatest.png
++Icon=kanatest
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+ X-Desktop-File-Install-Version=0.10
+-Categories=Game;Application;X-Fedora;
++Categories=Game;X-Fedora;
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
new file mode 100644
index 000000000000..7493d0a7bd15
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
@@ -0,0 +1,22 @@
+--- a/src/stats.c
++++ b/src/stats.c
+@@ -84,7 +84,7 @@ gchar buffer[BUFFER_SIZE];
+ 
+     info_dialog = gtk_message_dialog_new (GTK_WINDOW(appGUI->sts->stat_window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, buffer);
++                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", buffer);
+ 
+     gtk_window_set_title(GTK_WINDOW(info_dialog), _("Question"));
+     gtk_widget_show (info_dialog);
+--- a/src/test.c
++++ b/src/test.c
+@@ -538,7 +538,7 @@ test_info(GUI *appGUI) {
+ 
+     info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
+                                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message);
++                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message);
+ 
+     gtk_window_set_title (GTK_WINDOW(info_dialog), _("Information"));
+     gtk_widget_show (info_dialog);
diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index d24f05ecee86..c1d64fbe9eb8 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -1,48 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch gnome2-utils
+inherit autotools xdg
 
 DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://www.clayo.org/kanatest"
-SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.clayo.org/kanatest"
+SRC_URI="https://www.clayo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2=
+RDEPEND="
+	x11-libs/gtk+:2
 	dev-libs/libxml2:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS TRANSLATORS ChangeLog README )
+PATCHES=(
+	"${FILESDIR}"/${P}+gtk-2.22.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}+gtk-2.22.patch \
-		"${FILESDIR}"/${P}-autoconf.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/^Categories/s:Application;::' \
-		-e '/^Icon/s:.png::' \
-		data/${PN}.desktop || die
-
+	default
 	eautoreconf
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+src_install() {
+	default
+	dodoc TRANSLATORS
 }