gentoo resync : 31.05.2021

4 files changed, 2 insertions, 97 deletions

diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 0e3405ace762..fcc7110fdf8e 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,8 +1,4 @@
 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
-DIST swell-foop-40.0.tar.xz 821796 BLAKE2B c831a3ed4fc2f53a85793f19dee2e481970784dca4b092db7f905123073b185608fbd8c0a4d8b0c2a74fc4f48e982c4d39b88132381b2a4155609398868825fd SHA512 018a51fdc0e54d9f011a90757fad9d568df33b33241cff9281a49306b8cc236e173e251e8b7ae769a8096f0c9893d496108e4183382ac2f116128fce99774a00
 DIST swell-foop-40.1.tar.xz 821744 BLAKE2B 598af5d5bdeab2b6c3aca849e8c0a1f0c9690d14bc859c4c89bdf0577868efd7450f88e0039925e3cb83c60cd9943965382592962dc49fca31dac933099b7321 SHA512 99a90030eec32163f84e238458fca74b8ba19c7b804dc3f65d7f8f50f3d7f45dfd1cf45d383e332cad6c18fdf5d4eb79bf3c7b9f406a02431ed787b23a1c8cb7
-EBUILD swell-foop-3.34.1.ebuild 861 BLAKE2B d20089e12c8fe6ecbe777dd4402bc48422be515e36799ce039f8c36affdc673960095e3b495e16487e2a8227ab04ecd5b929c81e59f3297c19637ead0fffabf4 SHA512 c26a7b69a1556a90233eae98a64435e29229be57db26628bceb9ac6800da076235e078b3a6d957961ca60fd80efbdf09d18371cea75aa2e048bb25b19cbdbdc0
-EBUILD swell-foop-40.0.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
-EBUILD swell-foop-40.1.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
+EBUILD swell-foop-40.1.ebuild 873 BLAKE2B afb45ae03f89af2386f6bb030152574908ab204d97143c47878fd495abc011767f41cd34f977cf8e6158cff9fc30b774d2581e8074f76c56b5824043cca7a85f SHA512 61ccbf3ca403820c6cad19c2f2efbb4d46a278a2bc00821a8e077d899eabb32c7fcc0c7174e189d2e31aff086f13e8f312df48d20e03b130f0db1c0d04617f06
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
deleted file mode 100644
index d3d72fffdb64..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 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"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.12:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.0:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.34.1-fix-vala-0.50.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/swell-foop/swell-foop-40.0.ebuild b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
deleted file mode 100644
index 763530ce1aca..000000000000
--- a/games-puzzle/swell-foop/swell-foop-40.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-}
diff --git a/games-puzzle/swell-foop/swell-foop-40.1.ebuild b/games-puzzle/swell-foop/swell-foop-40.1.ebuild
index 763530ce1aca..fc264a49ff74 100644
--- a/games-puzzle/swell-foop/swell-foop-40.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2