gentoo resync : 22.12.2021

8 files changed, 58 insertions, 54 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 1a1352e0b891..d8061fb0ed17 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index 06175e0813b2..7f51b69e4a8b 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,4 +1,3 @@
-AUX freesweep-1.0.1-gcc10.patch 952 BLAKE2B ca47bd9364ce4af021a1e7387cb72e2649eec763461565a8fe2defaf097821a19a78c71927470645a51a8cdb500ac1ef87fa62758bd861580e4fc25c0ff9a6b1 SHA512 599979daf9d7a902d2c164a4355ccdc6be7cf2fa82a56cbbbd7ff958c4fb19ffceff0dec11bb0d27ae5b14525fff3392ed6302e912601f89fc7870a63202cb5e
-DIST freesweep-1.0.1.tar.gz 93966 BLAKE2B 8eab63930e41067e2e5626a4504bef00db58bfde54a43c4512bed2e8ae186d165b5b15acf8c1074a8b02e1d63876fb4e36b8c78f181c7d86d055976a15b8ec83 SHA512 8270c77940225c8ebf0912ac896eaaaabd81775a82877650f3b9c2e0cf3b6a296b73f02ebc26e8fe526fc56f3807d9a2809f46e44b3d8507f011f9cf2c794099
-EBUILD freesweep-1.0.1.ebuild 632 BLAKE2B 2c03220ac3e6c6c879e0885ceef5ccdf44906d4faf1a873e51d1506f73a116e804fca1590d0f7dce231baa660b276d3b406a51ec7be56ac81c97f3db92862c69 SHA512 8938944353bc412ff2420f2587ba0ff161afba39f706fa33a2335de022b34fdb531c88dc6c74bd390e803a02e2540aab2856251dad88cfe431acb2626734f1da
+DIST freesweep-1.0.2.tar.gz 93986 BLAKE2B 306c0e87448534c23c7754f9bedbaf9d72ee705bfdb3cc08a004076bd56a117f4bbb19f4676282edccc57286b5135d6714d6ad2e94a903235c8f4bb9a305ad77 SHA512 1695bb29efbaed5e6baf5faadcbd685e8e6b4ccb5d52567a833b5f5eeb69200fc220579fea7d6907bffc92a06e9b220bca494e8597394820a421f81f0af1d3aa
+EBUILD freesweep-1.0.2.ebuild 594 BLAKE2B 82eb1012fe39bb870aa1019d9a499740eb69443f3e4f62e1bd2c3cf963ea2e6f9d329426e8479b19ee50c6daafb9b069f752a0006c9b05e4c8531904be385543 SHA512 9d337152160815f391343763391d0aaa0a19eb71d3f51b873c75ef6763cfa9756d46add5e2900540efcede45d35eef35cea85e7f90f633a1831c28d03e7ff97c
 MISC metadata.xml 338 BLAKE2B a77722d450cf98aefc1863f0ae843136c7d0846947422884bbe565033566bd17fecdbe67fde708c624a3989c2082e9b07797d3ddf87c4ad01c579ba896d970cb SHA512 5cf55926ac66e6476db9ffde0ca7370f11348bd3785913794c2226706e42de3e045a8d33b39f68598f47b4e9f59885751dced131e9389c12a0db16908eb8bf38
diff --git a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
deleted file mode 100644
index 4288c8b26a2c..000000000000
--- a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a86245df4f3ff276a393f799d737d28a5cb0a5a8 Mon Sep 17 00:00:00 2001
-From: Reiner Herrmann <reiner@reiner-h.de>
-Date: Thu, 23 Apr 2020 00:46:58 +0200
-Subject: [PATCH] Fix build with GCC 10
-
-mark variable declaration in sweep.h as extern, as otherwise
-linker would complain about multiple definitions.
-keep actual declaration in a C file.
----
- main.c     | 2 ++
- sweep.h.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index 6411dcb..8d5cbe7 100644
---- a/main.c
-+++ b/main.c
-@@ -10,6 +10,8 @@
- 
- #include "sweep.h"
- 
-+DrawChars CharSet;
-+
- int main(int argc, char** argv)
- {
- 	GameStats* Game;
-diff --git a/sweep.h.in b/sweep.h.in
-index f30c133..7f398de 100644
---- a/sweep.h.in
-+++ b/sweep.h.in
-@@ -246,7 +246,7 @@ struct FileBuf
- FILE* DebugLog;
- #endif /* DEBUG_LOG */
- 
--DrawChars CharSet;
-+extern DrawChars CharSet;
- 
- /* These are the functions defined in files.c */
- int SourceHomeFile(GameStats* Game);
diff --git a/games-puzzle/freesweep/freesweep-1.0.1.ebuild b/games-puzzle/freesweep/freesweep-1.0.2.ebuild
index 3a27c3f4f0b9..abe5e0cb0e2b 100644
--- a/games-puzzle/freesweep/freesweep-1.0.1.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Console Minesweeper"
 HOMEPAGE="https://github.com/rwestlund/freesweep"
 SRC_URI="https://github.com/rwestlund/freesweep/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
-RDEPEND="sys-libs/ncurses:0="
+RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
 src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
 }
 
 src_install() {
 	dobin freesweep
-	einstalldocs
 	doman freesweep.6
+	einstalldocs
 }
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index b68ae0c9e11d..0db6e23e358a 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
 AUX pathological-1.1.3_p16-pygame2-compat.patch 1954 BLAKE2B e1670210cdad9f957f76f20ca5bbdc2cccfef9c37353dc00ffeb10c87473972b0066d2413c42c80541bfa23059cffe5143ad2791ec816a06654f4e5dedbb8551 SHA512 e63b964849803020cb68ed908b317fea81c60b5360cbd9cf10e3836483250972764352e619afb836196b50732360fac3da88a68d3863431a9b5f8a74535a2023
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
 DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
