summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild2
-rw-r--r--games-puzzle/brainparty/brainparty-0.61-r1.ebuild8
-rw-r--r--games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch14
-rw-r--r--games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch14
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild61
-rw-r--r--games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild2
-rw-r--r--games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild4
-rw-r--r--games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch6
-rw-r--r--games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild17
-rw-r--r--games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild6
-rw-r--r--games-puzzle/nudoku/Manifest2
-rw-r--r--games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch37
-rw-r--r--games-puzzle/nudoku/nudoku-2.1.0.ebuild (renamed from games-puzzle/nudoku/nudoku-1.0.0.ebuild)23
-rw-r--r--games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild2
-rw-r--r--games-puzzle/pingus/pingus-0.7.6-r3.ebuild2
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild3
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild3
17 files changed, 173 insertions, 33 deletions
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
index 3ed88c2a33d..4460627d59f 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit desktop python-single-r1
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
index 97d4b35c28a..6f6b8eeb9c5 100644
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
HOMEPAGE="http://www.tuxradar.com/brainparty"
@@ -28,6 +28,8 @@ PATCHES=(
"${FILESDIR}"/${P}-savegame.patch
"${FILESDIR}"/${P}-gcc49.patch
"${FILESDIR}"/${P}-gnu_cxx-hash.patch
+ "${FILESDIR}"/${P}-gcc-11.patch
+ "${FILESDIR}"/${P}-clang-11.patch
)
src_prepare() {
@@ -42,6 +44,8 @@ src_prepare() {
sed -i \
"/^int main(/ a\\\\tchdir(\"/usr/share/${PN}\");\n" \
main.cpp || die
+
+ tc-export CXX
}
src_install() {
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch b/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch
new file mode 100644
index 00000000000..07c1b970993
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-clang-11.patch
@@ -0,0 +1,14 @@
+clang-11 needs explicit cast
+
+https://bugs.gentoo.org/739284
+--- a/BPGame.cpp
++++ b/BPGame.cpp
+@@ -1507,7 +1507,7 @@ int BPGame::DivRem(int Num, int Div, int* Rem) {
+ }
+
+ void BPGame::DrawLine(int fromx, int fromy, int tox, int toy, Colour* col, float width) {
+- GLfloat vertices[] = { fromx, fromy, tox, toy };
++ GLfloat vertices[] = { (GLfloat)fromx, (GLfloat)fromy, (GLfloat)tox, (GLfloat)toy };
+
+ glDisable(GL_TEXTURE_2D);
+ glLineWidth(width);
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
new file mode 100644
index 00000000000..695fc0b674c
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gcc-11.patch
@@ -0,0 +1,14 @@
+gcc-11 needs const operator()
+
+https://bugs.gentoo.org/768204
+--- a/BPGame.h
++++ b/BPGame.h
+@@ -53,7 +53,7 @@ class BPMiniGame;
+ class SpriteFont;
+
+ struct cmp_str {
+- bool operator()(char const *a, char const *b) {
++ bool operator()(char const *a, char const *b) const {
+ return std::strcmp(a, b) < 0;
+ }
+ };
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
new file mode 100644
index 00000000000..196ab712fb4
--- /dev/null
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit autotools desktop lua-single
+
+DATA_PV="1.0.0"
+DESCRIPTION="Underwater puzzle game - find a safe way out"
+HOMEPAGE="http://fillets.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
+ mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+ >=media-libs/libsdl-1.2[sound,video]
+ >=media-libs/sdl-mixer-1.2.5[vorbis]
+ >=media-libs/sdl-image-1.2.2[png]
+ media-libs/smpeg
+ x11-libs/libX11
+ media-libs/sdl-ttf
+ dev-libs/fribidi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/fillets-ng-${PV}"
+
+src_prepare() {
+ default
+ #.mod was renamed to .fmod in lua 5.1.3 - bug #223271
+ sed -i \
+ -e 's/\.mod(/.fmod(/' \
+ $(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
+ || die "sed failed"
+ rm -f missing
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --datadir="/usr/share/${PN}"
+}
+
+src_install() {
+ default
+ insinto "/usr/share/${PN}"
+ cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
+ rm -f COPYING
+ einstalldocs
+ doins -r *
+ newicon images/icon.png ${PN}.png
+ make_desktop_entry fillets "Fish Fillets NG"
+}
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
index b44812810e1..717a4ba609c 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
index 1a86e9edd46..08ededa8519 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
COMMIT="317b1e70a87224c94cac85955a3d666a43527812"
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
KFMIN=5.60.0
QTMIN=5.12.3
inherit ecm kde.org
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
index 504f6c0987a..0bd66d5d284 100644
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -1,6 +1,6 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,13 +15,12 @@
+--- meandmyshadow-0.4.orig/CMakeLists.txt
++++ meandmyshadow-0.4/CMakeLists.txt
+@@ -15,13 +15,12 @@
Find_Package(CURL REQUIRED)
Find_Package(LibArchive REQUIRED)
Find_Package(OpenSSL REQUIRED)
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
index d576bee444c..809adb12079 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
-DESCRIPTION="A puzzle/platform game with a player and its shadow"
-HOMEPAGE="http://meandmyshadow.sourceforge.net/"
+DESCRIPTION="Puzzle/platform game with a player and its shadow"
+HOMEPAGE="https://acmepjz.github.io/meandmyshadow/
+https://github.com/acmepjz/meandmyshadow/"
SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
@@ -41,13 +42,13 @@ src_configure() {
-DDESKTOPDIR=/usr/share/applications
-DHARDWARE_ACCELERATION=$(usex opengl)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index 87cecf30833..b31eb86fcec 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit desktop python-r1
DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
@@ -40,7 +40,7 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
sed -i \
- -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+ -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
monsterz.py || die "sed failed"
rm Makefile || die
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 91eb0ee7850..62c4b2763e6 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1 +1 @@
-DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
+DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
diff --git a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
new file mode 100644
index 00000000000..396dbccddcc
--- /dev/null
+++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
@@ -0,0 +1,37 @@
+Ensure we link against the correct ncurses libraries.
+https://bugs.gentoo.org/764470
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,11 +1,7 @@
+ #AM_CFLAGS = --pedantic -Wall
+ #-DDEBUG
+
+-if HAVE_WIDE_NCURSES
+-nudoku_LDADD = -lncursesw
+-else
+-nudoku_LDADD = -lncurses
+-endif
++nudoku_LDADD = ${ncurses_LIBS}
+ bin_PROGRAMS = nudoku
+ nudoku_SOURCES = main.c sudoku.c sudoku.h
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo)
+
+ fi
+
+-have_wide_ncurses=no
+-AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes])
+-if test $have_wide_ncurses = no; then
+- AC_CHECK_LIB(ncurses, initscr, [], [
+- echo "nudoku requires ncurses"
+- exit 1
+- ])
+-fi
+-AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes])
++PKG_CHECK_MODULES([ncurses], [ncurses])
+
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+
diff --git a/games-puzzle/nudoku/nudoku-1.0.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
index 3277e1193f1..199f09b2bb1 100644
--- a/games-puzzle/nudoku/nudoku-1.0.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="ncurses based sudoku game"
HOMEPAGE="https://jubalh.github.io/nudoku"
@@ -12,15 +12,26 @@ SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="cairo"
-DEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ cairo? ( x11-libs/cairo )
+ >=sys-devel/gettext-0.20
+ sys-libs/ncurses:=
+ virtual/libintl
+"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.0-ncurses-link.patch"
+)
+
src_prepare() {
default
eautoreconf
}
-src_install() {
- emake DESTDIR="${D}" install
+src_configure() {
+ econf $(use_enable cairo)
}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
index 41ac5a9ae17..85aff6751a6 100644
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit desktop python-single-r1
diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
index 466c772c357..1b6acb9e7d8 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 687d7238d44..2988d396d97 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,6 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
GENTOO_ICONS="20160315"
SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
- KEYWORDS=""
else
MAGIC=e2135d5
SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index 687d7238d44..2988d396d97 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,6 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
GENTOO_ICONS="20160315"
SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
- KEYWORDS=""
else
MAGIC=e2135d5
SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"