summaryrefslogtreecommitdiff
path: root/games-puzzle
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/Manifest.gzbin17286 -> 16465 bytes
-rw-r--r--games-puzzle/color-lines/Manifest4
-rw-r--r--games-puzzle/color-lines/color-lines-0.6-r1.ebuild47
-rw-r--r--games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch35
-rw-r--r--games-puzzle/color-lines/metadata.xml11
-rw-r--r--games-puzzle/einstein/Manifest6
-rw-r--r--games-puzzle/einstein/einstein-2.1.1-r1.ebuild47
-rw-r--r--games-puzzle/einstein/einstein-2.1.1.ebuild40
-rw-r--r--games-puzzle/einstein/metadata.xml9
-rw-r--r--games-puzzle/gnome-sudoku/Manifest2
-rw-r--r--games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild49
-rw-r--r--games-puzzle/gnome-tetravex/Manifest2
-rw-r--r--games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild12
-rw-r--r--games-puzzle/hangman/Manifest3
-rw-r--r--games-puzzle/hangman/hangman-0.9.2-r1.ebuild36
-rw-r--r--games-puzzle/hangman/metadata.xml8
-rw-r--r--games-puzzle/icebreaker/Manifest11
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch247
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch28
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch20
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch34
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch98
-rw-r--r--games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild48
-rw-r--r--games-puzzle/icebreaker/icebreaker-2.2.2_p20231115.ebuild52
-rw-r--r--games-puzzle/icebreaker/metadata.xml11
-rw-r--r--games-puzzle/lightsoff/Manifest2
-rw-r--r--games-puzzle/lightsoff/lightsoff-46.0.ebuild53
-rw-r--r--games-puzzle/magiccube4d/Manifest12
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch53
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch22
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch15
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch11
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-xdg-config.patch64
-rw-r--r--games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild44
-rw-r--r--games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild39
-rw-r--r--games-puzzle/magiccube4d/metadata.xml11
-rw-r--r--games-puzzle/pauker/Manifest5
-rw-r--r--games-puzzle/pauker/files/pauker-1.8-javadoc.patch34
-rw-r--r--games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch24
-rw-r--r--games-puzzle/pauker/files/pauker_bundledjars.patch14
-rw-r--r--games-puzzle/pauker/pauker-1.8-r3.ebuild69
-rw-r--r--games-puzzle/pauker/pauker-1.8-r4.ebuild54
-rw-r--r--games-puzzle/pingus/Manifest2
-rw-r--r--games-puzzle/pingus/pingus-0.7.6-r5.ebuild2
-rw-r--r--games-puzzle/scramble/Manifest3
-rw-r--r--games-puzzle/scramble/metadata.xml8
-rw-r--r--games-puzzle/scramble/scramble-0.9.5-r1.ebuild41
-rw-r--r--games-puzzle/sdl-jewels/Manifest2
-rw-r--r--games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild43
-rw-r--r--games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild51
-rw-r--r--games-puzzle/seatris/Manifest4
-rw-r--r--games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch11
-rw-r--r--games-puzzle/seatris/metadata.xml8
-rw-r--r--games-puzzle/seatris/seatris-0.0.14-r2.ebuild56
-rw-r--r--games-puzzle/skladnik/Manifest8
-rw-r--r--games-puzzle/skladnik/skladnik-24.05.2.ebuild (renamed from games-puzzle/skladnik/skladnik-24.04.90.ebuild)4
-rw-r--r--games-puzzle/skladnik/skladnik-24.08.0.ebuild (renamed from games-puzzle/skladnik/skladnik-0.5.2.ebuild)14
-rw-r--r--games-puzzle/swell-foop/Manifest2
-rw-r--r--games-puzzle/swell-foop/swell-foop-46.0.ebuild44
-rw-r--r--games-puzzle/wakkabox/Manifest2
-rw-r--r--games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild30
-rw-r--r--games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild32
-rw-r--r--games-puzzle/wizznic/Manifest4
-rw-r--r--games-puzzle/wizznic/wizznic-369-r1.ebuild49
-rw-r--r--games-puzzle/wizznic/wizznic-400.ebuild48
-rw-r--r--games-puzzle/xpired/Manifest2
-rw-r--r--games-puzzle/xpired/xpired-1.22-r1.ebuild42
-rw-r--r--games-puzzle/xpired/xpired-1.22-r2.ebuild48
-rw-r--r--games-puzzle/zaz/Manifest4
-rw-r--r--games-puzzle/zaz/files/zaz-1.0.0-build.patch19
-rw-r--r--games-puzzle/zaz/metadata.xml11
-rw-r--r--games-puzzle/zaz/zaz-1.0.0-r2.ebuild50
72 files changed, 779 insertions, 1251 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 12b44c6a5373..6ed159048610 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
Binary files differ
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
deleted file mode 100644
index a4cc4433da3f..000000000000
--- a/games-puzzle/color-lines/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX color-lines-0.6-Makefile.patch 999 BLAKE2B 81490ece15e51ea8c267155152675def9442cd403e1f8736ee23f8c453d50d3b2712c10249999ad0a05e046f8d13bea5498cfd00e5e0debaa69218931107a947 SHA512 372707ef56d86fd4f8c439767495cb10eadcd9e9683053c7179dac7e655cf423a8a2b4a1b1e0a23667263370ac4e188aa8ec6a4123416f76d40b2d115ad41148
-DIST lines_0.6.tar.gz 862137 BLAKE2B 11be598d89963b7a32479565538d85531d8bab16e46b8c5851e30cda7fd480a9d40d43b10fd3d74f2d0f820f0606aabe775ff44bbe5dd9f55551095aeb95cb60 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a
-EBUILD color-lines-0.6-r1.ebuild 1019 BLAKE2B 9a8eacd4907fde250a990e66e920aed591523831f88ea12e5f6a7fc6f287b55c96ec5e67cb3f4f05bd5bf5b2a8bbf676acd3840a228dc26e8e019431393e7123 SHA512 66a2e7b3b64f5ab01fd8277b27eea28ca77703cc05c35e9403e55510ff7ad5737988a9f2788204b00825badf5c9b2ca51d5c5eed6e223df05309604777654687
-MISC metadata.xml 334 BLAKE2B 955de48da13d1bc2bfc4d9167b7e670dcd96a5cf7fd8038cf0e764ca8ce0d1649abf7dc738cb9f9fc241c474a24df7543329b9dc1ea35acd4439bc4b4d96308f SHA512 11d60dcc305b802b78284b5a4d8468b4d6607015fac84cd1b1d1684da979c9b4fcc8f0d3e6c6fcd1c198098af176fddeb37e2ea75e6ccd2c5651f3883b20c4b4
diff --git a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
deleted file mode 100644
index 35416f945881..000000000000
--- a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Color lines game written with SDL with bonus features"
-HOMEPAGE="https://github.com/OpenA/color-lines-sdl"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz -> lines_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-RDEPEND="
- media-libs/libsdl[X,sound,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[wav,mod]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lines-${PV}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${P}-Makefile.patch"
-
- sed -i \
- -e '/^Encoding/d' \
- -e '/^Version/d' \
- -e '/^Icon/s/.png//' \
- color-lines.desktop.in || die 'sed on color-lines.desktop.in failed'
-}
-
-src_compile() {
- emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/"
-}
-
-src_install() {
- insinto "/usr/share/${PN}"
- doins -r gfx sounds
-
- domenu ${PN}.desktop
- doicon icon/${PN}.png
- einstalldocs
- dobin ${PN}
-}
diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
deleted file mode 100644
index bf1339b94a01..000000000000
--- a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.unix.orig 2013-04-12 13:56:42.131113000 +0400
-+++ b/Makefile.unix 2013-04-12 13:57:26.595946027 +0400
-@@ -2,18 +2,18 @@
- VERTITLE := lines-$(VERSION)
- ARCHIVE := lines_$(VERSION).tar.gz
-
--CFLAGS:=-Wall -O2 $(shell sdl-config --cflags)
-+CFLAGS += $(shell sdl-config --cflags)
- #-DMAEMO
-
--LDFLAGS:=$(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-+LIBS := -lm $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-
- SRC := board.c graphics.c main.c sound.c
- OBJ := $(patsubst %.c, %.o, $(SRC))
-
- all: color-lines
--PREFIX:=/usr/local
-+PREFIX:=/usr
-
--BINDIR:=$(DESTDIR)/$(PREFIX)/games/
-+BINDIR:=$(DESTDIR)$(PREFIX)/games/bin
- GAMEDATADIR:=$(DESTDIR)/$(PREFIX)/share/games/color-lines/
-
- svnclean:
-@@ -29,8 +29,7 @@
-
- color-lines: $(OBJ)
- cat color-lines.desktop.in | sed -e "s|@BINDIR|$(BINDIR)|g" > color-lines.desktop
-- $(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@)
-- strip color-lines
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) $(LIBS)
-
- clean:
- rm -f *.o color-lines
diff --git a/games-puzzle/color-lines/metadata.xml b/games-puzzle/color-lines/metadata.xml
deleted file mode 100644
index cc826efafe7c..000000000000
--- a/games-puzzle/color-lines/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pinkbyte@gentoo.org</email>
- <name>Sergey Popov</name>
- </maintainer>
- <upstream>
- <remote-id type="github">OpenA/color-lines-sdl</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index 5b89c98f7eea..56eb17d1243b 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -1,5 +1,5 @@
AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029f70fa711dca0b816de9d6c282cb3da9f3455e99ddf0ba308db14daca1f228eef32ab76c26b5d53b300acb5ba0afc8 SHA512 4943199a89fb19025618c1a95afc4e57f740259992997460292af1cbdd764d668538c5acca2e1077bdfb78936c66b3a88e698194167ad72b3ee8e42501070dd3
-DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
+DIST einstein-puzzle-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
-EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
-MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
+EBUILD einstein-2.1.1-r1.ebuild 958 BLAKE2B 6d124ce3a86a124554a2d00a66cdd2ec83233ee2c1c425e026d18eee27e3bd5c8fc0bfb11fdd1c29f3dc2986cf789402d801f382c0f01eb760c3a6a02f864144 SHA512 3253d2c570ed5daa1e8521294543c9596ddc2a11cf4bee962bce4db0fd5b81451febe8d30ae00f90dfe9d0d27e27b76bb8a69a9680bc1cd597c3233645fb4e51
+MISC metadata.xml 333 BLAKE2B 1e248df456060f4db2bae50b177e7ca03672002452eb771af5ee9c2af631bb6637f02af5109f659b8cea6b0d781c02ddd956248a41a539ac663adba1d92cebc6 SHA512 cce9585fddd53506f9ab5cfa5d1b1eee686ba87956e3a245a292d925d432172c033126172325027e0c8434ee0f1f9fe0d0eb007c12d90f694878434023f1d70b
diff --git a/games-puzzle/einstein/einstein-2.1.1-r1.ebuild b/games-puzzle/einstein/einstein-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..e4d68b289902
--- /dev/null
+++ b/games-puzzle/einstein/einstein-2.1.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+MY_P=einstein-puzzle-${PV}
+DESCRIPTION="A puzzle game inspired by Albert Einstein"
+HOMEPAGE="https://github.com/lksj/einstein-puzzle/"
+SRC_URI="
+ https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz
+ -> ${MY_P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/einstein.png
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-mixer
+ media-libs/sdl-ttf
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
+ sed -i \
+ -e "/PREFIX/s:/usr/local:/usr:" \
+ -e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
+ || die
+}
+
+src_install() {
+ dobin einstein
+ insinto /usr/share/einstein/res
+ doins einstein.res
+ doicon "${DISTDIR}"/einstein.png
+ make_desktop_entry einstein "Einstein Puzzle"
+ einstalldocs
+}
diff --git a/games-puzzle/einstein/einstein-2.1.1.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild
deleted file mode 100644
index 857e57a6e54a..000000000000
--- a/games-puzzle/einstein/einstein-2.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A puzzle game inspired by Albert Einstein"
-HOMEPAGE="https://github.com/lksj/einstein-puzzle"
-SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-mixer
- media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-puzzle-${PV}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
- sed -i \
- -e "/PREFIX/s:/usr/local:/usr:" \
- -e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
- || die
-}
-
-src_install() {
- dobin "${PN}"
- insinto "/usr/share/${PN}/res"
- doins einstein.res
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} "Einstein Puzzle"
- einstalldocs
-}
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
index 7c730d47817a..f0608bcd1a8d 100644
--- a/games-puzzle/einstein/metadata.xml
+++ b/games-puzzle/einstein/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">lksj/einstein-puzzle</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index c13f6d902b02..e2a9bae22145 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,5 @@
DIST gnome-sudoku-45.5.tar.xz 395164 BLAKE2B 4c310a769d2ebdac1bb811d39f0cef8aad9cc424c39b7f84d64e4954c967e4d8ad7de59bbd92f84080dd75e0cbd104d71e0201b8be54611c29dd8c5cccc2ad18 SHA512 13d47ee3f85f3a481721cee98bcf7c552d3b5110544b5ba52b0e0014f55199e4840745c925eb4848f7609d3f9e6379c31138ac08894e8394c31ace722b8a796d
+DIST gnome-sudoku-46.3.tar.xz 396856 BLAKE2B ec2f0e11837dbba26b0ea5d31dd0c404d1193c43aa272d67f0e67bad4037e8d0544b89061c28ad356ddb4afeb80bfa39aaef02733cfde087643a88083b9c1489 SHA512 3a1e5607dcbc2841d9c0506da221affc2e8a64b2c96f5cf6744747be07445f6418ca853ae324caec3265882ba65f66b8dd5b06c185d334b47c64d7be65a41ac3
EBUILD gnome-sudoku-45.5.ebuild 1016 BLAKE2B 49b8361f31643802489e54d6bff2cea6682d793cbc356d16f2d956ed4b630ca8d51b19decc6af649b2234be6a8008dae262fc745a60152f6c110d663b4dbfc30 SHA512 3fb093f23d1aa64248e4dae0f80bfe3c4496113fe91cb3bec58c9457d2f4129353afa113934d3a8ab80ef380b47c95de7e2fc6abfbb90176543cced3e64c031e
+EBUILD gnome-sudoku-46.3.ebuild 1019 BLAKE2B 6a449a47e1be35af9632c8fd61a1931deb5d00ffcda1e8f1ace09b8b3527cd8562b83b2c7a5649402e50e7441dca8ca9e7c056434177230317023f693dd8fead SHA512 fdbe0410f3ef09a9d6addda41771d4e1cf73860df19b2b75974c28766c16c6df6bf95b268e743f597e9252a09f8df8d8c8d322b96d10d61b9d368c59736f0e08
MISC metadata.xml 353 BLAKE2B e2f4d98efe0c100b16c9fb00308f35f3b386960e8123a8d6b2fc077ea41fca33db7e80b3dfe23235eedac5374d6d73a7062eabea5deded271d1985fa550f62e1 SHA512 b04099e8b16ece9bb66c5f34fb32cdaa4a07da79317e1d83aec745f4d2b970ce5de4bb506324b8c5017c103cfea82cdec01ef9d3ea1a629a880da734bd4d9a27
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild
new file mode 100644
index 000000000000..16fef17ca527
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-46.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku https://gitlab.gnome.org/GNOME/gnome-sudoku"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libgee:0.8=[introspection]
+ >=gui-libs/gtk-4.10.0[introspection]
+ >=gui-libs/libadwaita-1.4_alpha[introspection,vala]
+ dev-libs/json-glib
+ >=dev-libs/qqwing-1.3.4:=
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index d2d58dd93b9d..c0ca30f0ed3d 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,4 +1,4 @@
AUX gnome-tetravex-3.38.2-meson-0.61.patch 1247 BLAKE2B d2275d6d5851216e99bd6d0ccb7265305a51c205ad1d280a210da4f0fac477ae85f1a708e56748eb3553ae6452655ef8af13c8a0c240dc675aaa8f35a318af2c SHA512 419b20a2f323fc95e443cccaa2513f4a6ea138a0c4bed4cb4b86ac1c683afef680c8fc15dacea252d033af1c26ba81d4ca014bcde739bebf15809c8b4ec187de
DIST gnome-tetravex-3.38.2.tar.xz 1004632 BLAKE2B 5e16420e9e05668e3c697a275e748e75d65531fbe7bca61baffa5846b76781403a3014e1f85a6f9ec69965c256cbacbe3a756e36c9725eeccfd6abd0c568dabc SHA512 ad67dfcbec5cf33f5361c6f5746d78158726a4bf5c85f29ea084a324e2ec493ca41bb61e47228ad4deb30985fd750e8703e11fd02051af5ac7c9c256513644b8
-EBUILD gnome-tetravex-3.38.2.ebuild 1015 BLAKE2B e3c4b256fcb04beb8632bccd6f48b00fee945ad89b61fd1af5bd090000542835a6d4e480ea90b0ee8f9e6812328f83086c36f801a6bda01192a580a3a3914f6b SHA512 8a79f8009c5be173034d35f66322a2abeb2fa0c1a33aaa3fcc490ab93e2f982f0a743857d313b4cef3a5ed260b3faffa29a21a2c3e74183d159424677d420c4d
+EBUILD gnome-tetravex-3.38.2.ebuild 1011 BLAKE2B 5f463a2a2fac8ffc5c55e9f7dc8c909597006b620c1e635fcac381a770fddcef13d2caa4174e36c690bcf1e6263cfa44c60111d1245d03bb2b9dc3abaf4db89d SHA512 5100db237a28c441dff27db6d5a9c0a796e01721587ddfa1fb7e559d9d63214a997b4e1b78db4d1ae6eb7ee29886983cf730b4165c931e0a89f87047caf7bf5c
MISC metadata.xml 534 BLAKE2B 84c1efbef4073e45f90e98658d9b538a508f8f037f4b753cd448ac309d3d4225e5e239811c28e60b9d789da0c7bcdc17c047a555ed275cb74be000207bb27ec2 SHA512 35f5ff55330d81a41c940deabea15e3214bcab24efc05ffb15d67861fee522b5b746b671df285f52271b02ea9bab6d4583c7a1aaa32774d6edfd99e72ee50a8a
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 9c4fef69a495..4c7575abd646 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-tetravex"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
@@ -33,8 +33,8 @@ PATCHES=(
)
src_prepare() {
- xdg_src_prepare
- vala_src_prepare
+ default
+ vala_setup
}
src_configure() {
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
deleted file mode 100644
index f388c293d479..000000000000
--- a/games-puzzle/hangman/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hangman-0.9.2.tar.gz 1023712 BLAKE2B d9d12e02cb48fb80e0cf9c5f9dcb52f57e6305342b41443a791252701758c302bdbfb15dfefcfbbc7c4fc39fe1bfaccd961d1eb3d9a351f937c219ce98c26a26 SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65
-EBUILD hangman-0.9.2-r1.ebuild 736 BLAKE2B df7383c6bc804a56b9af4df28c2c63bef82acded3ae43acf4f3362bea4ad413b918525987edd6dd16e667db4ddc80aa69291faf5b72d3e15a0b92ae7e35bff6e SHA512 8ed9ba6285e05d5b87a8b3f8613618630c65fcf832f6ce52962cce900d25135d314c4d89d5d53654ff9529c357bb68708a80cdb9be29ac0a50fd18236d378451
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
deleted file mode 100644
index abfc77ca017b..000000000000
--- a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="The classic word guessing game"
-HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
-SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!games-misc/bsd-games
- media-libs/libsdl
- media-libs/sdl-mixer
- media-libs/sdl-image
- media-libs/sdl-ttf"
-RDEPEND="${DEPEND}
- sys-apps/miscfiles"
-
-src_prepare() {
- default
- sed -i \
- -e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
- src/hangman.c \
- || die "sed failed"
-}
-
-src_install() {
- default
- newicon pics/noose.png ${PN}.png
- make_desktop_entry ${PN} Hangman
-}
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-puzzle/hangman/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
index 0c596f819682..9f3a819a5bae 100644
--- a/games-puzzle/icebreaker/Manifest
+++ b/games-puzzle/icebreaker/Manifest
@@ -1,7 +1,4 @@
-AUX icebreaker-1.9.6-gentoo.patch 8599 BLAKE2B b572190c99b2d3d27cebf80751df57d6c80e36189d95e98c11987232ce630668d1158fa2bdb62d09e584a48d42e1cc1618cd607661809b4972e558ce796843a4 SHA512 36685c3a0534305d13385f88b259ece8befdeb1115c0e5958ec2edde5cb3502b213c4b7b2f39a8a2183bab94385b0c2e678346b4175f1a1aa057269b011a6a1c
-AUX icebreaker-1.9.6-ldflags.patch 874 BLAKE2B e888051b968e3139f21a4a912e8dbeb891d9c93bbe96d1a9ceb5a3d5690eb2ae4f74d7afe9aca3892011341d034f2648e41f8ee5bfc5d6ad392add8d3ea85457 SHA512 1c27aa4373744f3a5d59643d36a950aa50377b5ef26fec988754d66860dc3f262bb46e82e40cf4222abb000f0a7ab4aac03d9508e55536212fa5eb7d1a0f5e5f
-AUX icebreaker-1.9.6-ovfl.patch 699 BLAKE2B 9203cb2007abe94d6746512c1bdeca9a0163fda87c443ce9ca4b99a0a435d5553ed972ea368f7717912ec8c9c994f3471f14f187be336738dee6ee70de95c2f8 SHA512 49dae47f4f4d446fbdcb0f5faaa6ff01ecacd695d0af01e10f70001245680116e83aa78b2a9cb4fa80e0641e4cb02c5fc09c0fa87cc79207aa5c5d4dca5f0658
-AUX icebreaker-1.9.6-parallell-install.patch 1187 BLAKE2B 52c23882a6a1f6c265232effed850f34caebdbc8c63e15268e3f1a6fe42c604c5a9ca7d2c20eaee22c896733f7d77752ce7f75e30fdc49664954e302ea4034e5 SHA512 d315283c5e0605e4cddaebc1d891b72a86cd0e6f27693864896ac6557fd4c0f9e748e648b11ae8682d6d47ad9ff0f4c9d63fd4dde09e621886a70828001b8327
-DIST icebreaker-1.9.6.tgz 137333 BLAKE2B 3fdfde734f868493313a2a7b018582f79d6140fa71c1802a27b558d2973968eb9cc01efb55c0b5a45d95cd4d1bc94b66f74809a82853d6d8c0ce1b7bf767e362 SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b
-EBUILD icebreaker-1.9.6-r1.ebuild 981 BLAKE2B 2b0b96b1a997895365a2c93b95176a50e51eb926da689dac2cfe17f550b81e3b7e8a23eb827c85ad85263d29a57f73fd4b8b64b199e844d35ae1397fe0e45c71 SHA512 c39cf3badd6107b1a57d95de7bd5f6521bf9f0d0b88c77e97ebcaf77e8e478c068964d7e8ca64e9f20c8973c1c4baabc09660913bf2d35f746c91988b29ad9fe
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+AUX icebreaker-2.2.2_p20231115-makefile.patch 3396 BLAKE2B 985dd52df5ea2e3f7fd10c8397445f70450b761518c96aae9d2fc7ac2a6daa4b49249be28c4a8aa9e8ec4a2d8abc09463d5c86161cd5223b2669a64d8b14d6fc SHA512 c87f3b187ce7372e2434026b811f9e954e481a814db72642b091a9d00c5ce0c4a4a0ee731bb0baf82a1fd75e66c5e6047f409dff52379be611d0238fe4f1af78
+DIST icebreaker-2.2.2_p20231115.tar.gz 538930 BLAKE2B a3f8a1c1c280c260c8fc1b8060575b000a30535e83bd2033fe68726bf02f31cb213c9a46af5fdd89c7d7c042053cd98b037d69b924daeec985b2f04645d10e9d SHA512 02174b8c57578dc269693ad2ce3ebae756490dd55c9f738a1e8dd75b868b6fafc14c7f0e62c5fc49bca797376a0957a647fc9d7c5f4005cdd7cdf7df637567b0
+EBUILD icebreaker-2.2.2_p20231115.ebuild 1078 BLAKE2B 9c5c1ec6af0e9b2c2ebf3aa67100f0b386b041bd924f7c0bcefe222ab6fde44240318d4538d506d2408f45d8137e02317bb26bc2fb94467c82e71614ea051215 SHA512 e51475be361d09fba99d0188620f88ca33ce1693d663dc148629ddfd9f58fa36eca6f9722e40a3801a4e35286f8ade4d18fcfdacc29917bb0d34d3b695cee0f6
+MISC metadata.xml 336 BLAKE2B ceeb2b39ecc087caf819359666ccb15f820c8b96e8a9a6ac1786645ba302c53c98ee12cf34e7939c770f27de37e65cd168566b825a5fd738b7516473d84f538c SHA512 b0d3e620503a3c839e344df1b49581adc998e7b88cc81d5a1b2141cb3bcaebdd25efc2d60cec1b21285da5dd363baa90c49653fe81824e2ccb11ba0236a113e8
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
deleted file mode 100644
index 846d5b4141bc..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
+++ /dev/null
@@ -1,247 +0,0 @@
---- a/dialog.c
-+++ b/dialog.c
-@@ -279,10 +279,10 @@ PopupReturnType popuphighscores()
-
- for (i=0;i<HISCORENUM;i++)
- {
-- snprintf(buf,4,"%d.",i+1);
-+ snprintf(buf,sizeof(buf),"%d.",i+1);
- puttext(scorelistrect.x+BLOCKWIDTH,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);
- puttext(scorelistrect.x+BLOCKWIDTH*4,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,hiscorename[i]);
-- snprintf(buf,30,"%ld",hiscoreval[i]);
-+ snprintf(buf,sizeof(buf),"%ld",hiscoreval[i]);
- puttext(scorelistrect.x+scorelistrect.w-(BLOCKWIDTH*5),scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);
- }
-
-@@ -364,7 +364,7 @@ PopupReturnType popuphelp()
- {
- puttext(helprect.x+BLOCKWIDTH/2,helprect.y+BLOCKHEIGHT/2+i*(CHARHEIGHT*2+4),2,color.normaltext,helptext[i]);
- }
-- snprintf(buf,80,"v%d.%d.%d %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
-+ snprintf(buf,sizeof(buf),"v%d.%d.%d %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
- puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf);
- puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!");
-
---- a/menu.c
-+++ b/menu.c
-@@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu()
-
- if (strlen(commandline.theme)>0)
- {
-- snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",commandline.theme);
-+ snprintf(originaltheme,sizeof(originaltheme),"%s",commandline.theme);
- originalthemecl=true;
- }
- else
- {
-- snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",options.theme);
-+ snprintf(originaltheme,sizeof(originaltheme),"%s",options.theme);
- originalthemecl=false;
- }
-
-@@ -521,7 +521,7 @@ PopupReturnType menuitem_theme(char * va
- if (((mbutton==1 || mbutton==4) && t==themecount-1) || ((mbutton!=1 && mbutton!=4) && t==0))
- { // "random", at the end/beginning of the list
-
-- strncpy(val,"random",MAXMENUVALUELENGTH);
-+ strcpy(options.theme,"random");
- snprintf(options.theme,MAXMENUVALUELENGTH,"random");
-
- settheme("linux"); // just for pretty
-@@ -538,7 +538,7 @@ PopupReturnType menuitem_theme(char * va
- if (mbutton==1 || mbutton==4) // left click or scroll forwards
- {
- strncpy(val,themelist[(t+1)%themecount],MAXMENUVALUELENGTH);
-- snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t+1)%themecount]);
-+ snprintf(options.theme,sizeof(options.theme),"%s",themelist[(t+1)%themecount]);
- }
- else // right or middle or scroll back
- {
---- a/hiscore.c
-+++ b/hiscore.c
-@@ -72,7 +72,7 @@
- // make sure all entries are zeroed out to start.
- for (i=0;i<HISCORENUM;i++)
- {
-- snprintf(temphiscorename[i],7,"Nobody");
-+ strcpy(temphiscorename[i],"Nobody");
- temphiscoreval[i]=100; //100 is better than 0. :)
- }
-
-@@ -103,7 +103,7 @@
- // ok, so now, we can copy things over in the proper sorted order
- for (i=0;i<HISCORENUM;i++)
- {
-- snprintf(hiscorename[i],50,temphiscorename[arrayindex[i]]);
-+ snprintf(hiscorename[i],50,"%s",temphiscorename[arrayindex[i]]);
- hiscoreval[i]=temphiscoreval[arrayindex[i]];
- }
-
-@@ -201,13 +201,13 @@
- // make sure the temp array contains the right data
- for (i=0;i<HISCORENUM;i++)
- {
-- snprintf(temphiscorename[i],50,hiname[i]);
-+ snprintf(temphiscorename[i],50,"%s",hiname[i]);
- temphiscoreval[i]=hival[i];
- }
-
- // and toss in the new data
- //(this is why these arrays are size HISCORENUM+1)
-- snprintf(temphiscorename[HISCORENUM],50,username);
-+ snprintf(temphiscorename[HISCORENUM],50,"%s",username);
- temphiscoreval[HISCORENUM]=score;
-
- // fill the "helper" array.
-@@ -221,7 +221,7 @@
- // and take the top ones back.
- for (i=0;i<HISCORENUM;i++)
- {
-- snprintf(hiname[i],50,temphiscorename[arrayindex[i]]);
-+ snprintf(hiname[i],50,"%s",temphiscorename[arrayindex[i]]);
- hival[i]=temphiscoreval[arrayindex[i]];
- }
- }
---- a/line.c
-+++ b/line.c
-@@ -30,8 +30,9 @@
-
- Line createline(int linenum)
- {
-- Line l;
-+ static Line l;
-
-+ memset(&l, 0, sizeof(l));
- switch (linenum)
- {
- case 1:
---- a/options.c
-+++ b/options.c
-@@ -66,7 +66,7 @@
- options.autopause=AUTOPAUSEOFF;
- options.difficulty=NORMAL;
- options.fullscreen=FULLSCREENOFF;
-- snprintf(options.theme,MAXTHEMENAMELENGTH+1,"linux");
-+ strcpy(options.theme,"linux");
- }
-
- int readoptions(void)
-@@ -81,7 +81,7 @@
-
- setdefaultoptions();
-
-- snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
-+ snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
-
- optionfile=fopen(filename,"r");
- if (optionfile==NULL)
-@@ -135,7 +135,7 @@
- }
- else if (!strcmp(optbuf,"theme"))
- {
-- snprintf(options.theme,MAXTHEMENAMELENGTH+1,"%s",valbuf);
-+ snprintf(options.theme,sizeof(options.theme),"%s",valbuf);
- }
- // FIX: add username
- }
-@@ -150,7 +150,7 @@
- {
- FILE * optionfile;
- char filename[255];
-- snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
-+ snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
-
- optionfile=fopen(filename,"w");
- if (optionfile==NULL)
-@@ -292,7 +292,7 @@
- else
- {
- // fix -- we should probably search for malicious characters here.
-- snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEME));
-+ snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEME));
- }
- }
- else if (strncmp(argv[i],FLAGTHEMELONG "=" ,strlen(FLAGTHEMELONG "=")) == 0)
-@@ -312,7 +312,7 @@
- else
- {
- // fix -- we should probably search for malicious characters here.
-- snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEMELONG "="));
-+ snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEMELONG "="));
- }
- }
- else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0)
---- a/penguin.c
-+++ b/penguin.c
-@@ -40,8 +40,9 @@
-
- Penguin createpenguinxy(int x, int y)
- {
-- Penguin p;
-+ static Penguin p;
-
-+ memset(&p, 0, sizeof(p));
- switch (random() % 4)
- {
- case 0:
---- a/themes.c
-+++ b/themes.c
-@@ -183,7 +183,7 @@
-
- foundcolor.spritetransparent = 0;
-
-- snprintf(themefilename, 256,"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
-+ snprintf(themefilename, sizeof(themefilename),"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
-
- themefile=fopen(themefilename,"r");
- if (themefile==NULL)
-@@ -329,7 +329,7 @@
- "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- "(Filename is %s)\n",themename,valbuf);
- }
-- snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+ snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- spriteimage=loadsprite(themename,loadfilebuf);
- }
- else if (!strcmp(optbuf,"spritemirrorbitmap"))
-@@ -340,7 +340,7 @@
- "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- "(Filename is %s)\n",themename,valbuf);
- }
-- snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+ snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- spritemirrorimage=loadsprite(themename,loadfilebuf);
- }
- else if (!strcmp(optbuf,"soundouch"))
-@@ -351,7 +351,7 @@
- "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- "(Filename is %s)\n",themename,valbuf);
- }
-- snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+ snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- loadsounds(themename,loadfilebuf,NULL);
- }
- else if (!strcmp(optbuf,"soundcrash"))
-@@ -362,7 +362,7 @@
- "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- "(Filename is %s)\n",themename,valbuf);
- }
-- snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+ snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- loadsounds(themename,NULL,loadfilebuf);
- }
- }
-@@ -474,11 +474,11 @@
- {
- fprintf(stderr,"Hey! You can't have a theme named random! Please remove the random.ibt\n"
- "file from your themes directory.\n");
-- snprintf(themename,MAXTHEMENAMELENGTH+1,"linux");
-+ strcpy(themename,"linux");
- }
- else
- {
-- snprintf(themename,MAXTHEMENAMELENGTH+1,themelist[random() %themecount]);
-+ snprintf(themename,sizeof(themename),"%s",themelist[random() %themecount]);
- }
- freethemenames(&themelist,themecount);
- return settheme(themename);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
deleted file mode 100644
index 93b40fc67687..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.orig 2010-10-11 12:20:01.274684641 -0400
-+++ b/Makefile 2010-10-11 12:22:02.256897083 -0400
-@@ -1,5 +1,3 @@
--CC=gcc
--
- SDLCONFIG=sdl-config
-
- ifndef prefix
-@@ -177,7 +175,7 @@
- [ -d win32.build ] && rm -rf win32.build || true
-
- icebreaker: $(SRC:.c=.o)
-- $(CC) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
-+ $(CC) $(LDFLAGS) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
-
- man: icebreaker.6
-
-@@ -202,8 +200,8 @@
- install -m 644 *.wav *.bmp $(datadir)/icebreaker
-
- install-bin: icebreaker
-- install -s -g games -m 2755 icebreaker $(bindir) || \
-- install -s -m 755 icebreaker $(bindir)
-+ install -g games -m 2755 icebreaker $(bindir) || \
-+ install -m 755 icebreaker $(bindir)
- @test -g $(bindir)/icebreaker || \
- echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
-
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
deleted file mode 100644
index 5e8ffc01d8d2..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/menu.c.old 2013-06-24 22:09:11.606750080 +0200
-+++ b/menu.c 2013-06-24 22:25:51.635735351 +0200
-@@ -522,7 +522,7 @@
- { // "random", at the end/beginning of the list
-
- strcpy(options.theme,"random");
-- snprintf(options.theme,MAXMENUVALUELENGTH,"random");
-+ snprintf(options.theme,MAXTHEMENAMELENGTH,"random");
-
- settheme("linux"); // just for pretty
-
-@@ -544,7 +544,7 @@
- {
- if (t<0) t=themecount;
- strncpy(val,themelist[(t-1)%themecount],MAXMENUVALUELENGTH);
-- snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t-1)%themecount]);
-+ snprintf(options.theme,MAXTHEMENAMELENGTH,"%s",themelist[(t-1)%themecount]);
- }
-
- settheme(options.theme);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
deleted file mode 100644
index 419262791d98..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile.old 2010-10-19 10:26:18.000000000 +0200
-+++ b/Makefile 2010-10-19 10:38:28.000000000 +0200
-@@ -196,26 +196,30 @@
- themes-install: install-themes
-
- install-themes:
-+ mkdir -p $(datadir)/icebreaker
- install -m 644 *.ibt $(datadir)/icebreaker
- install -m 644 *.wav *.bmp $(datadir)/icebreaker
-
- install-bin: icebreaker
-+ mkdir -p $(bindir)
- install -g games -m 2755 icebreaker $(bindir) || \
- install -m 755 icebreaker $(bindir)
- @test -g $(bindir)/icebreaker || \
- echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
-
- install-man: icebreaker.6
-+ mkdir -p $(mandir)/man6
- install -m 644 icebreaker.6 $(mandir)/man6
-
- install-scorefile:
-+ mkdir -p $(highscoredir)
- touch $(highscoredir)/icebreaker.scores
- chown -f games:games $(highscoredir)/icebreaker.scores && \
- chmod 664 $(highscoredir)/icebreaker.scores || \
- chmod 644 $(highscoredir)/icebreaker.scores
-
-
--install: all install-mkdirs install-themes install-bin install-man install-scorefile
-+install: install-themes install-bin install-man install-scorefile
-
- %.d: %.c
- set -e; $(CC) -M $(CFLAGS) $< \
diff --git a/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch b/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch
new file mode 100644
index 000000000000..7d2bd50cb6f0
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-2.2.2_p20231115-makefile.patch
@@ -0,0 +1,98 @@
+From a5950b94d56f6e35c3dca2e1ad2ff334aacaa070 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 12 Jun 2024 22:50:15 +0100
+Subject: [PATCH 1/3] Don't include -Werror in CFLAGS
+
+Distributions don't like -Werror because it prevents end users from
+building the software using newer compilers that may raise warnings you
+don't know about yet. This is particularly bad for source-based
+distributions like Gentoo.
+---
+ Makefile | 2 +-
+ Makefile.w32 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 686e636..808b36b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ ifndef bindir
+ endif
+
+
+-CFLAGS+=-Wall -Werror $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\"
++CFLAGS+=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\"
+
+ SRC=icebreaker.c cursor.c grid.c laundry.c line.c penguin.c sound.c \
+ level.c intro.c text.c status.c transition.c hiscore.c dialog.c \
+diff --git a/Makefile.w32 b/Makefile.w32
+index 92f60c5..17dd71a 100644
+--- a/Makefile.w32
++++ b/Makefile.w32
+@@ -12,7 +12,7 @@ ifndef OPTIMIZE
+ OPTIMIZE=-O2
+ endif
+
+-CFLAGS=-Wall -Werror -Wno-error=pointer-sign $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\".\" -DHISCOREPREFIX=\".\" -DWIN32 -fstack-protector
++CFLAGS+=-Wall -Wno-error=pointer-sign $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\".\" -DHISCOREPREFIX=\".\" -DWIN32 -fstack-protector
+
+ SRC=icebreaker.c cursor.c grid.c laundry.c line.c penguin.c sound.c \
+ level.c intro.c text.c status.c transition.c hiscore.c dialog.c \
+--
+2.45.1
+
+
+From 6ee6046bf1f9893a3c4bfd239871b3296c90b047 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 12 Jun 2024 22:54:52 +0100
+Subject: [PATCH 2/3] Include LDFLAGS earlier in the linking command
+
+Some flags need to come before the inputs in order to be effective.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 808b36b..45a7035 100644
+--- a/Makefile
++++ b/Makefile
+@@ -173,7 +173,7 @@ icebreaker.exe: $(DISTFILES)
+ [ -d win32.build ] && rm -rf win32.build || true
+
+ icebreaker: $(SRC:.c=.o)
+- $(CC) $(CFLAGS) $^ -o icebreaker $(SDL_LIB) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o icebreaker $(SDL_LIB)
+
+ man: icebreaker.6
+
+--
+2.45.1
+
+
+From 40b865e7776962d45e082fed4904b4c2690b753f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 15 Jun 2024 11:09:45 +0100
+Subject: [PATCH 3/3] Silence error when rpm command doesn't exist and add
+ fallback
+
+The error can trigger QA warnings in non-RPM distros.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 45a7035..5a497ce 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,7 @@ MAKENSIS=makensis
+ WINDLLS=SDL.dll SDL_mixer.dll libgcc_s_dw2-1.dll libvorbisfile-3.dll libvorbis-0.dll libogg-0.dll libssp-0.dll libwinpthread-1.dll
+ export WINARCH
+
+-RPMARCH := $(shell rpm --eval %{_arch} )
++RPMARCH := $(shell rpm --eval %{_arch} 2>/dev/null || echo none)
+ RPMOPTS=
+ RPMCRAZYDEFINES := --define "_topdir %(pwd)/rpmbuild" --define "_sourcedir %(pwd)" --define "_specdir %(pwd)" --define "_tmppath %(pwd)/rpmbuild/tmp/" --define "_builddir %(pwd)/rpmbuild/build/" --define "_rpmdir %(pwd)" --define "_srcrpmdir %(pwd)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm"
+
+--
+2.45.1
+
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
deleted file mode 100644
index 6f45f0b3cd13..000000000000
--- a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop eapi7-ver
-
-DESCRIPTION="Trap and capture penguins on Antarctica"
-HOMEPAGE="http://www.mattdm.org/icebreaker/"
-SRC_URI="http://www.mattdm.org/${PN}/$(ver_cut 1-2).x/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- media-libs/libsdl[video]
- media-libs/sdl-mixer
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ldflags.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-parallell-install.patch
- "${FILESDIR}"/${P}-ovfl.patch
-)
-
-src_compile() {
- emake \
- OPTIMIZE="${CFLAGS}" \
- prefix=/usr \
- bindir=/usr/bin \
- datadir=/usr/share \
- highscoredir="/var"
-}
-
-src_install() {
- emake \
- prefix="${D}/usr" \
- bindir="${D}/usr/bin" \
- datadir="${D}/usr/share" \
- highscoredir="${D}/var" install
-
- newicon ${PN}_48.bmp ${PN}.bmp
- make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
- einstalldocs
-}
diff --git a/games-puzzle/icebreaker/icebreaker-2.2.2_p20231115.ebuild b/games-puzzle/icebreaker/icebreaker-2.2.2_p20231115.ebuild
new file mode 100644
index 000000000000..0dc47653992d
--- /dev/null
+++ b/games-puzzle/icebreaker/icebreaker-2.2.2_p20231115.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+COMMIT="7180612a54b42a5f52e15238d7ddf64f0b879e51"
+DESCRIPTION="Trap and capture penguins on Antarctica"
+HOMEPAGE="https://mattdm.org/icebreaker/"
+SRC_URI="https://github.com/mattdm/icebreaker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-mixer
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+ emake \
+ prefix="${EPREFIX}"/usr \
+ bindir="${EPREFIX}"/usr/bin \
+ datadir="${EPREFIX}"/usr/share \
+ highscoredir="${EPREFIX}"/var \
+ CC="$(tc-getCC)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ OPTIMIZE=
+}
+
+src_install() {
+ emake \
+ prefix="${ED}"/usr \
+ bindir="${ED}"/usr/bin \
+ datadir="${ED}"/usr/share \
+ highscoredir="${ED}"/var \
+ install
+
+ newicon ${PN}_48.bmp ${PN}.bmp
+ make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
+ einstalldocs
+}
diff --git a/games-puzzle/icebreaker/metadata.xml b/games-puzzle/icebreaker/metadata.xml
index 1c3ba213c494..3cb3b8da70ed 100644
--- a/games-puzzle/icebreaker/metadata.xml
+++ b/games-puzzle/icebreaker/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mattdm/icebreaker</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 0d32413b8269..85afc93171d5 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,3 +1,5 @@
DIST lightsoff-40.0.1.tar.xz 562340 BLAKE2B c80aa328e56a1cb8da723c187c6a223d0bf93353f36ed651b10c38ac129c6d62970dcf72308cbbf4fd0f911113b5c53ed490824b488bdc92e84c7bd9e9ae1015 SHA512 ac1f812c3297a42f1e5aa8b8cdda2884b5c2aea2ea0190047ba5a0f47254b191d2105d7d1b548f0233fdee1b0e6033a97265a1cb28503daf403ee4e2c53a1aca
+DIST lightsoff-46.0.tar.xz 600644 BLAKE2B 425e10788bdbc77261ca58c77b3cb1e0b6b7b40ac0995009a265b0f141f6a5484569de295d696b581a1e1ad17eb996ca939e80f7aa7de2240ec59766184661d7 SHA512 e6be7d4d2eb9a14580087a93e36857c0fd9260f892807766bee0f4c7cfa4b75d9e28781fc350cdd09ee61fb2d2d7ead619d3a2512b68ab5ebfb34fe5218b942c
EBUILD lightsoff-40.0.1.ebuild 1091 BLAKE2B 36da4149ce2d4b27364cdfbc478ff149703f4989f1a8c158e876755e8b734dafbb8338d1f8247934dd45e621bb5ee66c52cb6a05d689b3b6be30905590a134bc SHA512 87c07182b03f45a4aa755c743193e423d20411378f42cf740050f9faee34a9cd385a499ffd994771327f3fcbebbd26ff82671f6ad0ce24e0f8e5a41ef935a900
+EBUILD lightsoff-46.0.ebuild 1076 BLAKE2B c4eeaf7cb5e433cc10d1671510a5ef2183404825bc4cf782a031de77b3dc3ef8ff0558a6b6e4299c46e37f0826172136515742ea1871ba0e2844a602c409dfd1 SHA512 44825723fe9096f6429096bb555b7285b7dd3fc9fbb521a0d92b226a1845ff472f0a475c7ecf203b95cda317cb4c5dc275d1abae12903ba3ee677d4e1bbecfcb
MISC metadata.xml 615 BLAKE2B 31e687d27fabffd6ee8dfbf107d8b9f059edd16b5235f77154883dddbfa810287cbfb2396905059c8e44e3ef2ad4a478387766840b1fb7f71f605271c5bd120a SHA512 cfa8d66b3ad1b08f4e1f1c35791912ffcdad5eff27442cc50f53345143d53826a6e0b0aed807825e8eca622fe26a2a6f71c5093f7768afd37f4773bec9d2466d
diff --git a/games-puzzle/lightsoff/lightsoff-46.0.ebuild b/games-puzzle/lightsoff/lightsoff-46.0.ebuild
new file mode 100644
index 000000000000..281b77fcd183
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-46.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/lightsoff"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.38.0:2
+ >=x11-libs/gtk+-3.24.0:3
+ >=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}"
+# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ gnome-base/librsvg:2[vala]
+"
+
+src_prepare() {
+ default
+ vala_setup
+
+ # Bug #778845
+ sed -i \
+ -e 's:40\.rc:40~rc:' \
+ -e 's:40\.beta:40~beta:' \
+ -e 's:40\.alpha:40~alpha:' \
+ data/org.gnome.LightsOff.appdata.xml.in || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
index a39eac0d1ac7..b4a3cba6a1b6 100644
--- a/games-puzzle/magiccube4d/Manifest
+++ b/games-puzzle/magiccube4d/Manifest
@@ -1,8 +1,4 @@
-AUX magiccube4d-2.2-64bit-ptr.patch 1406 BLAKE2B 7741efef6045568adfb19b9cf64191ff682969dbcc4b12fdbbe62c55a9f4a4ae87a1208ad56fbd9ae8c331a33a79cde2ad28296da2a72d0c54810d1e183334ed SHA512 eb684cca4f6f02903c71e970146f6c110d9634ce2f1416e64bdf258b85264c79eaaa9b869f05ddb116373d908f4d0d2675c87d275ab79f76b21f77c5ce1c1563
-AUX magiccube4d-2.2-gcc41.patch 885 BLAKE2B 42990103d195d793e1b10efa573179373202de3d798168b309c14e96a868a80171501d63993e0adff569c8f5a072c55f312431b2eb0deab9f0f9dbb88fef7489 SHA512 2ac9eed48b4598b006ce866c319075eb6b06e8119890db28a0a88d6c680949606d89f5aa113a946c565a4abae529d07d22c7def72dd17beb810ea2f555833d69
-AUX magiccube4d-2.2-ldflags.patch 501 BLAKE2B 2abc1cf4e4b9d210634fae3da618848d21b818d006d30d67a316e750f4e9c77bb2ab8097fc07a1a34aace7efb64f5b3845d8975aa65e7ed83de662eb2dff7968 SHA512 76183b674fa09d330edb82e3c72b605b992a6fe24273c55a45d819ad08854869a7a73ae2ab0d03c14cd872fb13fc0836b75c8d17e3828559bb49d0064caa41b6
-AUX magiccube4d-EventHandler.patch 429 BLAKE2B 7572ff178552f47fe12012f6d6a822a2e2d2d63115eb14fce6ecc8bf489a7ab3c04a7f028d7a514d8de9adca27e6032051b0930386e7d40db08378ad16690a4c SHA512 e11bc6d31a41dca68b450773f575ff1708426daf1f8750117de81592f7050cebe9ea61385e24bd09186d166d764b2d00351b203552eb9d1c2a10be03b3be4f03
-DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49
-DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6
-EBUILD magiccube4d-2.2-r1.ebuild 1028 BLAKE2B 786b6648d5c99055d96cf8685300efb764ba8efd6500d9ebb6acd7a823025bb53dfe176eaac6f1733415a95e1ea5df1858151bcd7bf5258ffe1badcbc6bfa37b SHA512 e79d8a38e58a47cdc9f08e46f80c4e4b37004fdc9e06911d7677bae18508c72d49730d2c7ade92e5d93831852ab846740d77e35ed7fa8925a16c6f36ceceae71
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+AUX magiccube4d-xdg-config.patch 2850 BLAKE2B 2103a1c2bdba567f02b95f2bc1f98e19fc870057e2019f975f8f692ad29b23dcfb8ba25ef64b0b85184a6297623faa46ac600326809148172ca2b3edb7b4844c SHA512 1d4e7007501333ea2b54ad21d4bc685ae1d36b25541256c81c81544e5b72a0ba02c104c5b714f023f8cdbc2c72d8da54608c1d1ac388cd58a4e5f8a334dbf4fa
+DIST magiccube4d-4.3.343.tar.gz 871676 BLAKE2B a023ef1c84546e32f0de032f3c8515fca8568fa8e22869446a480e878574064b8e5572d2a0e76ae88af06de4f18a911f36e478e9f3c3dc1979915c0aa58d64a3 SHA512 f9fc93d54d850495e9216aa0bbf8beffa662032921e9fef54de9940fc07ad03e9af52d9a488445e4985ec2369abe90494657e6f5e199ebc2070c707dd95cc486
+EBUILD magiccube4d-4.3.343.ebuild 895 BLAKE2B 06e82e29bdd466d23da18bf1d48bdae49fc3301459afdcfef0895fd0fd1b90fcc21882ac3db760c7e513bc39d77cc7566d1e9b571d7727be2ae663b8efbb1d39 SHA512 73266c880520e5993971e154f6b458329ffa35eca3f064813cdbf57a8bc44aa40923aa186b3a22cd0e7d5f79c30d2e1365f4e73d2ec061cdb447c9a7fd95e674
+MISC metadata.xml 342 BLAKE2B 7dc88ce989ca7ea07a5385b968a58db0b55dc574ab2d00b5d51cf97eec310d078813861a4fc7f056d68fb728d8e9132f8229bb2b1d887c5a4bef5ec53ecedfe1 SHA512 775b5f545a278e5528a5b9086cc55482f7acd2e82a599caaa77570c67b09cd2bfe7b8632f76d972e523ddacff0fb8135cdd79cfe8d7f4172f7206753483438f0
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
deleted file mode 100644
index 7fbd52871887..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
---- magiccube4d-src-2_2.orig/EventHandler.cpp 2007-09-30 12:01:46.503967712 +0200
-+++ magiccube4d-src-2_2/EventHandler.cpp 2007-09-30 12:03:23.489172011 +0200
-@@ -20,6 +20,7 @@
- #include <iostream>
- #include <unistd.h>
- #include <stdio.h>
-+#include <stdint.h>
-
- #include "MagicCube.h"
- #include "Puzzlest.h"
-@@ -415,7 +416,7 @@
- void
- EventHandler::undo_cb(void* argp)
- {
-- int arg = (int) argp;
-+ int arg = (intptr_t) argp;
- struct stickerspec grip;
- int dir;
- int slicesmask;
-@@ -461,7 +462,7 @@
- void
- EventHandler::redo_cb(void* argp)
- {
-- int arg = (int) argp;
-+ int arg = (intptr_t) argp;
- struct stickerspec grip;
- int dir;
- int slicesmask;
-@@ -507,7 +508,7 @@
- void
- EventHandler::scramble_cb(void *arg = NULL)
- {
-- int n = (int)arg;
-+ int n = (intptr_t)arg;
- struct stickerspec grip;
- int i, previous_face = -1;
- int ngrips = NFACES * 3 * 3 * 3;
-@@ -855,12 +856,12 @@
- void
- EventHandler::newPuzzle_cb(void* arg)
- {
-- if ((int)arg == preferences.getLength())
-+ if ((intptr_t)arg == preferences.getLength())
- {
- reset_cb(0);
- return;
- }
-- preferences.setLength((int)arg);
-+ preferences.setLength((intptr_t)arg);
- int length = preferences.getLength();
-
- polymgr->reset(length);
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
deleted file mode 100644
index 8e2aaf2b5fcd..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200
-+++ b/EventHandler.h 2006-05-19 22:11:58.000000000 +0200
-@@ -165,7 +165,7 @@
-
- int number_of_reference_stickers_needed;
- int (*reference_stickers_needed)[4];
-- void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL);
-+ void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg);
- void* cur_ui_data;
-
- bool quick_mode;
---- a/Machine.h.old 2006-05-19 22:12:17.000000000 +0200
-+++ b/Machine.h 2006-05-19 22:12:29.000000000 +0200
-@@ -31,7 +31,7 @@
- {
- public:
- typedef void (EventHandler::*event_handler)(EventHandler::Event*,
-- void *arg = 0);
-+ void *arg);
- virtual ~Machine() {};
-
- static Machine* createMachine(EventHandler*, int& argc, char *argv[],
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
deleted file mode 100644
index 73d1b4a59dca..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in.old 2010-10-15 10:38:48.000000000 +0200
-+++ b/Makefile.in 2010-10-15 10:39:07.000000000 +0200
-@@ -72,10 +72,10 @@
- $(CXX) -c $(CXXFLAGS) $<
-
- $(TARGET): $(OBJS)
-- $(CXX) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
-+ $(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
-
- $(TARGET).static: $(OBJS)
-- $(CXX) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
-+ $(CXX) $(LDFLAGS) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
-
- Vec.h: vec_h.c
- $(CC) -o vec_h vec_h.c
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
deleted file mode 100644
index d242438d8d05..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/EventHandler.cpp.old 2004-11-04 22:58:13.735812448 +1100
-+++ b/EventHandler.cpp 2004-11-04 22:57:03.176539088 +1100
-@@ -326,7 +326,7 @@
- number_of_reference_stickers_needed--;
- reference_stickers_needed++;
- if (number_of_reference_stickers_needed == 0)
-- (this->*what_to_do_after_got_reference_stickers)();
-+ (this->*what_to_do_after_got_reference_stickers)(NULL);
- }
- }
-
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-xdg-config.patch b/games-puzzle/magiccube4d/files/magiccube4d-xdg-config.patch
new file mode 100644
index 000000000000..e60ec6125c1c
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-xdg-config.patch
@@ -0,0 +1,64 @@
+From 7430d876b0efdb3f828a92df60a9e2d4d7ebc113 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 17 Aug 2024 23:31:43 +0100
+Subject: [PATCH] Write config to XDG_CONFIG_HOME or ~/.config unless old
+ config exists or on Win
+
+Storing configuration outside a standard user configuration directory is bad
+practise and very unhelpful for distributions wanting to package this software.
+
+This respects the old configuation location for compatibility.
+
+XDG_CONFIG_HOME or ~/.config should make sense on just about any non-Windows OS.
+---
+ src/com/superliminal/util/PropertyManager.java | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/com/superliminal/util/PropertyManager.java b/src/com/superliminal/util/PropertyManager.java
+index 80567fc..2a6de12 100644
+--- a/src/com/superliminal/util/PropertyManager.java
++++ b/src/com/superliminal/util/PropertyManager.java
+@@ -4,6 +4,8 @@ import java.util.*;
+ import java.io.*;
+ import java.awt.*;
+ import java.net.*;
++import java.nio.file.InvalidPathException;
++import java.nio.file.Paths;
+
+ /**
+ * Title: PropertyManager
+@@ -101,8 +103,19 @@ public class PropertyManager extends Properties {
+ * Applications should load any user-specific property overrides directly into this object
+ * and then call setProperty whenever a user action needs to change one.
+ */
+- public final static PropertyManager userprefs = new LocalProps(new File(StaticUtils.getBinDir(), PRODUCT_NAME + ".props"));
++ public final static PropertyManager userprefs;
+ static {
++ File propsFile = Paths.get(StaticUtils.getBinDir(), PRODUCT_NAME + ".props").toFile();
++
++ if (!propsFile.canWrite() && !System.getProperty("os.name").startsWith("Windows")) {
++ try {
++ propsFile = Paths.get(System.getenv("XDG_CONFIG_HOME"), PRODUCT_NAME + ".props").toFile();
++ } catch (NullPointerException | InvalidPathException e) {
++ propsFile = Paths.get(System.getProperty("user.home"), ".config", PRODUCT_NAME + ".props").toFile();
++ }
++ }
++
++ userprefs = new LocalProps(propsFile);
+ System.out.println("Launch dir: " + StaticUtils.getBinDir());
+ }
+
+@@ -256,8 +269,9 @@ public class PropertyManager extends Properties {
+ if(localPropFile == null || storeFailed)
+ return;
+ try {
++ localPropFile.getParentFile().mkdirs();
+ this.store(new FileOutputStream(localPropFile), PRODUCT_NAME + " User Preferences");
+- } catch(IOException e) {
++ } catch(IOException | SecurityException e) {
+ storeFailed = true; // so as to only give fail msg once
+ if(!localPropFile.canWrite())
+ System.err.println("Can't write");
+--
+2.45.2
+
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
deleted file mode 100644
index 1c45efaeaffc..000000000000
--- a/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_PV="${PV/./_}"
-DESCRIPTION="Four-dimensional analog of Rubik's cube"
-HOMEPAGE="https://www.superliminal.com/cube/cube.htm"
-SRC_URI="https://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz
- https://superliminal.com/cube/cube_transp.gif -> ${PN}.gif"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-src-${MY_PV}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${PN}-EventHandler.patch \
- "${FILESDIR}/${P}"-gcc41.patch \
- "${FILESDIR}/${P}"-64bit-ptr.patch \
- "${FILESDIR}"/${P}-ldflags.patch
- sed -i \
- -e "s:-Werror::" \
- configure \
- || die "sed failed"
-}
-
-src_compile() {
- emake DFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin magiccube4d
- dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
- doicon "${DISTDIR}"/${PN}.gif
- make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif
-}
diff --git a/games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild b/games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild
new file mode 100644
index 000000000000..99641bd510a5
--- /dev/null
+++ b/games-puzzle/magiccube4d/magiccube4d-4.3.343.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2 java-pkg-simple xdg
+
+DESCRIPTION="Four-dimensional analog of Rubik's cube"
+HOMEPAGE="https://www.superliminal.com/cube/cube.htm"
+SRC_URI="https://github.com/cutelyaware/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-xdg-config.patch
+)
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS=( src )
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher ${PN} --main com.superliminal.magiccube4d.MC4DSwing --java_args "-Xms128m -Xmx512m"
+
+ newicon -s 32 src/mc4d.png ${PN}.png
+ make_desktop_entry ${PN} "Magic Cube 4D"
+
+ dodoc README.md
+}
diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml
index 1c3ba213c494..e105507f248f 100644
--- a/games-puzzle/magiccube4d/metadata.xml
+++ b/games-puzzle/magiccube4d/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">cutelyaware/magiccube4d</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index e4d9f646f8d9..454f6fd20598 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,5 +1,4 @@
-AUX pauker-1.8-r3-project.properties.patch 734 BLAKE2B e65ed8af572af626fa620aab4d315e6c6ee2870e4966abad153e6a072f56bc070ee45c8d5a066aae64e2a396d6d3018557f5e05e64128aac7a7b7bfeb69f4d02 SHA512 3e7bd12f194fe4019cc5785219c8e85ca9e5ffcb64400fe1aec117bc68634e0a89e224b3c0a1367a749b52f5c9144339f3f3d044887b14053de4d243c5fd4212
-AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
+AUX pauker-1.8-javadoc.patch 1179 BLAKE2B 46063ea5b1869be3c9a156a164e70e3d0dc674b6f30288c46a36c3edf486d1eba065fc8f8221d9b8321628854b7dfdca679611d6f50c738e2695223447cade8b SHA512 a42265a582f189619b4617818866953616e20567bf4f11731ad0060a2254da539642ae5e1ea96c88d7f3d58c1bd406f5bcdb57fa0b9f437f3122f529db5e1eaf
DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8-r3.ebuild 1805 BLAKE2B c11d78fc115a814ac45dc6b33b7e0c48c33b1d958b975939a44dedf158fdbefb83a412de94926bfddfdc21e81509b86bf25808adf012bb614f5db007bb8b0940 SHA512 24ae415da504c52b308a067ac228ad084956f554b8b9f5f41052818932186bc232d12f511c51f392a05db073c345e7202a46cfc0d644cf103be4b31670970724
+EBUILD pauker-1.8-r4.ebuild 1285 BLAKE2B 7dec9907450970202d222faee5b4d89638cce26f031683b00ea36f5f094aeaed1c0d7d9ea67dcc4f8b6a28de6b4deb34ecf0dfe6c15ed370d4dce97c72df80d1 SHA512 3777972632482fa34a42f01a89545099ce34d4ad32ec9c3f1d993cdcc7b2b5e33679d7909ede3f7d373a6b7ee3d3780904e9b02602773b8c7ded41c068abfdd1
MISC metadata.xml 330 BLAKE2B 42488ad46ce8315bfe9b341e63c0e1490cb883bd6481acdb8620738525a6dd72d1d3dd1dbe558aa83a93ee0efabbf5b9c04e9d6209e34f7ff8515e5134cea112 SHA512 8df3d8c336515d44d4bb3138adf77ede34ba6c6e467b56c3cb267f6ca8b2cace57cab3595256492af08e52ef61ea87741697abc262e0fc5f78bb4c7442eb9296
diff --git a/games-puzzle/pauker/files/pauker-1.8-javadoc.patch b/games-puzzle/pauker/files/pauker-1.8-javadoc.patch
new file mode 100644
index 000000000000..ab87fe73c723
--- /dev/null
+++ b/games-puzzle/pauker/files/pauker-1.8-javadoc.patch
@@ -0,0 +1,34 @@
+#829503
+--- a/src/pauker/program/gui/swing/LineLabeler.java
++++ b/src/pauker/program/gui/swing/LineLabeler.java
+@@ -25,7 +25,7 @@ import javax.swing.text.JTextComponent;
+
+ /**
+ * A panel for labelling the Pauker import dialog
+- * @author Ronny Standtke <Ronny.Standtke@gmx.net>
++ * @author Ronny Standtke
+ */
+ public class LineLabeler extends JPanel implements DocumentListener {
+
+--- a/src/pauker/program/Card.java
++++ b/src/pauker/program/Card.java
+@@ -118,7 +118,7 @@ public class Card {
+ /**
+ * sets if the card is learned or not
+ * @param learned if true the cards state is set to learned and the current date is used as
+- * </CODE>learnedDate</CODE>
++ * <CODE>learnedDate</CODE>
+ */
+ public void setLearned(boolean learned) {
+ frontSide.setLearned(learned);
+LongTermBatch.java:101: error: @param name not found
+--- a/src/pauker/program/LongTermBatch.java
++++ b/src/pauker/program/LongTermBatch.java
+@@ -98,7 +98,6 @@ public class LongTermBatch extends Batch {
+ }
+
+ /** gets an expired card
+- * @param i the index of the expired card
+ * @return the expired card
+ */
+ public Card getOldestExpiredCard() {
diff --git a/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch b/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch
deleted file mode 100644
index b063b1055621..000000000000
--- a/games-puzzle/pauker/files/pauker-1.8-r3-project.properties.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/nbproject/project.properties b/nbproject/project.properties
-index 02aef46..edca271 100644
---- a/nbproject/project.properties
-+++ b/nbproject/project.properties
-@@ -37,8 +37,8 @@ javac.classpath=\
- # Space-separated list of extra javac options
- javac.compilerargs=-Xlint:all,-serial
- javac.deprecation=true
--javac.source=1.5
--javac.target=1.5
-+javac.source=1.8
-+javac.target=1.8
- javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
-@@ -64,7 +64,7 @@ jnlp.signed=false
- main.class=pauker.program.gui.swing.PaukerFrame
- manifest.file=manifest.mf
- meta.inf.dir=${src.dir}/META-INF
--platform.active=JDK_1.5
-+platform.active=JDK_1.8
- run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
deleted file mode 100644
index bebcbd088b12..000000000000
--- a/games-puzzle/pauker/files/pauker_bundledjars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/build.xml.orig 2008-11-24 20:24:55.000000000 +1300
-+++ b/build.xml 2008-11-24 20:25:33.000000000 +1300
-@@ -88,11 +88,6 @@
- basedir="build/classes/"
- includes="pauker/**,tools/**"
- excludes="pauker/Changes.txt,pauker/TODO.txt,**/*BeanInfo*,**/GraphicalStatisticPanel.gif">
-- <zipfileset src="${libs.swing-layout.classpath}"/>
-- <zipfileset src="libs/jhall.jar" excludes="META-INF/**"/>
-- <zipfileset src="libs/lucene-core-2.4.0.jar" excludes="META-INF/**"/>
-- <zipfileset src="libs/BrowserLauncher2-1_3.jar"
-- excludes="META-INF/**,classes/,source/,package?cache/,.**,*.txt,build.xml"/>
- <manifest>
- <attribute name="Main-Class" value="pauker.program.gui.swing.PaukerFrame"/>
- <attribute name="SplashScreen-Image" value="pauker/icons/Splash.png"/>
diff --git a/games-puzzle/pauker/pauker-1.8-r3.ebuild b/games-puzzle/pauker/pauker-1.8-r3.ebuild
deleted file mode 100644
index 6fb8a63cf540..000000000000
--- a/games-puzzle/pauker/pauker-1.8-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="A java based flashcard program"
-HOMEPAGE="https://pauker.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/pauker/pauker/${PV}/${P}.src.jar"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
- dev-java/browserlauncher2:1.0
- dev-java/javahelp
- dev-java/lucene:2.4
- dev-java/swing-layout:1
-"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${PN}_bundledjars.patch"
- "${FILESDIR}/pauker-1.8-r3-project.properties.patch"
-)
-
-src_prepare() {
- default
- find . -iname '*.jar' -delete || die
-
- java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar
- java-pkg_jar-from --into libs javahelp jhall.jar
- java-pkg_jar-from --into libs lucene-2.4 lucene-core.jar lucene-core-2.4.0.jar
- java-pkg_jar-from --into libs swing-layout-1 swing-layout.jar
-}
-
-src_compile() {
- eant -Dfile.reference.BrowserLauncher2-1_3.jar="libs/BrowserLauncher2-1_3.jar" \
- -Dlibs.swing-layout.classpath="libs/swing-layout.jar" \
- -Dplatforms.JDK_1.8.home="${JAVA_HOME}" jar $(use_doc javadoc)
-}
-
-#test depend on jemmy, a netbeans module. so unless it is packaged separately
-#tests cannot be build.
-
-src_install() {
- java-pkg_jarinto "/usr/share/${PN}"
- java-pkg_newjar "dist/${P}.jar"
-
- java-pkg_dolauncher ${PN} \
- -into "/usr" \
- --pwd /usr/share/${PN} \
- --main pauker.program.gui.swing.PaukerFrame
-
- use doc && java-pkg_dojavadoc dist/javadoc
- use source && java-pkg_dosrc src
-
- newicon src/pauker/icons/repeat.png ${PN}.png
- make_desktop_entry pauker Pauker
-}
diff --git a/games-puzzle/pauker/pauker-1.8-r4.ebuild b/games-puzzle/pauker/pauker-1.8-r4.ebuild
new file mode 100644
index 000000000000..962456b5c716
--- /dev/null
+++ b/games-puzzle/pauker/pauker-1.8-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A java based flashcard program"
+HOMEPAGE="https://pauker.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/pauker/pauker/${PV}/${P}.src.jar"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="
+ dev-java/browserlauncher2:1.0
+ dev-java/javahelp:0
+ dev-java/lucene:2.4
+ dev-java/swing-layout:1
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/pauker-1.8-javadoc.patch" )
+
+JAVA_MAIN_CLASS="pauker.program.gui.swing.PaukerFrame"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+ cp -r src res || die
+ find res -type f \( -name '*.java' -o -name '*.txt' \
+ -o -name '*.form' -o -name '*BeanInfo.java' \
+ -o -name '*Panel.gif' \) -exec rm -rf {} + || die
+}
+
+#test depend on jemmy, a netbeans module. so unless it is packaged separately
+#tests cannot be build.
+
+src_install() {
+ java-pkg-simple_src_install
+ newicon src/pauker/icons/repeat.png ${PN}.png
+ make_desktop_entry pauker Pauker
+}
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 0ef43bf8b3dc..fefe4847d93c 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -7,5 +7,5 @@ AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15
AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
-EBUILD pingus-0.7.6-r5.ebuild 1358 BLAKE2B 9cc70b2a385fda2441e1ab33b984c7fbcd07298da5da3bccaf64c496ab2d93df74317cb0ee3d2cfcc69605dc65a0ca9e220a69fa91257c3efd51f82be292aaaf SHA512 852699590ce770bba99ddafedcd4dd270fb9ef2860314e2d60af218ab726cae0c99a57cf28b269d1d13886fc32f3a4ea1e5def50654a57ba26b17ae27ea3937e
+EBUILD pingus-0.7.6-r5.ebuild 1371 BLAKE2B bc243628b2f31755d60ffe5d3c62668f9740a45070a74566660f62ab111278494063b92cc633f84f57cdd47a8229c64954293914cecdc9d3128c19f2bc362cdd SHA512 7a0322d2f85eba6eabeda9cf81fa6f0595448269d2fe658764c14ea93818779054c200fc28394611c6f206b2ea9ff41931ded01b314dc0a64110b90d180e4030
MISC metadata.xml 1286 BLAKE2B 6c7aca31ac2da0d7feaeff587ec61c63871cee36940afc9284d5fdd3f51a1c35cdac756b398dd61f0a9b94d641b952d369499d4373dbeaf9324a09a4f53d8553 SHA512 d75fbc588cf2c18c2fbd0958e80ac5b5048382c15f198181effdbc6d7908a3c93115e3c5aace272cfc1ec232846ddf614823a14a893944c5ce44e543100abaa3
diff --git a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
index 0e31967af72e..80d8be7a1c2b 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Free Lemmings clone"
HOMEPAGE="https://pingus.gitlab.io/"
SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
-LICENSE="GPL-3"
+LICENSE="GPL-3+ GPL-2+ ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="opengl music"
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
deleted file mode 100644
index 5912c9e7abce..000000000000
--- a/games-puzzle/scramble/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scramble-0.9.5.tar.gz 552301 BLAKE2B 9bbdbe1551ba03dc66342eaab9b7e85356ca6fa78f2bbf7423b79a65cfe46711f0818ff41cba81a98b3888c9558692ec9879095e6353216675a869ab4544753f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b
-EBUILD scramble-0.9.5-r1.ebuild 977 BLAKE2B 6bb090026f26a0c4c90ebfb542bb21d9f187fb5fe7d07a2290fefdf9725efd49d6c086c7b2a20f0737623f51aa16fd52bbe16ea5ecd5ea91b5bb9654acc6ba3c SHA512 938d635fe8e1eacbf36d1183e939278bd1cd1f16325b9c6dfc3e2b464436fb969bbb58acd7a6320362eafa1b367db1fe0d45091055227f15d375b6377f5d26db
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-puzzle/scramble/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
deleted file mode 100644
index 9158e8985e9a..000000000000
--- a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="Create as many words as you can before the time runs out"
-HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html"
-SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=media-libs/libsdl-1.2[sound,video]
- >=media-libs/sdl-mixer-1.2[vorbis]
- >=media-libs/sdl-image-1.2[png]
- media-libs/sdl-ttf
-"
-DEPEND="${RDEPEND}
- media-libs/libpng:0
- sys-apps/miscfiles
-"
-
-src_prepare() {
- default
- pngfix -q --out=pics/background-fixed.png pics/background.png
- mv -f pics/background-fixed.png pics/background.png
- append-cflags $(sdl-config --cflags)
- sed -i -e 's/inline //' src/scramble.c || die
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_install() {
- default
- newicon pics/sg_icon.png ${PN}.png
- make_desktop_entry ${PN} "Scramble"
-}
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
index e8469563db72..2c55a599bfa9 100644
--- a/games-puzzle/sdl-jewels/Manifest
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -1,4 +1,4 @@
AUX sdl-jewels-1.1.1-Makefile.patch 488 BLAKE2B 95eceefb92d28c8968790c7b2b3954d957bc2f59a0764efb66aea618b6db0f01272a2bf7a56a6789b601e2e76a6f96497074a8c4689e924c5f08a7bd7ebb2317 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26
DIST SDL_jewels-1.1.1.tgz 195366 BLAKE2B 4f8e3c85b8d6cc6388846fe3783cc3fed3cf1901a57788c8ebd62473ac3f0635eaf0f3f1017a06961706ec3143f8807b8170dc0a715b570e44c66a578eb7dae3 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4
-EBUILD sdl-jewels-1.1.1-r1.ebuild 968 BLAKE2B b2377f0968329902e5397f91d65978a933d6c8df57498165f6aca1c535907b1bb7d5faef0952232c6d71ef2c4dd099330a4fdb856a138e5dd0a7a6832d1c240e SHA512 50381f1020f1b8037ecfc9ac099e44c8850ecde13ce9aae6f5f45fe758d23b4399865dd7ea8a9470b5262d5f6b786c79463e8a6bdebfc8b5a27d52b9494545ae
+EBUILD sdl-jewels-1.1.1-r2.ebuild 1057 BLAKE2B ba938386280809e606f21a5ea7b523a734914af83d7a893ae4dd7943d0b203d7262cc202716b62127a1b2ee6229e9369994e7789104582f4ef174f5cef59cd38 SHA512 df5c399c9e1cc347bece6368b7c0b9adfa94c93f37117073078473087d9e5a28d6e24c423e34f8ea496b5cf2579b11988eb5bcaaae8759cf509fc20c40b00ba5
MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
deleted file mode 100644
index e9f6f0422ae1..000000000000
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop vcs-clean
-
-DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
-HOMEPAGE="http://www.linuxmotors.com/gljewel/"
-SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
- media-libs/libsdl[opengl,video]
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/SDL_jewels-${PV}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${P}-Makefile.patch"
-
- # fix the data dir locations as it looks to be intended to run from src dir
- sed -i -e "s|\"data\"|\"/usr/share/${PN}\"|" sound.c || die
- sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
- ecvs_clean
-}
-
-src_install() {
- dobin gljewel
-
- insinto "/usr/share/${PN}"
- doins -r data/*
-
- einstalldocs
- make_desktop_entry gljewel SDL_jewels
-}
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..f2b8a57c8bd5
--- /dev/null
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs vcs-clean
+
+DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
+HOMEPAGE="https://www.linuxmotors.com/linux/gljewel/"
+SRC_URI="https://www.linuxmotors.com/linux/gljewel/downloads/SDL_jewels-${PV}.tgz"
+S="${WORKDIR}/SDL_jewels-${PV}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+ media-libs/libsdl[opengl,video]
+ media-libs/libglvnd[X]
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_prepare() {
+ default
+
+ # fix the data dir locations as it looks to be intended to run from src dir
+ sed -i -e "s|\"data\"|\"${EPREFIX}/usr/share/${PN}\"|" sound.c || die
+ sed -i -e "s|data/bigfont.ppm|${EPREFIX}/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
+ ecvs_clean
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin gljewel
+
+ insinto /usr/share/${PN}
+ doins -r data/*
+
+ einstalldocs
+ make_desktop_entry gljewel SDL_jewels
+}
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
deleted file mode 100644
index 9d427f35dbc0..000000000000
--- a/games-puzzle/seatris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b
-DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2
-EBUILD seatris-0.0.14-r2.ebuild 1050 BLAKE2B aea45d29574fe5b25c6f675f91522da4d4cb65895f00fbcdd1e6584f129f206a46a265c4b11796da8892708bcbc39f87ba2199ea45186b962d53d03e934965e5 SHA512 44b854d5ce07ce3c42f9619ac659b77231ffdd68bfd1dcc99478a2d9c2db67d9e10910eb4a6e0dffa7ae1448e5db782c91b585ca8569aee163bfacdb0151044f
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
deleted file mode 100644
index e77c0dd75077..000000000000
--- a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- parse.o readcfg.o
-
- seatris: $(OBJS)
-- $(CC) $(LFLAGS) $(LIBS) -o seatris $(OBJS)
-+ $(CC) $(LDFLAGS) -o seatris $(OBJS) $(LIBS)
-
- clean:
- rm -f *.o seatris
diff --git a/games-puzzle/seatris/metadata.xml b/games-puzzle/seatris/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-puzzle/seatris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/seatris/seatris-0.0.14-r2.ebuild b/games-puzzle/seatris/seatris-0.0.14-r2.ebuild
deleted file mode 100644
index 2b208413feb3..000000000000
--- a/games-puzzle/seatris/seatris-0.0.14-r2.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A color ncurses tetris clone"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="
- ${DEPEND}
- acct-group/gamestat
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:/var/lib/games:/var/lib/${PN}:" \
- scoring.h seatris.6 || die
-}
-
-src_configure() {
- tc-export CC
- econf
-}
-
-src_compile() {
- emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
- dobin seatris
-
- doman seatris.6
- dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
-
- dodir /var/lib/${PN}
- touch "${ED}"/var/lib/${PN}/seatris.score || die
- fperms 660 /var/lib/${PN}/seatris.score
-
- fowners -R root:gamestat /var/lib/${PN} /usr/bin/${PN}
- fperms g+s /usr/bin/${PN}
-}
diff --git a/games-puzzle/skladnik/Manifest b/games-puzzle/skladnik/Manifest
index 0f2e7bef6356..97690fcadfd0 100644
--- a/games-puzzle/skladnik/Manifest
+++ b/games-puzzle/skladnik/Manifest
@@ -1,7 +1,7 @@
DIST skladnik-0.5.1.tar.xz 397604 BLAKE2B 1d99e01a611c819d21a4ef009070a07c64e19499ddb54ce21611850092cc3a2e1877ab034b7b722fe962d641b00d3ac195e541966372cc8518d75a404051f3e6 SHA512 84a8494a679d228a41f559c4d986bf50c7ee287e9af3d400e9cc35347ce4ac72166ee1691bfb6739b9c1923c5d6e3d48c695592dbd12238f10a0977957ad09a6
-DIST skladnik-0.5.2.tar.xz 404704 BLAKE2B 12f7746ea03f1b25ddc2b16071668a0966076129189c19a77b562b19961f54ca1b1c3df99d77adc068d1cd6b0b69e9b7be928cacee3ecdb244e7b5621a07012f SHA512 ced1f544bd5ffc383522b9a2655e890f229c6d94aa51386e937c4c101750e21a10179eaa5c62d2d08b5077423869f8eefcd2d5671c9f35c6e7c8759bbcfcde05
-DIST skladnik-24.04.90.tar.xz 408028 BLAKE2B 2763d6b0e1f95873991e32dac1f46fee54072adce18566d8747365611020b18efd862ca024be728f4ef137f40447dc11766099e275621e1fa1e1a0d88453d7ac SHA512 89c6e0f71638353fa30399866279e58f7dbd1774961ca1f46235456cc6f9d18d83914dbbaed908b3133428d75710d284d7fcb09490de2604c94237f9cdab42b5
+DIST skladnik-24.05.2.tar.xz 408008 BLAKE2B 2178a2c54c5bdb4a8f966a8681c509b73dc93ffc7c4a30b08ef59ea16d36b51d193d672749eaf2016d43d51b801cadc67c21ce13e6cb66de8418935a9fae55dc SHA512 75cdb0de9fc703a247c2e3a8a909bc0e7d97b70a09876f7de953955ac43c7e4ce34db3d99f0d273f799b3e6b076d60ce6366b68d9d0496db530dd82a401719b0
+DIST skladnik-24.08.0.tar.xz 409104 BLAKE2B 6073ccc25d3b915e6cb4e124b93ba8ec2bc40d36abc308b5626019c520516c859e3eea13d6f439ecdc52ea8fb8cf8b508501be7980297fd8763fdf0315b539f1 SHA512 d0bd4c4ab4c36a43f7d0fc2c637ec825882376726b921107e72abbadf56dc3817edb3c7649daadcfcc782ef9e7fbfbf6dd386fa5cf125d6efa3236a93b83ab06
EBUILD skladnik-0.5.1.ebuild 868 BLAKE2B fcf35d026ab16e4b685986a89bd52dec79b234181df43e45f6b05958a6deb8988d50a3328debf220fd145eb0b70068c53d59a5f603a4e6c4305add87746b3aec SHA512 4d927d258af0651bd5117b574147ab7323ab1cedf060899acee1229d57db2b3e296c17670c3ed1b5982c5b1016b716157800f88448b9e5384a3a6a1f404d4ebf
-EBUILD skladnik-0.5.2.ebuild 873 BLAKE2B 8add94753f3b396cc7f1c173862b5e9eb692381e62f6e5b3310488786443857edcb47e213d09f66bac399904fcf14cecbac6c9bff3df9c140069922cec76d78e SHA512 25f775feb0005a62f9d5dca942fc770d92151b2e5b70c99e01e2cb8524844a3e60dc7ae7438da4ff0e819a7e2aab4528da910e315832a42fe27635971f4e5f9d
-EBUILD skladnik-24.04.90.ebuild 873 BLAKE2B 658ffab7e67738f2e73102651892d1b5dd023fb80406953f1a67342a3805b49ca4735185b92a3bcee3bb5f8d6ed92fc8b1a1a9d8fe9b9e8f9bbdec3e29e33200 SHA512 37ddd8c221d5fbf40b7ceb151d3a9f59f2c3d7744dbcf24d31f5c5fa43146cd2b1659fcb463d260bb2d2884a1f011e836cf0245f2105156c0575f2673b962150
+EBUILD skladnik-24.05.2.ebuild 892 BLAKE2B 5948071f3a05e67ee729c6a125a13d3aed0f29adea64e3999caf394e4836865c21cda5a874cd8351cc78e036c30b484c8c8c09107da67fe7849036f600536622 SHA512 8a9d6b7b2b9b808be066cd987a969d1cd6819dc7aa352cc51a94f5d42fae558cf9b20710443f8434273cecef80db826bd944db0345327140bf46a1d8e5398ef6
+EBUILD skladnik-24.08.0.ebuild 892 BLAKE2B a15e34ab37e988184e27da330845c5b6b2c588f4d43dbe519518b910486120a78f1cf29db2b4414ea3655cbfdb294db1d6700316e1129715ca8a74e6156523c5 SHA512 5b158ea4e5d70db06ca31cab90b42ee7f7f6f2e7ead5699d1dbdee8da9b9cf3e17601400a7ed808a86fe5fc675b45b0e3dbc2449faa22aa44fec9bcfc7d57f3f
MISC metadata.xml 424 BLAKE2B 35ce1e430b010cdafb4d02130746e2c00530efd7930167ee760f318ae1e7277ba69e60a2dc739bb399d8d78d67752f1fe7edbb000639c58e05a4c4da5c913ddd SHA512 42b7256744e10afba765b2e06b271d6ddfea8bc899f2e75a3828ab0bc630a50d7a14bbe94722f56cc3cb16ea92f400509255fd8a42095ceb2282b7fb52e0f644
diff --git a/games-puzzle/skladnik/skladnik-24.04.90.ebuild b/games-puzzle/skladnik/skladnik-24.05.2.ebuild
index df3df346eebb..50cdd953154b 100644
--- a/games-puzzle/skladnik/skladnik-24.04.90.ebuild
+++ b/games-puzzle/skladnik/skladnik-24.05.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ECM_HANDBOOK="optional"
PVCUT=$(ver_cut 1-3)
-KFMIN=6.0.0
+KFMIN=6.3.0
QTMIN=6.6.2
inherit ecm gear.kde.org
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/skladnik/ https://invent.kde.org/games/skladnik"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
RDEPEND="
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
diff --git a/games-puzzle/skladnik/skladnik-0.5.2.ebuild b/games-puzzle/skladnik/skladnik-24.08.0.ebuild
index c62735c795a1..db53201cea58 100644
--- a/games-puzzle/skladnik/skladnik-0.5.2.ebuild
+++ b/games-puzzle/skladnik/skladnik-24.08.0.ebuild
@@ -4,21 +4,21 @@
EAPI=8
ECM_HANDBOOK="optional"
-KFMIN=6.0.0
-QTMIN=6.6.2
-inherit ecm kde.org
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
DESCRIPTION="The Japanese warehouse keeper sokoban game"
-HOMEPAGE="https://invent.kde.org/games/skladnik"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://apps.kde.org/skladnik/ https://invent.kde.org/games/skladnik"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
RDEPEND="
>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
- >=kde-apps/libkdegames-24.02.0:6
+ >=kde-apps/libkdegames-${PVCUT}:6
>=kde-frameworks/kconfig-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index e2ed4753d294..fdd331b5bb18 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,5 @@
DIST swell-foop-41.1.tar.xz 832672 BLAKE2B 97908acab3bc565f084d97b02f8a6200dc170bd1bdb87ebc4e027881aa75a5111e3ecd24594395266fdfdab586a328df9d15fa8d25105529ec571b36f4fa0e5f SHA512 811638d9b09d7aaa584e56def47900bc866b56ac59120a1df91130f7a6b9555befd18907647874fd69dfa0992cee1c6320dc2bc684b3e5f05f6a25a791ac0a60
+DIST swell-foop-46.0.tar.xz 869096 BLAKE2B dccae8be0223726586c002c4a1752e5fd0162b31f91e9e739a76adc5599ee3b6d2f069654e1463dc16ecd537cb3e836d2f0a2fed93a840e75f5f021284005143 SHA512 01cb51635f78cb860cc967bcf54089f385d16cc1d64e209f21906acb04b86a1eb83951eb6fedc71b5fc3cdfb15947da9527ac087ea9b50112086679816bb4c7c
EBUILD swell-foop-41.1.ebuild 895 BLAKE2B 2645c72f77e847f3edbc01e192318185fa76234dfa1b471affe43b2639bd3361c6b528c27e2ef31deb08d84ca2c679ae001047bd963498c1eb53d12c24cefe21 SHA512 88a4413ff050d8dc051517b1980e48aef2db33745317d4ae562ac7e7319ccb6c32f125c43a7a50e5649670c9ae627bf6fd7414d0d4920e629427e21785c2af23
+EBUILD swell-foop-46.0.ebuild 856 BLAKE2B d5f8f3f743ab4f09f07acb4579eacabd3b85e15e4c1cf9bf34a4897aa75c04e8465ae218f6810b65faba96d091d0339b1a76dc2d5b8c2c7deeebe246b44df2a5 SHA512 16956faf3253486165b6e8bc45e810ce2702a02d20f43aee03bd4d0e98e6b306a7c3bcee7b143d2960e8c255dd01a1608ea54c87d717b1543d93bd77735a4c05
MISC metadata.xml 351 BLAKE2B ebb682e6b2425036dc21e6c2e0e87dd279e464d31f66740c738b295620f5916f463c97b3d26219948b66afa2f1e421d7ef16659d84be4666348f22ea5003f5ab SHA512 9986af293f36c17d1fb7cdfe77636f257b2ad7da98bf524df49d5d224ec275d37a22ff137cab8915176b4cbdfca786211b750c93ee980d26af6131add18674b4
diff --git a/games-puzzle/swell-foop/swell-foop-46.0.ebuild b/games-puzzle/swell-foop/swell-foop-46.0.ebuild
new file mode 100644
index 000000000000..aa0d80360354
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-46.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/swell-foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.74:2
+ >=gui-libs/gtk-4.10:4
+ >=dev-libs/libgnome-games-support-2.0.0:2=
+ >=gnome-base/librsvg-2.46
+ >=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() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
index 07fbd246c03b..9df660369f62 100644
--- a/games-puzzle/wakkabox/Manifest
+++ b/games-puzzle/wakkabox/Manifest
@@ -1,4 +1,4 @@
AUX wakkabox-1.1.0-gentoo.patch 1768 BLAKE2B 57fc63581b1fecaf579fc70cee8a693c4c55a27c19afe85442e3a36b5d7fcf693dba91ff4cf52ab5f21813f15250abc3352930c333636780f0ff9c478b255c32 SHA512 28c261d77372ffad9815dc6d40118595d7896bafb352237ce708f028ac50ae0530d5a61f75ece36c35ec7f041da9979c9cfa37c19dae1e83ef9ddb34ffa4bf94
DIST wakkabox-1.1.0.tar.gz 158231 BLAKE2B f756cf98135591dbae60f00a4e85f4286204f0206196b032c2ac547ae5f1259a4b228f673aed047a8848a6500abaccc0ea69f8eb47e1950309fadc9738e684da SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be
-EBUILD wakkabox-1.1.0-r1.ebuild 613 BLAKE2B ac2beb4615cbb105771f47ad5a719acb72dab76cf9a440422fb2aa86392c1c745f7e3476050055b3234e283feef0daa5a718b4c9235adffbf8a78bfbc8307c21 SHA512 98d132cf9f39b470f20accdaa35fefb3b558776bc362e923b350cfa78c82b7914876b877e64f9b72bfccd4f35be507d3f01ab944a3274dd5557ab6e6c49bd800
+EBUILD wakkabox-1.1.0-r2.ebuild 610 BLAKE2B 848fecad9695103de14b71af60a77d275823f578acda4762fdd70577b0676034c4df57a0043a18b02e1e5a9fd0d65cccccca3342db7b247523b008c29b0cf085 SHA512 16c09203c208b19f9220b2a46e18bd7be98503d592d99145221ade9d07323739a43fd7e65f93c3aa1ab873f70f6fbec253f72560e7ba0c4906cfde813481d296
MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
deleted file mode 100644
index a04dd8404b70..000000000000
--- a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A simple block-pushing game"
-HOMEPAGE="http://kenn.frap.net/wakkabox/"
-SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.0.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${P}-gentoo.patch
- rm aclocal.m4
- eautoreconf
-}
-
-src_install() {
- default
- newicon bigblock.bmp ${PN}.bmp
- make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..ea075d716b7c
--- /dev/null
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="A simple block-pushing game"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+ default
+ rm aclocal.m4 || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ newicon bigblock.bmp ${PN}.bmp
+ make_desktop_entry ${PN} ${PN^} /usr/share/pixmaps/${PN}.bmp
+}
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
index bdcc4c472bc5..0c589cef158b 100644
--- a/games-puzzle/wizznic/Manifest
+++ b/games-puzzle/wizznic/Manifest
@@ -1,3 +1,3 @@
-DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
-EBUILD wizznic-369-r1.ebuild 1038 BLAKE2B 86d7af3d7eeca6327276da05e4eaee8510601c4561c849274993496df7cfa3400798696c5338145ecfa90b86c7ec44a332b39dbf0a4a29a035dc0ae88068614e SHA512 79aed3706239ff120e5031666d8875912e78a7dc145ed1a553e5b8f67ade2bc15fa8c6bc4eb1630d69aa89608fae964c8ffc9676ba587d595a3237ae41857b7a
+DIST Wizznic_src_build_400.tar.bz2 38064791 BLAKE2B b80f1c3b49618b05a274ed8c29306d7e2ecaac599c5bcef881f10fcb5844e542b0125380fd359e25def195cca29b24aa4550fb48999b797171bcc65038a7ef43 SHA512 bdbfabebf9aedcb81b5e01e9580c27e644a652351de1384839e5013598202e7c74c7a72e571a99193184a0689e89a1170dc18ca70e1e4107a83a5572992ca73a
+EBUILD wizznic-400.ebuild 1081 BLAKE2B f773b6862b92632fa76034292d3ad9d8df9ead6d2746e3d78eef9b6b174432f9a5df1fb47700c3df856895129578ea7404192cd95d99a7f3731eb081a3534177 SHA512 ac6f6302d56e24bfc5d3d0a4769215230f0dc23d7d2e7b84281412cd102a453b04b0633bcb5914e686397826a0b369a98fd6c251a331dbe01fbfee57e75a67cf
MISC metadata.xml 331 BLAKE2B 3209331853c901fb5adef2d3cc667b7bed0e22c4f8963e8e9961038e5566cb9126a06d60c4ae54c4396a284ab333e8d6f5156b75089fd7540aee5409c80f2274 SHA512 ef00f84e659ee51d028292846b5f66d68a72ad96d380517ef1f895269e15fbd2e962f30bed53bfd4b30482055d4785225d79a621b9d31c06ad8683a4f6f50bc2
diff --git a/games-puzzle/wizznic/wizznic-369-r1.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild
deleted file mode 100644
index e1446c75a01f..000000000000
--- a/games-puzzle/wizznic/wizznic-369-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Block-clearing puzzle game"
-HOMEPAGE="http://wizznic.org/"
-SRC_URI="https://downloads.sourceforge.net/wizznic/Wizznic_src_build_${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer[vorbis]
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Wizznic_src_build_${PV}"
-
-src_prepare() {
- default
- sed \
- -e '/^\(CC\|LD\|STRIP\)/d' \
- -e 's/(LD)/(CC)/g' \
- -e '/CFLAGS.*=/d' \
- Makefile.linux > Makefile || die
-}
-
-src_compile() {
- emake \
- DATADIR="/usr/share/${PN}/" \
- BINDIR="/usr/bin" \
- STRIP=true
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- DATADIR="/usr/share/${PN}/" \
- BINDIR="/usr/bin" \
- install
- dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt}
- newicon data/wmicon.png ${PN}.png
- make_desktop_entry wizznic "Wizznic!"
-}
diff --git a/games-puzzle/wizznic/wizznic-400.ebuild b/games-puzzle/wizznic/wizznic-400.ebuild
new file mode 100644
index 000000000000..9e5e1d49a3c8
--- /dev/null
+++ b/games-puzzle/wizznic/wizznic-400.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Block-clearing puzzle game"
+HOMEPAGE="http://wizznic.org/"
+SRC_URI="https://downloads.sourceforge.net/wizznic/Wizznic_src_build_${PV}.tar.bz2"
+S="${WORKDIR}/Wizznic_src_build_${PV}"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+DEPEND="
+ media-libs/libsdl[sound,joystick,opengl?,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ opengl? ( media-libs/libglvnd[X] )
+"
+
+RDEPEND="
+ ${DEPEND}
+"
+
+src_compile() {
+ emake -f Makefile.linux \
+ DATADIR="${EPREFIX}/usr/share/${PN}/" \
+ WITH_OPENGL=$(usex opengl true false) \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -Wall -std=c99" \
+ LDFLAGS="${LDFLAGS}" \
+ STRIP=true
+}
+
+src_install() {
+ emake -f Makefile.linux \
+ DESTDIR="${ED}" \
+ DATADIR="/usr/share/${PN}/" \
+ BINDIR="/usr/bin" \
+ install
+
+ dodoc doc/{changelog,credits,media-licenses,ports,readme}.txt
+ newicon -s 32 data/wmicon.png ${PN}.png
+ make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
index f927b5ffce5e..beab2370b04a 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -1,4 +1,4 @@
AUX xpired-1.22-ldflags.patch 868 BLAKE2B 8230de4bfae81985ed37abb2c3810df680c64957411c0fa77c83d60581a373f2c85674bcbb5d4fd6070108981d76f6f2802fc5b191cdd8aa606f3f21df48d791 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9
DIST xpired-1.22-linux_source.tar.gz 478593 BLAKE2B 54ee871017e39bd599a1e5e13df282d309d4ef9c91c7bf1e6eab31cd83d5f2bb4d31d9c08df091796d9f61f55eb0d54e9745b8162f9e9116eeac98d7c49b0f9d SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10
-EBUILD xpired-1.22-r1.ebuild 876 BLAKE2B 409642f3a3b40b992ef80c265a9e64ed49c296fdbb193bf2644bf766a3d95847ea00d3651dac3c7bab2e7cba10dbaea9b0f7f0b17df3443799de75cb1cf30e92 SHA512 57ddc6d8e5a605bdd410107d5dc2f8253d0dd7203802463b985d3d5eccd84af38227f7281e1be97c49562cb5173ae1d045fd0b58cb17b05d9f244349c0b527d2
+EBUILD xpired-1.22-r2.ebuild 1001 BLAKE2B debea5ecb77294ccb59e0b645ff07b3b62944e756929451879665dfe15c71e4ec6af09a09d7c6367decf74707564f5530f157d7ee2386f32c4cd4fb66f866032 SHA512 fda9f1ed08ef284be762595fd7f3186c84f5711f37c9500f26490bef419ee819804e0c587d5cff39dc5bf7c96a8c197339bce70298377624f133072ec69471f5
MISC metadata.xml 330 BLAKE2B f71e4ff9b7904fb681900d015703e5332f708644c1d1620b47f6357761b933c1864936039c8fdbbc8e6034387fee5cb87fc61c3559f1244238db3806a0db5696 SHA512 9e442b200bd6e64c372097344c228d30ebe3fa2ba74d71c64793dedb0271b9a47f4cdd48e1b13365093de82efbc784f913183b57d13a287c14c8ce71fbfe924d
diff --git a/games-puzzle/xpired/xpired-1.22-r1.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild
deleted file mode 100644
index 8fb097ba0442..000000000000
--- a/games-puzzle/xpired/xpired-1.22-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Sokoban-styled puzzle game with lots more action"
-HOMEPAGE="https://xpired.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/xpired/${P}-linux_source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-gfx
- media-libs/sdl-image[jpeg]
- media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_compile() {
- emake \
- PREFIX=/usr \
- SHARE_PREFIX=/usr/share/xpired
-}
-
-src_install() {
- emake \
- PREFIX="${D}/usr" \
- SHARE_PREFIX="${D}/usr/share/${PN}" \
- install
-
- newicon img/icon.bmp ${PN}.bmp
- make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
- make_desktop_entry xpiredit "Xpired Level Editor"
-
- einstalldocs
-}
diff --git a/games-puzzle/xpired/xpired-1.22-r2.ebuild b/games-puzzle/xpired/xpired-1.22-r2.ebuild
new file mode 100644
index 000000000000..c5ac92ffb8aa
--- /dev/null
+++ b/games-puzzle/xpired/xpired-1.22-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Sokoban-styled puzzle game with lots more action"
+HOMEPAGE="https://www.online-siesta.com/game/x-pired/"
+SRC_URI="https://downloads.sourceforge.net/xpired/${P}-linux_source.tar.gz"
+S="${WORKDIR}/src"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-gfx
+ media-libs/sdl-image[jpeg]
+ media-libs/sdl-mixer[mod]
+"
+
+RDEPEND="
+ ${DEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_compile() {
+ emake \
+ PREFIX="${EPREFIX}/usr" \
+ SHARE_PREFIX="${EPREFIX}/usr/share/${PN}" \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install \
+ PREFIX="${ED}/usr" \
+ SHARE_PREFIX="${ED}/usr/share/${PN}"
+
+ newicon img/icon.bmp ${PN}.bmp
+ make_desktop_entry ${PN} X-pired /usr/share/pixmaps/${PN}.bmp
+ make_desktop_entry ${PN}it "X-pired Level Editor" /usr/share/pixmaps/${PN}.bmp
+
+ einstalldocs
+}
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
deleted file mode 100644
index aefb27509f1b..000000000000
--- a/games-puzzle/zaz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
-DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
-EBUILD zaz-1.0.0-r2.ebuild 1157 BLAKE2B b654bdbe2c524fe5f6b6915b23a92a52ea66f96209dfdc924bd7f272586361edc7231dee36292b55dab48d51996c88e339cf56f8a61c813df6641449722a1c28 SHA512 746577f3bc49174bb06b0e06c9dcc89eabcdff1aed7a768089f1542df146baa3948063961b2bb59e484cd14755f25d183b8ada3c68811b564005f4cfa27a1dd4
-MISC metadata.xml 327 BLAKE2B 40cd94d6aa36d8776044feadf89d9753c6ce38bdcee80b078779f612fd7e98ed43dd43895896717e291ee8d0913039420b165be6b4b80deb08d04d1b6ca20f62 SHA512 a4bbf08d0150fdcaf359ae34f0ba4f2235816615f98e7121535a80b69e97f381bff1de0ba2d0ea46015278d1ca77d2ffe9261f4e003601e988262ccc32792f89
diff --git a/games-puzzle/zaz/files/zaz-1.0.0-build.patch b/games-puzzle/zaz/files/zaz-1.0.0-build.patch
deleted file mode 100644
index bef2954bf088..000000000000
--- a/games-puzzle/zaz/files/zaz-1.0.0-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru zaz-0.7.0.orig/Makefile.am zaz-0.7.0/Makefile.am
---- zaz-0.7.0.orig/Makefile.am 2009-10-14 18:20:14.000000000 -0400
-+++ zaz-0.7.0/Makefile.am 2010-05-13 15:49:59.404464060 -0400
-@@ -2,15 +2,6 @@
-
- SUBDIRS = po src data extra
-
--dist_doc_DATA = \
-- README\
-- COPYING\
-- AUTHORS\
-- ChangeLog\
-- INSTALL\
-- NEWS
--
--
- EXTRA_DIST = config.rpath m4/ChangeLog\
- $(shared_data_DATA) \
- zaz.anjuta\
diff --git a/games-puzzle/zaz/metadata.xml b/games-puzzle/zaz/metadata.xml
deleted file mode 100644
index ff599c6d98fb..000000000000
--- a/games-puzzle/zaz/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">zaz</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-puzzle/zaz/zaz-1.0.0-r2.ebuild b/games-puzzle/zaz/zaz-1.0.0-r2.ebuild
deleted file mode 100644
index d029a94a7a34..000000000000
--- a/games-puzzle/zaz/zaz-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic xdg toolchain-funcs
-
-DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
-HOMEPAGE="https://sourceforge.net/projects/zaz/"
-SRC_URI="https://downloads.sourceforge.net/zaz/${P}.tar.bz2"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
- virtual/opengl
- virtual/glu
- media-libs/libsdl[X,sound,video]
- media-libs/sdl-image[jpeg,png]
- media-libs/libvorbis
- media-libs/libtheora
- media-libs/ftgl
- virtual/libintl
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- default
- local x=/usr/share/gettext/po/Makefile.in.in
- [[ -e $x ]] && cp -f $x po/ #336119
-
- eapply "${FILESDIR}"/${P}-build.patch
- eautoreconf
-}
-
-src_configure() {
- append-libs -lvorbis
- append-cflags $($(tc-getPKG_CONFIG) sdl --cflags)
- append-cxxflags $($(tc-getPKG_CONFIG) sdl --cflags)
- econf \
- --with-applicationdir=/usr/share/applications \
- --with-icondir=/usr/share/pixmaps \
- --localedir=/usr/share/locale \
- $(use_enable nls)
-}