-EBUILD pathological-1.1.3_p16-r3.ebuild 1682 BLAKE2B 82abefa183235d72c9d5036052d8090cf34491b31eaaf39f79cb4da21fdee8b41d9c3ab9137a795da344a732497c48d544bf8f8d0b872961cce361b3172dbe0d SHA512 5cebbdead906abe02c24d0d0f970488a54eea86bbd1c66794abd6a6a484f253cdfcb606e8508bf0a5a53184d1230d660a4f672f6931d432eb192d97a41f41c5f
+EBUILD pathological-1.1.3_p16-r3.ebuild 1697 BLAKE2B fc67b86410ffe646678d3f5d86731b40b66dc3d1457c9f05823b3499524d44a088f448a3952258e6ff7146878acd21b2bc25c0204a4eab0d4d0387866e3a3190 SHA512 dbe197343def9d6ce68f4afa0173a426668d262ed61e3c38d6d203a0d7c216b027182809c51aeadb1fa5ea6c1912b9bde119f182dfdfb52cd06f13ecb604e14c
 MISC metadata.xml 336 BLAKE2B 359f5565f58bfe5b62b7f7af3b062185641e53e861e0191f010d9842e1a3d77dbd0dd5eb61c68b85cb00151c47c9b8223bdfbdf1ac57ab885f812bf94c50f15e SHA512 aa01ff164bcaa993d52746a3b3bdf5913646c0822253c227133c8ed5f3bdb8636195d2ba7e3b125f00ec901d2f3182cec39fb41fcea7b0948f1641d9d2ab739c
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
index 0c32cefd318d..a16de8ecbe0d 100644
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 src_prepare() {
 	# debian's patches add python3 support and sanitize other aspects
 	# use_ogg_music: excluded given .xm files are fine
-	local debian=($(<"${WORKDIR}"/debian/patches/series))
+	local debian
+	debian=($(<"${WORKDIR}"/debian/patches/series)) || die
 	debian=(${debian[@]/60_use_ogg_music.patch/})
 	PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
 
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 6548c64a0c00..c38953398e7c 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,5 @@
 DIST swell-foop-40.1.tar.xz 821744 BLAKE2B 598af5d5bdeab2b6c3aca849e8c0a1f0c9690d14bc859c4c89bdf0577868efd7450f88e0039925e3cb83c60cd9943965382592962dc49fca31dac933099b7321 SHA512 99a90030eec32163f84e238458fca74b8ba19c7b804dc3f65d7f8f50f3d7f45dfd1cf45d383e332cad6c18fdf5d4eb79bf3c7b9f406a02431ed787b23a1c8cb7
+DIST swell-foop-41.0.1.tar.xz 758800 BLAKE2B 5df8870f5be52a4dfec9c012a2496e9b727eb93d01480bedb1c836b8b399f9b42ff36b18c78dad7ca26dd9da6b143229064167423fba3d7630a86d5108e4f3d2 SHA512 b579616cddb77fb3e6d6a8b382fe4b9692a884d62b0907fd551048dbfe28d3f031ac9c8e43e2888ee408a51bccb026109cd9e9ac371b475eaffebb1d9c237c11
 EBUILD swell-foop-40.1.ebuild 873 BLAKE2B afb45ae03f89af2386f6bb030152574908ab204d97143c47878fd495abc011767f41cd34f977cf8e6158cff9fc30b774d2581e8074f76c56b5824043cca7a85f SHA512 61ccbf3ca403820c6cad19c2f2efbb4d46a278a2bc00821a8e077d899eabb32c7fcc0c7174e189d2e31aff086f13e8f312df48d20e03b130f0db1c0d04617f06
+EBUILD swell-foop-41.0.1.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild b/games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
new file mode 100644
index 000000000000..763530ce1aca
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-41.0.1.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
+}