summaryrefslogtreecommitdiff
path: root/games-puzzle
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /games-puzzle
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/Manifest.gzbin17116 -> 17132 bytes
-rw-r--r--games-puzzle/biniax2/Manifest5
-rw-r--r--games-puzzle/biniax2/biniax2-1.30-r1.ebuild42
-rw-r--r--games-puzzle/biniax2/biniax2-1.30-r2.ebuild49
-rw-r--r--games-puzzle/biniax2/files/biniax2-1.30-build.patch9
-rw-r--r--games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch17
-rw-r--r--games-puzzle/brainworkshop/Manifest8
-rw-r--r--games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild48
-rw-r--r--games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild56
-rw-r--r--games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch12
-rw-r--r--games-puzzle/brainworkshop/files/brainworkshop-5.0.2-datadir.patch7
-rw-r--r--games-puzzle/brainworkshop/metadata.xml2
-rw-r--r--games-puzzle/hitori/Manifest2
-rw-r--r--games-puzzle/hitori/hitori-3.38.2.ebuild36
-rw-r--r--games-puzzle/meandmyshadow/Manifest7
-rw-r--r--games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch17
-rw-r--r--games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild54
-rw-r--r--games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild43
-rw-r--r--games-puzzle/meandmyshadow/metadata.xml1
-rw-r--r--games-puzzle/nudoku/Manifest2
-rw-r--r--games-puzzle/nudoku/nudoku-2.1.0.ebuild6
-rw-r--r--games-puzzle/pathological/Manifest4
-rw-r--r--games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch12
-rw-r--r--games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch68
-rw-r--r--games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild110
-rw-r--r--games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild74
-rw-r--r--games-puzzle/pauker/Manifest2
-rw-r--r--games-puzzle/pauker/pauker-1.8-r2.ebuild (renamed from games-puzzle/pauker/pauker-1.8-r1.ebuild)6
-rw-r--r--games-puzzle/pingus/Manifest3
-rw-r--r--games-puzzle/pingus/files/pingus-9999-no_libexec.patch33
-rw-r--r--games-puzzle/pingus/pingus-9999.ebuild53
-rw-r--r--games-puzzle/quadrapassel/Manifest2
-rw-r--r--games-puzzle/quadrapassel/quadrapassel-40.2.ebuild49
-rw-r--r--games-puzzle/swell-foop/Manifest1
-rw-r--r--games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch25
35 files changed, 439 insertions, 426 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index e35a7b6b5a34..2dcb2aee8b32 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
Binary files differ
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
index 574da8e3dffc..187c8e805838 100644
--- a/games-puzzle/biniax2/Manifest
+++ b/games-puzzle/biniax2/Manifest
@@ -1,6 +1,7 @@
-AUX biniax2-1.30-build.patch 529 BLAKE2B 4c1a391a9d4534d83b017962c62d8cc776cf44a53f942d468f5e033287158ad7781451a174901e06103f73af216eb1792bb0f18f7941367c2ba9d1d2eaf7ec63 SHA512 3f335b2e71c81f46298c188a1cd3fc5e74210ddb79c4ec514156bfc581125aaf3aaee792f1f86b2b87edc6f8507cee577d817d3c15ce6691c45624c9def11b50
+AUX biniax2-1.30-build.patch 244 BLAKE2B 03dc0143569127afd2d52c5242d6e8fa83f1e5a09d1616d6b96789d88effa6b38820fa219674b28a3a11351f8e403310d1fe8c3e33b22eca5974d2ffbcdc6589 SHA512 e070bbaa29099aeafb192742fd5907e146fc93b3214a585da09a9d2bf2ade06f7acbfc0951fb721f0d0bd8139a40ee0a7fdf949a576611f3067009d373a83a1f
AUX biniax2-1.30-dotfiles.patch 1372 BLAKE2B 2e33067d9fa951d371093ef33c61303e93760707730ce513f951235b3dad0ff146c6b8132f722da29ec05c61fb5a50eeb58e92ea50251a09e56bfcbd538a1b19 SHA512 7cc2c04ee62931038afe7b89eaeffef33e7e9312a206b987817760c6537c1923945634243abc380b059fc332d12b220d83660f5158f832d1dadb854dc1ea5fa3
+AUX biniax2-1.30-fno-common.patch 389 BLAKE2B 0b871740561bcd0a30b7f820bfc8a3f18180d12afd33623da5e15343f987acf3cd8b2a1282bce259dedf6a9a0663a37e3ddf16d42ec92d9b4adb2be152970b7f SHA512 22f5c509133b65ef12358298ab1486f69805e7a40475c598087f512e4a2fbf84086e2d98864a055c67703ffbe0c7dd89d885506b7b14d10b86c06c9a0c8c3a8d
AUX biniax2.xpm 1292 BLAKE2B de60ee16f9229155b2a31682f759b025822eed85bfbe2b7c3d83cd18df230dd3a62bff7d5a5c11e496715a4e3565bee1e565cfbfae15b634993a3c26ec29b070 SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58
DIST biniax2-1.30-fullsrc.tar.gz 3072220 BLAKE2B 7a62f9cf625e7f7d59ac6b84528911f939e489da131a7b414fcdc7cb4acffe1877363983a190aacbc2ce8ca87ae5a631ecc1f9bc937c103b65b6c0543c3cb641 SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5
-EBUILD biniax2-1.30-r1.ebuild 805 BLAKE2B e3277770de490616fa92e5e2f6bfac4f469a2ae6c31726f9e6e1818702a39248026550c7c4282df0a224d298ba8717e4d44facc43868159e81fcb33f0788f87d SHA512 d8f89846c14ff7232284a097032674d164ede3ce12b563be2a0afce5305deddcd1c460f42f299d798da235c56e098c31ee376dda47b0e41f190f5c3968a3b245
+EBUILD biniax2-1.30-r2.ebuild 907 BLAKE2B e5b996f119a23ba06ac2faafe9db3c89a947f69ee500fcf2265b4ba675e6b0bebc987cc3822cecd9d34e50fca008312f07ac5c8552c71c31498813378c4b918c SHA512 32c3c56c5b2d7190fb2ee3f72f8fbe61a2ae25629b090a74ba7d802a6c10320dd100d5f2d723b84e3db55fa177b0b3c7b163201fad72353227a5d5fc08629aec
MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
deleted file mode 100644
index e4710407e8e7..000000000000
--- a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Logic game with arcade and tactics modes"
-HOMEPAGE="http://biniax.com/"
-SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
-
- rm -f data/Thumbs.db
- sed -i \
- -e "s:data/:/usr/share/${PN}/:" \
- desktop/{gfx,snd}.c \
- || die
- eapply \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-dotfiles.patch
-}
-
-src_install() {
- dobin ${PN}
- insinto "/usr/share/${PN}"
- doins -r data/*
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry ${PN} Biniax-2
-}
diff --git a/games-puzzle/biniax2/biniax2-1.30-r2.ebuild b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
new file mode 100644
index 000000000000..533449cd9a87
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Logic game with arcade and tactics modes"
+HOMEPAGE="http://biniax.com/"
+SRC_URI="http://www.tuzsuzov.com/biniax/${P}-fullsrc.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-dotfiles.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+ default
+
+ rm data/Thumbs.db || die
+
+ sed -i "s|data/|${EPREFIX}/usr/share/${PN}/|" desktop/{gfx,snd}.c || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+
+ insinto /usr/share/${PN}
+ doins -r data/.
+
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} Biniax-2
+}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
index cce8abe91a93..168ba6bfa794 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -1,14 +1,5 @@
--- a/makefile
+++ b/makefile
-@@ -4,7 +4,7 @@
- # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
-
- FLAGS=-W -WALL
--CC=gcc
-+CC?=gcc
- FILES=biniax.c hof.c desktop/cfg.c desktop/gfx.c desktop/snd.c desktop/inp.c desktop/sys.c
- INCLUDES=-I . -I desktop
- LINKTO=-lSDL -lSDL_mixer -lSDL_image
@@ -12,4 +12,4 @@
TARGET=biniax2
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
new file mode 100644
index 000000000000..73206f0c78d8
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-fno-common.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/795078
+--- a/desktop/inp.c
++++ b/desktop/inp.c
+@@ -37,4 +37,5 @@
+ ******************************************************************************/
+
++BNX_INP _Inp;
+
+ BNX_BOOL inpInit()
+--- a/desktop/inp.h
++++ b/desktop/inp.h
+@@ -70,5 +70,4 @@
+ } BNX_INP;
+
+-BNX_INP _Inp;
+
+ /******************************************************************************
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index d15f2a4fa3d6..b0ba581f9c90 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,4 +1,4 @@
-AUX brainworkshop-5-fix-paths.patch 411 BLAKE2B e0243d2d6485ac0363505f604277adff228956591818333942b7a2c4e42f7392e49245fad58ff4f063fd25e2da9a6cfefe178e31566e737f18a1c79ab4a81a25 SHA512 2562fc3b436066c16cf3157ee4adc4ab390981eb5c3db8751848f4d30e1f780b74be78366ac578b5d44c553d488e51752ded6e5308503c7e5095a653881361f0
-DIST brainworkshop-5_beta20200310.tar.gz 8001718 BLAKE2B ec3ef92d169956cb9334230e60b5e2c370154c11640daa3201b56654cd402ecba37d3bd1e3ff95339b351bd8984fb84a6bab72bf9f752175d0fb3ae1d989ba10 SHA512 f061ef005ac5f1c8b3fe1f23d847852730a9402bfa6be83946b2cd1f3a352a7a6eb67b73c81506f082fe2ae590598435736a36c87513a11b87f3e8237a296669
-EBUILD brainworkshop-5_beta20200310.ebuild 1142 BLAKE2B 91e9568b20e489ac8666a172b6d6027d9f49fa66719e6b5dcded2e453187e40521e39bd0437e9544ccc36579fbef5bdc80f0c2f52db5200c7e01a59bea5b9bb1 SHA512 a0368690526275ea41390268e4dc37bd15614c4f6538830fbd47f1b5f5e1d1760c68f96b873babc36122bb56366a456178a42ec6a9035469d54206f66988e0b1
-MISC metadata.xml 395 BLAKE2B a3f578a832b020cd1cb4f4dba3ce03e62081a44fa5402d66e907da7ec73462c6bc14932ca13222ea69ae3c38ef6c84790b793e0c992a617896a7f7dcbb348881 SHA512 b80e67f4bc7b85a5eeddc36d5a17b440a65f71422d42428ca95af5533243aa71bc5bda20e49404d03f7bb02d75752ec432fa80508f1bc0a59d295d146cf2b629
+AUX brainworkshop-5.0.2-datadir.patch 193 BLAKE2B e2c69f8eb23bab1e3d04ffbe0ed3d687f2a250c51dbc96ce97f1d14860453462d0cf35ca7f76cdd85c7a9f86680794f7b6ae5db8100d9c81ce5c04cfeeeb0764 SHA512 c326abbe4894839a0db1935a83242f35ab9e708835bfabe3fdbd437da02eff8cfb57cc0337cbc131693ebedf951830be7770cc4e7ed85b1c583139bc91e98465
+DIST brainworkshop-5.0.2.tar.gz 7998711 BLAKE2B d2662d2e565b576b441a41ec9177c3bd17f30d0f671d67ee7497bc2a983ba193e977a0d4cb4bfcd684cc46fe918159ffa5181a141e591adf819b28e744437222 SHA512 07ab0b30cef92b3c5ac0476a1baa5afb8f57afb557b266169a7f72fe4cbe8c0afbf0db491a23106da6c61f055c24c5f0c4268ead41d92101e5a8284a7dc80265
+EBUILD brainworkshop-5.0.2.ebuild 1052 BLAKE2B d532051b73adbd8735fa5a2f0bf21d809e19529ebb27556cb1d4dacc25b165503783c2a1251c33de947a6f86c1bfcb2de48576719475898fc104afdfe0000115 SHA512 2467458e7870f7c58955654dffa56e0ce9cbcd02073469d4c0685bbb93eaa102ec67ae9b378508c28a3a62bd358c1e154d57fda088648fb011539752c04605ab
+MISC metadata.xml 404 BLAKE2B 2afbf1927b048a8657b2201a01c99633de7b9c68c34ce38c592a5077e06f7776f3418c49733c9dcc9c9c1dcb0a7f268fc4092273f51ad7f1d6b59822e6aeaff6 SHA512 3e1a02368e4e7fcf6abaaf7a26cbb136ae1cb64608b91c635a44de0126012f7ad59a3b8ee0225de7af3e7ad487ea9fcc36fb6e296436571ea46f4a258d3a58e8
diff --git a/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild b/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild
new file mode 100644
index 000000000000..aeddd40b56cd
--- /dev/null
+++ b/games-puzzle/brainworkshop/brainworkshop-5.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="Short-term-memory training N-Back game"
+HOMEPAGE="https://github.com/brain-workshop/brainworkshop"
+SRC_URI="https://github.com/brain-workshop/brainworkshop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-Sampling-Plus-1.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ >=dev-python/pyglet-1.5[${PYTHON_USEDEP},sound]
+ ')"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.2-datadir.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" ${PN}.py || die
+
+ python_fix_shebang ${PN}.py
+}
+
+src_install() {
+ newbin ${PN}.py ${PN}
+
+ insinto /usr/share/${PN}
+ doins -r res/.
+
+ dodoc Readme.md Readme-{instructions,resources}.txt data/Readme-stats.txt
+
+ domenu ${PN}.desktop
+ newicon res/misc/brain/brain.png ${PN}.png
+}
diff --git a/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
deleted file mode 100644
index c0ec2a730ce8..000000000000
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop edos2unix python-single-r1 xdg
-
-COMMIT="ea817f7e163c4fb07a60b2066c694cba92d23818"
-DESCRIPTION="Short-term-memory training N-Back game"
-HOMEPAGE="https://github.com/samcv/brainworkshop"
-SRC_URI="https://github.com/samcv/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pyglet-1.5[${PYTHON_USEDEP},sound]
- ')
-"
-
-BDEPEND="
- ${PYTHON_DEPS}
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-${PV%_*}-fix-paths.patch
-)
-
-src_prepare() {
- edos2unix ${PN}.pyw
- default
-
- sed -i \
- "s#@GENTOO_DATADIR@#${EPREFIX}/usr/share/${PN}#g" \
- ${PN}.pyw || die
-}
-
-src_install() {
- python_newscript ${PN}.pyw ${PN}
-
- insinto /usr/share/${PN}
- doins -r res/*
-
- dodoc Readme.md Readme-{instructions,resources}.txt data/Readme-stats.txt
-
- newicon -s 48 res/misc/brain/brain.png ${PN}.png
- make_desktop_entry ${PN} "Brain Workshop"
-}
diff --git a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
deleted file mode 100644
index 5e720d5cf8ba..000000000000
--- a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
---- a/brainworkshop.pyw 2018-07-14 19:11:17.536581902 +0100
-+++ b/brainworkshop.pyw 2018-07-14 19:12:07.582695292 +0100
-@@ -173,7 +173,7 @@
- if rtrn:
- return rtrn
- else:
-- return os.path.join(get_main_dir(), FOLDER_RES)
-+ return '@GENTOO_DATADIR@'
- def edit_config_ini():
- if sys.platform == 'win32':
- cmd = 'notepad'
diff --git a/games-puzzle/brainworkshop/files/brainworkshop-5.0.2-datadir.patch b/games-puzzle/brainworkshop/files/brainworkshop-5.0.2-datadir.patch
new file mode 100644
index 000000000000..1b54317b29c9
--- /dev/null
+++ b/games-puzzle/brainworkshop/files/brainworkshop-5.0.2-datadir.patch
@@ -0,0 +1,7 @@
+--- a/brainworkshop.py
++++ b/brainworkshop.py
+@@ -173,3 +173,3 @@
+ else:
+- return os.path.join(get_main_dir(), FOLDER_RES)
++ return '@GENTOO_DATADIR@'
+ def edit_config_ini():
diff --git a/games-puzzle/brainworkshop/metadata.xml b/games-puzzle/brainworkshop/metadata.xml
index 91d27f3c24f6..3dc8b6f3ed68 100644
--- a/games-puzzle/brainworkshop/metadata.xml
+++ b/games-puzzle/brainworkshop/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo Games Project</name>
</maintainer>
<upstream>
- <remote-id type="github">samcv/brainworkshop</remote-id>
+ <remote-id type="github">brain-workshop/brainworkshop</remote-id>
<remote-id type="sourceforge">brainworkshop</remote-id>
</upstream>
</pkgmetadata>
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index b84674b54146..7edba3f7fe79 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,3 +1,5 @@
DIST hitori-3.36.0.tar.xz 166404 BLAKE2B 851653744c8fcd200576e93753fa3c4a5a166caf7a6efd8048f5755f3a5b096b1387db73a6e39bc4a87815a2c0f39e71cacd95d0ca9940b3a0fb734cb95f36ed SHA512 fab2f1475895e26ac540c6302902c72b4e1bf68935fd88b216e3be37990d8dc2791b15e84d9eac69d1abd43ac01e40cbe238acabbdd686bf7abb96eb59b90265
+DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
EBUILD hitori-3.36.0.ebuild 702 BLAKE2B aaadc16dff772c34c21cceb09e2d9576856b8142705662c22da13c00ba5e0bf14d6708596a53ddbbf5d6d7cd876cbc1bdfc8190175bb00d1521dcf1e318781b6 SHA512 b7c44694a9c7a765e5bc00f5da60a58d6c73e07f62200c62c2f10c14d375c524eaa23e8ed00d7329dac7a05029a709fcd6de316846171795d98f4881da8427c2
+EBUILD hitori-3.38.2.ebuild 704 BLAKE2B b5fdb69ecc171dc02b99228f8de0675addfe5f272907383359e61214097891c8230b2ce567669423062e97cba42dc6a26be365882d78e555da9db883d2ead78e SHA512 f6dc91b81412d6d46a67591ef40b3f8cd8de44ea2aa9d42aff208753862d723d7763dab27c9589a867e1927ffdc8bcce29d770d08ec8bf5e2242566996f93061
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.38.2.ebuild b/games-puzzle/hitori/hitori-3.38.2.ebuild
new file mode 100644
index 000000000000..dac7645c4182
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.38.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.22.0:3
+ >=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index 9d426684462a..fc2665e2e1d1 100644
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,4 +1,3 @@
-AUX meandmyshadow-0.4-cmake.patch 513 BLAKE2B c2a272dea4328ce3348b2fd06b4e050681f09ca2068399f445c3d65d9416b0ad885ca449c14467fdba191d8795b0ed42d31f2a89752cd72346b98a736aafb77a SHA512 e81037c98f55bebe587f878ff1f5f57c6c5558f8305f5e2cd50db0bbb5634bde418c5254f43051b07b0017b380b2144103eae8ae4fcdc3c780ce2b3134e3f538
-DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
-EBUILD meandmyshadow-0.4-r1.ebuild 1170 BLAKE2B e6d8232736deff162408bc3c544467b3386e7e362c2c7c89115925cea2d5ffa44b5f500ecf12869b12464222201f048f13baae1d0245630b9fd9031617e58870 SHA512 17c7bdec047c44a6cf39da425d813fc25b30f56380f45aef3abfa93067f3fa167551a3b80d6a6235bc20e654d3e567547613dd1ab6ee5235305263e77986e8ec
-MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
+DIST meandmyshadow-0.5a-src.tar.gz 17527733 BLAKE2B 76d47908ac0151981c0a597d7fac8bacc98895d7038943ff6f349c60156d503266acbb3875415f7552202f36bd21d97c1508a3e0a9fed501a65c5d4c1cca70ab SHA512 c9e6de9c9b47af3839b6830faa3619ddc69b2c2cabf4d90f4c1393758805acf9835abcba45d79037766b4b6e5f006e6f880eba593d1142b0e829a887eb844f27
+EBUILD meandmyshadow-0.5a.ebuild 1079 BLAKE2B f585551216ec336152ad58ab9592c3c0ae78921f30a3e3dcfdf2b55f48d5d5313744a99bfcecead7cc677ae3ec3d76d2bf1a840ea1d5839cfeec96f018619e75 SHA512 48e50c5543a52fd731da618f1c3ee284b41f0ff545d9b2b83f716e9b5af40efcafe9ef2c83c19590287f7ae93eb6eeab9b014d527a2e2e91d1cecd149cd62c29
+MISC metadata.xml 397 BLAKE2B 82f3515fec81bd0125599afae726f07288a46c95b1a53ceb39b5c6b8cfb4da217ab36a74dafbe50bd4bf82f75a56a3def2d9e655b834c7054e3c5449115e20ef SHA512 5a7d09cdca621671373aa34495f53f240ff0733560315480a1e94fcff63818a9b796e9227d4a52675cfdbd4d45eb56e458e7a3318eadf9e5f57b3a5a7878c4f4
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
deleted file mode 100644
index 0bd66d5d284a..000000000000
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- meandmyshadow-0.4.orig/CMakeLists.txt
-+++ meandmyshadow-0.4/CMakeLists.txt
-@@ -15,13 +15,12 @@
- Find_Package(CURL REQUIRED)
- Find_Package(LibArchive REQUIRED)
- Find_Package(OpenSSL REQUIRED)
-+Find_Package(X11 REQUIRED)
-
- #Use openGL only when compiling with HARDWARE_ACCELERATION.
- #Otherwise we try to find XLib.
- if(HARDWARE_ACCELERATION)
- Find_Package(OpenGL REQUIRED)
--else(HARDWARE_ACCELERATION)
-- INCLUDE(FindX11)
- endif(HARDWARE_ACCELERATION)
-
- #Add the include dirs of the libraries.
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
deleted file mode 100644
index 809adb120794..000000000000
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Puzzle/platform game with a player and its shadow"
-HOMEPAGE="https://acmepjz.github.io/meandmyshadow/
-https://github.com/acmepjz/meandmyshadow/"
-SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="
- app-arch/libarchive
- dev-libs/openssl:0=
- media-libs/libsdl[sound,video,X]
- media-libs/sdl-gfx
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-ttf
- net-misc/curl
- x11-libs/libX11
- opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_VERBOSE_MAKEFILE=TRUE
- -DBINDIR="/usr/bin"
- -DDATAROOTDIR="/usr/share"
- -DICONDIR=/usr/share/icons
- -DDESKTOPDIR=/usr/share/applications
- -DHARDWARE_ACCELERATION=$(usex opengl)
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild
new file mode 100644
index 000000000000..66db4ae6b1b0
--- /dev/null
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.5a.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{2..4} )
+inherit xdg cmake lua-single
+
+DESCRIPTION="Puzzle/platform game with a player and its shadow"
+HOMEPAGE="https://acmepjz.github.io/meandmyshadow/"
+SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
+
+LICENSE="
+ Apache-2.0 BitstreamVera CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0
+ GPL-2+ GPL-3 GPL-3+ LGPL-2.1 OFL-1.1 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ app-arch/libarchive:=
+ media-libs/libsdl2[sound,video]
+ media-libs/sdl2-image[jpeg,png]
+ media-libs/sdl2-mixer[vorbis]
+ media-libs/sdl2-ttf
+ net-misc/curl[ssl]"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+ AUTHORS ChangeLog README.md
+ docs/{Controls,ScriptAPI,ThemeDescription}.md
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 $(lua_get_version))
+ -DLua_FIND_VERSION_MINOR=$(ver_cut 2 $(lua_get_version))
+ -DLua_FIND_VERSION_COUNT=2
+ -DLua_FIND_VERSION_EXACT=ON
+ )
+ cmake_src_configure
+}
diff --git a/games-puzzle/meandmyshadow/metadata.xml b/games-puzzle/meandmyshadow/metadata.xml
index d0cf56051e6c..825763c35375 100644
--- a/games-puzzle/meandmyshadow/metadata.xml
+++ b/games-puzzle/meandmyshadow/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Games Project</name>
</maintainer>
<upstream>
+ <remote-id type="github">acmepjz/meandmyshadow</remote-id>
<remote-id type="sourceforge">meandmyshadow</remote-id>
</upstream>
</pkgmetadata>
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 54015f423885..950349e1d4c7 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,4 +1,4 @@
AUX nudoku-2.1.0-ncurses-link.patch 927 BLAKE2B 6a1a5c40a5d3730684eefcc5298eb6ce676c1b5df380d6d9c6453aec9a2066d89ad876a39f95678d27e00281776a3d7e81cb4b9b2719c7f82e1f2f4fd357a3bc SHA512 a93051295845a7abd7a61b74c7f718f8c59f1b7bbb70015ec3db72d1b6bb08370ab63428611ccea1d9396321e54447d8117dedb3c411e4912e801efbc1921746
DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
-EBUILD nudoku-2.1.0.ebuild 666 BLAKE2B 3bf79bf9a9a79c82a1290917f2c41fd710e1952f866d2691034b2b859ff4140d15f7c1b6f1e34c596ac7b601dce24d7b2907f306c015d2a761e4555128bf52dc SHA512 16623d1a4ef0d45b9c45d66f0bb5503fc71abad51b1a5286c13022717ddb2311aa5dae866f227b074bf7cfc6ab7c979dcc28d81a03015500e608bba65e59793e
+EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B d774320d88895741c67dfaa1440f8f62d0068d712f34b287ae346d9e9e5067d1cb31cccfdc31fc184216064c4892f972589b92daab45944b7c9daf8f5d23b389 SHA512 f8981d38845de5ab71abfd730372362624ea406297fefeaf3ec50d2540541f0fd443543af998ff25dd83082fc343d3f4531db88b6bd9ec098d03f67ef46372b4
MISC metadata.xml 245 BLAKE2B 8fb3a3f2774de770fb66ef326ffa556ccb999f87ee12603b1491c67ac6576d70894f70122c1ebacf82338d8908884aee6b8a908487f742aee61281096ce8f06c SHA512 c085edc6403259d8375f348dbb0f80c6a7cfc49e05e6266c458d0dd9e9e4c680583f73f8dda5badfd5be648640956dc4fa55d4dff39447582edd7d30a487cc4b
diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
index 199f09b2bb1b..4ba0f1598188 100644
--- a/games-puzzle/nudoku/nudoku-2.1.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-inherit autotools flag-o-matic
+inherit autotools
DESCRIPTION="ncurses based sudoku game"
-HOMEPAGE="https://jubalh.github.io/nudoku"
+HOMEPAGE="https://jubalh.github.io/nudoku/"
SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cairo"
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index a32894b72615..ae4aa152cbcd 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
-AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
+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-r1.ebuild 2278 BLAKE2B 9204987bdb5da3dc98d9324fe154cc321f801d7f97043d74f3544d4bbda9c316d72319ca6125a4b74af1c3923285dd2a93c934ad2e873fd39f0652c2337cb06e SHA512 56271d57f35448edde4196ee6b62ff0f289a89ed91abd4fd21c0553f57453558ebfccd3bab03cf3918bc76dce4fa588782983a0b0d2cebd7869139a458fa6f87
+EBUILD pathological-1.1.3_p16-r3.ebuild 1680 BLAKE2B 3dbc7ff5690ebb63b60a2b888b86fb204ea7188af81a3db9acf3c23cfdfcc1490c79d3474ad4f044bf7e98295346d5ad2077904608675eb3169188d853ef3548 SHA512 556796261f70f0a868a6d05b5fa9d6c3bc74395739771f3520c1ced91e3b5d9cb330b3661bd968329277ac5ecf98003a38d0cf80a864c88ead05d04581efebf8
MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
deleted file mode 100644
index 48038df00036..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.old 2019-12-25 20:55:37.932303932 +0100
-+++ b/Makefile 2019-12-25 20:55:58.584530808 +0100
-@@ -4,9 +4,6 @@
-
- all: write-highscores docs
-
--write-highscores: write-highscores.c
-- gcc -s -o write-highscores write-highscores.c
--
- docs: html/wheel.png
- html/wheel.png:
- ./makehtml
diff --git a/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch b/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch
new file mode 100644
index 000000000000..525f30438e17
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch
@@ -0,0 +1,68 @@
+These are integers and use of "is" with pygame-2 ignores input events.
+
+https://bugs.gentoo.org/794211
+
+See also: pygame-2.0.1/buildconfig/pygame-stubs/constants.pyi
+--- a/pathological.py
++++ b/pathological.py
+@@ -133,3 +133,3 @@
+ if colorkey is not None:
+- if colorkey is -1:
++ if colorkey == -1:
+ colorkey = image.get_at((0,0))
+@@ -1395,6 +1395,6 @@
+ for event in pygame.event.get():
+- if event.type is QUIT:
++ if event.type == QUIT:
+ return -4
+- elif event.type is KEYDOWN:
+- if event.key is K_ESCAPE: return -3
++ elif event.type == KEYDOWN:
++ if event.key == K_ESCAPE: return -3
+ elif event.key == ord('n'): return 2
+@@ -1419,3 +1419,3 @@
+
+- elif event.type is MOUSEBUTTONDOWN:
++ elif event.type == MOUSEBUTTONDOWN:
+ if self.paused:
+@@ -1713,5 +1713,5 @@
+ for event in pygame.event.get():
+- if event.type is QUIT:
++ if event.type == QUIT:
+ return -2
+- elif event.type is KEYDOWN:
++ elif event.type == KEYDOWN:
+ if event.key == K_ESCAPE: return -1
+@@ -1744,3 +1744,3 @@
+ return 1
+- elif event.type is MOUSEBUTTONDOWN:
++ elif event.type == MOUSEBUTTONDOWN:
+ return 1
+@@ -1799,5 +1799,5 @@
+ for event in pygame.event.get():
+- if event.type is QUIT:
++ if event.type == QUIT:
+ return None
+- elif event.type is KEYUP:
++ elif event.type == KEYUP:
+ if event.key == K_LSHIFT:
+@@ -1806,3 +1806,3 @@
+ shift_state &= ~KMOD_RSHIFT
+- elif event.type is KEYDOWN:
++ elif event.type == KEYDOWN:
+ if event.key == K_LSHIFT:
+@@ -1994,3 +1994,3 @@
+ for event in pygame.event.get():
+- if event.type is QUIT:
++ if event.type == QUIT:
+ if self.curpage == 1:
+@@ -1999,3 +1999,3 @@
+ return -2
+- elif event.type is KEYDOWN:
++ elif event.type == KEYDOWN:
+ if event.key == K_F2:
+@@ -2032,3 +2032,3 @@
+ continue
+- elif event.type is MOUSEBUTTONDOWN:
++ elif event.type == MOUSEBUTTONDOWN:
+ if self.curpage == 1:
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
deleted file mode 100644
index c41cdb26e8ec..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit desktop python-single-r1 toolchain-funcs
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/${PN}/${P/_p*}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygame-1.5.5[${PYTHON_MULTI_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- doc? ( media-libs/netpbm )
-"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- unpack ./${PN}.6.gz
-}
-
-src_prepare() {
- default
-
- # Debian fixes
- # We don't face this bug, this way we skip needing to convert the
- # files at build time
- sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
-
- for p in $(<"${WORKDIR}"/debian/patches/series) ; do
- eapply -p1 "${WORKDIR}/debian/patches/${p}"
- done
-
- # Fix prestripped files
- eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
-
- if use doc ; then
- sed -i -e '5,$ s/=/ /g' makehtml || die
- else
- echo "#!/bin/sh" > makehtml
- fi
-
- sed -i \
- -e "s:/usr/share/games:/usr/share:" \
- -e "s:exec:exec ${EPYTHON}:" \
- ${PN} || die
-
- sed -i \
- -e 's:\xa9:(C):' \
- -e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
- ${PN}.py || die
-
- python_fix_shebang ${PN}.py
-
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
-
- exeinto /usr/"$(get_libdir)"/${PN}
- doexe write-highscores
-
- insinto /usr/share/${PN}
- doins -r circuits graphics music sounds ${PN}.py
-
- insinto /var/games/
- doins ${PN}_scores
- fperms 660 /var/games/${PN}_scores
-
- doman ${PN}.6
- use doc && local HTML_DOCS=( html/. )
- einstalldocs
- dodoc changelog
-
- doicon ${PN}.xpm
- make_desktop_entry ${PN} Pathological ${PN}
-
- # remove some unneeded resource files
- rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
-}
-
-pkg_postinst() {
- if ! has_version "media-libs/sdl-mixer[mod]" ; then
- echo
- elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
- elog "no background music will be played."
- echo
- fi
-
-}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
new file mode 100644
index 000000000000..dc1f36d2d15d
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit desktop optfeature python-single-r1
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="https://pathological.sourceforge.net/"
+SRC_URI="
+ mirror://sourceforge/pathological/${MY_P}.tar.gz
+ mirror://debian/pool/main/p/pathological/${MY_P/-/_}-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/sdl2-image[jpeg,png]
+ $(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')"
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( media-libs/netpbm[png] )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-pygame2-compat.patch
+)
+
+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))
+ debian=(${debian[@]/60_use_ogg_music.patch/})
+ PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
+
+ default
+
+ sed -e "s|^cd .*/|cd ${EPREFIX}/usr/share/|" \
+ -e "s|^exec|exec ${EPYTHON}|" \
+ -i ${PN} || die
+
+ gzip -d ${PN}.6.gz || die
+ rm graphics/*.xcf || die
+}
+
+src_compile() {
+ use doc && emake docs
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.6
+
+ insinto /usr/share/${PN}
+ doins -r circuits graphics music sounds ${PN}.py
+
+ doicon ${PN}.xpm
+ domenu "${WORKDIR}"/debian/${PN}.desktop
+
+ use doc && local HTML_DOCS=( html/. )
+ dodoc changelog
+ einstalldocs
+}
+
+pkg_postinst() {
+ optfeature "background music support" "media-libs/sdl2-mixer[mod]"
+}
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index 9edccff11199..34e780884315 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,4 +1,4 @@
AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
+EBUILD pauker-1.8-r2.ebuild 1705 BLAKE2B a8f2a0f8d68cffdeaa41c6e580d4b7532cefdcca603fe5c8fdb41a962c11c14135c5a70517a2c980026843cb408514c9002788d3be6be0ddb1213736f733795e SHA512 4e3b8ae469c18bb5c126d37c415590d6ed0a1ac63b3ca810d3805da937f7503ae59383c89f163df34e05376d76ae5d4c62248aaae6e1c80ad64ba57af9a55180
MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/pauker-1.8-r1.ebuild b/games-puzzle/pauker/pauker-1.8-r2.ebuild
index 62c31d7abb45..d99c4293362c 100644
--- a/games-puzzle/pauker/pauker-1.8-r1.ebuild
+++ b/games-puzzle/pauker/pauker-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,10 +22,10 @@ COMMON_DEP="
dev-java/swing-layout:1
"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5
+ >=virtual/jre-1.8:*
"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
+ >=virtual/jdk-1.8:*
app-arch/unzip
"
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 28ef72a1847c..42185bff6396 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -4,8 +4,7 @@ AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0
AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
-AUX pingus-9999-no_libexec.patch 895 BLAKE2B 2cdbf1faffe66c4b6a9fe3518cbecbfce292995cc08f28ef4929a72d1df00a4f937a0c270d932ab724946986104f59a00af58676496950a429d14b1436386f39 SHA512 91bdecf06f47dca2ff3c019b6bafdbdba560ac05c49389b1fd9d59ab89f20b7251c3cfea62857b6f6de4720a2cba405e1c7bb8df5b36c76b2e2c0bf36fc7a5e4
DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
EBUILD pingus-0.7.6-r3.ebuild 1283 BLAKE2B 00c962037144ae945a566f7c0f7f9beee6b17c3b05740aa0415c404700e8c0ae9a34226c9c870a24c437b9d1203d5b95019373919db1f08788a57fc27b9453d7 SHA512 80926aeb99b05783497a2e1db5f30a7e4302eddcf53e8072ee55da144694146df47c2c683e7067d2b9a66c8860f368e07ed2975f953246fb654364fa25493a7b
-EBUILD pingus-9999.ebuild 908 BLAKE2B 4b46851176ab8ecfd078d3d52401c3f5ac8c17f0ef5afe0f6b74daa590dc675c3d7d4b29b8712b4a9fb6a92403486c08d3c9c47f43f89b815c0160429161c4fd SHA512 baf30d488bfd4da6a6b7623b7ece35cbd9d9084730719e35623248762787d5233cdd2d23dcdd9bd8504c06bc5c1153aa2cb8227c9f9c1e99da48092be2c23d94
+EBUILD pingus-9999.ebuild 635 BLAKE2B a5741a018b2111cc3acd1fb9cc2de193c8e6e5b4454a537b22a212b8b57dbb334dcc711165874f0dbc8a797f8d65593ec4f1274e8ecad2ea43a93b00c1ab6518 SHA512 24a4bc4bbc79636e5baf580de0d224a289ed446b45c0f57d0e7b1a6fadd8fe0606b5b53498eed77bb0ac0eb1875a4a34da837e9340e816b8a8325d184c537e75
MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch b/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
deleted file mode 100644
index 45da29a42264..000000000000
--- a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 3 Apr 2019 18:35:28 +0200
-Subject: [PATCH] Don't install pingus executable into libexec
-
-This doesn't really make any sense.
----
- CMakeLists.txt | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3a92be64..fa835236d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,15 +213,6 @@ if(BUILD_TESTS)
- endif(BUILD_TESTS)
-
- install(TARGETS pingus
-- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
--
--configure_file(
-- ${CMAKE_CURRENT_SOURCE_DIR}/pingus.sh.in
-- ${CMAKE_BINARY_DIR}/pingus.sh)
--
--install(FILES
-- ${CMAKE_BINARY_DIR}/pingus.sh
-- RENAME pingus
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION ${CMAKE_INSTALL_BINDIR})
-
---
-2.21.0
-
diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
index b0083c14fd54..86efbe6553a5 100644
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@@ -2,41 +2,30 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake flag-o-matic xdg
-DESCRIPTION="free Lemmings clone"
+inherit xdg cmake git-r3
+
+DESCRIPTION="Free Lemmings clone"
HOMEPAGE="https://pingus.gitlab.io/"
-if [[ "${PV}" == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
-else
- SRC_URI="https://github.com/Pingus/pingus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3"
+EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
+
+LICENSE="GPL-3+"
SLOT="0"
-IUSE=""
RDEPEND="
- dev-libs/boost:=
- dev-libs/jsoncpp
- media-libs/libpng:0=
+ dev-libs/jsoncpp:=
+ dev-libs/libfmt:=
+ dev-libs/libsigc++:2
+ media-libs/libmodplug
+ media-libs/libpng:=
media-libs/libsdl2[joystick,opengl,video]
- media-libs/sdl2-image[png]
- media-libs/sdl2-mixer[mod]
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.7.6-noopengl.patch
- "${FILESDIR}"/${P}-no_libexec.patch
-)
-
-src_prepare() {
- sed '/find_package(Boost/s@ signals@@' -i CMakeLists.txt || die
- cmake_src_prepare
- strip-flags
-}
+ media-libs/libvorbis
+ media-libs/openal
+ media-libs/opusfile
+ media-libs/sdl2-image[jpeg,png]
+ media-sound/mpg123
+ virtual/opengl"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/boost
+ media-libs/glm"
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 251a052513a8..60e12689eb45 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,3 +1,5 @@
DIST quadrapassel-40.1.tar.xz 336740 BLAKE2B 71dfcbdaba846e8e199dce027034d2e3be7afc5ca3ffb67c508cbddc5bbdc15d4b93c95b5ff2a728e8e7da4e2034fd9eea76f6a160c0a62b9787ee8d0d34db23 SHA512 82817bde8a7ad9f782ad6a72825b5fccf21a7e5089a3a6c291239e55e268303f30d2bcfd85df0049c15c545a0f91a79eaed71b94a56371cb41dbf6089d8b22b3
+DIST quadrapassel-40.2.tar.xz 336896 BLAKE2B 66e32182508f91b67495fbb5aebc47ca40a4386cd8c9aaea9ffc94dca77c4fa7ce5c153b354f14507636bd53b2a27357c7e6ab76287d09310d5ac1ce52434699 SHA512 58a1a2c26b9c667da2ebd75a653b5dc534295109a9040bc3ce3cb33b4cae9a263e95701e0b3283696fddda1e8b47593bd3dbb64f4fdff90f20b0713b2a13ef4d
EBUILD quadrapassel-40.1.ebuild 989 BLAKE2B dd7d1fc07aac9cdaaf0d3af2c6c269fb39f984cc25c6a2209f85e40a82159fc2cab9777b6636f46f9a849c89c3c1d8cd6c628f122d72055c1087bc37e4bc7ace SHA512 cce18c626eff86e19af134e56094f856285456e2b71112cfa9824598a6e73a6cf01371e5fae123eb4b4d71ad0bbd0139ac63ad38b3e4f294b2a2ec45f598fa32
+EBUILD quadrapassel-40.2.ebuild 991 BLAKE2B 731c7709b8e7c60af65521bf564609868b0b84586caa9155a9c80a41a013c46ca5a68766d4d0e98e6bacc51a542b58698a51481dd9815bf25c98cb08b19d66b8 SHA512 033e073e9f1254a60a897d775036d8ddbf076e1dafc0d1c8063bbf2cb1b11d74776eeb56e98d702ce5fa30b190919cf7c6ab4de2c6b26d82e0822fd8582e0b83
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild b/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild
new file mode 100644
index 000000000000..6e103d03a15f
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-40.2.ebuild
@@ -0,0 +1,49 @@
+# 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="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel https://gitlab.gnome.org/GNOME/quadrapassel"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=media-libs/clutter-1:1.0
+ >=media-libs/clutter-gtk-0.91.6:1.0
+ media-libs/cogl:1.0=
+ >=media-libs/gsound-1.0.2
+ >=x11-libs/gtk+-3.12.0:3
+ >=dev-libs/libmanette-0.2.0
+ x11-libs/pango
+ >=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ media-libs/gsound[vala]
+ dev-libs/libmanette[vala]
+ gnome-base/librsvg:2[vala]
+"
+
+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/Manifest b/games-puzzle/swell-foop/Manifest
index fcc7110fdf8e..a58852570ea8 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,4 +1,3 @@
-AUX 3.34.1-fix-vala-0.50.patch 757 BLAKE2B 47d92ba8487ed20161481abb7553f68043928dbe2a42f69635943f22c0d35006564a3b226d93b79ed0306572cb4d65b56e22fce5d40905015a421f25ba58aa5c SHA512 6c247e6c9d266f9fb3be929727cabdc3a5d0bca3214663dd87b22da68729dfbd53c2f9d21dee307fa4399eb912ee0ba0d15a0fda526f8abcf6b6bf9672de203f
DIST swell-foop-40.1.tar.xz 821744 BLAKE2B 598af5d5bdeab2b6c3aca849e8c0a1f0c9690d14bc859c4c89bdf0577868efd7450f88e0039925e3cb83c60cd9943965382592962dc49fca31dac933099b7321 SHA512 99a90030eec32163f84e238458fca74b8ba19c7b804dc3f65d7f8f50f3d7f45dfd1cf45d383e332cad6c18fdf5d4eb79bf3c7b9f406a02431ed787b23a1c8cb7
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/files/3.34.1-fix-vala-0.50.patch b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
deleted file mode 100644
index ddc189ff54da..000000000000
--- a/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-