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/bff-or-die/bff-or-die-20200614.ebuild9
-rw-r--r--games-puzzle/braincurses/braincurses-1.1.0.ebuild8
-rw-r--r--games-puzzle/brainparty/brainparty-0.61-r2.ebuild (renamed from games-puzzle/brainparty/brainparty-0.61-r1.ebuild)19
-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/brainworkshop/brainworkshop-5_beta20200310.ebuild5
-rw-r--r--games-puzzle/enigma/enigma-1.21-r3.ebuild61
-rw-r--r--games-puzzle/enigma/files/enigma-1.21-build.patch133
-rw-r--r--games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch11
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild59
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild28
-rw-r--r--games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild4
-rw-r--r--games-puzzle/gnome-klotski/Manifest1
-rw-r--r--games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild (renamed from games-puzzle/gnome2048/gnome2048-3.36.4.ebuild)29
-rw-r--r--games-puzzle/gnome-sudoku/Manifest1
-rw-r--r--games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild48
-rw-r--r--games-puzzle/gnome-taquin/Manifest1
-rw-r--r--games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild49
-rw-r--r--games-puzzle/gnome-tetravex/Manifest1
-rw-r--r--games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild50
-rw-r--r--games-puzzle/gnome2048/Manifest3
-rw-r--r--games-puzzle/gnome2048/gnome2048-3.38.2.ebuild (renamed from games-puzzle/gnome2048/gnome2048-3.36.0.ebuild)6
-rw-r--r--games-puzzle/gnurobbo/gnurobbo-0.68.ebuild3
-rw-r--r--games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch12
-rw-r--r--games-puzzle/greedy/greedy-0.2.0-r2.ebuild (renamed from games-puzzle/greedy/greedy-0.2.0-r1.ebuild)36
-rw-r--r--games-puzzle/lightsoff/Manifest1
-rw-r--r--games-puzzle/lightsoff/lightsoff-40.0.1.ebuild46
-rw-r--r--games-puzzle/metadata.xml1
-rw-r--r--games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild2
-rw-r--r--games-puzzle/nightsky/nightsky-20111222-r1.ebuild (renamed from games-puzzle/nightsky/nightsky-20111222.ebuild)31
-rw-r--r--games-puzzle/numptyphysics/Manifest2
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch44
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch13
-rw-r--r--games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild (renamed from games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild)29
-rw-r--r--games-puzzle/numptyphysics/numptyphysics-9999.ebuild43
-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/pingus/pingus-9999.ebuild4
-rw-r--r--games-puzzle/pipepanic/pipepanic-0.1.3-r2.ebuild (renamed from games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild)13
-rw-r--r--games-puzzle/quadrapassel/Manifest1
-rw-r--r--games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild50
-rw-r--r--games-puzzle/seatris/seatris-0.0.14-r1.ebuild (renamed from games-puzzle/seatris/seatris-0.0.14.ebuild)43
-rw-r--r--games-puzzle/sgt-puzzles/metadata.xml4
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild3
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild3
-rw-r--r--games-puzzle/splice/splice-20121120-r1.ebuild (renamed from games-puzzle/splice/splice-20121120.ebuild)35
-rw-r--r--games-puzzle/swell-foop/Manifest1
-rw-r--r--games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch25
-rw-r--r--games-puzzle/swell-foop/swell-foop-3.34.1.ebuild4
-rw-r--r--games-puzzle/swell-foop/swell-foop-40.0.ebuild44
-rw-r--r--games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild (renamed from games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild)33
-rw-r--r--games-puzzle/triptych/triptych-1.16.ebuild4
-rw-r--r--games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch61
-rw-r--r--games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch4
-rw-r--r--games-puzzle/xbomb/xbomb-2.2b-r1.ebuild (renamed from games-puzzle/xbomb/xbomb-2.2b.ebuild)41
-rw-r--r--games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch16
-rw-r--r--games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch20
-rw-r--r--games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild79
-rw-r--r--games-puzzle/xlogical/xlogical-1.0.7.ebuild59
-rw-r--r--games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch16
-rw-r--r--games-puzzle/xwelltris/xwelltris-1.0.1.ebuild52
-rw-r--r--games-puzzle/zaz/zaz-1.0.0-r1.ebuild9
63 files changed, 929 insertions, 518 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/bff-or-die/bff-or-die-20200614.ebuild b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
index 1f5014cfab2..5d5a60d2416 100644
--- a/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
+++ b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit eutils desktop xdg
+inherit desktop wrapper xdg
MY_PN="BffOrDie"
DESCRIPTION="Time travelling alien couch co-op puzzle game for 1-4 players"
HOMEPAGE="https://www.bffordie.com/"
SRC_URI="${MY_PN}_Linux.zip"
+S="${WORKDIR}/${MY_PN}_Linux"
+
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
@@ -18,13 +20,10 @@ RDEPEND="
sys-libs/zlib
virtual/opengl
"
-
BDEPEND="
app-arch/unzip
"
-S="${WORKDIR}/${MY_PN}_Linux"
-
DIR="/opt/${PN}"
QA_PREBUILT="${DIR#/}/*"
diff --git a/games-puzzle/braincurses/braincurses-1.1.0.ebuild b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
index 94f0c4ab55b..4a313b35b8a 100644
--- a/games-puzzle/braincurses/braincurses-1.1.0.ebuild
+++ b/games-puzzle/braincurses/braincurses-1.1.0.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=7
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/bderrly/braincurses/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_compile() {
emake CXX=$(tc-getCXX) LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r2.ebuild
index 97d4b35c28a..ea625a5d984 100644
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61-r2.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils
+inherit desktop toolchain-funcs
DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
HOMEPAGE="http://www.tuxradar.com/brainparty"
SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="
media-libs/libsdl[sound,opengl,video]
media-libs/sdl-gfx
media-libs/sdl-image[png]
media-libs/sdl-mixer[vorbis]
- media-libs/sdl-ttf"
+ media-libs/sdl-ttf
+ virtual/opengl
+ virtual/glu
+"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}
-
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 +45,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/brainworkshop/brainworkshop-5_beta20200310.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
index 145e5021f07..c0ec2a730ce 100644
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8} )
-inherit desktop eutils python-single-r1 xdg
+inherit desktop edos2unix python-single-r1 xdg
COMMIT="ea817f7e163c4fb07a60b2066c694cba92d23818"
DESCRIPTION="Short-term-memory training N-Back game"
HOMEPAGE="https://github.com/samcv/brainworkshop"
SRC_URI="https://github.com/samcv/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild
index bdecef93025..a073345f723 100644
--- a/games-puzzle/enigma/enigma-1.21-r3.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools gnome2-utils
+EAPI=7
+
+inherit autotools xdg
DESCRIPTION="Puzzle game similar to Oxyd"
HOMEPAGE="http://www.nongnu.org/enigma/"
@@ -13,7 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls"
-COMMON_DEPS="
+RDEPEND="
+ media-fonts/dejavu
media-libs/sdl-ttf
media-libs/libsdl[video]
media-libs/sdl-mixer
@@ -23,25 +25,22 @@ COMMON_DEPS="
net-misc/curl
|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
net-libs/enet:=
- nls? ( virtual/libintl )
-"
-DEPEND="${COMMON_DEPS}
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPS}
- media-fonts/dejavu
- x11-misc/xdg-utils
-"
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
src_prepare() {
default
- cp /usr/share/gettext/config.rpath .
- eapply "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-gcc6.patch
- sed -i \
- -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
- src/main.cc || die
+
eautoreconf
+ config_rpath_update .
}
src_configure() {
@@ -51,25 +50,15 @@ src_configure() {
}
src_install() {
- HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
- default
- dosym \
- /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
- /usr/share/${PN}/fonts/DejaVuSansCondensed.ttf
- dosym \
- /usr/share/fonts/dejavu/DejaVuSans.ttf \
- /usr/share/${PN}/fonts/vera_sans.ttf
+ HTML_DOCS=( doc/. )
+ DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING )
+ default
doman doc/enigma.6
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
+ dosym \
+ ../../fonts/dejavu/DejaVuSansCondensed.ttf \
+ /usr/share/enigma/fonts/DejaVuSansCondensed.ttf
+ dosym \
+ ../../fonts/dejavu/DejaVuSans.ttf \
+ /usr/share/enigma/fonts/vera_sans.ttf
}
diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch
index 6d5e91ca76e..421ac8b7ae7 100644
--- a/games-puzzle/enigma/files/enigma-1.21-build.patch
+++ b/games-puzzle/enigma/files/enigma-1.21-build.patch
@@ -1,24 +1,14 @@
-diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am
---- enigma-1.21.orig/Makefile.am 2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/Makefile.am 2015-02-06 18:20:22.239518323 -0500
-@@ -3,12 +3,9 @@
- # tools -> lib-src/lua
- # src -> tools, lib-src
- #
--SUBDIRS = m4 lib-src tools intl src data doc po etc
-+SUBDIRS = m4 lib-src tools intl src data po etc
- EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,6 +67,7 @@
+ AC_PROG_CXX
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
--docdir = @datadir@/doc/enigma
--doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
--
- ACLOCAL_AMFLAGS = -I m4
-
- .PHONY: tolua
-diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
---- enigma-1.21.orig/configure.ac 2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/configure.ac 2015-02-06 18:20:22.282516643 -0500
-@@ -342,7 +342,6 @@
+ dnl do not add the AC_PROG_CXX default CXXFLAGS
+@@ -342,7 +343,6 @@
CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
AC_MSG_RESULT(yes)
else
@@ -26,9 +16,49 @@ diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
AC_MSG_RESULT(no)
fi
-diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
---- enigma-1.21.orig/etc/Makefile.am 2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/Makefile.am 2015-02-06 18:25:44.131945494 -0500
+@@ -421,14 +421,17 @@
+ dnl ----------------------------------------------------------
+
+ AC_MSG_CHECKING(whether to use system enet)
+-AC_ARG_WITH(system-enet,
+- AS_HELP_STRING(--with-system-enet, Use system enet), system_enet=$withval,
+- system_enet=no
+-)
++AC_ARG_WITH([system-enet], [
++ AS_HELP_STRING([--with-system-enet], [Use system enet])], [
++ system_enet=$withval], [
++ system_enet=no])
++AC_MSG_RESULT([${system_enet}])
++
+ AM_CONDITIONAL([SYSTEM_ENET], [test "x$system_enet" = xyes])
+-AM_COND_IF([SYSTEM_ENET],
+- PKG_CHECK_MODULES(LIBENET, [libenet], ,AC_MSG_ERROR([libenet not found!])),
+- AC_CONFIG_SUBDIRS([lib-src/enet]))
++AM_COND_IF([SYSTEM_ENET], [
++ PKG_CHECK_MODULES([LIBENET], [libenet])], [
++ AC_CONFIG_SUBDIRS([lib-src/enet])
++])
+
+
+
+--- a/etc/enigma.desktop
++++ b/etc/enigma.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.21
++Version=1.0
+ Name=Enigma
+ Name[be]=Enigma
+ Name[cs]=Enigma
+@@ -44,5 +44,5 @@
+ StartupNotify=false
+ Icon=enigma
+ Type=Application
+-Categories=Application;Game;PuzzleGame;
++Categories=Game;X-PuzzleGame;
+
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
@@ -1,18 +1,18 @@
# if !MINGW32
# Comply with xdg icon theme specification
@@ -52,26 +82,34 @@ diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
dist_appdata_DATA = enigma.appdata.xml
# endif !MINGW32
-diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop
---- enigma-1.21.orig/etc/enigma.desktop 2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/enigma.desktop 2015-02-06 18:20:22.282516643 -0500
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=1.21
-+Version=1.0
- Name=Enigma
- Name[be]=Enigma
- Name[cs]=Enigma
-@@ -44,5 +44,5 @@
- StartupNotify=false
- Icon=enigma
- Type=Application
--Categories=Application;Game;PuzzleGame;
-+Categories=Game;X-PuzzleGame;
+--- a/lib-src/zipios++/configure.ac
++++ b/lib-src/zipios++/configure.ac
+@@ -37,6 +37,7 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
-diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
---- enigma-1.21.orig/po/Makefile.in.in 2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/po/Makefile.in.in 2015-02-06 18:20:22.283516604 -0500
+ dnl Checks for libraries.
+ AC_CHECK_LIB(z, inflate, [cv_libz=yes], [cv_libz=no])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,12 +3,9 @@
+ # tools -> lib-src/lua
+ # src -> tools, lib-src
+ #
+-SUBDIRS = m4 lib-src tools intl src data doc po etc
++SUBDIRS = m4 lib-src tools intl src data po etc
+ EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+
+-docdir = @datadir@/doc/enigma
+-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
+-
+ ACLOCAL_AMFLAGS = -I m4
+
+ .PHONY: tolua
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -25,12 +25,12 @@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
@@ -87,14 +125,15 @@ diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
#install_sh@ -d
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am
---- enigma-1.21.orig/src/Makefile.am 2014-12-19 16:24:38.000000000 -0500
-+++ enigma-1.21/src/Makefile.am 2015-02-06 18:20:22.283516604 -0500
-@@ -12,7 +12,7 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,8 +11,8 @@
+
CXXFLAGS = @CXXFLAGS@\
-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
- -DDOCDIR=\"$(docdir)\" \
+- -DDOCDIR=\"$(docdir)\" \
- -DLOCALEDIR=\"$(localedir_enigma)\" \
++ -DDOCDIR=\"$(htmldir)\" \
+ -DLOCALEDIR=\"/usr/share/locale\" \
-I$(top_srcdir)/lib-src/zipios++ \
-I$(top_builddir)/lib-src/zipios++ \
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch b/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch
new file mode 100644
index 00000000000..6fb973b0d46
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/778590
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+ ###################################################
+ # Check for libm
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
deleted file mode 100644
index 722c291c1dd..00000000000
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-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"
-IUSE=""
-
-RDEPEND="
- >=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
- >=dev-lang/lua-5:0
-"
-DEPEND="${RDEPEND}
- 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/fish-fillets/fish-fillets-1.0.1-r100.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
index 196ab712fb4..6dc60e4f3df 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,6 +12,7 @@ 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"
+S="${WORKDIR}/fillets-ng-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -19,42 +20,49 @@ KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${LUA_REQUIRED_USE}"
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+ ${LUA_DEPS}
+ dev-libs/fribidi
>=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/sdl-ttf
media-libs/smpeg
x11-libs/libX11
- media-libs/sdl-ttf
- dev-libs/fribidi
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/fillets-ng-${PV}"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.1-respect-AR.patch"
+)
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
+
+ rm -f missing || die
mv configure.in configure.ac || die
eautoreconf
}
src_configure() {
- econf --datadir="/usr/share/${PN}"
+ econf --datadir=/usr/share/${PN}
}
src_install() {
+ rm -f COPYING || die
+
default
- insinto "/usr/share/${PN}"
+
+ 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/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
index 5a209fa62cf..acc24c9c6d3 100644
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
GCONF_DEBUG="yes"
-inherit eutils gnome2
+inherit epatch gnome2
DESCRIPTION="A simple (but not so easy to solve!) puzzle game"
HOMEPAGE="http://glightoff.sourceforge.net/"
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index 863a8f65ec1..bf88b950f02 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1 +1,2 @@
DIST gnome-klotski-3.36.3.tar.xz 903456 BLAKE2B f8890d3e3c20fdd3df1933c5abfe81f4a7aa55678b62285c8992e899612c8ed361a57328b9a1b3ac190b9cbb6492f2cfd8b9dc93d77deea5752c4ca0552a19d2 SHA512 7e47ecad366e3c43108422263de0c1c01692f9eacd27622c2db8e673782b0f20c5e3085fbc4f33490c0a48e8b537141537bcd9fba4284a47ab151449034398a9
+DIST gnome-klotski-3.38.2.tar.xz 1030904 BLAKE2B 06af4115dab0fc63fd867633209c2590ad88331f9e7945ed1efec555a78dce9b6f41772e804170cb4a11a8463daf423e68e697abaf3ffba7fbc075dec78201a9 SHA512 dc2c33b4b555d77f04a8146741f9a4f5a6694ec046d457d50255fac306894c5b3306082c91adbfbc7d73d43ea3b109b36d992ecd9183db803c20e22f17c5e274
diff --git a/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
index 5eae653dcd4..84a76492105 100644
--- a/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-GNOME_ORG_MODULE="gnome-2048"
+VALA_MIN_API_VERSION="0.40"
inherit gnome.org gnome2-utils meson vala xdg
-DESCRIPTION="Move the tiles until you obtain the 2048 tile"
-HOMEPAGE="https://wiki.gnome.org/Apps/2048"
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
+ dev-libs/libgee:0.8=
>=dev-libs/glib-2.42.0:2
- >=x11-libs/gtk+-3.22.23:3
- >=media-libs/clutter-1.12.0:1.0
- >=media-libs/clutter-gtk-1.6.0:1.0
- >=dev-libs/libgee-0.14.0:0.8
- dev-libs/libgnome-games-support:1=
+ >=dev-libs/libgnome-games-support-1.7.1:1=
+ >=x11-libs/gtk+-3.24.0:3
+ >=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}
+ gnome-base/librsvg:2[vala]
"
-DEPEND="${RDEPEND}"
BDEPEND="
- dev-libs/libxml2:2
+ $(vala_depend)
+ dev-libs/appstream-glib
dev-util/itstool
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- $(vala_depend)
"
src_prepare() {
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 9cee612d6ae..72155e15b04 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1 +1,2 @@
DIST gnome-sudoku-3.36.0.tar.xz 357916 BLAKE2B fa56f8a1aaa87d7fac6c1df182ec8a3572aefe6a2693b3c2784afc0fd050a4085082b2ff6b0bfe8733d4b1d6e28e2e0927270b43a5708fd259d00f8803cb5e93 SHA512 617477b884d9ffb08571b25c76b52f2a418064f7af324673e32f43e8b3327c995ab4ace26feb5edeeadc79a1f7f1a0ef7d7fb39ef9397fc855e476bad29a50dc
+DIST gnome-sudoku-40.0.tar.xz 355580 BLAKE2B 9561e375fb9112c722317d1e85105e7efe2fa010f17756449f29d8d8fd292882c6f65706e412917166b841ba8618bfecbb8aa340657b61b7e6dba30076a33c49 SHA512 28b32179a038d692b0fe0cdc77971b20ede4865fb99e6b2761399ce554fdc1c8d11fdd96c2637cba44f534c2e84e1550daffc91180546683a13b417417125ca4
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
new file mode 100644
index 00000000000..32bf1bb1dea
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+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"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libgee:0.8=[introspection]
+ >=x11-libs/gtk+-3.24.0:3[introspection]
+ dev-libs/json-glib
+ >=dev-libs/qqwing-1.3.4
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index 492d37e24f5..26e8bf96d84 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1 +1,2 @@
DIST gnome-taquin-3.36.4.tar.xz 5253972 BLAKE2B ddeacc57e52e434c5f3f7956226c4dc3c25416c61d8e920116dafebd89a3b442c01c54840bacdb93d5ee6ca4b6428c36f77c56f53651fe90ee8fda9026b23db5 SHA512 72e28698e292ec198c77f4f56624bafd88220157582d220ace363e29bb2f3bdbe7198c30348a6aef12e07dce275be6280fd4dc8a6bcc58f31d1e5ef54d0f3f7d
+DIST gnome-taquin-3.38.1.tar.xz 5265440 BLAKE2B f37397a4f3d0e71cfe39b8bce00fa7a04679467b402251aae155395740b655aa67031d2cdcc8d46fa45b9a69b1e829e0da883f17f9ec9a48d763098cf44e7f95 SHA512 c92244049bb24ab1585375ca6337965891bcaf46e642e009e3f670a818554d842c1f55c78735229198dfd6d96e95ee56e106a7eb238052e1382118287d9e28d6
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
new file mode 100644
index 00000000000..5feac7ead04
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Move tiles so that they reach their places"
+HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.42.0:2
+ >=media-libs/gsound-1.0.2
+ >=x11-libs/gtk+-3.24.0:3
+ >=gnome-base/librsvg-2.32.0:2
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ x11-libs/gdk-pixbuf:2
+ $(vala_depend)
+ media-libs/gsound[vala]
+ gnome-base/librsvg:2[vala]
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 7aa34aa5557..04aafbbc3a0 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1 +1,2 @@
DIST gnome-tetravex-3.36.4.tar.xz 1005996 BLAKE2B 9647f3db8e60c6cccc243d3da798265fc51eb16a463ef37b8259689b6cc36b81391616f36b665f28c108bb0d70bc42ebe2fc1feafbbc77cb3256f78d1bc4c016 SHA512 a3c163ae61b312b94ed32c02eb13ccaf9aa2f5eefede1a0735b4240e3127be0bd6e827fda47b1bc2987f793fc5927ee63cc836bf1e2a149f958acb1946dba954
+DIST gnome-tetravex-3.38.2.tar.xz 1004632 BLAKE2B 5e16420e9e05668e3c697a275e748e75d65531fbe7bca61baffa5846b76781403a3014e1f85a6f9ec69965c256cbacbe3a756e36c9725eeccfd6abd0c568dabc SHA512 ad67dfcbec5cf33f5361c6f5746d78158726a4bf5c85f29ea084a324e2ec493ca41bb61e47228ad4deb30985fd750e8703e11fd02051af5ac7c9c256513644b8
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
new file mode 100644
index 00000000000..12f07175c24
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cli +gui"
+REQUIRED_USE="|| ( cli gui )"
+
+RDEPEND="
+ >=dev-libs/glib-2.42.0:2
+ gui? ( >=x11-libs/gtk+-3.22.23:3 )
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ gui? ( dev-util/itstool )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use cli build_cli)
+ $(meson_use gui build_gui)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome2048/Manifest b/games-puzzle/gnome2048/Manifest
index c86c42acad3..ae07289a6ed 100644
--- a/games-puzzle/gnome2048/Manifest
+++ b/games-puzzle/gnome2048/Manifest
@@ -1,2 +1 @@
-DIST gnome-2048-3.36.0.tar.xz 117764 BLAKE2B cf8f1fab6c218921a1ca1e3d568a0ea3cea9d7e39cb6631c79a82540c2152f09f3b29726a6af03720c84f6973d8f1371d32819bfec077f08b0803184fc1cf256 SHA512 a61907f7d1fb728ded21b61c74cc5d20f56b19ac4a82d4e068c5b5a8bddc6bd69b5aea1e48b08a83a7942482983981171cf9a73421c98f45dd7aa47e3cee3cf0
-DIST gnome-2048-3.36.4.tar.xz 121084 BLAKE2B 2dc8ae415d246780781cee624ff54047534e8d7b25681f6b6ae1e5cd6b8b71668f405a6f78c1a53857def9eabd3f80ff4dbaf415f22432b1251dd2373d511a6f SHA512 4b2e564aaf304e8e97e364a02eb8faf3a0169eab7fe73e8d716f03fd0156fe2796dca1332f257f335c1e7574774d2eb7ed0b97c13925d3300598b34c96fcd561
+DIST gnome-2048-3.38.2.tar.xz 126780 BLAKE2B 8d6eeb63927b49db6ff4cd4f0cf4da73233aa4b916bfb94b994e17417814c004bdbeaa913eee43dbb965e0723d0ef20682df62655138620cd0ba0ce42ad8be1c SHA512 9063c31ef2a1126b92b6f52950237ac3878a8cbe4b1304e2c56e4bc7f8b99320f45ad27b3d7be3fb4cd2a1856bd11a171facc98bc917076118b83380668e4df8
diff --git a/games-puzzle/gnome2048/gnome2048-3.36.0.ebuild b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
index 5eae653dcd4..6e94bd1f38d 100644
--- a/games-puzzle/gnome2048/gnome2048-3.36.0.ebuild
+++ b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,11 +16,11 @@ IUSE=""
RDEPEND="
>=dev-libs/glib-2.42.0:2
- >=x11-libs/gtk+-3.22.23:3
+ >=x11-libs/gtk+-3.24.0:3
>=media-libs/clutter-1.12.0:1.0
>=media-libs/clutter-gtk-1.6.0:1.0
>=dev-libs/libgee-0.14.0:0.8
- dev-libs/libgnome-games-support:1=
+ >=dev-libs/libgnome-games-support-1.7.1:1=
"
DEPEND="${RDEPEND}"
BDEPEND="
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
index fded8903934..2d1ba046871 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,6 +24,7 @@ RDEPEND="
media-libs/sdl-ttf
"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-flags.patch"
diff --git a/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch b/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch
new file mode 100644
index 00000000000..a728cde5b34
--- /dev/null
+++ b/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch
@@ -0,0 +1,12 @@
+--- a/greedy.c
++++ b/greedy.c
+@@ -13,6 +13,9 @@
+
+ #include <ncurses.h>
+ #include <stdlib.h>
++#include <time.h>
++#include <unistd.h>
++#include <string.h>
+ #include "playmodes.h"
+ #include "playmodes.c"
+
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r2.ebuild
index dffb899aebf..aea669387c1 100644
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ b/games-puzzle/greedy/greedy-0.2.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit toolchain-funcs games
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="fun little ncurses puzzle game"
HOMEPAGE="http://www.kotinet.com/juhamattin/linux/index.html"
@@ -11,30 +12,31 @@ SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-missing-include.patch )
src_prepare() {
- rm -f Makefile
+ default
+
+ rm Makefile || die
# It wants a scores file. We need to touch one and install it.
- touch greedy.scores
+ touch greedy.scores || die
}
src_compile() {
- emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
+ emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" greedy
}
src_install() {
- insinto "${GAMES_STATEDIR}"
- doins greedy.scores
-
- dogamesbin greedy
- dodoc CHANGES README TODO
+ dobin greedy
+ einstalldocs
- prepgamesdirs
+ insinto /var/games
+ doins greedy.scores
# We need to set the permissions correctly
- fperms 664 "${GAMES_STATEDIR}/greedy.scores"
+ fperms 664 /var/games/greedy.scores
}
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index e252d05a1ae..742dbd050a1 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1 +1,2 @@
DIST lightsoff-3.36.0.tar.xz 497756 BLAKE2B 1765f848608a40feda87e7e950675febcccb307639b6aeec3f12001516f80766a815e8989ba9c18813a397759efedd251921d988091be2bdd7c8c887a296bfe5 SHA512 9d026432bf059fb72aa8aab7b52c22e81acca12c8ba6a26350970a22a760a5d113958288196acc38d6ecba1096155323ecef86406e94d35e9ed82f26f9e30eae
+DIST lightsoff-40.0.1.tar.xz 562340 BLAKE2B c80aa328e56a1cb8da723c187c6a223d0bf93353f36ed651b10c38ac129c6d62970dcf72308cbbf4fd0f911113b5c53ed490824b488bdc92e84c7bd9e9ae1015 SHA512 ac1f812c3297a42f1e5aa8b8cdda2884b5c2aea2ea0190047ba5a0f47254b191d2105d7d1b548f0233fdee1b0e6033a97265a1cb28503daf403ee4e2c53a1aca
diff --git a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
new file mode 100644
index 00000000000..47b3e2b9932
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+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="
+ 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() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/metadata.xml b/games-puzzle/metadata.xml
index abb3008d8ab..64f38387513 100644
--- a/games-puzzle/metadata.xml
+++ b/games-puzzle/metadata.xml
@@ -30,4 +30,3 @@
Kategoria games-puzzle zawiera układanki.
</longdescription>
</catmetadata>
-
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index 1b700232e1a..b31eb86fcec 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -3,7 +3,7 @@
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"
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
index d4876d52ef4..f74d7895b84 100644
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils gnome2-utils games
+inherit desktop gnome2-utils
DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
HOMEPAGE="http://www.nicalis.com/nightsky/"
SRC_URI="nightskyhd-linux-1324519044.tar.gz"
+S="${WORKDIR}"/NightSky
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="bundled-libs"
+
RESTRICT="bindist fetch splitdebug"
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/NightSky*
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+ ${MYGAMEDIR#/}/NightSky*
${MYGAMEDIR#/}/lib/*
- ${MYGAMEDIR#/}/lib64/*"
+ ${MYGAMEDIR#/}/lib64/*
+"
RDEPEND="
virtual/glu
@@ -36,8 +40,6 @@ RDEPEND="
sys-libs/zlib
)"
-S=${WORKDIR}/NightSky
-
pkg_nofetch() {
einfo "Please buy & download ${SRC_URI} from:"
einfo " ${HOMEPAGE}"
@@ -45,12 +47,14 @@ pkg_nofetch() {
}
src_prepare() {
- einfo "removing ${ARCH} unrelated files..."
+ default
+
+ einfo "Removing ${ARCH} unrelated files..."
rm -v NightSkyHD$(usex amd64 "" "_64") || die
rm -rv lib$(usex amd64 "" "64") || die
if ! use bundled-libs ; then
- einfo "removing bundled libs..."
+ einfo "Removing bundled libs..."
rm -rv lib* || die
fi
@@ -58,12 +62,12 @@ src_prepare() {
rm -r Settings || die
sed \
- -e "s#@GAMES_PREFIX_OPT@#${GAMES_PREFIX_OPT}#" \
+ -e "s#@GAMES_PREFIX_OPT@#/opt#" \
"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
}
src_install() {
- dogamesbin "${T}"/${PN}
+ dobin "${T}"/${PN}
insinto "${MYGAMEDIR}"
doins -r *
@@ -72,16 +76,13 @@ src_install() {
make_desktop_entry ${PN}
fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
- prepgamesdirs
}
pkg_preinst() {
- games_pkg_preinst
gnome2_icon_savelist
}
pkg_postinst() {
- games_pkg_postinst
gnome2_icon_cache_update
echo
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index b8b327c51d4..ce3a6fe46ba 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -11,7 +11,7 @@ DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b0
DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.4.tar.gz 1646818 BLAKE2B a78b68437bf446036b227dd9e37bcc3b7e3098f9998aa4a6172e68736b5b840db153538c063a20a02b3a1e7e2d5b0c9b3e976f5ffa8b631a44b8544e9c34bb24 SHA512 2934303737309c058f64ba9dc24a292553e065c7604c8f0964365a9ca2ef68356a68515df5d71b2d3a0f59d115ebcc8b052a17f66ca2cfd5ffa80b68a38ca407
+DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
deleted file mode 100644
index e3a7b2ee372..00000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/external/glaserl/makefile b/external/glaserl/makefile
-index 4120459..f49d9e7 100644
---- a/external/glaserl/makefile
-+++ b/external/glaserl/makefile
-@@ -1,7 +1,5 @@
- TARGET := libglaserl.a
-
--CFLAGS += -g -O2
--
- SOURCES := $(wildcard *.c)
- OBJECTS := $(SOURCES:.c=.o)
-
-diff --git a/makefile b/makefile
-index 0f9a9b6..292b759 100644
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,6 @@
- APP := numptyphysics
-
- SOURCES := $(wildcard src/*.cpp)
--CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
-
- all: app
-
-@@ -13,7 +12,7 @@ app: $(TARGET)
-
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- $(SILENTMSG) "\tLD\t$@\n"
-- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
-
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- $(SILENTMSG) "\tCLEAN\n"
-diff --git a/src/Os.cpp b/src/Os.cpp
-index b5d7fb9..6a0ccf4 100644
---- a/src/Os.cpp
-+++ b/src/Os.cpp
-@@ -262,5 +262,5 @@ Os::globalDataDir()
- }
-
- // System-wide installation
-- return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
-+ return "/usr/share/numptyphysics/data";
- }
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
new file mode 100644
index 00000000000..9a739ed5227
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 8125a48..0ee4942 100644
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
+
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ $(SILENTMSG) "\tLD\t$@\n"
+- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+ $(SILENTMSG) "\tCLEAN\n"
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
index f06dc622d84..3e4879ce8aa 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic
+EAPI=7
+
+inherit flag-o-matic gnome2-utils toolchain-funcs
DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+HOMEPAGE="https://thp.io/2015/numptyphysics/"
# This is only the SRC_URI for the user levels. The code is in git repo.
SRC_URI="user-levels? (
- https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> ${P}.tar.gz
+ https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz
http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
@@ -39,20 +40,22 @@ KEYWORDS="~amd64"
IUSE="+user-levels"
RDEPEND="
+ dev-libs/glib:2
media-libs/libsdl2[opengl,video]
media-libs/sdl2-image[png]
media-libs/sdl2-ttf
virtual/opengl
- dev-libs/glib:2
-"
-DEPEND="${DEPEND}
- virtual/pkgconfig
"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
-src_prepare() {
- default
- append-cxxflags -std=c++11 -Isrc
- eapply "${FILESDIR}"/${P}-gentoo.patch
+src_compile() {
+ tc-export CC CXX
+ emake
}
pkg_preinst() {
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index 01e05708917..91c738f58ca 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic git-r3
+EAPI=7
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+inherit flag-o-matic git-r3 gnome2-utils toolchain-funcs
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://thp.io/2015/numptyphysics/"
+EGIT_REPO_URI="https://github.com/thp/numptyphysics"
# This is only the SRC_URI for the user levels. The code is in git repo.
SRC_URI="user-levels? (
http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
@@ -32,35 +33,27 @@ SRC_URI="user-levels? (
http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
)"
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
IUSE="+user-levels"
-RDEPEND="media-libs/libsdl2[opengl,video]
+RDEPEND="
+ dev-libs/glib:2
+ media-libs/libsdl2[opengl,video]
media-libs/sdl2-image[png]
media-libs/sdl2-ttf
virtual/opengl
- dev-libs/glib:2"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-src_unpack() {
- git-r3_src_unpack
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
-src_prepare() {
- append-cxxflags -std=c++11 -Isrc
- sed -i '/-g -O2/d' external/Box2D/Source/Makefile \
- external/glaserl/makefile || die
- sed -i "/return thp::/s% thp::.*$%\"/usr/share/${PN}/data\";%" \
- src/Os.cpp || die
- sed -e '/CXXFLAGS +=/s/\(CXXFLAGS +=\).*\( -DAPP=.*\)/\1\2/' \
- -e '/SILENTCMD/s/$(LIBS)$/$(LDFLAGS) $(LIBS)/' \
- -i makefile || die
- eapply_user
+src_compile() {
+ tc-export CC CXX
+ emake
}
pkg_preinst() {
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/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
index a69c1c22fc7..b0083c14fd5 100644
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake toolchain-funcs flag-o-matic xdg
+inherit cmake flag-o-matic xdg
DESCRIPTION="free Lemmings clone"
HOMEPAGE="https://pingus.gitlab.io/"
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r2.ebuild
index bc849e72427..12646582091 100644
--- a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3-r2.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit desktop
DESCRIPTION="A simple pipe connecting game"
HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
LICENSE="GPL-2 FreeArt"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
DEPEND="media-libs/libsdl[video]"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-source"
+RDEPEND="${DEPEND}"
src_prepare() {
default
@@ -29,9 +28,9 @@ src_prepare() {
}
src_install() {
- dobin "${PN}"
+ dobin ${PN}
- insinto "/usr/share/${PN}"
+ insinto /usr/share/${PN}
doins *.bmp
newicon PipepanicIcon64.png ${PN}.png
make_desktop_entry ${PN} "Pipepanic"
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 548ab937417..281e746fd82 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1 +1,2 @@
DIST quadrapassel-3.36.05.tar.xz 309160 BLAKE2B a9db4572a128ae0b965f29f83206dfa272ec6e5ad6316b0b0135d7424fdf6ea96c8ed602b4c6908b9ef7185c7821a658982398ea7a003de3c9714cbbb129fe59 SHA512 4219129a65d604e11cb1ef6ba38926311e7f32fb5bfebfc723236277fe0b779c5f1ddfca27db43f40d059291e2a4f9ff2552de6332002cb11b965136a946340e
+DIST quadrapassel-3.38.1.tar.xz 332316 BLAKE2B 5d1a1cb2c53653739e06818dd0ac1570b3a8f66ac4172ecec2e62e0afaa4054c604448c847600301dfd843d7d30c299691ca70b8568cf17921505ac16a5ba510 SHA512 4514b2ba0e53b5c9b6ce32fed850cdeac4d2fe9f848f87af61d51da18a94ff54da8c7126bd4df837452ba967dccf4dcd61c41c59402f1f0b76e2e19253bde8eb
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
new file mode 100644
index 00000000000..40282e16218
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/clutter-1:1.0
+ >=media-libs/clutter-gtk-0.91.6:1.0
+ media-libs/cogl:1.0=
+ >=media-libs/gsound-1.0.2
+ >=x11-libs/gtk+-3.12.0:3
+ >=dev-libs/libmanette-0.2.0
+ x11-libs/pango
+ >=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ media-libs/gsound[vala]
+ dev-libs/libmanette[vala]
+ gnome-base/librsvg:2[vala]
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14-r1.ebuild
index d13a963fa7c..6669683f0a9 100644
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ b/games-puzzle/seatris/seatris-0.0.14-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="A color ncurses tetris clone"
HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
@@ -12,16 +13,28 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND="sys-libs/ncurses"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
+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:${GAMES_STATEDIR}:" \
+ -e "s:/var/lib/games:/var/lib/${PN}:" \
scoring.h seatris.6 || die
+}
- epatch "${FILESDIR}"/${P}-as-needed.patch
+src_configure() {
+ tc-export CC
+ econf
}
src_compile() {
@@ -29,11 +42,15 @@ src_compile() {
}
src_install() {
- dogamesbin seatris
+ dobin seatris
+
doman seatris.6
dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
- dodir "${GAMES_STATEDIR}"
- touch "${D}${GAMES_STATEDIR}/seatris.score"
- fperms 660 "${GAMES_STATEDIR}/seatris.score"
- prepgamesdirs
+
+ 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}
+ fperms g+s /usr/bin/${PN}
}
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
index 744f27f1fda..697024d76f6 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -6,8 +6,8 @@
<name>Gentoo Games Project</name>
</maintainer>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
- <name>NP-Hardass</name>
+ <email>np-hardass@gentoo.org</email>
+ <name>Adam Feldman</name>
</maintainer>
<use>
<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
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"
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120-r1.ebuild
index d9b15617e47..2a420c4413f 100644
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ b/games-puzzle/splice/splice-20121120-r1.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# TODO: unbundle mono? (seems hardcoded)
-# icon
+EAPI=7
-EAPI=5
-
-inherit eutils games
+inherit desktop wrapper
DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
HOMEPAGE="http://www.cipherprime.com/games/splice/"
SRC_URI="splice-linux-1353389454.tar.gz"
+S="${WORKDIR}"/Linux
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
RESTRICT="bindist fetch splitdebug"
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Splice*
- ${MYGAMEDIR#/}/Splice_Data/Mono/*"
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+ ${MYGAMEDIR#/}/Splice*
+ ${MYGAMEDIR#/}/Splice_Data/Mono/*
+"
+# TODO: unbundle mono? (seems hardcoded)
+# icon
RDEPEND="
virtual/glu
virtual/opengl
@@ -29,8 +31,6 @@ RDEPEND="
x11-libs/libXcursor
x11-libs/libXext"
-S=${WORKDIR}/Linux
-
pkg_nofetch() {
einfo "Please buy & download ${SRC_URI} from:"
einfo " ${HOMEPAGE}"
@@ -38,7 +38,9 @@ pkg_nofetch() {
}
src_prepare() {
- einfo "removing ${ARCH} unrelated files..."
+ default
+
+ einfo "Removing ${ARCH} unrelated files..."
rm -v Splice.x86$(usex amd64 "" "_64") || die
rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
@@ -49,12 +51,11 @@ src_prepare() {
src_install() {
dodoc "${T}"/README
- insinto "${MYGAMEDIR}"
+ insinto ${MYGAMEDIR}
doins -r *
make_desktop_entry ${PN}
- games_make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
+ make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
- fperms +x "${MYGAMEDIR}"/Splice.x86$(usex amd64 "_64" "")
- prepgamesdirs
+ fperms +x ${MYGAMEDIR}/Splice.x86$(usex amd64 "_64" "")
}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index ad503877342..38ba62678b3 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1 +1,2 @@
DIST swell-foop-3.34.1.tar.xz 732008 BLAKE2B e41527ce485fc7d41b3b8667fba1100fc79a1683adbe7948ecb0f73b418f5e8bcd8c5eeb15c1083cfcbb0237294016ea49510ae6103e2cfc6bc93b508a61a02f SHA512 53625882a755959349f259f5527a48f926e6b8e0493eb81ac257fed6869b87d48e789e4a2141bee7aa8910fb061ca9d7541ceef7f3bdb7a5138068cc6dd16b81
+DIST swell-foop-40.0.tar.xz 821796 BLAKE2B c831a3ed4fc2f53a85793f19dee2e481970784dca4b092db7f905123073b185608fbd8c0a4d8b0c2a74fc4f48e982c4d39b88132381b2a4155609398868825fd SHA512 018a51fdc0e54d9f011a90757fad9d568df33b33241cff9281a49306b8cc236e173e251e8b7ae769a8096f0c9893d496108e4183382ac2f116128fce99774a00
diff --git a/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
new file mode 100644
index 00000000000..ddc189ff54d
--- /dev/null
+++ b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
@@ -0,0 +1,25 @@
+From a366bf649c032c56f52138d14e2b96b4a48525de Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Thu, 2 Jul 2020 15:28:02 +0200
+Subject: [PATCH] Don't use unsupported vala syntax
+
+---
+ src/game-view.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/game-view.vala b/src/game-view.vala
+index 1fb0c4b..69b50b8 100644
+--- a/src/game-view.vala
++++ b/src/game-view.vala
+@@ -451,7 +451,7 @@ private class Theme : Object
+ internal Theme (string name)
+ {
+ textures = new Clutter.Image [4];
+- string[4] colors = {"blue", "green", "yellow", "red"};
++ string[] colors = {"blue", "green", "yellow", "red"};
+
+ /* Create the textures required to render */
+ try
+--
+2.26.3
+
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
index 1073712ed55..d3d72fffdb6 100644
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
$(vala_depend)
"
+PATCHES=(
+ "${FILESDIR}"/3.34.1-fix-vala-0.50.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
diff --git a/games-puzzle/swell-foop/swell-foop-40.0.ebuild b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
new file mode 100644
index 00000000000..763530ce1ac
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=x11-libs/gtk+-3.24:3
+ >=media-libs/clutter-1.14.0:1.0
+ >=media-libs/clutter-gtk-1.5.0:1.0
+ >=dev-libs/libgnome-games-support-1.7.1:1=
+ >=dev-libs/libgee-0.14.0:0.8=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild
index d8b650922b2..e0c90bcce70 100644
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# TODO: unbundle media-libs/cal3d, lib hacked or old version
-
-EAPI=5
+EAPI=7
-inherit eutils games
+inherit desktop wrapper
DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
HOMEPAGE="http://www.tinyandbig.com/"
SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
+S="${WORKDIR}"/tinyandbig
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="bundled-libs"
+
RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+MYGAMEDIR=opt/${PN}
QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
${MYGAMEDIR#/}/bin64/*"
-DEPEND="app-arch/bzip2"
+# TODO: unbundle media-libs/cal3d, lib hacked or old version
RDEPEND="
- virtual/opengl
media-libs/openal
+ virtual/opengl
x11-libs/libX11
!bundled-libs? (
media-gfx/nvidia-cg-toolkit
- )"
-
-S=${WORKDIR}/tinyandbig
+ )
+"
+BDEPEND="app-arch/bzip2"
pkg_nofetch() {
einfo "Please buy & download ${SRC_URI} from:"
@@ -40,7 +40,9 @@ pkg_nofetch() {
}
src_prepare() {
- if use !bundled-libs ; then
+ default
+
+ if ! use bundled-libs ; then
rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
fi
}
@@ -48,13 +50,12 @@ src_prepare() {
src_install() {
local bindir=$(usex amd64 "bin64" "bin32")
- insinto "${MYGAMEDIR}"
+ insinto ${MYGAMEDIR}
doins -r assets ${bindir}
- games_make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
+ make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
make_desktop_entry ${PN} "Tiny & Big"
dodoc readme.txt
- fperms +x "${MYGAMEDIR}"/${bindir}/tinyandbig
- prepgamesdirs
+ fperms +x ${MYGAMEDIR}/${bindir}/tinyandbig
}
diff --git a/games-puzzle/triptych/triptych-1.16.ebuild b/games-puzzle/triptych/triptych-1.16.ebuild
index c6c262733c4..a142a6c3e78 100644
--- a/games-puzzle/triptych/triptych-1.16.ebuild
+++ b/games-puzzle/triptych/triptych-1.16.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
-inherit desktop eutils
+inherit wrapper
DESCRIPTION="Fast-paced Tetris-like puzzler"
HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
index 2ee8edd4ec9..6f45b4c82fa 100644
--- a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
@@ -1,34 +1,27 @@
-*** xbomb-2.1/Makefile 1996-01-20 16:02:46.000000000 -0500
---- xbomb-2.1.new/Makefile
-***************
-*** 27,34 ****
-
- OBJ=xbomb.o xwindow.o hiscore.o
-
-- INSTDIR=/usr/local
--
- ########
-
- xbomb : $(OBJ)
---- 27,32 ----
-***************
-*** 52,60 ****
-
- install :
- strip xbomb
-! install -d $(INSTDIR)/bin
-! install -d $(INSTDIR)/man/man6
-! install -d $(INSTDIR)/lib/app-defaults
-! install -m 755 xbomb $(INSTDIR)/bin
-! install -m 644 xbomb.6 $(INSTDIR)/man/man6
-! install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
---- 50,58 ----
-
- install :
- strip xbomb
-! install -d $(DESTDIR)/usr/bin
-! install -d $(DESTDIR)/usr/share/man/man6
-! install -d $(DESTDIR)/etc/X11/app-defaults
-! install -m 755 xbomb $(DESTDIR)/usr/bin
-! install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
-! install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,6 @@
+
+ OBJ=xbomb.o xwindow.o hiscore.o
+
+-INSTDIR=/usr/local
+-
+ ########
+
+ xbomb : $(OBJ)
+@@ -52,9 +50,9 @@
+
+ install :
+ strip xbomb
+- install -d $(INSTDIR)/bin
+- install -d $(INSTDIR)/man/man6
+- install -d $(INSTDIR)/lib/app-defaults
+- install -m 755 xbomb $(INSTDIR)/bin
+- install -m 644 xbomb.6 $(INSTDIR)/man/man6
+- install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
++ install -d $(DESTDIR)/usr/bin
++ install -d $(DESTDIR)/usr/share/man/man6
++ install -d $(DESTDIR)/etc/X11/app-defaults
++ install -m 755 xbomb $(DESTDIR)/usr/bin
++ install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
++ install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
index a320b0900c5..9f1f524b33c 100644
--- a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -30,7 +30,7 @@
########
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
index 488c4de4bd5..d717dc1dcef 100644
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop toolchain-funcs
DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
@@ -11,30 +12,44 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
DEPEND="x11-libs/libXaw"
-RDEPEND=${DEPEND}
+RDEPEND="
+ ${DEPEND}
+ acct-group/gamestat
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-DESTDIR.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-DESTDIR.patch \
- "${FILESDIR}"/${P}-ldflags.patch
+ default
+
sed -i \
-e '/strip/d' \
-e '/^CC=/d' \
-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
- -e "s:/usr/bin:${GAMES_BINDIR}:" \
Makefile || die
sed -i \
- -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \
+ -e "s:/var/tmp:/var/lib/${PN}:g" \
hiscore.c || die
}
+src_configure() {
+ tc-export CC
+}
+
src_install() {
default
- dodir "${GAMES_STATEDIR}"/${PN}
- touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed"
- fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi
+
+ dodir /var/lib/${PN}
+ touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
+ fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
+
+ fowners root:gamestat /var/lib/${PN}
+ fperms g+s /usr/bin/${PN}
+
make_desktop_entry xbomb XBomb
- prepgamesdirs
}
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
index 19cd188b0e0..5c77527dc59 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- properties.h.old 2007-01-11 17:33:45.000000000 +0100
-+++ properties.h 2007-01-11 17:34:32.000000000 +0100
+--- a/properties.h
++++ b/properties.h
@@ -33,9 +33,7 @@
#include <map>
#include <string>
@@ -10,8 +10,8 @@
#include "defs.h"
---- anim.h.old 2007-01-11 17:36:20.000000000 +0100
-+++ anim.h 2007-01-11 17:36:37.000000000 +0100
+--- a/anim.h
++++ b/anim.h
@@ -27,9 +27,7 @@
// Language Includes
#include <list>
@@ -22,8 +22,8 @@
// Application Includes
#include "graph.h"
---- exception.h.old 2007-01-11 17:37:37.000000000 +0100
-+++ exception.h 2007-01-11 17:38:21.000000000 +0100
+--- a/exception.h
++++ b/exception.h
@@ -27,10 +27,9 @@
// Language Includes
@@ -36,8 +36,8 @@
#define CatchEx(aEx) catch( CXLException aEx )
#define ThrowEx(aError) throw CXLException(aError,__FILE__,__LINE__)
---- gamelogic.cpp.old 2007-01-11 17:38:52.000000000 +0100
-+++ gamelogic.cpp 2007-01-11 17:39:12.000000000 +0100
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
@@ -154,7 +154,7 @@
levelFile = NULL;
}
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
index 4b64fcd6778..594298c93d4 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -1,5 +1,5 @@
---- gamelogic.cpp
-+++ gamelogic.cpp
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
@@ -25,6 +25,7 @@
#include<fstream>
#include<cstdio>
@@ -8,8 +8,8 @@
#ifndef WIN32
#include<unistd.h>
---- levelmap.cpp
-+++ levelmap.cpp
+--- a/levelmap.cpp
++++ b/levelmap.cpp
@@ -21,6 +21,7 @@
////////////////////////////////////////////////////////////////////////
@@ -18,8 +18,8 @@
#include <cstdio>
#include <cctype>
#include <cstring>
---- mapedit.cpp
-+++ mapedit.cpp
+--- a/mapedit.cpp
++++ b/mapedit.cpp
@@ -26,6 +26,8 @@
#include<cstdio>
#include<list>
@@ -29,8 +29,8 @@
#ifndef WIN32
#include<unistd.h>
---- modlist.cpp
-+++ modlist.cpp
+--- a/modlist.cpp
++++ b/modlist.cpp
@@ -22,6 +22,7 @@
#include <iostream>
@@ -39,8 +39,8 @@
#ifdef WIN32
#include <afxwin.h>
---- tile_spinner.cpp
-+++ tile_spinner.cpp
+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
@@ -24,6 +24,7 @@
diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
new file mode 100644
index 00000000000..835489919ed
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop edos2unix
+
+MY_PV=$(ver_rs 2 '-')
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="SDL logical clone"
+HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
+SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+ alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alt_gfx"
+
+DEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-image[jpeg]
+ media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+ ${DEPEND}
+ acct-group/gamestat
+"
+BDEPEND="alt_gfx? ( app-arch/unzip )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc41.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_unpack() {
+ unpack ${MY_P}.tar.bz2
+
+ if use alt_gfx ; then
+ cd "${S}"/images || die
+ unpack xlogical_gfx.zip
+ fi
+}
+
+src_prepare() {
+ sed -i '/^CXXFLAGS/d' Makefile.am || die
+
+ edos2unix properties.h anim.h exception.h
+
+ default
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # localstatedir is only used for the score file
+ # NOTE: Check on bumps!
+ econf --localstatedir="/var/games"
+}
+
+src_install() {
+ dobin ${PN}
+
+ insinto /usr/share/${PN}
+ doins -r ${PN}.{properties,levels} music sound images
+ find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die
+
+ insinto /var/games/${PN}
+ doins ${PN}.scores
+
+ fowners root:gamestat /var/games/${PN}/${PN}.scores
+ fperms 660 /var/games/${PN}/${PN}.scores
+ fperms g+s /usr/bin/${PN}
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+ make_desktop_entry ${PN} "Xlogical"
+}
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
deleted file mode 100644
index fd78761103c..00000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils games
-
-MY_PV=$(replace_version_separator 2 '-' )
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
-SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
- alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-RDEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-image[jpeg]
- media-libs/sdl-mixer[mod]"
-DEPEND="${RDEPEND}
- alt_gfx? ( app-arch/unzip )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
- unpack ${MY_P}.tar.bz2
- if use alt_gfx ; then
- cd "${S}/images"
- unpack xlogical_gfx.zip
- fi
-}
-
-src_prepare() {
- sed -i '/^CXXFLAGS/d' Makefile.am || die
- edos2unix properties.h anim.h exception.h
- epatch \
- "${FILESDIR}"/${P}-gcc41.patch \
- "${FILESDIR}"/${P}-gcc43.patch
- mv configure.in configure.ac
- eautoreconf
-}
-
-src_install() {
- dogamesbin ${PN}
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r ${PN}.{properties,levels} music sound images
- find "${D}" -name "Makefile*" -exec rm -f '{}' +
-
- insinto "${GAMES_STATEDIR}"/${PN}
- doins ${PN}.scores
- fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
-
- dodoc AUTHORS ChangeLog NEWS README TODO
- make_desktop_entry ${PN} "Xlogical"
- prepgamesdirs
-}
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch
new file mode 100644
index 00000000000..67f832ae372
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch
@@ -0,0 +1,16 @@
+--- a/src/commonfuncs.cxx
++++ b/src/commonfuncs.cxx
+@@ -41,7 +41,12 @@ bool find_full_path_for_file(char* name, char* ret_full_pathname, FMode mode)
+
+ do
+ {
+- sprintf(ret_full_pathname,"%s/%s",GLOBAL_SEARCH,name); //First check in GLOBAL_SEARCH dir
++ sprintf(ret_full_pathname,"%s/%s","@GENTOO_PORTAGE_EPREFIX@/var/lib/xwelltris",name); // First check in /var/lib/xwelltris
++ fd=open(ret_full_pathname,fmode);
++ if(fd>0)
++ break;
++
++ sprintf(ret_full_pathname,"%s/%s",GLOBAL_SEARCH,name); // Then in GLOBAL_SEARCH dir
+ fd=open(ret_full_pathname,fmode);
+ if(fd>0)
+ break;
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index eb2e02cbf21..36c39e67014 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit games
+EAPI=7
+
+inherit toolchain-funcs prefix
DESCRIPTION="2.5D tetris like game"
HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
@@ -11,24 +12,41 @@ SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="media-libs/libsdl[video]
- media-libs/sdl-image[gif]"
-RDEPEND=${DEPEND}
+DEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-image[gif]
+"
+RDEPEND="
+ ${DEPEND}
+ acct-group/gamestat
+"
+
+PATCHES=(
+ # Look in ${EPREFIX}/var/lib/xwelltris for score file
+ "${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
+)
src_prepare() {
+ default
+
sed -i \
-e '/INSTALL_PROGRAM/s/-s //' \
src/Make.common.in || die
+
sed -i \
- -e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+ -e "/GLOBAL_SEARCH/s:\".*\":\"/usr/share/${PN}\":" \
src/include/globals.h.in || die
+
+ # Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
+ eprefixify src/commonfuncs.cxx
}
src_configure() {
+ tc-export CC CXX
+
# configure/build process is pretty messed up
- egamesconf --with-sdl
+ econf --with-sdl
}
src_compile() {
@@ -36,11 +54,19 @@ src_compile() {
}
src_install() {
- dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
+ dodir /usr/bin /usr/share/${PN} /var/lib/${PN} /usr/share/man
+
emake install \
- INSTDIR="${D}/${GAMES_BINDIR}" \
- INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
+ INSTDIR="${D}/usr/bin" \
+ INSTLIB="${D}/usr/share/${PN}" \
INSTMAN=/usr/share/man
+
dodoc AUTHORS Changelog README*
- prepgamesdirs
+
+ # Move score file to our location
+ mv "${ED}"/usr/share/${PN}/welltris.scores "${ED}"/var/lib/${PN}/welltris.scores || die
+
+ fowners root:gamestat /var/lib/${PN}/welltris.scores
+ fperms 660 /var/lib/${PN}/welltris.scores
+ fperms g+s /usr/bin/${PN}
}
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
index 4a3321038e5..ba80059c7f1 100644
--- a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools flag-o-matic xdg
+
+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/"
@@ -39,8 +40,8 @@ src_prepare() {
src_configure() {
append-libs -lvorbis
- append-cflags $(pkg-config sdl --cflags)
- append-cxxflags $(pkg-config sdl --cflags)
+ 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 \