gentoo resync : 28.04.2021

4 files changed, 77 insertions, 1 deletions

diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 61cca005e673..2ce6221b5549 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,6 @@
+AUX 3.34.1-fix-vala-0.50.patch 757 BLAKE2B 47d92ba8487ed20161481abb7553f68043928dbe2a42f69635943f22c0d35006564a3b226d93b79ed0306572cb4d65b56e22fce5d40905015a421f25ba58aa5c SHA512 6c247e6c9d266f9fb3be929727cabdc3a5d0bca3214663dd87b22da68729dfbd53c2f9d21dee307fa4399eb912ee0ba0d15a0fda526f8abcf6b6bf9672de203f
 DIST swell-foop-3.34.1.tar.xz 732008 BLAKE2B e41527ce485fc7d41b3b8667fba1100fc79a1683adbe7948ecb0f73b418f5e8bcd8c5eeb15c1083cfcbb0237294016ea49510ae6103e2cfc6bc93b508a61a02f SHA512 53625882a755959349f259f5527a48f926e6b8e0493eb81ac257fed6869b87d48e789e4a2141bee7aa8910fb061ca9d7541ceef7f3bdb7a5138068cc6dd16b81
-EBUILD swell-foop-3.34.1.ebuild 806 BLAKE2B 06d62d325011ef75b857bc92cf0240bf14fcfd7203dc969458e2c472df31c1a4afe8296d73d97d73030141b1bac0de9918729fb9089999d706c1406008f72b72 SHA512 edb409ca716211e2646c19d6eca82f738161e1b264b5b8c1f8ae7d5614e345544a6a9ad29d53bbc7164d0070e741edfb456eadc84f4f62efa62837d5c6df1a0c
+DIST swell-foop-40.0.tar.xz 821796 BLAKE2B c831a3ed4fc2f53a85793f19dee2e481970784dca4b092db7f905123073b185608fbd8c0a4d8b0c2a74fc4f48e982c4d39b88132381b2a4155609398868825fd SHA512 018a51fdc0e54d9f011a90757fad9d568df33b33241cff9281a49306b8cc236e173e251e8b7ae769a8096f0c9893d496108e4183382ac2f116128fce99774a00
+EBUILD swell-foop-3.34.1.ebuild 861 BLAKE2B d20089e12c8fe6ecbe777dd4402bc48422be515e36799ce039f8c36affdc673960095e3b495e16487e2a8227ab04ecd5b929c81e59f3297c19637ead0fffabf4 SHA512 c26a7b69a1556a90233eae98a64435e29229be57db26628bceb9ac6800da076235e078b3a6d957961ca60fd80efbdf09d18371cea75aa2e048bb25b19cbdbdc0
+EBUILD swell-foop-40.0.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
new file mode 100644
index 000000000000..ddc189ff54da
--- /dev/null
+++ b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
@@ -0,0 +1,25 @@
+From a366bf649c032c56f52138d14e2b96b4a48525de Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Thu, 2 Jul 2020 15:28:02 +0200
+Subject: [PATCH] Don't use unsupported vala syntax
+
+---
+ src/game-view.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/game-view.vala b/src/game-view.vala
+index 1fb0c4b..69b50b8 100644
+--- a/src/game-view.vala
++++ b/src/game-view.vala
+@@ -451,7 +451,7 @@ private class Theme : Object
+     internal Theme (string name)
+     {
+         textures = new Clutter.Image [4];
+-        string[4] colors = {"blue", "green", "yellow", "red"};
++        string[] colors = {"blue", "green", "yellow", "red"};
+ 
+         /* Create the textures required to render */
+         try
+-- 
+2.26.3
+
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
index 1073712ed558..d3d72fffdb64 100644
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	$(vala_depend)
 "
 
+PATCHES=(
+	"${FILESDIR}"/3.34.1-fix-vala-0.50.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/games-puzzle/swell-foop/swell-foop-40.0.ebuild b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
new file mode 100644
index 000000000000..763530ce1aca
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/gtk+-3.24:3
+	>=media-libs/clutter-1.14.0:1.0
+	>=media-libs/clutter-gtk-1.5.0:1.0
+	>=dev-libs/libgnome-games-support-1.7.1:1=
+	>=dev-libs/libgee-0.14.0:0.8=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}