gentoo auto-resync : 23:09:2023 - 17:20:26

5 files changed, 49 insertions, 26 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index cf2144c1845e..bff2cb02f054 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
index 0e09539d96c2..c7d60b3b5198 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,4 +1,5 @@
-AUX gmult-12.0-vala-0.56.11.patch 468 BLAKE2B 31a1b5fcffe809c8748d47ccb6c774c97affc211c05d70a05d15be685600bece5c614d4bdbceb0d8e0163997235b9474305c985918831c367128a9eab41aede2 SHA512 8bfdc1a4fdaa212220d4dfe9557a63187758cfcbf7162e3ffac305b3b426045e6dc1b73d7f027d175baf72a1fe0997e14e5006f5836ae4e99a8ab54446c13e77
 DIST gmult-12.0.tar.bz2 195103 BLAKE2B d1d93190a607dc62bf4809dff7c5240c97f49dc4c833ea91028e9810961125eadba6fac41852b53f674b14c1e4c777a8d9ed58496ad2641ad99ed961041c40c8 SHA512 617b51defaf61c7967c9ccd6898209330733709df4290717e6c158719d04c61a38fa6832197c937f8aef1da23dc2f820c707291761ef8437ab0e78850253768c
-EBUILD gmult-12.0.ebuild 1177 BLAKE2B 5143d3e64fb2f6f128f21b52e4d90fedc7949acaaa865bedeee08390ecc911e996515309c986d7f134232794a565781db78a6275c96fb98c1a760f3978df5f1a SHA512 598f9752ab9ccd1a2730e233f23af3394720a812d14984f657b60b131323bfc3793d37be2fd405cd688a0a5696bc597836ede371fa6c65219553e5b9011650c0
+DIST gmult-13.0.tar.bz2 202650 BLAKE2B 894a7a5fda188497e4c3a431f40b1ccff6ab875e2938b8d4174fa8d1925087b921eca989a7678d9c99c8afc242c5ad741de0b88947a094da40469b6c1f803ac0 SHA512 08c162c6a7184d38044fd11f1bb04b50dd0ab763c60150bb3b706faff8b4ea360fd44c53bd41422e164593a869416a366927f9b90c923b372cf1f25b61b424a1
+EBUILD gmult-12.0.ebuild 919 BLAKE2B 410c3246b158984da98e17c7e6964b3b53e89c654f3f3f3da018f609223097ac1e53bc3c1dfb30e74245aa857ea43fd81fa4287e98bb019a02a4ce61fcd346c8 SHA512 2903c01156c13a410ded80ce0bf4c38946b3da7651d155c1b1926d72a7b2d18b674ef59c2485fa4d8105979afe25e1be435fa8c561b4d85a813390e5a6108013
+EBUILD gmult-13.0.ebuild 919 BLAKE2B 410c3246b158984da98e17c7e6964b3b53e89c654f3f3f3da018f609223097ac1e53bc3c1dfb30e74245aa857ea43fd81fa4287e98bb019a02a4ce61fcd346c8 SHA512 2903c01156c13a410ded80ce0bf4c38946b3da7651d155c1b1926d72a7b2d18b674ef59c2485fa4d8105979afe25e1be435fa8c561b4d85a813390e5a6108013
 MISC metadata.xml 337 BLAKE2B b8fb50568754e9544c17fad92f9be53263e1b292b61506fb616b263d39c53c7943741a156ef2a94d25415a8b55d1bc5a974f3807147d8a7152242ba2a8505c02 SHA512 60bb053c0f86be5ce8f8fa29715e2a0072d502a7600c95cf06b9f5e478ee7b9ade83899001e63b32e4ee6364b0da79df039a778e22f055628bc42e1d2185fdde
diff --git a/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch b/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch
deleted file mode 100644
index fb0ba7a5227d..000000000000
--- a/games-kids/gmult/files/gmult-12.0-vala-0.56.11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-vala-0.56.11 gtk4 bindings seemingly broke API, and so this
-workaround must either be applied conditionally or depend
-on >=vala-0.56.11 as it breaks older VALA_0_56 and we cannot
-check for minor versions from defines.
-
-https://bugs.gentoo.org/912438
---- a/gmult/main.vala
-+++ b/gmult/main.vala
-@@ -108,4 +108,4 @@
-     var provider = new Gtk.CssProvider();
--#if VALA_0_58
--    provider.load_from_data(css);
-+#if VALA_0_56
-+    provider.load_from_data(css, -1);
- #else
diff --git a/games-kids/gmult/gmult-12.0.ebuild b/games-kids/gmult/gmult-12.0.ebuild
index 6fda353fb576..d30313af7d24 100644
--- a/games-kids/gmult/gmult-12.0.ebuild
+++ b/games-kids/gmult/gmult-12.0.ebuild
@@ -30,15 +30,6 @@ BDEPEND="
 
 DOCS=( NEWS.md README.md )
 
-src_prepare() {
-	default
-
-	# TODO: verify if this is still needed with new vala releases
-	# as it may instead break them if reverted (see patch for details)
-	has_version -b ">=dev-lang/vala-0.56.11" &&
-		eapply "${FILESDIR}"/${PN}-12.0-vala-0.56.11.patch
-}
-
 src_configure() {
 	vala_setup
 	meson_src_configure
diff --git a/games-kids/gmult/gmult-13.0.ebuild b/games-kids/gmult/gmult-13.0.ebuild
new file mode 100644
index 000000000000..d30313af7d24
--- /dev/null
+++ b/games-kids/gmult/gmult-13.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
+HOMEPAGE="https://gitlab.gnome.org/mterry/gmult/"
+SRC_URI="https://gitlab.gnome.org/mterry/gmult/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # only used for unnecessary .desktop/.po validation
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gui-libs/gtk-4.10:4[introspection]
+	>=gui-libs/libadwaita-1.3:1[vala]
+	virtual/libintl
+	x11-libs/cairo
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	sys-devel/gettext
+"
+
+DOCS=( NEWS.md README.md )
+
+src_configure() {
+	vala_setup
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}