diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2018-05-01 19:45:55 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2018-05-01 19:45:55 +0000 |
| commit | 41e24ce3866c78f3d301234ef5265012d3f6c136 (patch) | |
| tree | 7801ff5b8c7b23e0c61b880417b7d7be07daf542 | |
| parent | 2018-05-01 19:26:14 UTC (diff) | |
| parent | games-strategy/dopewars: Drop old (diff) | |
| download | gentoo-41e24ce3866c78f3d301234ef5265012d3f6c136.tar.gz gentoo-41e24ce3866c78f3d301234ef5265012d3f6c136.tar.bz2 gentoo-41e24ce3866c78f3d301234ef5265012d3f6c136.zip | |
Merge updates from master
148 files changed, 1539 insertions, 1359 deletions
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild index ca86402cd437..b3f32a4fea35 100644 --- a/dev-java/lucene/lucene-2.4.1-r2.ebuild +++ b/dev-java/lucene/lucene-2.4.1-r2.ebuild @@ -46,7 +46,7 @@ src_compile() { # put javacc.jar on ant's classpath here even when <javacc> task # doesn't use it - it's to fool the <available> test, first time # it's useful not to have ignoresystemclasses=true... - ANT_TASKS="ant-nodeps javacc" \ + ANT_TASKS="ant-core javacc" \ eant \ -Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \ javacc diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild index 268afd299faa..714a0c0c9bc5 100644 --- a/dev-python/namespace-zope/namespace-zope-1.ebuild +++ b/dev-python/namespace-zope/namespace-zope-1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild index da0e81e1c162..96521da87c5a 100644 --- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild +++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="ZPL" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch index 176fcd74752b..19eefa4bf423 100644 --- a/games-fps/duke3d/files/20040817-credits.patch +++ b/games-fps/duke3d/files/20040817-credits.patch @@ -1,5 +1,5 @@ ---- menues.c 2003-08-17 22:16:10.000000000 +0200 -+++ menues.c 2004-03-29 01:59:28.000000000 +0200 +--- a/menues.c 2003-08-17 22:16:10.000000000 +0200 ++++ b/menues.c 2004-03-29 01:59:28.000000000 +0200 @@ -1747,9 +1747,10 @@ case 996: case 997: diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch index d23f7a118f77..9ed2a0052153 100644 --- a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch +++ b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2003-08-17 17:45:35.948650760 -0400 -+++ Makefile 2003-08-17 17:46:36.894385600 -0400 +--- a/Makefile.orig 2003-08-17 17:45:35.948650760 -0400 ++++ b/Makefile 2003-08-17 17:46:36.894385600 -0400 @@ -4,6 +4,8 @@ beos := false macosx := false diff --git a/games-fps/duke3d/files/20040817-endian.patch b/games-fps/duke3d/files/20040817-endian.patch index a22d07fb09f1..3bcdc1379db6 100644 --- a/games-fps/duke3d/files/20040817-endian.patch +++ b/games-fps/duke3d/files/20040817-endian.patch @@ -1,5 +1,5 @@ ---- duke3d/source/buildengine/platform.h 2003-08-07 12:06:17.000000000 +0200 -+++ duke3d.new/source/buildengine/platform.h 2004-08-24 18:35:05.292291088 +0200 +--- buildengine/platform.h.old 2003-08-07 12:06:17.000000000 +0200 ++++ buildengine/platform.h 2004-08-24 18:35:05.292291088 +0200 @@ -5,6 +5,7 @@ #include "win32_compat.h" #elif (defined PLATFORM_UNIX) diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch index 5eb90fea3e14..c7793a833bf9 100644 --- a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch +++ b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch @@ -1,6 +1,6 @@ diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile ---- duke3d/source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200 -+++ duke3d-patched/source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100 +--- source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200 ++++ source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100 @@ -99,11 +99,11 @@ ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) $(error Cygwin users need to set the SDL_LIB_DIR envr var.) @@ -47,8 +47,8 @@ diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Ma listclean: @echo "A 'make clean' would remove" $(CLEANUP) diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile ---- duke3d/source/Makefile 2004-05-15 05:14:16.000000000 +0200 -+++ duke3d-patched/source/Makefile 2008-02-27 23:09:57.000000000 +0100 +--- source/Makefile 2004-05-15 05:14:16.000000000 +0200 ++++ source/Makefile 2008-02-27 23:09:57.000000000 +0100 @@ -45,11 +45,11 @@ ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) $(error Cygwin users need to set the SDL_LIB_DIR envr var.) diff --git a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch index 2a37148d799c..3aaf67c6c90b 100644 --- a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch +++ b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch @@ -1,6 +1,6 @@ iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c ---- duke3d/source/buildengine/a.c 2004-11-25 13:55:21.000000000 -0500 -+++ duke3d-gcc4/source/buildengine/a.c 2005-06-18 18:14:24.000000000 -0400 +--- source/buildengine/a.c 2004-11-25 13:55:21.000000000 -0500 ++++ source/buildengine/a.c 2005-06-18 18:14:24.000000000 -0400 @@ -186,7 +186,9 @@ if (i3 == 0) { @@ -13,8 +13,8 @@ iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c *dest = ((unsigned char*)i2)[i4]; return i1; diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c ---- duke3d/source/buildengine/pragmas.c 2003-07-25 20:11:32.000000000 -0400 -+++ duke3d-gcc4/source/buildengine/pragmas.c 2005-06-18 18:25:37.000000000 -0400 +--- source/buildengine/pragmas.c 2003-07-25 20:11:32.000000000 -0400 ++++ source/buildengine/pragmas.c 2005-06-18 18:25:37.000000000 -0400 @@ -56,28 +56,39 @@ void clearbufbyte(void *buffer, int size, long fill_value) { @@ -74,8 +74,8 @@ diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/prag } diff -u -r duke3d/source/buildengine/a.h duke3d.gcc4.1.1/source/buildengine/a.h ---- duke3d/source/buildengine/a.h 2003-04-11 08:54:06.000000000 +0200 -+++ duke3d.gcc4.1.1/source/buildengine/a.h 2006-06-22 12:14:40.366393568 +0200 +--- source/buildengine/a.h 2003-04-11 08:54:06.000000000 +0200 ++++ source/buildengine/a.h 2006-06-22 12:14:40.366393568 +0200 @@ -116,56 +116,56 @@ #if ((defined __GNUC__) && (!defined C_IDENTIFIERS_UNDERSCORED)) diff --git a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild new file mode 100644 index 000000000000..357def0066df --- /dev/null +++ b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit readme.gentoo-r1 + +DESCRIPTION="Freedoom - Open Source Doom resources" +HOMEPAGE="http://www.nongnu.org/freedoom/" +SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip + https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="app-arch/unzip" +RDEPEND="" + +S="${WORKDIR}" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +A Doom engine is required to play the wad +but games-fps/doomsday doesn't count since it doesn't +have the necessary features. +To play freedoom with Doom engines which do not support +subdirectories, create symlinks by running the following: +(Be careful of overwriting existing wads.) + +# cd /usr/share/doom-data +# ln -sn freedoom/*.wad . +" + +src_install() { + insinto /usr/share/doom-data/${PN} + doins */*.wad + dodoc "${P}"/CREDITS + HTMLDOCS="${P}/README.html" einstalldocs + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/games-fps/freedoom/freedoom-0.10.1.ebuild b/games-fps/freedoom/freedoom-0.10.1.ebuild deleted file mode 100644 index 4fdffa8813eb..000000000000 --- a/games-fps/freedoom/freedoom-0.10.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit games - -DESCRIPTION="Freedoom - Open Source Doom resources" -HOMEPAGE="http://www.nongnu.org/freedoom/" -SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip - https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND="app-arch/unzip" - -S=${WORKDIR} - -src_install() { - insinto "${GAMES_DATADIR}"/doom-data/${PN} - doins */*.wad - dodoc ${P}/CREDITS - dohtml ${P}/README.html - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "A Doom engine is required to play the wad" - elog "but games-fps/doomsday doesn't count since it doesn't" - elog "have the necessary features." - echo - ewarn "To play freedoom with Doom engines which do not support" - ewarn "subdirectories, create symlinks by running the following:" - ewarn "(Be careful of overwriting existing wads.)" - ewarn - ewarn " cd ${GAMES_DATADIR}/doom-data" - ewarn " ln -sn freedoom/*.wad ." - ewarn -} diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8-r1.ebuild index 63ae43948870..7440f19e8ec0 100644 --- a/games-fps/openarena/openarena-0.8.8.ebuild +++ b/games-fps/openarena/openarena-0.8.8-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic versionator games +EAPI=6 +inherit desktop epatch flag-o-matic versionator DESCRIPTION="Open-source replacement for Quake 3 Arena" HOMEPAGE="http://openarena.ws/" @@ -26,15 +26,18 @@ RDEPEND=" x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) - vorbis? ( media-libs/libvorbis )" + vorbis? ( media-libs/libvorbis ) +" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip +" -MY_S=${WORKDIR}/${PN}-engine-source-${PV} -BUILD_DIR=${PN}-build -DIR=${GAMES_DATADIR}/${PN} +MY_S="${WORKDIR}/${PN}-engine-source-${PV}" +BUILD_DIR="${PN}-build" +DIR="/usr/share/${PN}" src_prepare() { + default cd "${WORKDIR}" epatch "${FILESDIR}"/${P}-makefile.patch \ "${FILESDIR}"/${P}-unbundling.patch @@ -64,8 +67,8 @@ src_compile() { src_install() { cd "${MY_S}"/"${BUILD_DIR}" - newgamesbin openarena-smp.* "${PN}" - newgamesbin oa_ded.* "${PN}-ded" + newbin openarena-smp.* "${PN}" + newbin oa_ded.* "${PN}-ded" cd "${S}" insinto "${DIR}" @@ -74,6 +77,4 @@ src_install() { dodoc CHANGES CREDITS LINUXNOTES README newicon "${MY_S}"/misc/quake3.png ${PN}.png make_desktop_entry ${PN} "OpenArena" - - prepgamesdirs } diff --git a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch index d0e3c48299f0..3dea0e7a983b 100644 --- a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch +++ b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=308739 ---- src/SDL/i_sshot.c -+++ src/SDL/i_sshot.c +--- a/src/SDL/i_sshot.c ++++ b/src/SDL/i_sshot.c @@ -231,7 +231,7 @@ if (fp) { diff --git a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch b/games-fps/prboom/files/prboom-2.5.0-nvidia.patch index 2b7aa9b32d46..c602c784c13f 100644 --- a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch +++ b/games-fps/prboom/files/prboom-2.5.0-nvidia.patch @@ -1,5 +1,5 @@ ---- src/gl_intern.h.orig 2003-09-21 16:39:30.247451624 -0400 -+++ src/gl_intern.h 2003-09-21 16:39:41.610724144 -0400 +--- a/src/gl_intern.h.orig 2003-09-21 16:39:30.247451624 -0400 ++++ b/src/gl_intern.h 2003-09-21 16:39:41.610724144 -0400 @@ -84,6 +84,6 @@ #define min(a,b) ((a)<(b)?(a):(b)) #endif @@ -8,8 +8,8 @@ +//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT; #endif // _GL_INTERN_H ---- src/gl_main.c.orig 2003-09-21 16:39:55.436622288 -0400 -+++ src/gl_main.c 2003-09-21 16:43:00.943420968 -0400 +--- a/src/gl_main.c.orig 2003-09-21 16:39:55.436622288 -0400 ++++ b/src/gl_main.c 2003-09-21 16:43:00.943420968 -0400 @@ -285,6 +285,7 @@ if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0) @@ -35,8 +35,8 @@ W_UnlockLumpName("PLAYPAL"); } else { if (palette>0) ---- src/gl_texture.c.orig 2003-09-21 16:43:18.450759448 -0400 -+++ src/gl_texture.c 2003-09-21 16:43:39.549551944 -0400 +--- a/src/gl_texture.c.orig 2003-09-21 16:43:18.450759448 -0400 ++++ b/src/gl_texture.c 2003-09-21 16:43:39.549551944 -0400 @@ -178,7 +178,7 @@ pal[transparent_pal_index*4+1]=0; pal[transparent_pal_index*4+2]=0; diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0-r1.ebuild index 89b2de060de4..9cb1017bc0a2 100644 --- a/games-fps/prboom/prboom-2.5.0.ebuild +++ b/games-fps/prboom/prboom-2.5.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs games +EAPI=6 +inherit desktop readme.gentoo-r1 toolchain-funcs DESCRIPTION="Port of ID's doom to SDL and OpenGL" HOMEPAGE="http://prboom.sourceforge.net/" @@ -14,21 +14,40 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -DEPEND="media-libs/libsdl[joystick,video] +RDEPEND=" + media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl - virtual/glu" -RDEPEND="${DEPEND}" + virtual/glu +" +DEPEND="${RDEPEND}" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +To play the original Doom levels, place doom.wad and/or doom2.wad +into /usr/share/doom-data +Then run ${PN} accordingly. + +doom1.wad is the shareware demo wad consisting of 1 episode, +and doom.wad is the full Doom 1 set of 3 episodes +(or 4 in the Ultimate Doom wad). + +You can even emerge doom-data and/or freedoom to play for free. +" src_prepare() { + default + ebegin "Detecting NVidia GL/prboom bug" $(tc-getCC) "${FILESDIR}"/${P}-nvidia-test.c 2> /dev/null local ret=$? eend ${ret} "NVidia GL/prboom bug found ;(" - [ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${P}-nvidia.patch - epatch "${FILESDIR}"/${P}-libpng14.patch + [ ${ret} -eq 0 ] || eapply "${FILESDIR}"/${P}-nvidia.patch + + eapply "${FILESDIR}"/${P}-libpng14.patch + sed -i \ -e '/^gamesdir/ s/\/games/\/bin/' \ src/Makefile.in \ @@ -48,32 +67,25 @@ src_configure() { # leave --disable-cpu-opt in otherwise the configure script # will append -march=i686 and crap ... let the user's CFLAGS # handle this ... - egamesconf \ + econf \ --enable-gl \ --disable-i386-asm \ --disable-cpu-opt \ - --with-waddir="${GAMES_DATADIR}/doom-data" + --with-waddir="/usr/share/doom-data" } src_install() { default - emake DESTDIR="${D}" install + doman doc/*.{5,6} + dodoc doc/README.* doc/*.txt + readme.gentoo_create_doc + doicon "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} "PrBoom" - prepgamesdirs } pkg_postinst() { - games_pkg_postinst - elog "To play the original Doom levels, place doom.wad and/or doom2.wad" - elog "into ${GAMES_DATADIR}/doom-data" - elog "Then run ${PN} accordingly." - elog - elog "doom1.wad is the shareware demo wad consisting of 1 episode," - elog "and doom.wad is the full Doom 1 set of 3 episodes" - elog "(or 4 in the Ultimate Doom wad)." - elog - elog "You can even emerge doom-data and/or freedoom to play for free." + readme.gentoo_print_elog } diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild index 9836fd5cf2a1..a535a8e3f9c6 100644 --- a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild +++ b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit eutils -MY_PN=${PN/-bin/} +MY_PN="${PN/-bin/}" DESCRIPTION="Blood remake" HOMEPAGE="http://www.transfusion-game.com/" SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ~x86" +KEYWORDS="-* ~amd64 ~x86" IUSE="" RESTRICT="strip" @@ -21,15 +21,15 @@ RDEPEND="sys-libs/glibc" DEPEND="${RDEPEND} app-arch/unzip" -S=${WORKDIR}/${MY_PN} +S="${WORKDIR}/${MY_PN}" -dir=${GAMES_PREFIX_OPT}/${MY_PN} -Ddir=${D}/${dir} +dir="/opt/${MY_PN}" +Ddir="${D}/${dir}" src_install() { # install everything that looks anything like docs... dodoc ${MY_PN}/doc/*.txt ${MY_PN}/*txt qw/*txt - dohtml ${MY_PN}/doc/*.html + HTML_DOCS="${MY_PN}/doc/*.html" einstalldocs #...then mass copy everything to the install dir... dodir "${dir}" @@ -42,8 +42,6 @@ src_install() { "${Ddir}"/${MY_PN}/*txt doicon "${DISTDIR}"/${MY_PN}.png - games_make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}" + make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}" make_desktop_entry ${MY_PN} "Transfusion" ${MY_PN} - - prepgamesdirs } diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch index 04804563646d..d55e43ffcf52 100644 --- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch +++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2012-04-26 21:40:25.277417417 +0200 -+++ Makefile 2012-04-26 21:43:34.300835150 +0200 +--- a/Makefile.old 2012-04-26 21:40:25.277417417 +0200 ++++ b/Makefile 2012-04-26 21:43:34.300835150 +0200 @@ -344,11 +344,11 @@ endif diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild index 6fce51878abb..eced904caceb 100644 --- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild +++ b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A cartoon style multiplayer first-person shooter" HOMEPAGE="http://worldofpadman.net/" @@ -16,12 +16,12 @@ IUSE="+curl dedicated maps +openal +theora +vorbis" RDEPEND="sys-libs/zlib !dedicated? ( - media-libs/libsdl[opengl,video,X] >=media-libs/speex-1.2.0 media-libs/speexdsp - virtual/glu virtual/jpeg:0 + media-libs/libsdl[opengl,video,X] virtual/opengl + virtual/glu openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) @@ -29,11 +29,13 @@ RDEPEND="sys-libs/zlib media-libs/libtheora media-libs/libogg ) - )" + ) +" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip +" -S=${WORKDIR}/${P}_svn2178-src +S="${WORKDIR}/${P}_svn2178-src" src_unpack() { unpack ${A} @@ -41,7 +43,8 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + eapply "${FILESDIR}"/${P}-gentoo.patch sed -i \ -e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \ code/renderer/tr_image_jpg.c || die #479652 @@ -60,7 +63,7 @@ src_compile() { V=1 \ ARCH=${arch} \ BUILD_CLIENT=$(use dedicated && echo 0) \ - DEFAULT_BASEDIR="${GAMES_DATADIR}"/${PN} \ + DEFAULT_BASEDIR=/usr/share/${PN} \ OPTIMIZE= \ USE_CURL=$(usex curl 1 0) \ USE_CURL_DLOPEN=0 \ @@ -75,13 +78,13 @@ src_compile() { } src_install() { - newgamesbin build/release-*/wopded.* ${PN}-ded + newbin build/release-*/wopded.* ${PN}-ded if ! use dedicated ; then - newgamesbin build/release-*/wop.* ${PN} + newbin build/release-*/wop.* ${PN} newicon misc/quake3.png ${PN}.png make_desktop_entry ${PN} "World of Padman" fi - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins -r ../wop dodoc id-readme.txt \ @@ -89,6 +92,5 @@ src_install() { voip-readme.txt \ ../XTRAS/changelog.txt \ ../XTRAS/sounds_readme.txt - dohtml -r ../XTRAS/readme{,.html} - prepgamesdirs + HTML_DOCS="../XTRAS/readme ../XTRAS/readme.html" einstalldocs } diff --git a/games-kids/memonix/memonix-1.6.ebuild b/games-kids/memonix/memonix-1.6-r1.ebuild index d7ab208ab1ed..72187823716e 100644 --- a/games-kids/memonix/memonix-1.6.ebuild +++ b/games-kids/memonix/memonix-1.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit cmake-utils games +EAPI=6 +inherit cmake-utils eutils DESCRIPTION="Brain teasers, puzzle and memory games for kid's in one pack" HOMEPAGE="http://www.viewizard.com/memonix/" @@ -13,39 +13,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsdl:0[sound,opengl,video,X] +RDEPEND=" + media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] - !games-kids/memonix-bin" -RDEPEND="${DEPEND}" +" +DEPEND="${RDEPEND}" -S=${WORKDIR}/MemonixSourceCode - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} +S="${WORKDIR}/MemonixSourceCode" src_install() { - exeinto "$(games_get_libdir)" + exeinto /usr/"$(get_libdir)" doexe ../${P}_build/Memonix - insinto "${GAMES_DATADIR}/${PN}" + insinto "/usr/share/${PN}" doins ../gamedata.vfs - games_make_wrapper ${PN} "$(games_get_libdir)"/Memonix "${GAMES_DATADIR}"/${PN} + make_wrapper ${PN} /usr/"$(get_libdir)"/Memonix /usr/share/${PN} newicon ../icon48.png ${PN}.png make_desktop_entry ${PN} dodoc ReadMe.txt - - prepgamesdirs } diff --git a/games-misc/exult-sound/exult-sound-0.ebuild b/games-misc/exult-sound/exult-sound-0-r1.ebuild index da4b29d8393d..d83c7ae5d659 100644 --- a/games-misc/exult-sound/exult-sound-0.ebuild +++ b/games-misc/exult-sound/exult-sound-0-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit games +EAPI=6 -DESCRIPTION="sound data for games-engines/exult" +DESCRIPTION="Sound data for games-engines/exult" HOMEPAGE="http://exult.sourceforge.net/" SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip mirror://sourceforge/exult/U7MusicOGG_2of2.zip @@ -18,7 +17,7 @@ IUSE="" DEPEND="!<games-engines/exult-9999" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { mkdir music && cd music || die @@ -29,10 +28,9 @@ src_unpack() { } src_install() { - insinto "${GAMES_DATADIR}/exult/music" + insinto /usr/share/exult/music doins "${WORKDIR}/music/"*ogg - insinto "${GAMES_DATADIR}/exult/" + insinto /usr/share/exult/ doins "${WORKDIR}/flx/"*.flx newdoc "${WORKDIR}/music/readme.txt" music-readme.txt - prepgamesdirs } diff --git a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch b/games-misc/typespeed/files/typespeed-0.6.5-musl.patch index 3fd53b328ebd..3967b10f3428 100644 --- a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch +++ b/games-misc/typespeed/files/typespeed-0.6.5-musl.patch @@ -1,6 +1,6 @@ diff -ur a/typespeed-0.6.5/src/typespeed.h b/typespeed-0.6.5/src/typespeed.h ---- a/typespeed-0.6.5/src/typespeed.h 2008-08-13 15:36:51.000000000 +0100 -+++ b/typespeed-0.6.5/src/typespeed.h 2016-01-01 10:41:54.919998820 +0100 +--- typespeed-0.6.5/src/typespeed.h 2008-08-13 15:36:51.000000000 +0100 ++++ typespeed-0.6.5/src/typespeed.h 2016-01-01 10:41:54.919998820 +0100 @@ -27,10 +27,10 @@ #include <stdint.h> diff --git a/games-misc/typespeed/typespeed-0.6.5.ebuild b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild index c920053621fa..354c9eba5a35 100644 --- a/games-misc/typespeed/typespeed-0.6.5.ebuild +++ b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils games +EAPI=6 +inherit autotools DESCRIPTION="Test your typing speed, and get your fingers CPS" HOMEPAGE="http://typespeed.sourceforge.net/" @@ -13,32 +13,34 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc64 ~x86" IUSE="nls" -RDEPEND="sys-libs/ncurses:0 - nls? ( virtual/libintl )" +RDEPEND=" + sys-libs/ncurses:0= + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { + default sed -i \ -e 's/testsuite//' \ -e 's/doc//' \ Makefile.am || die sed -i -e '/^CC =/d' src/Makefile.am || die - epatch "${FILESDIR}"/${P}-musl.patch + eapply "${FILESDIR}"/${P}-musl.patch rm -rf m4 #417265 eautoreconf } src_configure() { - egamesconf \ + econf \ --localedir=/usr/share/locale \ --docdir=/usr/share/doc/${PF} \ - --with-highscoredir="${GAMES_STATEDIR}" \ $(use_enable nls) } src_install() { default dodoc doc/README - prepgamesdirs } diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild index a076f4776e58..d04ec26a8f3f 100644 --- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild +++ b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-single-r1 DESCRIPTION="Connect-4 game, single or network multiplayer" HOMEPAGE="http://forcedattack.sourceforge.net/" @@ -11,28 +13,33 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" + IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" -RDEPEND="dev-python/pygame" +RDEPEND="${PYTHON_DEPS} + dev-python/pygame[${PYTHON_USEDEP}] +" -S=${WORKDIR}/4stAttack-${PV} +S="${WORKDIR}/4stAttack-${PV}" src_prepare() { + default + # move the doc files aside so it's easier to install the game files mv README.txt credits.txt changelog.txt .. rm -f GPL version~ # This patch makes the game save settings in $HOME - epatch "${FILESDIR}"/${P}-gentoo.diff + eapply "${FILESDIR}"/${P}-gentoo.diff } src_install() { - games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}"/${PN} - insinto "${GAMES_DATADIR}"/${PN} + make_wrapper ${PN} "python2 ${PN}.py" /usr/share/${PN} + insinto /usr/share/${PN} doins -r * - newicon kde/icons/48x48/forcedattack2.png ${PN}.png + newicon kde/icons/64x64/forcedattack2.png ${PN}.png make_desktop_entry ${PN} "4st Attack 2" dodoc ../{README.txt,credits.txt,changelog.txt} - prepgamesdirs } diff --git a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff index be7d32ed3ff2..9cb5be53b793 100644 --- a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff +++ b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff @@ -1,5 +1,5 @@ ---- 4stattack.py -+++ 4stattack.py +--- a/4stattack.py ++++ b/4stattack.py @@ -28,6 +28,9 @@ images = None screen = None diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild index 5dc26f04662d..4e1bc1d0b0b2 100644 --- a/games-puzzle/anagramarama/anagramarama-0.2.ebuild +++ b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop vcs-clean DESCRIPTION="Create as many words as you can before the time runs out" HOMEPAGE="http://www.coralquest.com/anagramarama/" @@ -17,26 +17,28 @@ DEPEND=">=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2" RDEPEND="${DEPEND} - sys-apps/miscfiles" + sys-apps/miscfiles +" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_prepare() { + default + ecvs_clean sed -i \ - -e "s:wordlist.txt:${GAMES_DATADIR}\/${PN}\/wordlist.txt:" \ - -e "s:\"audio\/:\"${GAMES_DATADIR}\/${PN}\/audio\/:" \ - -e "s:\"images\/:\"${GAMES_DATADIR}\/${PN}\/images\/:" \ + -e "s:wordlist.txt:/usr/share/${PN}/wordlist.txt:" \ + -e "s:audio/:/usr/share/${PN}/audio/:" \ + -e "s:images/:/usr/share/${PN}/images/:" \ src/{ag.c,dlb.c} \ || die "sed failed" - ecvs_clean - epatch "${FILESDIR}"/${P}-gentoo.patch + eapply "${FILESDIR}"/${P}-gentoo.patch } src_install() { - newgamesbin ag ${PN} - insinto "${GAMES_DATADIR}/${PN}" + newbin ag ${PN} + insinto "/usr/share/${PN}" doins wordlist.txt doins -r images/ audio/ dodoc readme - prepgamesdirs + make_desktop_entry ${PN} "Anagramarama" } diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch index 85b194ea7928..fb60615055db 100644 --- a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch +++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch @@ -1,5 +1,5 @@ ---- makefile.old 2009-02-08 18:24:33.000000000 +0100 -+++ makefile 2009-02-08 18:29:12.000000000 +0100 +--- a/makefile.old 2009-02-08 18:24:33.000000000 +0100 ++++ b/makefile 2009-02-08 18:29:12.000000000 +0100 @@ -1,5 +1,4 @@ -LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9 -CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild index 6e2173c76467..822cc2d5e973 100644 --- a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild +++ b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 games + +inherit desktop python-single-r1 DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter" HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/" @@ -12,39 +13,35 @@ SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="dev-python/pygame[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" -RDEPEND=${DEPEND} +IUSE="" REQUIRED_USE=${PYTHON_REQUIRED_USE} -pkg_setup() { - python-single-r1_pkg_setup - games_pkg_setup -} +RDEPEND="${PYTHON_DEPS} + dev-python/pygame[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" src_prepare() { + default python_fix_shebang . } src_install() { emake \ DESTDIR="${D}" \ - PREFIX="${GAMES_DATADIR}" \ + PREFIX="/usr/share/" \ TO="${PN}" \ install - rm -rf "${D}${GAMES_DATADIR}/games" "${D}${GAMES_DATADIR}/share" || die + rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die - python_optimize "${D}${GAMES_DATADIR}/${PN}" + python_optimize "${ED}/usr/share/${PN}" - dodir "${GAMES_BINDIR}" - dosym "${GAMES_DATADIR}/${PN}/angrydd.py" "${GAMES_BINDIR}/${PN}" + dodir /usr/bin + dosym "${ED}/usr/share/${PN}/angrydd.py" "/usr/bin/${PN}" doman angrydd.6 dodoc README TODO HACKING doicon angrydd.png make_desktop_entry angrydd "Angry, Drunken Dwarves" - - prepgamesdirs } diff --git a/games-puzzle/color-lines/color-lines-0.6.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild index a9937b1a62ad..e239fd1588a2 100644 --- a/games-puzzle/color-lines/color-lines-0.6.ebuild +++ b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Color lines game written with SDL with bonus features" HOMEPAGE="https://github.com/OpenA/color-lines-sdl" @@ -13,37 +12,36 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -RDEPEND="media-libs/libsdl[X,sound,video] +RDEPEND=" + media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] - media-libs/sdl-mixer[wav,mod]" + media-libs/sdl-mixer[wav,mod] +" DEPEND="${RDEPEND}" S="${WORKDIR}/lines-${PV}" src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" + default + eapply "${FILESDIR}/${P}-Makefile.patch" sed -i \ -e '/^Encoding/d' \ -e '/^Version/d' \ -e '/^Icon/s/.png//' \ color-lines.desktop.in || die 'sed on color-lines.desktop.in failed' - - epatch_user } src_compile() { - emake BINDIR="${EPREFIX}${GAMES_BINDIR}/" GAMEDATADIR="${EPREFIX}${GAMES_DATADIR}/${PN}/" + emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/" } src_install() { - insinto "${GAMES_DATADIR}/${PN}" + insinto "/usr/share/${PN}" doins -r gfx sounds domenu ${PN}.desktop doicon icon/${PN}.png - dodoc ChangeLog - dogamesbin ${PN} - - prepgamesdirs + einstalldocs + dobin ${PN} } diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch index 9f552d712713..bf1339b94a01 100644 --- a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch +++ b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.unix.orig 2013-04-12 13:56:42.131113000 +0400 -+++ Makefile.unix 2013-04-12 13:57:26.595946027 +0400 +--- a/Makefile.unix.orig 2013-04-12 13:56:42.131113000 +0400 ++++ b/Makefile.unix 2013-04-12 13:57:26.595946027 +0400 @@ -2,18 +2,18 @@ VERTITLE := lines-$(VERSION) ARCHIVE := lines_$(VERSION).tar.gz diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r2.ebuild index 1aa804b6b341..5233b13dc8d8 100644 --- a/games-puzzle/concentration/concentration-1.2-r1.ebuild +++ b/games-puzzle/concentration/concentration-1.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="The classic memory game with some new life" HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/concentration" @@ -17,15 +17,12 @@ DEPEND="media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_install() { default newicon pics/set1/19.png ${PN}.png make_desktop_entry ${PN} Concentration - prepgamesdirs } diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild index a3cf9d1c896b..2ea5d017d259 100644 --- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild +++ b/games-puzzle/connectagram/connectagram-1.2.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils qmake-utils games +EAPI=6 +inherit gnome2-utils qmake-utils DESCRIPTION="A word unscrambling game" HOMEPAGE="https://gottcode.org/connectagram/" @@ -13,18 +13,22 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-qt/qtcore-5.2:5 +RDEPEND=" + >=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 - >=dev-qt/qtgui-5.2:5" + >=dev-qt/qtgui-5.2:5 +" DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + + eapply "${FILESDIR}"/${P}-gentoo.patch sed -i \ - -e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \ - -e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \ + -e "s#@GAMES_BINDIR@#/usr/bin#" \ + -e "s#@GAMES_DATADIR@#/usr/share#" \ ${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die } @@ -34,18 +38,15 @@ src_configure() { src_install() { emake INSTALL_ROOT="${D}" install - dodoc CREDITS ChangeLog NEWS README - prepgamesdirs + einstalldocs } pkg_preinst() { gnome2_icon_savelist - games_pkg_preinst } pkg_postinst() { gnome2_icon_cache_update - games_pkg_postinst } pkg_postrm() { diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild index d74b179844e6..1f7406534412 100644 --- a/games-puzzle/construo/construo-0.2.2.ebuild +++ b/games-puzzle/construo/construo-0.2.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools games +EAPI=6 +inherit autotools desktop DESCRIPTION="2d construction toy with objects that react on physical forces" HOMEPAGE="http://www.nongnu.org/construo/" @@ -13,26 +13,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="virtual/opengl +RDEPEND=" + virtual/opengl virtual/glu media-libs/freeglut - x11-libs/libXxf86vm" + x11-libs/libXxf86vm +" DEPEND="${RDEPEND} x11-proto/xf86vidmodeproto" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-lGLU.patch sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die eautoreconf } -src_configure() { - egamesconf --datadir="${GAMES_DATADIR_BASE}" -} - src_install() { default - prepgamesdirs + make_desktop_entry "${PN}.glut" "${PN}.glut" + make_desktop_entry "${PN}.x11" "${PN}.x11" } diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch index cc946b043bae..48165ed21df0 100644 --- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch +++ b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch @@ -1,5 +1,5 @@ ---- command_line.cxx -+++ command_line.cxx +--- a/command_line.cxx ++++ b/command_line.cxx @@ -19,7 +19,9 @@ #include <config.h> @@ -11,8 +11,8 @@ #include "settings.hxx" #include "command_line.hxx" ---- config.hxx -+++ config.hxx +--- a/config.hxx ++++ b/config.hxx @@ -21,6 +21,7 @@ #define CONFIG_HH @@ -21,8 +21,8 @@ class Config { ---- lisp_reader.cxx -+++ lisp_reader.cxx +--- a/lisp_reader.cxx ++++ b/lisp_reader.cxx @@ -17,6 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -31,8 +31,8 @@ #include "construo_error.hxx" #include "lisp_reader.hxx" ---- unix_system.cxx -+++ unix_system.cxx +--- a/unix_system.cxx ++++ b/unix_system.cxx @@ -17,8 +17,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -45,8 +45,8 @@ #include <unistd.h> #include <sys/time.h> #include <time.h> ---- vector.cxx -+++ vector.cxx +--- a/vector.cxx ++++ b/vector.cxx @@ -16,8 +16,8 @@ totally replaced old CL_Vector with this code */ @@ -58,8 +58,8 @@ #include "vector.hxx" CL_Vector::CL_Vector(float x, float y, float z, float w) ---- world.cxx -+++ world.cxx +--- a/world.cxx ++++ b/world.cxx @@ -17,7 +17,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -70,8 +70,8 @@ #include <algorithm> #include "config.h" ---- x11_display.cxx -+++ x11_display.cxx +--- a/x11_display.cxx ++++ b/x11_display.cxx @@ -19,6 +19,7 @@ #include <config.h> diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch index 4c0b018cfdc1..be8e7b604d6f 100644 --- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch +++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch @@ -1,5 +1,5 @@ ---- configure.ac.old 2009-11-24 18:27:48.000000000 +0100 -+++ configure.ac 2009-11-24 18:28:29.000000000 +0100 +--- a/configure.ac.old 2009-11-24 18:27:48.000000000 +0100 ++++ b/configure.ac 2009-11-24 18:28:29.000000000 +0100 @@ -114,7 +114,7 @@ AC_CHECK_LIB(glut, glutMainLoop, [ diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild index 3469a41670fb..55b13cc7ed85 100644 --- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild +++ b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils gnome2-utils versionator games +EAPI=6 +inherit autotools gnome2-utils versionator -MY_P=${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3) +MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)" DESCRIPTION="highly addictive and remotely related to tetris" HOMEPAGE="http://www.karimmi.de/cuyo/" SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz" @@ -18,31 +18,26 @@ DEPEND="sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) - media-libs/sdl-image" + media-libs/sdl-image +" RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-gcc44.patch \ "${FILESDIR}"/${P}-gentoo.patch \ "${FILESDIR}"/${P}-gcc6.patch eautoreconf } -src_install() { - default - prepgamesdirs -} - pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest index 04d9be4d3acc..89d46b3acbcd 100644 --- a/games-puzzle/einstein/Manifest +++ b/games-puzzle/einstein/Manifest @@ -1,2 +1,2 @@ -DIST einstein-2.0-src.tar.gz 722301 BLAKE2B 3cb857bbbbfe9d3dab763d461dfe0c91ed204ac2e080a6d546e35cb869da05a8735900bd1db071074628b11f77e675bc21a811a79079587c6388b58ba401dcd1 SHA512 45599546f2f7fce32f7441cfdae88b72297f4a506d9eb98a64c3b24ec2e2fd86a63d59961a21e017df6a7a676d864ad12598d735f9049adf43cddd91d661f619 DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283 +DIST v2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3 diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild index a689cf7dc9f5..0489b66bdf2c 100644 --- a/games-puzzle/einstein/einstein-2.0.ebuild +++ b/games-puzzle/einstein/einstein-2.1.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A puzzle game inspired by Albert Einstein" -HOMEPAGE="https://freecode.com/projects/einsteinpuzzle" -SRC_URI="mirror://gentoo/${P}-src.tar.gz +HOMEPAGE="https://github.com/lksj/einstein-puzzle" +SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz mirror://gentoo/${PN}.png" LICENSE="GPL-2" @@ -19,24 +19,22 @@ DEPEND="media-libs/libsdl[sound,video] media-libs/sdl-ttf" RDEPEND="${DEPEND}" +S="${WORKDIR}/${PN}-puzzle-${PV}" + src_prepare() { - epatch "${FILESDIR}"/${P}*.patch + default + eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch sed -i \ - -e "/PREFIX/s:/usr/local:${GAMES_PREFIX}:" \ - -e "s:\$(PREFIX)/share/einstein:${GAMES_DATADIR}/${PN}:" \ - -e "s:\$(PREFIX)/bin:${GAMES_BINDIR}:" \ + -e "/PREFIX/s:/usr/local:/usr:" \ -e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \ || die - sed -i \ - -e "s:PREFIX L\"/share/einstein:L\"${GAMES_DATADIR}/${PN}:" main.cpp \ - || die } src_install() { - dogamesbin "${PN}" - insinto "${GAMES_DATADIR}/${PN}/res" + dobin "${PN}" + insinto "/usr/share/${PN}/res" doins einstein.res doicon "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} "Einstein Puzzle" - prepgamesdirs + einstalldocs } diff --git a/games-puzzle/einstein/files/einstein-2.0-64bit.patch b/games-puzzle/einstein/files/einstein-2.0-64bit.patch deleted file mode 100644 index 4d6656252898..000000000000 --- a/games-puzzle/einstein/files/einstein-2.0-64bit.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- einstein-2.0.orig/formatter.cpp -+++ einstein-2.0/formatter.cpp -@@ -58,7 +58,7 @@ - if ((c.type == INT_ARG) || (c.type == STRING_ARG) || - (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG)) - { -- int no = (int)c.data; -+ long int no = (long int)c.data; - args[no - 1] = c.type; - } - } -@@ -123,7 +123,7 @@ - std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const - { - std::wstring s; -- int no; -+ long int no; - - for (int i = 0; i < commandsCnt; i++) { - Command *cmd = &commands[i]; -@@ -135,8 +135,8 @@ - - case STRING_ARG: - case INT_ARG: -- no = (int)cmd->data - 1; -- if (no < (int)argValues.size()) -+ no = (long int)cmd->data - 1; -+ if (no < (long int)argValues.size()) - s += argValues[no]->format(cmd); - break; - diff --git a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch index fe870bf036e7..3edb666ad690 100644 --- a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch +++ b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2009-02-09 16:37:58.000000000 +0100 -+++ Makefile 2009-02-09 16:38:13.000000000 +0100 +--- a/Makefile.old 2009-02-09 16:37:58.000000000 +0100 ++++ b/Makefile 2009-02-09 16:38:13.000000000 +0100 @@ -49,7 +49,7 @@ diff --git a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch deleted file mode 100644 index 25e1815e5e41..000000000000 --- a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- einstein-2.0.orig/convert.h -+++ einstein-2.0/convert.h -@@ -5,6 +5,7 @@ - #include <iostream> - #include <sstream> - #include <string> -+#include <typeinfo> - - #include "exceptions.h" - #include "unicode.h" - ---- einstein-2.0.orig/unicode.cpp -+++ einstein-2.0/unicode.cpp -@@ -1,5 +1,6 @@ - #include <wchar.h> - #include <stdlib.h> -+#include <string.h> - #ifdef WIN32 - #include <windows.h> - #endif diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild index c9b2e6c38ed0..bdecef930251 100644 --- a/games-puzzle/enigma/enigma-1.21-r2.ebuild +++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils gnome2-utils games +EAPI=6 +inherit autotools gnome2-utils -DESCRIPTION="puzzle game similar to Oxyd" +DESCRIPTION="Puzzle game similar to Oxyd" HOMEPAGE="http://www.nongnu.org/enigma/" SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz" @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -COMMON_DEPS="media-libs/sdl-ttf +COMMON_DEPS=" + media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] @@ -22,16 +23,20 @@ COMMON_DEPS="media-libs/sdl-ttf net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:= - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${COMMON_DEPS} - sys-devel/gettext" + sys-devel/gettext +" RDEPEND="${COMMON_DEPS} media-fonts/dejavu - x11-misc/xdg-utils" + x11-misc/xdg-utils +" src_prepare() { + default cp /usr/share/gettext/config.rpath . - epatch "${FILESDIR}"/${P}-build.patch \ + eapply "${FILESDIR}"/${P}-build.patch \ "${FILESDIR}"/${P}-gcc6.patch sed -i \ -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \ @@ -40,32 +45,28 @@ src_prepare() { } src_configure() { - egamesconf \ + econf \ --with-system-enet \ $(use_enable nls) } src_install() { - DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \ + HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \ default dosym \ /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \ - "${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf + /usr/share/${PN}/fonts/DejaVuSansCondensed.ttf dosym \ /usr/share/fonts/dejavu/DejaVuSans.ttf \ - "${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf - dohtml -r doc/* + /usr/share/${PN}/fonts/vera_sans.ttf doman doc/enigma.6 - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild index e516d714b0d6..b0c84fa8eeca 100644 --- a/games-puzzle/fbg/fbg-0.9-r1.ebuild +++ b/games-puzzle/fbg/fbg-0.9-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A Tetris clone written in OpenGL" HOMEPAGE="http://fbg.sourceforge.net/" @@ -19,23 +19,23 @@ DEPEND="virtual/opengl media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" src_prepare() { + default sed -i \ - -e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \ + -e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \ -e '/^datadir=/d' \ configure || die } src_configure() { - egamesconf --disable-fbglaunch + econf --disable-fbglaunch } src_install() { default newicon startfbg/icon.xpm ${PN}.xpm make_desktop_entry ${PN} "Falling Block Game" ${PN} - rm -rf "${D}/${GAMES_PREFIX}"/doc - prepgamesdirs + rm -rf "${ED}/usr/doc" } diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild index fec0213902dd..722c291c1dd8 100644 --- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild +++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils games +EAPI=6 +inherit autotools desktop DATA_PV="1.0.0" DESCRIPTION="Underwater puzzle game - find a safe way out" @@ -15,41 +15,45 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=media-libs/libsdl-1.2[sound,video] +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" + >=dev-lang/lua-5:0 +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" -S=${WORKDIR}/fillets-ng-${PV} +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() { - egamesconf \ - --datadir="${GAMES_DATADIR}/${PN}" + econf --datadir="/usr/share/${PN}" } src_install() { default - insinto "${GAMES_DATADIR}/${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" - prepgamesdirs } diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch index 64cd0335ce9c..b9b55a333cb6 100644 --- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2004-10-08 18:41:12.000000000 -0400 -+++ Makefile 2008-08-06 19:48:47.000000000 -0400 +--- a/Makefile.orig 2004-10-08 18:41:12.000000000 -0400 ++++ b/Makefile 2008-08-06 19:48:47.000000000 -0400 @@ -41,15 +41,13 @@ ############## diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild index 93dbd923bb86..41ee671603ff 100644 --- a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild +++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils games +EAPI=6 +inherit desktop toolchain-funcs DESCRIPTION="Clone of the famous PuyoPuyo game" HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29" @@ -17,25 +17,28 @@ IUSE="opengl" DEPEND="media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] - opengl? ( virtual/opengl )" + opengl? ( virtual/opengl ) +" RDEPEND="${DEPEND}" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-gcc4.patch \ "${FILESDIR}"/${P}-gcc41.patch \ "${FILESDIR}"/${P}-libs.patch find . -type f -name ".*" -exec rm -f \{\} \; sed -i \ - -e "s:^DATADIR=.*:DATADIR=\"${GAMES_DATADIR}/${PN}\":" \ - -e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:${GAMES_BINDIR}:" \ + -e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \ + -e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \ Makefile \ || die } src_compile() { - emake CXX="$(tc-getCXX)" \ + emake \ + CXX="$(tc-getCXX)" \ ENABLE_OPENGL="$(use opengl && echo true || echo false)" } @@ -44,5 +47,4 @@ src_install() { doman man/flobopuyo.6 doicon "${DISTDIR}/${PN}.png" make_desktop_entry flobopuyo FloboPuyo - prepgamesdirs } diff --git a/games-puzzle/freesweep/freesweep-0.92.ebuild b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild index 711e5c61c6fa..fe5d96ca8f6d 100644 --- a/games-puzzle/freesweep/freesweep-0.92.ebuild +++ b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs games +EAPI=6 +inherit toolchain-funcs DESCRIPTION="Console Minesweeper" HOMEPAGE="http://freshmeat.net/projects/freesweep" @@ -12,17 +12,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~ppc-macos" -RDEPEND="sys-libs/ncurses:0" +RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" src_compile() { emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" } src_install() { - dogamesbin freesweep - dodoc README + dobin freesweep + einstalldocs doman freesweep.6 - prepgamesdirs } diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild index 1fee81603db0..73020c4a91e1 100644 --- a/games-puzzle/galaxis/galaxis-1.8.ebuild +++ b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis" HOMEPAGE="http://www.catb.org/~esr/galaxis/" @@ -13,16 +12,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" -DEPEND=">=sys-libs/ncurses-5.3:0" -RDEPEND=${DEPEND} +DEPEND=">=sys-libs/ncurses-5.3:0=" +RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_install() { - dogamesbin galaxis + dobin galaxis doman galaxis.6 - dodoc README - prepgamesdirs + einstalldocs } diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild index b7e04a7574c1..307663065741 100644 --- a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild +++ b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit games +EAPI=6 +inherit desktop DESCRIPTION="A puzzle game where it's your job to clear the screen of gems" HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/" @@ -13,11 +13,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=media-libs/libsdl-1.2.3-r1[joystick,video] - >=media-libs/sdl-mixer-1.2.1[mod]" -RDEPEND="${DEPEND}" +RDEPEND=" + >=media-libs/libsdl-1.2.3-r1[joystick,video] + >=media-libs/sdl-mixer-1.2.1[mod] +" +DEPEND="${RDEPEND}" src_prepare() { + default sed -i \ -e '/^CC/d' \ -e '/^CXX/d' \ @@ -30,14 +33,15 @@ src_prepare() { src_compile() { emake \ - DATA_PREFIX="${GAMES_DATADIR}/${PN}" \ + DATA_PREFIX="/usr/share/${PN}" \ XTRA_FLAGS="${CFLAGS}" } src_install() { - dogamesbin gemdropx - dodir "${GAMES_DATADIR}/${PN}" - cp -r data/* "${D}/${GAMES_DATADIR}/${PN}/" || die + dobin gemdropx + dodir "/usr/share/${PN}" + cp -r data/* "${ED}/usr/share/${PN}/" || die dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt - prepgamesdirs + newicon data/images/gemdropx-icon.xpm ${PN}.xpm + make_desktop_entry ${PN} "Gem Drop X" /usr/share/pixmaps/${PN}.xpm } diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild index 25f254cd5548..863fc84ff7f1 100644 --- a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild +++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils games +EAPI=6 +inherit desktop gnome2-utils -DESCRIPTION="graphical implementation of the sliding puzzle game fifteen" +DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen" HOMEPAGE="https://frigidcode.com/code/gfifteen/" SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz" @@ -15,9 +15,11 @@ IUSE="" RDEPEND="x11-libs/gtk+:3" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { + default # make it compile against newer gtk+:3 (bug #536994) sed -i \ -e 's/-DGTK_DISABLE_DEPRECATED=1 //' \ @@ -25,24 +27,21 @@ src_prepare() { } src_configure() { - egamesconf --disable-assembly + econf --disable-assembly } src_install() { default doicon -s scalable ${PN}.svg domenu gfifteen.desktop - prepgamesdirs } pkg_preinst() { gnome2_icon_savelist - games_pkg_preinst } pkg_postinst() { gnome2_icon_cache_update - games_pkg_postinst } pkg_postrm() { diff --git a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch index 69dd08c3e8b0..bb92102a37de 100644 --- a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch +++ b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch @@ -1,5 +1,5 @@ ---- GNUDoku.C -+++ GNUDoku.C +--- a/GNUDoku.C ++++ b/GNUDoku.C @@ -25,6 +25,7 @@ #include <cstdlib> #include <cstdio> @@ -8,8 +8,8 @@ #include <vector> #include <cassert> ---- sudoku.C -+++ sudoku.C +--- a/sudoku.C ++++ b/sudoku.C @@ -10,6 +10,7 @@ #include <cstdio> #include <cstdlib> diff --git a/games-puzzle/gnudoku/gnudoku-0.93.ebuild b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild index b4bbd4305682..bfd07d1a9a25 100644 --- a/games-puzzle/gnudoku/gnudoku-0.93.ebuild +++ b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic games +EAPI=6 +inherit desktop flag-o-matic MY_PN="GNUDoku" MY_P=${MY_PN}-${PV} @@ -18,12 +18,14 @@ RESTRICT="test" RDEPEND=">=dev-cpp/gtkmm-2.6:2.4" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch + default + eapply "${FILESDIR}"/${P}-gcc43.patch append-cxxflags -std=c++11 sed -i \ -e "s:\$(CXX):\$(CXX) ${CXXFLAGS} ${LDFLAGS}:" \ @@ -32,9 +34,8 @@ src_prepare() { } src_install() { - dogamesbin GNUDoku + dobin GNUDoku newicon GNUDoku.png ${PN}.png make_desktop_entry ${MY_PN} ${MY_PN} dodoc ALGORITHM Changelog README TODO - prepgamesdirs } diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch new file mode 100644 index 000000000000..c1502aca4290 --- /dev/null +++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch @@ -0,0 +1,220 @@ +Index: konstruktor.c +=================================================================== +--- a/konstruktor.c (Revision 412) ++++ b/konstruktor.c (Arbeitskopie) +@@ -247,7 +247,7 @@ + else if (level.w == 32 && level.h == 31) + gsize = 1; + inforedraw = 1; +- sprintf(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer); ++ strcpy(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer); + robbo.keys = k_count_obj(KEY); /* count keys on a map */ + robbo.bullets = k_count_obj(BULLET) * 9; /* count bullets */ + game_area.redraw = REDRAW_EVERYTHING; +@@ -688,7 +688,7 @@ + create_object(nx, ny, BOMB2); + switch (K_icons[selected].game_obj) { + case GROUND: +- sprintf(infostring, txt_konstruktor_Ground); ++ strcpy(infostring, txt_konstruktor_Ground); + break; + case STOP: + sprintf(infostring, "%s (%d %s)", +@@ -745,7 +745,7 @@ + txt_konstruktor_on_map); + break; + case EMPTY_FIELD: +- sprintf(infostring, txt_konstruktor_Empty_Field); ++ strcpy(infostring, txt_konstruktor_Empty_Field); + break; + case BUTTERFLY: + sprintf(infostring, "%s (%d %s)", +@@ -783,9 +783,9 @@ + case WALL: + board[nx][ny].state = wallnumber; + if (wallnumber != 3) +- sprintf(infostring, txt_konstruktor_Wall); ++ strcpy(infostring, txt_konstruktor_Wall); + else +- sprintf(infostring, txt_konstruktor_Black_Wall); ++ strcpy(infostring, txt_konstruktor_Black_Wall); + // game_area.redraw=REDRAW_EVERYTHING; + break; + case TELEPORT: +@@ -905,7 +905,7 @@ + break; + case K_RELOAD: + if (cnt == lastselected) { +- sprintf(infostring, txt_konstruktor_Level_reloaded); ++ strcpy(infostring, txt_konstruktor_Level_reloaded); + clear_screen(); + level_init(); + konstruktor_viewport_init(); +@@ -923,7 +923,7 @@ + k_redraw_all(); + cnt = -1; + } else { +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_Reload_level_select_again_to_reload); + lastclick = 50; + }; +@@ -1048,7 +1048,7 @@ + inforedraw = 1; + break; + case EMPTY_FIELD: +- sprintf(infostring, txt_konstruktor_Empty_Field); ++ strcpy(infostring, txt_konstruktor_Empty_Field); + inforedraw = 1; + break; + case WALL: +@@ -1055,9 +1055,9 @@ + if (cnt == selected) + wallnumber = (wallnumber + 1) % 10; + if (wallnumber != 3) +- sprintf(infostring, txt_konstruktor_Wall); ++ strcpy(infostring, txt_konstruktor_Wall); + else +- sprintf(infostring, txt_konstruktor_Black_Wall); ++ strcpy(infostring, txt_konstruktor_Black_Wall); + inforedraw = 1; + break; + case K_LASER: +@@ -1078,7 +1078,7 @@ + teleportnr = (teleportnr % 11) + 1; + break; + case GROUND: +- sprintf(infostring, txt_konstruktor_Ground); ++ strcpy(infostring, txt_konstruktor_Ground); + inforedraw = 1; + break; + case BIRD: +@@ -1101,16 +1101,16 @@ + direction = (direction + 1) % 4; + switch (direction) { + case 0: +- sprintf(infostring, txt_konstruktor_Direction_right); ++ strcpy(infostring, txt_konstruktor_Direction_right); + break; + case 1: +- sprintf(infostring, txt_konstruktor_Direction_down); ++ strcpy(infostring, txt_konstruktor_Direction_down); + break; + case 2: +- sprintf(infostring, txt_konstruktor_Direction_left); ++ strcpy(infostring, txt_konstruktor_Direction_left); + break; + case 3: +- sprintf(infostring, txt_konstruktor_Direction_up); ++ strcpy(infostring, txt_konstruktor_Direction_up); + break; + } + inforedraw = 1; +@@ -1119,13 +1119,13 @@ + ltype = (ltype + 1) % 3; + switch (ltype) { + case 0: +- sprintf(infostring, txt_konstruktor_Laser_Gun); ++ strcpy(infostring, txt_konstruktor_Laser_Gun); + break; + case 1: +- sprintf(infostring, txt_konstruktor_Blaster_Gun); ++ strcpy(infostring, txt_konstruktor_Blaster_Gun); + break; + case 2: +- sprintf(infostring, txt_konstruktor_Regular_Gun); ++ strcpy(infostring, txt_konstruktor_Regular_Gun); + break; + } + inforedraw = 1; +@@ -1136,16 +1136,16 @@ + movable = (rmstate & 1); + switch (rmstate) { + case 0: +- sprintf(infostring, txt_konstruktor_Fixed); ++ strcpy(infostring, txt_konstruktor_Fixed); + break; + case 1: +- sprintf(infostring, txt_konstruktor_Moveable); ++ strcpy(infostring, txt_konstruktor_Moveable); + break; + case 2: +- sprintf(infostring, txt_konstruktor_Rotating); ++ strcpy(infostring, txt_konstruktor_Rotating); + break; + case 3: +- sprintf(infostring, txt_konstruktor_Moveable_Rotating); ++ strcpy(infostring, txt_konstruktor_Moveable_Rotating); + break; + } + inforedraw = 1; +@@ -1152,7 +1152,7 @@ + break; + case K_INSERT: + if (lastselected == cnt) { +- sprintf(infostring, txt_konstruktor_Level_created); ++ strcpy(infostring, txt_konstruktor_Level_created); + insert = 1; + /* + * Clear board +@@ -1176,7 +1176,7 @@ + cnt = -1; + + } else { +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_New_level_select_again_to_create); + lastclick = 50; + } +@@ -1187,7 +1187,7 @@ + * Clear board + */ + if (lastselected == cnt) { +- sprintf(infostring, txt_konstruktor_Level_cleared); ++ strcpy(infostring, txt_konstruktor_Level_cleared); + robbo.screws = 0; + robbo.keys = 0; + robbo.bullets = 0; /* Thunor: I added this as it was missing */ +@@ -1206,7 +1206,7 @@ + clear_entire_board(); + cnt = -1; + } else { +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_Clear_level_select_again_to_clear); + lastclick = 50; + } +@@ -1215,9 +1215,9 @@ + case K_SAVE: + if (lastselected == cnt) { + if (insert == 1) +- sprintf(infostring, txt_konstruktor_New_level_appended_to_pack); ++ strcpy(infostring, txt_konstruktor_New_level_appended_to_pack); + else +- sprintf(infostring, txt_konstruktor_Changes_saved); ++ strcpy(infostring, txt_konstruktor_Changes_saved); + cnt = -1; + + k_save_map(); +@@ -1228,10 +1228,10 @@ + lastclick = 50; + + if (insert == 1) +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_Save_select_again_to_save_new_level); + else +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_Save_select_again_to_save_changes); + } + inforedraw = 1; +@@ -1297,7 +1297,7 @@ + konstruktor_end(); + cnt = -1; + } else { +- sprintf(infostring, ++ strcpy(infostring, + txt_konstruktor_Exit_designer_select_again_to_exit); + lastclick = 50; /* very long click is used as + * another click */ diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch index 9034a6fac0e2..af69bd9e1c9d 100644 --- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch +++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2011-06-20 21:19:49.578922392 +0200 -+++ Makefile 2011-06-20 21:20:28.535421648 +0200 +--- a/Makefile.old 2011-06-20 21:19:49.578922392 +0200 ++++ b/Makefile 2011-06-20 21:20:28.535421648 +0200 @@ -39,14 +39,13 @@ CFLAGS?=-O3 -pipe CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \ diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild index b3b59d5f3fc6..39a81fdcd790 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild +++ b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux" HOMEPAGE="http://gnurobbo.sourceforge.net/" @@ -13,29 +13,28 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsdl[sound,video,joystick] +RDEPEND=" + media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] - media-libs/sdl-ttf" -RDEPEND=${DEPEND} + media-libs/sdl-ttf +" +DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-underlink.patch -} +PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) src_compile() { emake \ - PACKAGE_DATA_DIR="${GAMES_DATADIR}/${PN}" \ - BINDIR="${GAMES_BINDIR}" \ + PACKAGE_DATA_DIR="/usr/share/${PN}" \ + BINDIR="/usr/bin" \ DOCDIR="/usr/share/doc/${PF}" } src_install() { - dogamesbin gnurobbo - insinto "${GAMES_DATADIR}/${PN}" + dobin gnurobbo + insinto "/usr/share/${PN}" doins -r data/{levels,skins,locales,rob,sounds} dodoc AUTHORS Bugs ChangeLog README TODO newicon icon32.png ${PN}.png make_desktop_entry ${PN} Gnurobbo - prepgamesdirs } diff --git a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch index 48275a8c39b1..9726f249820b 100644 --- a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch +++ b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch @@ -2,8 +2,8 @@ respect flags applied on top of debian patches ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -46,8 +46,6 @@ dnl Checks for libraries. dnl AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Groundhog needs GTK 2.0)) diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild index 0682e563376e..ba93616b6702 100644 --- a/games-puzzle/groundhog/groundhog-1.4.ebuild +++ b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools games +EAPI=6 +inherit desktop epatch autotools DEB_VER="9" DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes" @@ -15,19 +15,23 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="x11-libs/gtk+:2 - nls? ( virtual/libintl )" +RDEPEND=" + x11-libs/gtk+:2 + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { + default cd "${WORKDIR}" epatch groundhog_${PV}-${DEB_VER}.diff cd "${S}" sed -e "s:groundhog-1.4/::" -i \ debian/patches/sv.po.patch || die - epatch \ + eapply \ $(sed -e 's:^:debian/patches/:' debian/patches/series) \ "${FILESDIR}"/${P}-flags.patch mv configure.in configure.ac || die @@ -37,10 +41,11 @@ src_prepare() { } src_configure() { - egamesconf $(use_enable nls) + econf $(use_enable nls) } src_install() { default - prepgamesdirs + doicon src/pixmaps/${PN}.xpm + make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm } diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild index 8e7c4cdd73d8..eece76f8cc06 100644 --- a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild +++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="An entertaining game based on the old DOS game lines" HOMEPAGE="http://gtkballs.antex.ru/" @@ -13,13 +13,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="x11-libs/gtk+:2 - nls? ( virtual/libintl )" +RDEPEND=" + x11-libs/gtk+:2 + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.10.38 )" + nls? ( >=sys-devel/gettext-0.10.38 ) +" src_prepare() { + default sed -i \ -e '/^nlsdir=/s:=.*:=/usr/share/locale:' \ -e '/^localedir/s:=.*:=/usr/share/locale:' \ @@ -27,12 +31,11 @@ src_prepare() { } src_configure() { - egamesconf $(use_enable nls) + econf $(use_enable nls) } src_install() { default newicon gnome-gtkballs.png ${PN}.png make_desktop_entry gtkballs "GTK Balls" - prepgamesdirs } diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch index 81a8cece8870..fa5857492da3 100644 --- a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch +++ b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch @@ -1,5 +1,5 @@ ---- configure.in.old 2014-06-03 09:21:52.868225743 +0200 -+++ configure.in 2014-06-03 09:22:06.604614448 +0200 +--- a/configure.in.old 2014-06-03 09:21:52.868225743 +0200 ++++ b/configure.in 2014-06-03 09:22:06.604614448 +0200 @@ -66,7 +66,7 @@ *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;; esac],[setgid=true;enable_setgid=yes]) diff --git a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild index 514d95cea835..0f88623656e1 100644 --- a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild +++ b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit flag-o-matic autotools games +EAPI=6 +inherit autotools flag-o-matic DESCRIPTION="Bejeweled clone game" HOMEPAGE="http://www.gweled.org/" @@ -13,26 +13,25 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gtk+:2 media-libs/libmikmod - gnome-base/librsvg:2" + gnome-base/librsvg:2 +" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + eapply "${FILESDIR}"/${P}-gentoo.patch + mv configure.in configure.ac || die eautoreconf } src_configure() { filter-flags -fomit-frame-pointer append-ldflags -Wl,--export-dynamic - egamesconf \ - --disable-setgid -} -src_install() { - default - gamesowners -R "${D}/var/games/gweled" - prepgamesdirs + econf --disable-setgid } diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild index 468a996b6fa2..abfc77ca017b 100644 --- a/games-puzzle/hangman/hangman-0.9.2.ebuild +++ b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="The classic word guessing game" HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html" @@ -22,6 +22,7 @@ RDEPEND="${DEPEND} sys-apps/miscfiles" src_prepare() { + default sed -i \ -e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \ src/hangman.c \ @@ -32,5 +33,4 @@ src_install() { default newicon pics/noose.png ${PN}.png make_desktop_entry ${PN} Hangman - prepgamesdirs } diff --git a/games-puzzle/hexamine/hexamine-0.2.1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild index 0551f1e713ad..67529d0521a4 100644 --- a/games-puzzle/hexamine/hexamine-0.2.1.ebuild +++ b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 games + +inherit desktop python-single-r1 DESCRIPTION="Hexagonal Minesweeper" HOMEPAGE="https://sourceforge.net/projects/hexamine" @@ -12,32 +13,30 @@ SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="dev-python/pygame - ${PYTHON_DEPS}" -DEPEND="${PYTHON_DEPS}" +IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S=${WORKDIR}/${PN} +RDEPEND="${PYTHON_DEPS} + dev-python/pygame +" +DEPEND="" -pkg_setup() { - python-single-r1_pkg_setup - games_pkg_setup -} +S="${WORKDIR}/${PN}" src_prepare() { + default # Modify game data directory sed -i \ - -e "s:\`dirname \$0\`:${GAMES_DATADIR}/${PN}:" \ + -e "s:\`dirname \$0\`:/usr/share/${PN}:" \ -e "s:\./hexamine:exec ${EPYTHON} &:" \ hexamine || die } src_install() { - dogamesbin hexamine - insinto "${GAMES_DATADIR}/${PN}" + dobin hexamine + insinto "/usr/share/${PN}" doins -r hexamine.* skins - dodoc ABOUT README - prepgamesdirs + einstalldocs + make_desktop_entry ${PN} "Hexamine" } diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch index d6e16a6c39a6..846d5b4141bc 100644 --- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch +++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch @@ -1,5 +1,5 @@ ---- dialog.c -+++ dialog.c +--- a/dialog.c ++++ b/dialog.c @@ -279,10 +279,10 @@ PopupReturnType popuphighscores() for (i=0;i<HISCORENUM;i++) @@ -22,8 +22,8 @@ puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf); puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!"); ---- menu.c -+++ menu.c +--- a/menu.c ++++ b/menu.c @@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu() if (strlen(commandline.theme)>0) @@ -57,8 +57,8 @@ } else // right or middle or scroll back { ---- hiscore.c -+++ hiscore.c +--- a/hiscore.c ++++ b/hiscore.c @@ -72,7 +72,7 @@ // make sure all entries are zeroed out to start. for (i=0;i<HISCORENUM;i++) @@ -102,8 +102,8 @@ hival[i]=temphiscoreval[arrayindex[i]]; } } ---- line.c -+++ line.c +--- a/line.c ++++ b/line.c @@ -30,8 +30,9 @@ Line createline(int linenum) @@ -115,8 +115,8 @@ switch (linenum) { case 1: ---- options.c -+++ options.c +--- a/options.c ++++ b/options.c @@ -66,7 +66,7 @@ options.autopause=AUTOPAUSEOFF; options.difficulty=NORMAL; @@ -171,8 +171,8 @@ } } else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0) ---- penguin.c -+++ penguin.c +--- a/penguin.c ++++ b/penguin.c @@ -40,8 +40,9 @@ Penguin createpenguinxy(int x, int y) @@ -184,8 +184,8 @@ switch (random() % 4) { case 0: ---- themes.c -+++ themes.c +--- a/themes.c ++++ b/themes.c @@ -183,7 +183,7 @@ foundcolor.spritetransparent = 0; diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch index 44ef9bdf8631..93b40fc67687 100644 --- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch +++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-10-11 12:20:01.274684641 -0400 -+++ Makefile 2010-10-11 12:22:02.256897083 -0400 +--- a/Makefile.orig 2010-10-11 12:20:01.274684641 -0400 ++++ b/Makefile 2010-10-11 12:22:02.256897083 -0400 @@ -1,5 +1,3 @@ -CC=gcc - diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch index 03050be548fb..5e8ffc01d8d2 100644 --- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch +++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch @@ -1,5 +1,5 @@ ---- menu.c.old 2013-06-24 22:09:11.606750080 +0200 -+++ menu.c 2013-06-24 22:25:51.635735351 +0200 +--- a/menu.c.old 2013-06-24 22:09:11.606750080 +0200 ++++ b/menu.c 2013-06-24 22:25:51.635735351 +0200 @@ -522,7 +522,7 @@ { // "random", at the end/beginning of the list diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch index de388d9b5758..419262791d98 100644 --- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch +++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch @@ -1,5 +1,5 @@ ---- Makefile.old 2010-10-19 10:26:18.000000000 +0200 -+++ Makefile 2010-10-19 10:38:28.000000000 +0200 +--- a/Makefile.old 2010-10-19 10:26:18.000000000 +0200 ++++ b/Makefile 2010-10-19 10:38:28.000000000 +0200 @@ -196,26 +196,30 @@ themes-install: install-themes diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild new file mode 100644 index 000000000000..f064951fac68 --- /dev/null +++ b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop + +DESCRIPTION="Trap and capture penguins on Antarctica" +HOMEPAGE="http://www.mattdm.org/icebreaker/" +SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + media-libs/libsdl[video] + media-libs/sdl-mixer +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-parallell-install.patch + "${FILESDIR}"/${P}-ovfl.patch +) + +src_compile() { + emake \ + OPTIMIZE="${CFLAGS}" \ + prefix=/usr \ + bindir=/usr/bin \ + datadir=/usr/share \ + highscoredir="/var" +} + +src_install() { + emake \ + prefix="${D}/usr" \ + bindir="${D}/usr/bin" \ + datadir="${D}/usr/share" \ + highscoredir="${D}/var" install + + newicon ${PN}_48.bmp ${PN}.bmp + make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp + einstalldocs +} diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild deleted file mode 100644 index 449e0864f626..000000000000 --- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="Trap and capture penguins on Antarctica" -HOMEPAGE="http://www.mattdm.org/icebreaker/" -SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/libsdl[video] - media-libs/sdl-mixer" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-parallell-install.patch \ - "${FILESDIR}"/${P}-ovfl.patch -} - -src_compile() { - emake \ - OPTIMIZE="${CFLAGS}" \ - prefix=/usr \ - bindir="${GAMES_BINDIR}" \ - datadir="${GAMES_DATADIR}" \ - highscoredir="${GAMES_STATEDIR}" -} - -src_install() { - emake \ - prefix="${D}/usr" \ - bindir="${D}${GAMES_BINDIR}" \ - datadir="${D}${GAMES_DATADIR}" \ - highscoredir="${D}${GAMES_STATEDIR}" install - newicon ${PN}_48.bmp ${PN}.bmp - make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp - dodoc ChangeLog README* TODO - prepgamesdirs -} diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r3.ebuild index 21bb3113dafd..e70ad0267d87 100644 --- a/games-puzzle/jools/jools-0.20-r2.ebuild +++ b/games-puzzle/jools/jools-0.20-r3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 games -MUS_P=${PN}-musicpack-1.0 +inherit eutils python-single-r1 + +MUS_P="${PN}-musicpack-1.0" DESCRIPTION="clone of Bejeweled, a popular pattern-matching game" HOMEPAGE="http://pessimization.com/software/jools/" SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz @@ -14,19 +15,16 @@ SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="dev-python/pygame[${PYTHON_USEDEP}] - ${PYTHON_DEPS}" -RDEPEND=${DEPEND} +IUSE="" REQUIRED_USE=${PYTHON_REQUIRED_USE} -S=${WORKDIR}/${P}/jools +RDEPEND="${PYTHON_DEPS} + dev-python/pygame[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" -pkg_setup() { - python-single-r1_pkg_setup - games_pkg_setup -} +S="${WORKDIR}/${P}/jools" src_unpack() { unpack ${P}.tar.gz @@ -35,22 +33,23 @@ src_unpack() { } src_prepare() { - echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > config.py + default + echo "MEDIAROOT = \"/usr/share/${PN}\"" > config.py python_fix_shebang . } src_install() { - games_make_wrapper ${PN} "${EPYTHON} ./__init__.py" "$(games_get_libdir)"/${PN} - insinto "$(games_get_libdir)"/${PN} + make_wrapper ${PN} "${EPYTHON} ./__init__.py" /usr/"$(get_libdir)"/${PN} + insinto /usr/"$(get_libdir)"/${PN} doins *.py - python_optimize "${D}$(games_get_libdir)/${PN}" + python_optimize "${ED}/usr/$(get_libdir)/${PN}" - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins -r fonts images music sounds newicon images/ruby/0001.png ${PN}.png make_desktop_entry ${PN} Jools + dodoc ../{ChangeLog,doc/{POINTS,TODO}} - dohtml ../doc/manual.html - prepgamesdirs + HTML_DOCS="../doc/manual.html" einstalldocs } diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild index 054dd29a9f4a..0f13cdb89b69 100644 --- a/games-puzzle/lpairs/lpairs-1.0.4.ebuild +++ b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A classical memory game" HOMEPAGE="http://lgames.sourceforge.net/LPairs/" @@ -13,12 +13,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls sound" -RDEPEND="media-libs/libsdl[sound?,video] - nls? ( virtual/libintl )" +RDEPEND=" + media-libs/libsdl[sound?,video] + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { + default sed -i \ -e 's:$localedir:/usr/share/locale:' \ -e 's:$(localedir):/usr/share/locale:' \ @@ -28,8 +32,8 @@ src_prepare() { } src_configure() { - egamesconf \ - --datadir="${GAMES_DATADIR_BASE}" \ + econf \ + --datadir=/usr \ $(use_enable nls) \ $(usex sound '' --disable-sound) } @@ -38,5 +42,4 @@ src_install() { default doicon lpairs.png make_desktop_entry lpairs LPairs - prepgamesdirs } diff --git a/games-puzzle/ltris/ltris-1.0.19.ebuild b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild index 439782b6b496..9f3d02d2cc06 100644 --- a/games-puzzle/ltris/ltris-1.0.19.ebuild +++ b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools flag-o-matic eutils games +EAPI=6 +inherit autotools desktop flag-o-matic -DESCRIPTION="very polished Tetris clone" +DESCRIPTION="Very polished Tetris clone" HOMEPAGE="http://lgames.sourceforge.net/LTris/" SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz" @@ -13,26 +13,29 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="media-libs/libsdl[video] +RDEPEND=" + media-libs/libsdl[video] media-libs/sdl-mixer - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + eapply "${FILESDIR}"/${P}-gentoo.patch mv configure.in configure.ac || die AT_M4DIR=m4 eautoreconf append-cflags -std=gnu89 # build with gcc5 (bug #570966) } src_configure() { - egamesconf $(use_enable nls) + econf $(use_enable nls) } src_install() { default newicon icons/ltris48.xpm ${PN}.xpm make_desktop_entry ltris LTris - prepgamesdirs } diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest index a241354be48a..a1723fcf9e19 100644 --- a/games-puzzle/magiccube4d/Manifest +++ b/games-puzzle/magiccube4d/Manifest @@ -1 +1,2 @@ +DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49 DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6 diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch index adb4d2836a62..8e2aaf2b5fcd 100644 --- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch @@ -1,5 +1,5 @@ ---- EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200 -+++ EventHandler.h 2006-05-19 22:11:58.000000000 +0200 +--- a/EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200 ++++ b/EventHandler.h 2006-05-19 22:11:58.000000000 +0200 @@ -165,7 +165,7 @@ int number_of_reference_stickers_needed; @@ -9,8 +9,8 @@ void* cur_ui_data; bool quick_mode; ---- Machine.h.old 2006-05-19 22:12:17.000000000 +0200 -+++ Machine.h 2006-05-19 22:12:29.000000000 +0200 +--- a/Machine.h.old 2006-05-19 22:12:17.000000000 +0200 ++++ b/Machine.h 2006-05-19 22:12:29.000000000 +0200 @@ -31,7 +31,7 @@ { public: diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch index 446eb0cc91ae..73d1b4a59dca 100644 --- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.in.old 2010-10-15 10:38:48.000000000 +0200 -+++ Makefile.in 2010-10-15 10:39:07.000000000 +0200 +--- a/Makefile.in.old 2010-10-15 10:38:48.000000000 +0200 ++++ b/Makefile.in 2010-10-15 10:39:07.000000000 +0200 @@ -72,10 +72,10 @@ $(CXX) -c $(CXXFLAGS) $< diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch index 7dae8981c4aa..d242438d8d05 100644 --- a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch +++ b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch @@ -1,5 +1,5 @@ ---- EventHandler.cpp.old 2004-11-04 22:58:13.735812448 +1100 -+++ EventHandler.cpp 2004-11-04 22:57:03.176539088 +1100 +--- a/EventHandler.cpp.old 2004-11-04 22:58:13.735812448 +1100 ++++ b/EventHandler.cpp 2004-11-04 22:57:03.176539088 +1100 @@ -326,7 +326,7 @@ number_of_reference_stickers_needed--; reference_stickers_needed++; diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild index 7d4287d447bd..5f9eac856d8f 100644 --- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild +++ b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop -MY_PV=${PV/./_} -DESCRIPTION="four-dimensional analog of Rubik's cube" +MY_PV="${PV/./_}" +DESCRIPTION="Four-dimensional analog of Rubik's cube" HOMEPAGE="http://www.superliminal.com/cube/cube.htm" -SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz" +SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz + http://superliminal.com/cube/cube_transp.gif -> ${PN}.gif" LICENSE="free-noncomm" SLOT="0" @@ -17,10 +18,11 @@ IUSE="" DEPEND="x11-libs/libXaw" RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN}-src-${MY_PV} +S="${WORKDIR}/${PN}-src-${MY_PV}" src_prepare() { - epatch "${FILESDIR}"/${PN}-EventHandler.patch \ + default + eapply "${FILESDIR}"/${PN}-EventHandler.patch \ "${FILESDIR}/${P}"-gcc41.patch \ "${FILESDIR}/${P}"-64bit-ptr.patch \ "${FILESDIR}"/${P}-ldflags.patch @@ -35,7 +37,8 @@ src_compile() { } src_install() { - dogamesbin magiccube4d + dobin magiccube4d dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt - prepgamesdirs + doicon "${DISTDIR}"/${PN}.gif + make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif } diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild index fc86ad6a5122..c7d403f40c4d 100644 --- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild +++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit cmake-utils gnome2-utils games +inherit cmake-utils gnome2-utils DESCRIPTION="A puzzle/platform game with a player and its shadow" HOMEPAGE="http://meandmyshadow.sourceforge.net/" @@ -22,21 +22,18 @@ DEPEND="media-libs/libsdl[sound,video,X] net-misc/curl app-arch/libarchive x11-libs/libX11 - opengl? ( virtual/opengl )" -RDEPEND=${DEPEND} + opengl? ( virtual/opengl ) +" +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) -src_prepare() { - cmake-utils_src_prepare -} - src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" - -DBINDIR="${GAMES_BINDIR}" - -DDATAROOTDIR="${GAMES_DATADIR}" + -DCMAKE_INSTALL_PREFIX="/usr" + -DBINDIR="/usr/bin" + -DDATAROOTDIR="/usr/share" -DICONDIR=/usr/share/icons -DDESKTOPDIR=/usr/share/applications $(cmake-utils_use opengl HARDWARE_ACCELERATION) @@ -44,23 +41,16 @@ src_configure() { cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { cmake-utils_src_install dodoc AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest index e49e4d1cdc2a..35720a71532a 100644 --- a/games-puzzle/mindless/Manifest +++ b/games-puzzle/mindless/Manifest @@ -1,2 +1,3 @@ DIST OracleAll_050523.txt 1280717 BLAKE2B 8ae2c78cd0c1453785d5d5e382804e2e186d481a0195a92a93adf091dcd51833311d9111806641eff4489a47842eb362f09d9a6d69973817619c07b9be1cadd2 SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5 DIST mindless-1.6.tar.gz 85620 BLAKE2B 5922cdb31ec83a0e7cda6c8646c75f35d1e52ce96711b62bd5749762e5074b39568f499bcd3dce39e4bb6d9d7e70097d62c310235bb59f1eda790d057197544a SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f +DIST mindless.png 5119 BLAKE2B 19796bda1bc29c7a78a91cf083e98ef1a51fae0581cece3f8822f2474011cab5d20d0ffc797ef83912cebe406816271d67016cfef86393fe554c03dd42956541 SHA512 1a26d6f241889887a4464555189f25936e3961ef6df113dd4d3eab0f60699ea6bba9af3d88517e61ae9ad9dfc630e663a9d4c7ff0876ff3bcf21cbcee6a7f50a diff --git a/games-puzzle/mindless/mindless-1.6-r1.ebuild b/games-puzzle/mindless/mindless-1.6-r1.ebuild new file mode 100644 index 000000000000..4777d0640580 --- /dev/null +++ b/games-puzzle/mindless/mindless-1.6-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop readme.gentoo-r1 + +ORANAME="OracleAll_050523.txt" +DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people" +HOMEPAGE="http://mindless.sourceforge.net/" +SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz + http://www.wizards.com/dci/oracle/${ORANAME} + http://mindless.sourceforge.net/images/logo.png -> ${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="mirror" # for the card database + +RDEPEND=" + x11-libs/gtk+:2 + media-fonts/font-schumacher-misc +" +DEPEND="${RDEPEND} + gnome-base/librsvg:2 + virtual/pkgconfig +" + +DATAFILE="/usr/share/${PN}/${ORANAME}" +DOC_CONTENTS=" + The first time you start ${PN} you need to tell it where to find + the text database of cards. This file has been installed at: + ${DATAFILE} +" + +src_unpack() { + unpack "${P}.tar.gz" + cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed" +} + +src_prepare() { + default + sed -i \ + -e '/^CC=/d' \ + -e '/^CFLAGS=/d' \ + Makefile \ + || die 'sed failed' +} + +src_install() { + dobin mindless + insinto "/usr/share/${PN}" + doins "${WORKDIR}/${ORANAME}" + einstalldocs + readme.gentoo_create_doc + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} "Mindless Automaton" +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild deleted file mode 100644 index 2bc3f3b408c3..000000000000 --- a/games-puzzle/mindless/mindless-1.6.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit games - -ORANAME="OracleAll_050523.txt" -DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people" -HOMEPAGE="http://mindless.sourceforge.net/" -SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz - http://www.wizards.com/dci/oracle/${ORANAME}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror" # for the card database - -RDEPEND="x11-libs/gtk+:2 - media-fonts/font-schumacher-misc" -DEPEND="${RDEPEND} - gnome-base/librsvg - virtual/pkgconfig" - -src_unpack() { - unpack "${P}.tar.gz" - cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed" - DATAFILE="${GAMES_DATADIR}/${PN}/${ORANAME}" -} - -src_prepare() { - sed -i \ - -e '/^CC=/d' \ - -e '/^CFLAGS=/d' \ - Makefile \ - || die 'sed failed' -} - -src_install() { - dogamesbin mindless - insinto "${GAMES_DATADIR}/${PN}" - doins "${WORKDIR}/${ORANAME}" - dodoc CHANGES README TODO - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - elog "The first time you start ${PN} you need to tell it where to find" - elog "the text database of cards. This file has been installed at:" - elog "${DATAFILE}" - echo -} diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch index e9b313423699..4817f75786f8 100644 --- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch +++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch @@ -6,8 +6,8 @@ unsigned long. Should probably really be uint32_t but I'll leave that decision to upstream. Thanks Pelle Nilsson (and son). 64bit check borrowed from bug #496863. Closes: #498912. ---- src/libgame/gadgets.c -+++ src/libgame/gadgets.c +--- a/src/libgame/gadgets.c ++++ b/src/libgame/gadgets.c @@ -18,6 +18,12 @@ #include "text.h" #include "misc.h" diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch index c8d386f4e581..be7f701de42f 100644 --- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch +++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch @@ -1,5 +1,5 @@ ---- src/main.h.old -+++ src/main.h +--- a/src/main.h.old ++++ b/src/main.h @@ -459,7 +459,6 @@ #endif extern struct HiScore highscore[]; diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch index 9b538a688816..a7effd4b6984 100644 --- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch +++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch @@ -1,5 +1,5 @@ ---- src/Makefile.old -+++ src/Makefile +--- a/src/Makefile.old ++++ b/src/Makefile @@ -146,7 +146,7 @@ endif diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild index 88a24e7a64e5..812835fd25d0 100644 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild +++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs games +EAPI=6 +inherit desktop toolchain-funcs -DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)" +DESCRIPTION="A game like Deflektor (C 64) or Mindbender (Amiga)" HOMEPAGE="http://www.artsoft.org/mirrormagic/" SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz" @@ -13,17 +13,21 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sdl" -RDEPEND="!sdl? ( x11-libs/libX11 ) +RDEPEND=" + !sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image - )" + ) +" DEPEND="${RDEPEND} - !sdl? ( x11-libs/libXt )" + !sdl? ( x11-libs/libXt ) +" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-gcc41.patch \ "${FILESDIR}"/${P}-parallel.patch \ "${FILESDIR}"/${P}-64bit.patch \ @@ -40,17 +44,16 @@ src_compile() { RANLIB="$(tc-getRANLIB)" \ OPTIONS="${CFLAGS}" \ EXTRA_LDFLAGS="${LDFLAGS}" \ - RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \ - RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \ + RO_GAME_DIR=/usr/share/${PN} \ + RW_GAME_DIR=/var/${PN} \ TARGET=$(usex sdl sdl x11) } src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} + dobin ${PN} + insinto /usr/share/${PN} doins -r graphics levels music sounds doicon "${FILESDIR}"/${PN}.xpm make_desktop_entry ${PN} "Mirror Magic II" - dodoc CHANGES CREDITS README TODO - prepgamesdirs + einstalldocs } diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch index 8e55b23a327c..d0847d6c2c10 100644 --- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch +++ b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch @@ -1,5 +1,5 @@ ---- monsterz.py -+++ monsterz.py +--- a/monsterz.py ++++ b/monsterz.py @@ -829,10 +829,10 @@ pass else: diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch index 652450bf190b..6920e0e36971 100644 --- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch +++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch @@ -1,5 +1,5 @@ ---- monsterz.py.orig 2006-05-12 18:55:51.000000000 -0400 -+++ monsterz.py 2006-05-12 18:57:44.000000000 -0400 +--- a/monsterz.py.orig 2006-05-12 18:55:51.000000000 -0400 ++++ b/monsterz.py 2006-05-12 18:57:44.000000000 -0400 @@ -1907,7 +1906,7 @@ print ' (C) Mike Kershaw <dragorn@kismetwireless.net>' diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild index e8e78eba8638..4cff31b75f8c 100644 --- a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild +++ b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild @@ -1,44 +1,47 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils python-r1 games -DESCRIPTION="a little puzzle game, similar to the famous Bejeweled or Zookeeper" +inherit desktop python-r1 + +DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper" HOMEPAGE="http://sam.zoy.org/projects/monsterz/" SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz" LICENSE="GPL-1+ LGPL-2+ WTFPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" + IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/pygame[${PYTHON_USEDEP}] media-libs/sdl-image[png] - media-libs/sdl-mixer[mod]" + media-libs/sdl-mixer[mod] +" DEPEND="${RDEPEND}" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-gentoo.patch \ "${FILESDIR}"/${P}-64bit.patch \ "${FILESDIR}"/${P}-blit.patch sed -i \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \ + -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \ monsterz.py || die "sed failed" rm Makefile || die } src_install() { - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins -r graphics sound - newgamesbin monsterz.py ${PN} + newbin monsterz.py ${PN} newicon graphics/icon.png ${PN}.png make_desktop_entry ${PN} Monsterz - dodoc README AUTHORS TODO - python_replicate_script "${ED%/}${GAMES_BINDIR}"/monsterz - prepgamesdirs + einstalldocs + python_replicate_script "${ED%/}"/usr/bin/monsterz } diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch index 704dcf1f53bc..697db8ef7a28 100644 --- a/games-puzzle/mures/files/mures-0.5-save.patch +++ b/games-puzzle/mures/files/mures-0.5-save.patch @@ -1,5 +1,5 @@ ---- gi_sdl.c -+++ gi_sdl.c +--- a/gi_sdl.c ++++ b/gi_sdl.c @@ -606,6 +606,7 @@ { int i,found; @@ -19,8 +19,8 @@ case SDLK_F1: game_restart(g); ---- output.c -+++ output.c +--- a/output.c ++++ b/output.c @@ -215,7 +215,8 @@ void output_screenshot() diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch index 805cd0c7b35d..3acf0b0f7233 100644 --- a/games-puzzle/mures/files/mures-0.5-underlink.patch +++ b/games-puzzle/mures/files/mures-0.5-underlink.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.old 2011-06-21 14:39:14.404333493 +0200 -+++ src/Makefile.am 2011-06-21 14:39:30.538340283 +0200 +--- a/src/Makefile.am.old 2011-06-21 14:39:14.404333493 +0200 ++++ b/src/Makefile.am 2011-06-21 14:39:30.538340283 +0200 @@ -1,8 +1,8 @@ bin_PROGRAMS = mures diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild index 10bd791881fe..36b51630c7e7 100644 --- a/games-puzzle/mures/mures-0.5.ebuild +++ b/games-puzzle/mures/mures-0.5-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit autotools eutils games +EAPI=6 +inherit autotools desktop DESCRIPTION="A clone of Sega's Chu Chu Rocket" HOMEPAGE="http://mures.sourceforge.net/" @@ -18,12 +17,15 @@ DEPEND="media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf - opengl? ( virtual/opengl )" + opengl? ( virtual/opengl ) +" RDEPEND="${DEPEND}" -dir=${GAMES_DATADIR}/${PN} +dir="/usr/share/${PN}" src_prepare() { + default + # Disable OpenGL support if USE flag is not set if ! use opengl ; then sed -i \ @@ -37,14 +39,15 @@ src_prepare() { src/maps/battle/Makefile.am \ || die "sed failed" - epatch "${FILESDIR}"/${P}-underlink.patch + eapply "${FILESDIR}"/${P}-underlink.patch + mv configure.in configure.ac eautoreconf cd src # Save to HOME - epatch "${FILESDIR}"/${P}-save.patch + eapply "${FILESDIR}"/${P}-save.patch # Modify game data & scrips path sed -i \ @@ -80,8 +83,8 @@ src_install() { rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles" insinto "${dir}" doins -r src/{gui,images,sounds,textures,maps,*.lua} - dodoc README TODO ChangeLog AUTHORS - dogamesbin src/mures - - prepgamesdirs + einstalldocs + dobin src/mures + newicon src/images/cat_right.png ${PN}.png + make_desktop_entry ${PN} "Mures" } diff --git a/games-puzzle/neverball/neverball-1.6.0.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild index 28d7120de14b..86b5c7b5e35b 100644 --- a/games-puzzle/neverball/neverball-1.6.0.ebuild +++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils games +EAPI=6 +inherit desktop gnome2-utils DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL" HOMEPAGE="http://neverball.org/" @@ -14,20 +14,24 @@ KEYWORDS="~amd64 ~x86" IUSE="nls" RESTRICT="test" -RDEPEND="media-libs/libsdl2[sound,joystick,opengl,video] +RDEPEND=" + media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf - media-libs/libpng:0 + media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - sys-devel/gettext" + sys-devel/gettext +" src_prepare() { + default sed -i \ -e 's:mapc:neverball-mapc:g' \ -e 's:MAPC:NEVERBALL-MAPC:g' \ @@ -46,20 +50,19 @@ src_compile() { E_CFLAGS="${CFLAGS}" \ E_CXXFLAGS="${CXXFLAGS}" \ LOCALEDIR=/usr/share/locale \ - DATADIR="${GAMES_DATADIR}/${PN}" + DATADIR="/usr/share/${PN}" } src_install() { local font - dogamesbin ${PN}-mapc neverball neverputt - insinto "${GAMES_DATADIR}/${PN}" + dobin ${PN}-mapc neverball neverputt + insinto "/usr/share/${PN}" doins -r data/* - for font in DejaVuSans-Bold.ttf wqy-microhei.ttc - do - rm -f "${D}${GAMES_DATADIR}/${PN}"/ttf/${font} + for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do + rm -f "${ED}/usr/share/${PN}"/ttf/${font} dosym /usr/share/fonts/*/${font} \ - "${GAMES_DATADIR}/${PN}"/ttf/${font} + "/usr/share/${PN}"/ttf/${font} done if [[ -d locale ]] ; then insinto /usr/share @@ -78,19 +81,13 @@ src_install() { newman dist/mapc.1 neverball-mapc.6 make_desktop_entry neverball Neverball make_desktop_entry neverputt Neverputt neverputt - - prepgamesdirs } pkg_postinst() { gnome2_icon_cache_update - games_pkg_postinst - elog "${P} will overwrite existing high-score files, so back them up if" - elog "you want to preserve your old scores and progress." } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch index 1ed79dbe4d86..bebcbd088b12 100644 --- a/games-puzzle/pauker/files/pauker_bundledjars.patch +++ b/games-puzzle/pauker/files/pauker_bundledjars.patch @@ -1,5 +1,5 @@ ---- build.xml.orig 2008-11-24 20:24:55.000000000 +1300 -+++ build.xml 2008-11-24 20:25:33.000000000 +1300 +--- a/build.xml.orig 2008-11-24 20:24:55.000000000 +1300 ++++ b/build.xml 2008-11-24 20:25:33.000000000 +1300 @@ -88,11 +88,6 @@ basedir="build/classes/" includes="pauker/**,tools/**" diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8-r1.ebuild index af0161d502ee..62c31d7abb45 100644 --- a/games-puzzle/pauker/pauker-1.8.ebuild +++ b/games-puzzle/pauker/pauker-1.8-r1.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 JAVA_PKG_IUSE="doc source" -inherit eutils java-pkg-2 java-ant-2 games + +inherit desktop java-pkg-2 java-ant-2 DESCRIPTION="A java based flashcard program" HOMEPAGE="http://pauker.sourceforge.net/" @@ -14,27 +15,27 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -COMMON_DEP="dev-java/browserlauncher2:1.0 - dev-java/javahelp - dev-java/lucene:2.4 - dev-java/swing-layout:1" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${COMMON_DEP}" - -S=${WORKDIR} +COMMON_DEP=" + dev-java/browserlauncher2:1.0 + dev-java/javahelp + dev-java/lucene:2.4 + dev-java/swing-layout:1 +" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5 +" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + app-arch/unzip +" -pkg_setup() { - games_pkg_setup - java-pkg-2_pkg_setup -} +S="${WORKDIR}" src_prepare() { + default find . -iname '*.jar' -delete - epatch "${FILESDIR}/${PN}_bundledjars.patch" + eapply "${FILESDIR}/${PN}_bundledjars.patch" java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar java-pkg_jar-from --into libs javahelp jhall.jar @@ -52,12 +53,12 @@ src_compile() { #tests cannot be build. src_install() { - java-pkg_jarinto "${GAMES_DATADIR}/${PN}" + java-pkg_jarinto "/usr/share/${PN}" java-pkg_newjar "dist/${P}.jar" java-pkg_dolauncher ${PN} \ - -into "${GAMES_PREFIX}" \ - --pwd "${GAMES_DATADIR}"/${PN} \ + -into "/usr" \ + --pwd /usr/share/${PN} \ --main pauker.program.gui.swing.PaukerFrame use doc && java-pkg_dojavadoc dist/javadoc @@ -65,5 +66,4 @@ src_install() { newicon src/pauker/icons/repeat.png ${PN}.png make_desktop_entry pauker Pauker - prepgamesdirs } diff --git a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch index d8c078de6a91..0f2ca8b8b23d 100644 --- a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch +++ b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch @@ -1,5 +1,5 @@ ---- bin/penguzzle -+++ bin/penguzzle +--- a/bin/penguzzle ++++ b/bin/penguzzle @@ -1,4 +1,6 @@ -#!/usr/bin/wishx +#!/usr/bin/wish diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild index ed926fa4a95e..54cc98723ec2 100644 --- a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild +++ b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Tcl/Tk variant of the well-known 15-puzzle game" HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml" @@ -13,34 +13,39 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-lang/tk - dev-tcltk/tclx" +RDEPEND=" + dev-lang/tk:0= + dev-tcltk/tclx +" DEPEND="app-arch/unzip" -S=${WORKDIR}/${PN}${PV} +S="${WORKDIR}/${PN}${PV}" src_prepare() { + default sed -i \ - -e "s:~/puzz/images:${GAMES_DATADIR}/${PN}:" \ + -e "s:~/puzz/images:/usr/share/${PN}:" \ lib/init \ || die "sed init failed" sed -i \ - -e "s:~/puzz/lib:$(games_get_libdir)/${PN}:" \ + -e "s:~/puzz/lib:/usr/$(get_libdir)/${PN}:" \ bin/${PN} \ || die "sed ${PN} failed" - epatch "${FILESDIR}"/${P}-tclx.patch + eapply "${FILESDIR}"/${P}-tclx.patch } src_install() { - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins images/img0.gif - insinto "$(games_get_libdir)"/${PN} + insinto /usr/"$(get_libdir)"/${PN} doins lib/init - dogamesbin bin/${PN} + dobin bin/${PN} - dodoc README - prepgamesdirs + newicon images/img0.gif ${PN}.gif + make_desktop_entry ${PN} "Penguzzle" /usr/share/pixmaps/${PN}.gif + + einstalldocs } diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild index 5d20e42bd953..5da7fe0df616 100644 --- a/games-puzzle/picpuz/picpuz-2.5.ebuild +++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils games +EAPI=6 +inherit desktop gnome2-utils DESCRIPTION="A jigsaw puzzle program" HOMEPAGE="http://kornelix.squarespace.com/picpuz/" @@ -15,40 +15,37 @@ IUSE="" RDEPEND="x11-libs/gtk+:3" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-pthread-underlinking.patch -} +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-pthread-underlinking.patch +) src_compile() { emake \ - BINDIR="${GAMES_BINDIR}" \ - DATADIR="${GAMES_DATADIR}"/${PN} \ + BINDIR="/usr/bin" \ + DATADIR=/usr/share/${PN} \ DOCDIR=/usr/share/doc/${PF}/html } src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} + dobin ${PN} + insinto /usr/share/${PN} doins -r icons locales doicon -s 48 icons/${PN}.png make_desktop_entry ${PN} Picpuz - dohtml -r doc/{userguide-en.html,images} + HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs dodoc doc/{changelog,README,translations} newman doc/${PN}.man ${PN}.1 - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild index 0ccc9171bcdf..bc849e724279 100644 --- a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild +++ b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A simple pipe connecting game" HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/" @@ -16,26 +16,24 @@ IUSE="" DEPEND="media-libs/libsdl[video]" RDEPEND="${RDEPEND}" -S=${WORKDIR}/${P}-source +S="${WORKDIR}/${P}-source" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + eapply "${FILESDIR}"/${P}-gentoo.patch # change harcoded data paths to match the install directory sed -i \ - -e "s:/opt/QtPalmtop/share/pipepanic/:${GAMES_DATADIR}/${PN}/:" \ + -e "s:/opt/QtPalmtop/share/pipepanic/:/usr/share/${PN}/:" \ main.h \ || die "sed failed" } src_install() { - dogamesbin "${PN}" + dobin "${PN}" - insinto "${GAMES_DATADIR}/${PN}" + insinto "/usr/share/${PN}" doins *.bmp newicon PipepanicIcon64.png ${PN}.png make_desktop_entry ${PN} "Pipepanic" - - dodoc AUTHORS ChangeLog README - - prepgamesdirs + einstalldocs } diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild index f0b06ab7c7b5..bab059bfdd7e 100644 --- a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild +++ b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic games +EAPI=6 +inherit desktop flag-o-matic DESCRIPTION="Rotating pieces puzzle game" HOMEPAGE="http://pipewalker.sourceforge.net/" @@ -20,15 +20,13 @@ RDEPEND="${DEPEND}" src_configure() { append-flags $(sdl-config --cflags) - egamesconf \ - --datadir="${GAMES_DATADIR_BASE}" + econf --datadir="/usr/share" } src_install() { emake -C data DESTDIR="${D}" install - dogamesbin src/${PN} + dobin src/${PN} doicon extra/${PN}.xpm make_desktop_entry ${PN} PipeWalker - dodoc AUTHORS ChangeLog README - prepgamesdirs + einstalldocs } diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch index d9db4978290f..ca56f5b4cc00 100644 --- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch +++ b/games-puzzle/quadra/files/quadra-1.2.0-format.patch @@ -1,5 +1,5 @@ ---- source/net_list.cpp.old 2015-12-08 21:41:16.782404098 +0100 -+++ source/net_list.cpp 2015-12-08 21:41:33.153114600 +0100 +--- a/source/net_list.cpp.old 2015-12-08 21:41:16.782404098 +0100 ++++ b/source/net_list.cpp 2015-12-08 21:41:33.153114600 +0100 @@ -693,7 +693,7 @@ //Drawn at a total higher or equal to end_value: suspense! // or maybe timer just elapsed and the game is drawn diff --git a/games-puzzle/quadra/quadra-1.2.0.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild index a315a077f55d..4f77d48dc9ca 100644 --- a/games-puzzle/quadra/quadra-1.2.0.ebuild +++ b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A tetris clone with multiplayer support" HOMEPAGE="https://github.com/quadra-game/quadra" @@ -13,32 +13,34 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext - media-libs/libpng:0 - sys-libs/zlib" + media-libs/libpng:0= + sys-libs/zlib +" DEPEND="${RDEPEND} sys-devel/bc - x11-proto/xextproto" + x11-proto/xextproto +" src_prepare() { + default sed -i \ -e "/^libgamesdir:=/s:/games:/${PN}:" \ -e "/^datagamesdir:=/s:/games:/${PN}:" \ config/config.mk.in || die - epatch "${FILESDIR}"/${P}-format.patch + eapply "${FILESDIR}"/${P}-format.patch } src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} + dobin ${PN} + insinto /usr/share/${PN} doins ${PN}.res doicon images/${PN}.xpm make_desktop_entry ${PN} Quadra - dodoc ChangeLog NEWS README - dohtml help/* - prepgamesdirs + HTML_DOCS="help/*" einstalldocs } diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild index ec7c6c3447a8..042921d7df86 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild +++ b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Puzzle game like the known tetromino and the average pipe games" HOMEPAGE="http://tamentis.com/projects/rezerwar/" @@ -18,6 +18,7 @@ DEPEND="media-libs/libsdl[sound,joystick,video] RDEPEND="${DEPEND}" src_prepare() { + default sed -i \ -e '/check_sdl$/d' \ -e 's/-O2 //' \ @@ -31,11 +32,10 @@ src_prepare() { src_configure() { SDLCONFIG=sdl-config \ - TARGET_BIN="${GAMES_BINDIR}" \ + TARGET_BIN="/usr/bin" \ TARGET_DOC=/usr/share/doc/${PF} \ - TARGET_DATA="${GAMES_DATADIR}/${PN}" \ - ./configure \ - || die "configure failed" + TARGET_DATA="/usr/share/${PN}" \ + ./configure || die "configure failed" sed -i \ -e '/TARGET_DOC/d' \ Makefile \ @@ -43,9 +43,8 @@ src_configure() { } src_install() { - dodir "${GAMES_BINDIR}" + dodir /usr/bin default dodoc doc/{CHANGES,README,TODO} make_desktop_entry rezerwar Rezerwar - prepgamesdirs } diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild index 04c3496512b2..9158e8985e9a 100644 --- a/games-puzzle/scramble/scramble-0.9.5.ebuild +++ b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools flag-o-matic games +EAPI=6 +inherit autotools desktop flag-o-matic DESCRIPTION="Create as many words as you can before the time runs out" HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html" @@ -13,14 +13,21 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=media-libs/libsdl-1.2[sound,video] +RDEPEND=" + >=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[png] - media-libs/sdl-ttf" -RDEPEND="${DEPEND} - sys-apps/miscfiles" + media-libs/sdl-ttf +" +DEPEND="${RDEPEND} + media-libs/libpng:0 + sys-apps/miscfiles +" src_prepare() { + default + pngfix -q --out=pics/background-fixed.png pics/background.png + mv -f pics/background-fixed.png pics/background.png append-cflags $(sdl-config --cflags) sed -i -e 's/inline //' src/scramble.c || die mv configure.{in,ac} || die @@ -29,5 +36,6 @@ src_prepare() { src_install() { default - prepgamesdirs + newicon pics/sg_icon.png ${PN}.png + make_desktop_entry ${PN} "Scramble" } diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild index 98377fdd0a72..e9f6f0422ae1 100644 --- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild +++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop vcs-clean DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points" HOMEPAGE="http://www.linuxmotors.com/gljewel/" @@ -14,29 +14,30 @@ KEYWORDS="~amd64 ~x86" IUSE="" RESTRICT="test" -DEPEND="media-libs/libsdl[opengl,video] - virtual/opengl" -RDEPEND="${DEPEND}" +RDEPEND=" + media-libs/libsdl[opengl,video] + virtual/opengl +" +DEPEND="${RDEPEND}" -S=${WORKDIR}/SDL_jewels-${PV} +S="${WORKDIR}/SDL_jewels-${PV}" src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" + default + eapply "${FILESDIR}/${P}-Makefile.patch" # fix the data dir locations as it looks to be intended to run from src dir - sed -i -e "s|\"data\"|\"${GAMES_DATADIR}/${PN}\"|" sound.c || die - sed -i -e "s|data/bigfont.ppm|${GAMES_DATADIR}/${PN}/bigfont.ppm|" gljewel.c || die + sed -i -e "s|\"data\"|\"/usr/share/${PN}\"|" sound.c || die + sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die ecvs_clean } src_install() { - dogamesbin gljewel + dobin gljewel - insinto "${GAMES_DATADIR}/${PN}" + insinto "/usr/share/${PN}" doins -r data/* - dodoc ChangeLog README - + einstalldocs make_desktop_entry gljewel SDL_jewels - prepgamesdirs } diff --git a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch index 6e5b46d7c7e0..18b56ca6c1a3 100644 --- a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch +++ b/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch @@ -1,5 +1,5 @@ ---- src/locale_dialog.cpp.old -+++ src/locale_dialog.cpp +--- a/src/locale_dialog.cpp.old ++++ b/src/locale_dialog.cpp @@ -85,7 +85,7 @@ if (paths.isEmpty()) { QString appdir = QCoreApplication::applicationDirPath(); @@ -9,8 +9,8 @@ paths.append(appdir + "/../Resources"); } foreach (const QString& path, paths) { ---- src/main.cpp.old -+++ src/main.cpp +--- a/src/main.cpp.old ++++ b/src/main.cpp @@ -46,7 +46,7 @@ QString path = app.applicationDirPath(); QStringList paths; diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild index b640740df693..f599addb09f1 100644 --- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild +++ b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 LANGS="cs de es en fr he hu it nl ro tr uk" LANGSLONG="es_CL" -inherit eutils gnome2-utils qmake-utils games + +inherit desktop gnome2-utils qmake-utils DESCRIPTION="A single player word finding game based on Boggle" HOMEPAGE="https://gottcode.org/tanglet/" @@ -15,16 +16,19 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="sys-libs/zlib +RDEPEND=" + sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 - dev-qt/qtgui:5" -RDEPEND=${DEPEND} + dev-qt/qtgui:5 +" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-datadir.patch + default + eapply "${FILESDIR}"/${P}-datadir.patch sed -i \ - -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ + -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \ src/locale_dialog.cpp \ src/main.cpp || die } @@ -34,11 +38,12 @@ src_configure() { } src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} + dobin ${PN} + insinto /usr/share/${PN} doins -r data - #translations - insinto "${GAMES_DATADIR}"/${PN}/translations/ + + # Translations + insinto /usr/share/${PN}/translations/ for lang in ${LINGUAS};do for x in ${LANGS};do if [[ ${lang} == ${x} ]];then @@ -50,21 +55,17 @@ src_install() { insinto /usr/share/icons doins -r icons/hicolor - dodoc ChangeLog CREDITS NEWS - + einstalldocs doicon icons/${PN}.xpm domenu icons/${PN}.desktop - prepgamesdirs } pkg_preinst() { gnome2_icon_savelist - games_pkg_preinst } pkg_postinst() { gnome2_icon_cache_update - games_pkg_postinst } pkg_postrm() { diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild index 684b07a7833d..013dcef24a21 100644 --- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild +++ b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs games +EAPI=6 +inherit flag-o-matic toolchain-funcs -DESCRIPTION="console based tetrinet inc. standalone server" +DESCRIPTION="Console based tetrinet inc. standalone server" HOMEPAGE="http://tetrinet.or.cz/" SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2" @@ -13,12 +13,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="ipv6" -RDEPEND=">=sys-libs/ncurses-5:0" +RDEPEND=">=sys-libs/ncurses-5:0=" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-no-ipv6.patch \ "${FILESDIR}"/${P}-build.patch @@ -27,7 +29,6 @@ src_prepare() { } src_install() { - dogamesbin tetrinet tetrinet-server + dobin tetrinet tetrinet-server dodoc README TODO tetrinet.txt - prepgamesdirs } diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild index 27d3c275cccc..959e94bd77ec 100644 --- a/games-puzzle/textmaze/textmaze-1.2.ebuild +++ b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit games +EAPI=6 MY_P=${PN}_v${PV} DESCRIPTION="An ncurses-based maze solving game written in Perl" @@ -15,17 +14,18 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="dev-perl/Curses" +DEPEND="" -S=${WORKDIR}/TextMaze +S="${WORKDIR}/TextMaze" src_prepare() { + default sed -i \ -e "s#/usr/local/bin/perl#/usr/bin/perl#" \ textmaze || die } src_install() { - dogamesbin textmaze - dodoc CHANGES README - prepgamesdirs + dobin textmaze + einstalldocs } diff --git a/games-puzzle/tint/tint-0.03b.ebuild b/games-puzzle/tint/tint-0.03b-r1.ebuild index da85ff697b2b..4b2d9dc72843 100644 --- a/games-puzzle/tint/tint-0.03b.ebuild +++ b/games-puzzle/tint/tint-0.03b-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 -MY_P=${P/-/_} +MY_P="${P/-/_}" DESCRIPTION="Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game" HOMEPAGE="http://oasis.frogfoot.net/code/tint/" SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz" @@ -14,27 +13,24 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" IUSE="" -DEPEND=">=sys-libs/ncurses-5.4-r1:0" -RDEPEND=${DEPEND} +DEPEND=">=sys-libs/ncurses-5.4-r1:0=" +RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-ovflfix.patch -} +PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch ) src_compile() { emake \ STRIP=true \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ - localstatedir="${GAMES_STATEDIR}" + localstatedir="/var/lib" } src_install() { - dogamesbin tint + dobin tint doman tint.6 dodoc CREDITS NOTES insopts -m 0664 - insinto "${GAMES_STATEDIR}" + insinto /var/lib doins tint.scores - prepgamesdirs } diff --git a/games-puzzle/tod/files/tod-0-makefile.patch b/games-puzzle/tod/files/tod-0-makefile.patch index cd17d1cce42b..9783fab0c4bc 100644 --- a/games-puzzle/tod/files/tod-0-makefile.patch +++ b/games-puzzle/tod/files/tod-0-makefile.patch @@ -1,5 +1,5 @@ ---- makefile -+++ makefile +--- a/makefile ++++ b/makefile @@ -1,8 +1,7 @@ OBJ = hiscore rec scrctl tetanus crc allegdlg hgrcos
HEADS = tod.h allegdlg.h crc.h hgrcos.h hiscore.h
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0-r1.ebuild index 98278d52a037..0ed9a29063f0 100644 --- a/games-puzzle/tod/tod-0.ebuild +++ b/games-puzzle/tod/tod-0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Tetanus On Drugs simulates playing Tetris under the influence of drugs" HOMEPAGE="http://www.pineight.com/tod/" @@ -15,21 +15,23 @@ IUSE="" RDEPEND="media-libs/allegro:0[X]" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip +" -S=${WORKDIR} +S="${WORKDIR}" src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch + default + eapply "${FILESDIR}"/${P}-makefile.patch sed -i \ - -e "s:idltd\.dat:${GAMES_DATADIR}/${PN}/idltd.dat:" \ + -e "s:idltd\.dat:/usr/share/${PN}/idltd.dat:" \ rec.c || die } src_install() { - newgamesbin tod-debug.exe tod - insinto "${GAMES_DATADIR}"/${PN} + newbin tod-debug.exe tod + insinto /usr/share/${PN} doins idltd.dat dodoc readme.txt - prepgamesdirs + make_desktop_entry ${PN} "Tetanus On Drugs" } diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch index d0279ac3b874..92a8bb4c18a1 100644 --- a/games-puzzle/tong/files/tong-1.2-datadir.patch +++ b/games-puzzle/tong/files/tong-1.2-datadir.patch @@ -1,5 +1,5 @@ ---- tong.cpp.orig -+++ tong.cpp +--- a/tong.cpp.orig ++++ b/tong.cpp @@ -202,7 +202,6 @@ Tetrad *tetrad, *nexttetrad; Paddle *paddle; diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch index 8ce66ebf1d31..86566646b8d6 100644 --- a/games-puzzle/tong/files/tong-1.2-fps.patch +++ b/games-puzzle/tong/files/tong-1.2-fps.patch @@ -1,5 +1,5 @@ ---- tong.cpp.orig -+++ tong.cpp +--- a/tong.cpp.orig ++++ b/tong.cpp @@ -64,6 +64,8 @@ #define DEMO_TIME 8000 diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch index 68b4547d9427..ad9b283f4785 100644 --- a/games-puzzle/tong/files/tong-1.2-makefile.patch +++ b/games-puzzle/tong/files/tong-1.2-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile.orig ++++ b/Makefile @@ -1,11 +1,10 @@ # TONG! makefile, tweak as you see fit diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2-r1.ebuild index 9ca7ebcb55be..a16067fc57ba 100644 --- a/games-puzzle/tong/tong-1.2.ebuild +++ b/games-puzzle/tong/tong-1.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Tetris and Pong in the same place at the same time" HOMEPAGE="http://www.nongnu.org/tong/" @@ -18,27 +18,27 @@ DEPEND="media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]" RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}/${P}-makefile.patch" \ "${FILESDIR}/${P}-fps.patch" \ "${FILESDIR}/${P}-datadir.patch" sed -i \ - -e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \ + -e "s:\"media/:\"/usr/share/${PN}/media/:" \ media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \ || die cp media/icon.png "${T}/${PN}.png" || die } src_install() { - dogamesbin tong - dodir "${GAMES_DATADIR}/${PN}" - cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die + dobin tong + dodir "/usr/share/${PN}" + cp -r media/ "${ED}/usr/share/${PN}" || die dodoc CHANGELOG README making-of.txt CREDITS make_desktop_entry tong TONG doicon "${T}/${PN}.png" - prepgamesdirs } diff --git a/games-puzzle/toppler/toppler-1.1.6.ebuild b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild index 311b799d69ce..98307d76c751 100644 --- a/games-puzzle/toppler/toppler-1.1.6.ebuild +++ b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 DESCRIPTION="Reimplementation of Nebulous using SDL" HOMEPAGE="http://toppler.sourceforge.net/" @@ -13,21 +12,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="media-libs/libsdl[video] +RDEPEND=" + media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_configure() { - egamesconf $(use_enable nls) -} - -src_install() { - default - prepgamesdirs + econf $(use_enable nls) } diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild index 44b959583284..76d28a5eee3a 100644 --- a/games-puzzle/torrent/torrent-0.8.2.ebuild +++ b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit games +EAPI=6 +inherit desktop DESCRIPTION="Match rising tiles before reaching the top to score as many points as possible" HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html" @@ -13,13 +13,16 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -DEPEND=">=media-libs/libsdl-1.2.4 +RDEPEND=" + >=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 - media-libs/sdl-ttf" -RDEPEND="${DEPEND}" + media-libs/sdl-ttf +" +DEPEND="${RDEPEND}" src_prepare() { + default sed -i \ -e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \ src/torrent.c \ @@ -28,5 +31,6 @@ src_prepare() { src_install() { default - prepgamesdirs + newicon pics/sg_icon.png ${PN}.png + make_desktop_entry ${PN} Torrent ${PN} } diff --git a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch index 0be83307fa91..ad82efaeab94 100644 --- a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch +++ b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch @@ -1,5 +1,5 @@ ---- configure.ac.old 2015-02-26 23:25:34.146334845 +0100 -+++ configure.ac 2015-02-26 23:25:47.978312858 +0100 +--- a/configure.ac.old 2015-02-26 23:25:34.146334845 +0100 ++++ b/configure.ac 2015-02-26 23:25:47.978312858 +0100 @@ -17,6 +17,7 @@ CFLAGS="$CFLAGS $SDL_CFLAGS" -LIBS="$LIBS $SDL_LIBS" @@ -10,16 +10,16 @@ +AC_SUBST(LIBS) AC_OUTPUT( Makefile ) ---- configure.ac.old 2015-02-26 23:33:25.801552821 +0100 -+++ configure.ac 2015-02-26 23:33:47.509542361 +0100 +--- a/configure.ac.old 2015-02-26 23:33:25.801552821 +0100 ++++ b/configure.ac 2015-02-26 23:33:47.509542361 +0100 @@ -1,4 +1,4 @@ -AC_INIT( wakkabox.c ) +AC_INIT([[wakkabox.c]]) AC_CANONICAL_HOST AC_CANONICAL_TARGET ---- wakkabox.c.old 2015-02-26 23:43:26.146386413 +0100 -+++ wakkabox.c 2015-02-26 23:44:39.647389816 +0100 +--- a/wakkabox.c.old 2015-02-26 23:43:26.146386413 +0100 ++++ b/wakkabox.c 2015-02-26 23:44:39.647389816 +0100 @@ -249,22 +249,22 @@ printf("Loading bmp files from %s...", DATADIR); diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild index 44b16ff42ace..a04dd8404b70 100644 --- a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild +++ b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools games +EAPI=6 +inherit autotools desktop DESCRIPTION="A simple block-pushing game" HOMEPAGE="http://kenn.frap.net/wakkabox/" @@ -10,19 +10,21 @@ SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=">=media-libs/libsdl-1.0.1" RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + eapply "${FILESDIR}"/${P}-gentoo.patch rm aclocal.m4 eautoreconf } src_install() { default - prepgamesdirs + newicon bigblock.bmp ${PN}.bmp + make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp } diff --git a/games-puzzle/wizznic/wizznic-369.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild index 1b4906e0f35c..ca391dbb54d0 100644 --- a/games-puzzle/wizznic/wizznic-369.ebuild +++ b/games-puzzle/wizznic/wizznic-369-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Block-clearing puzzle game" HOMEPAGE="http://wizznic.org/" @@ -17,11 +17,12 @@ DEPEND="media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" -S=${WORKDIR}/Wizznic_src_build_${PV} +S="${WORKDIR}/Wizznic_src_build_${PV}" src_prepare() { + default sed \ -e '/^\(CC\|LD\|STRIP\)/d' \ -e 's/(LD)/(CC)/g' \ @@ -31,19 +32,18 @@ src_prepare() { src_compile() { emake \ - DATADIR="${GAMES_DATADIR}/${PN}/" \ - BINDIR="${GAMES_BINDIR}" \ + DATADIR="/usr/share/${PN}/" \ + BINDIR="/usr/bin" \ STRIP=true } src_install() { emake \ DESTDIR="${D}" \ - DATADIR="${GAMES_DATADIR}/${PN}/" \ - BINDIR="${GAMES_BINDIR}" \ + DATADIR="/usr/share/${PN}/" \ + BINDIR="/usr/bin" \ install dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt} newicon data/wmicon.png ${PN}.png make_desktop_entry wizznic "Wizznic!" - prepgamesdirs } diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild index 1d4185bd9b4e..6e16ab61c1cd 100644 --- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild +++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit eutils DESCRIPTION="A puzzle game with a strong emphasis on physics" HOMEPAGE="http://2dboy.com/" @@ -21,19 +21,23 @@ KEYWORDS="~amd64 ~x86" IUSE="" RESTRICT="fetch strip" -RDEPEND="media-libs/libsdl[sound,opengl,video] +RDEPEND=" + media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu - >=sys-devel/gcc-3.4" + >=sys-devel/gcc-3.4 +" DEPEND="" -S=${WORKDIR}/${MY_PN} -dir=${GAMES_PREFIX_OPT}/${PN} +S="${WORKDIR}/${MY_PN}" +dir="/opt/${PN}" -QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32 - ${dir:1}/${MY_PN%Demo}.bin64" +QA_PREBUILT=" + ${dir:1}/${MY_PN%Demo}.bin32 + ${dir:1}/${MY_PN%Demo}.bin64 +" pkg_nofetch() { if [[ ${PN} == *-demo ]] ; then @@ -48,7 +52,7 @@ src_install() { exeinto "${dir}" doexe ${MY_PN%Demo}* - games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo} + make_wrapper ${PN} "${dir}"/${MY_PN%Demo} insinto "${dir}" doins -r icons properties res @@ -61,7 +65,5 @@ src_install() { fi dodoc linux-issues.txt - dohtml readme.html - - prepgamesdirs + HTML_DOCS="readme.html" einstalldocs } diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch index bb0302963bdc..1e007494e93e 100644 --- a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch +++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch @@ -1,5 +1,5 @@ ---- initmenu.c.old 2008-10-27 23:23:43.000000000 +0100 -+++ initmenu.c 2008-10-27 23:22:52.000000000 +0100 +--- a/initmenu.c.old 2008-10-27 23:23:43.000000000 +0100 ++++ b/initmenu.c 2008-10-27 23:22:52.000000000 +0100 @@ -408,19 +408,17 @@ XCharStruct overall_return ; diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild index bbb076fd9603..71a44a6d8c39 100644 --- a/games-puzzle/xblockout/xblockout-1.1.6.ebuild +++ b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools flag-o-matic eutils games +EAPI=6 +inherit autotools desktop flag-o-matic DESCRIPTION="X Window block dropping game in 3 Dimension" HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/" @@ -13,14 +13,17 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/libX11 - x11-libs/libXext" +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext +" DEPEND="${RDEPEND}" -S=${WORKDIR}/xbl-${PV} +S="${WORKDIR}/xbl-${PV}" src_prepare() { - epatch "${FILESDIR}"/${P}-font.patch + default + eapply "${FILESDIR}"/${P}-font.patch sed -i \ -e '/^CC/d' \ -e 's:-lm:-lm -lX11:' \ @@ -29,26 +32,29 @@ src_prepare() { Makefile.in || die # Don't know about other archs. --slarti use amd64 && filter-flags "-fweb" + + mv configure.in configure.ac || die eautoreconf } src_compile() { emake \ USE_SETGID= \ - SCOREDIR="${GAMES_DATADIR}/${PN}" \ - RESOURCEDIR="${GAMES_DATADIR}/${PN}" \ + SCOREDIR="/usr/share/${PN}" \ + RESOURCEDIR="/usr/share/${PN}" \ LDOPTIONS="${LDFLAGS}" } src_install() { - newgamesbin bl xbl + newbin bl xbl - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} newins Xbl.ad Xbl newman xbl.man xbl.6 dodoc README xbl-README - dohtml *.html *.gif - make_desktop_entry xbl XBlockOut - prepgamesdirs + HTML_DOCS="*.html *.gif" einstalldocs + + newicon xbl-game.gif ${PN}.gif + make_desktop_entry xbl XBlockOut /usr/share/pixmaps/${PN}.gif } diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild index 8c27e559e753..8ea6b7243bf8 100644 --- a/games-puzzle/xpired/xpired-1.22.ebuild +++ b/games-puzzle/xpired/xpired-1.22-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="A Sokoban-styled puzzle game with lots more action" HOMEPAGE="http://xpired.sourceforge.net" @@ -16,27 +16,27 @@ IUSE="" DEPEND="media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" -S=${WORKDIR}/src +S="${WORKDIR}/src" -src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags.patch -} +PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) src_compile() { emake \ - PREFIX=/usr/games \ - SHARE_PREFIX=/usr/share/games/xpired + PREFIX=/usr \ + SHARE_PREFIX=/usr/share/xpired } src_install() { emake \ - PREFIX="${D}/usr/games" \ - SHARE_PREFIX="${D}/usr/share/games/${PN}" \ + PREFIX="${D}/usr" \ + SHARE_PREFIX="${D}/usr/share/${PN}" \ install + newicon img/icon.bmp ${PN}.bmp make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp make_desktop_entry xpiredit "Xpired Level Editor" - prepgamesdirs + + einstalldocs } diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild index cec22aef2e45..1c863a9b1d17 100644 --- a/games-puzzle/xtris/xtris-1.15.ebuild +++ b/games-puzzle/xtris/xtris-1.15-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs games +inherit desktop toolchain-funcs -DESCRIPTION="a networked Tetris-like game" +DESCRIPTION="A networked Tetris-like game" HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html" SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz" @@ -16,22 +16,21 @@ IUSE="" DEPEND="x11-libs/libX11" RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_compile() { emake \ CC=$(tc-getCC) \ - BINDIR="${GAMES_BINDIR}" \ + BINDIR=/usr/bin \ MANDIR=/usr/share/man \ CFLAGS="${CFLAGS}" \ EXTRALIBS="${LDFLAGS}" } src_install() { - dogamesbin xtris xtserv xtbot + dobin xtris xtserv xtbot doicon "${FILESDIR}"/${PN}.xpm make_desktop_entry ${PN} xtris ${PN} doman xtris.6 xtserv.6 xtbot.6 dodoc ChangeLog PROTOCOL README - prepgamesdirs } diff --git a/games-puzzle/zaz/zaz-1.0.0.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild index 002808730c0e..1ea20bafcd65 100644 --- a/games-puzzle/zaz/zaz-1.0.0.ebuild +++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools flag-o-matic eutils games +EAPI=6 +inherit autotools flag-o-matic DESCRIPTION="A puzzle game where the player has to arrange balls in triplets" HOMEPAGE="https://sourceforge.net/projects/zaz/" @@ -13,23 +13,27 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls" -RDEPEND="virtual/opengl +RDEPEND=" + virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl - virtual/libintl" + virtual/libintl +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { + default local x=/usr/share/gettext/po/Makefile.in.in [[ -e $x ]] && cp -f $x po/ #336119 - epatch "${FILESDIR}"/${P}-build.patch + eapply "${FILESDIR}"/${P}-build.patch eautoreconf } @@ -37,15 +41,9 @@ src_configure() { append-libs -lvorbis append-cflags $(pkg-config sdl --cflags) append-cxxflags $(pkg-config sdl --cflags) - egamesconf \ - --disable-dependency-tracking \ + econf \ --with-applicationdir=/usr/share/applications \ --with-icondir=/usr/share/pixmaps \ --localedir=/usr/share/locale \ $(use_enable nls) } - -src_install() { - default - prepgamesdirs -} diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest index 5ee83e228d56..f8b05a25ee16 100644 --- a/games-rpg/bass/Manifest +++ b/games-rpg/bass/Manifest @@ -1,2 +1,2 @@ -DIST bass-cd-1.2.zip 69377781 BLAKE2B 7eb59b78eda2ab1385f742189f420706aac3364dabb9263729341d1973e93b27c0509e7d22b5eb3a228400a398a82cc074adb9a601e93cfa7d7dca1f51e9d68e SHA512 ff896e723b4dbf2cc52851ee1260c1006aa285b768a727974719d63509bdac1c65be9ea565eb037d5e9e1c8fd8fd76a8c04776bcde46616ca9ccce18ea498d64 +DIST BASS-Floppy-1.3.zip 7675813 BLAKE2B dbe6e110c4901ba6f1b055208b796b71ef1ab879a0266273765c8f9544065715e0535f41ecaa1cde7e02499ac5e90624eb5a42d1b82dbeee52ddba90bd1dcdd9 SHA512 d220f84448b50e1464329e204f876acc4a9eda24b319577ed74aec8e1a0316e2df268f8768ac9267b90a29a857b010bdae71e2f3c77428987f299bec3dc1ce15 DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e diff --git a/games-rpg/bass/bass-1.2-r1.ebuild b/games-rpg/bass/bass-1.3.ebuild index 1e217f1dd025..4ca16f0ae141 100644 --- a/games-rpg/bass/bass-1.2-r1.ebuild +++ b/games-rpg/bass/bass-1.3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop eutils DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future" #HOMEPAGE="http://www.revgames.com/_display.php?id=16" HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky" -SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip +SRC_URI="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip mirror://gentoo/${PN}.png" LICENSE="bass" @@ -17,17 +17,17 @@ IUSE="" RDEPEND=">=games-engines/scummvm-0.5.0" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip +" -S=${WORKDIR}/bass-cd-${PV} +S="${WORKDIR}/" src_install() { - games_make_wrapper bass "scummvm -f -p \"${GAMES_DATADIR}/${PN}\" -q\$(scummvmGetLang.sh) sky" . - dogamesbin "${FILESDIR}"/scummvmGetLang.sh - insinto "${GAMES_DATADIR}"/${PN} + make_wrapper bass "scummvm -f -p \"/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" . + dobin "${FILESDIR}"/scummvmGetLang.sh + insinto /usr/share/${PN} doins sky.* dodoc readme.txt doicon "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} "Beneath a Steel Sky" - prepgamesdirs } diff --git a/games-rpg/draci-historie/draci-historie-2012.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild index 4b04995622b4..8998b3837a2a 100644 --- a/games-rpg/draci-historie/draci-historie-2012.ebuild +++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit unpacker eutils games +EAPI=6 +inherit eutils unpacker DESCRIPTION="Bert the little dragon searches for his father" HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html" BASE_URL="http://www.ucw.cz/draci-historie/binary/dh" -SRC_URI="l10n_cs? ( ${BASE_URL}-cz-${PV}.zip ) +SRC_URI=" + l10n_cs? ( ${BASE_URL}-cz-${PV}.zip ) l10n_de? ( ${BASE_URL}-de-${PV}.zip ) l10n_en? ( ${BASE_URL}-en-${PV}.zip ) l10n_pl? ( ${BASE_URL}-pl-${PV}.zip ) - !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )" + !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) ) +" LICENSE="GPL-2" SLOT="0" @@ -21,7 +23,7 @@ IUSE="l10n_cs l10n_de l10n_en l10n_pl" RDEPEND=">=games-engines/scummvm-1.1" DEPEND="$(unpacker_src_uri_depends)" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then @@ -47,30 +49,31 @@ src_unpack() { } src_prepare() { + default rm -f *.{bat,exe,ins} readme.* || die } src_install() { newicon bert.ico draci-historie.ico - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} for lingua in $(find * -type d); do doins -r ${lingua} done if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then - games_make_wrapper draci-historie-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" draci" . + make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" . make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico fi if use l10n_cs ; then - games_make_wrapper draci-historie-cs "scummvm -f -p \"${GAMES_DATADIR}/${PN}/cs\" draci" . + make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" . make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico fi if use l10n_de ; then - games_make_wrapper draci-historie-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" draci" . + make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" . make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)" /usr/share/pixmaps/draci-historie.ico fi if use l10n_pl ; then - games_make_wrapper draci-historie-pl "scummvm -f -p \"${GAMES_DATADIR}/${PN}/pl\" draci" . + make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" . make_desktop_entry ${PN}-pl "Dračí Historie (Polski)" /usr/share/pixmaps/draci-historie.ico fi - prepgamesdirs + einstalldocs } diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest index bc4e6a7d83af..a11c32cbc841 100644 --- a/games-rpg/drascula/Manifest +++ b/games-rpg/drascula/Manifest @@ -1,4 +1,5 @@ DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11 -DIST drascula-1.5.0.dat 219267 BLAKE2B 1216bef8ef51e559a6d2a67c2a79c1f60613cf0f01d084864dbff10711d86512f01f69175ade2872fae8e0191ce45d3e0132259d84aac8598c6ff1490152c05b SHA512 0d788887f0cbe95f7008920d7929831d928497040ae0a2e2869c677363b693aafcf839df20ae192ec4a902f98a95771c9c45d3ec63c5a4bb1961e5f56d20fc53 +DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015 DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf +DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a diff --git a/games-rpg/drascula/drascula-1.0-r2.ebuild b/games-rpg/drascula/drascula-1.0-r3.ebuild index e8fcaed673bc..f058ca3b8da3 100644 --- a/games-rpg/drascula/drascula-1.0-r2.ebuild +++ b/games-rpg/drascula/drascula-1.0-r3.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit eutils -INT_PV=1.1 +INT_PV="1.1" INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip" -DAT_PV=1.5.0 -AUD_PV=2.0 +DAT_PV="2.0.0" +AUD_PV="2.0" + DESCRIPTION="Drascula: The Vampire Strikes Back" HOMEPAGE="http://www.alcachofasoft.com/" SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip - https://github.com/scummvm/scummvm/raw/v1.5.0/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat + https://github.com/scummvm/scummvm/raw/v${DAT_PV}/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-${AUD_PV}.zip ) + https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png l10n_es? ( ${INT_URI} ) l10n_de? ( ${INT_URI} ) l10n_fr? ( ${INT_URI} ) @@ -26,9 +28,10 @@ RESTRICT="mirror" RDEPEND=">=games-engines/scummvm-0.13.1" DEPEND="${RDEPEND} - app-arch/unzip" + app-arch/unzip +" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then @@ -43,21 +46,20 @@ src_unpack() { src_install() { local lang - games_make_wrapper ${PN} "scummvm -f -p \"${GAMES_DATADIR}/${PN}\" drascula" . - for lang in es de fr it - do + make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" . + for lang in es de fr it; do if use l10n_${lang} ; then - games_make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"${GAMES_DATADIR}/${PN}\" drascula" . + make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}\" drascula" . make_desktop_entry ${PN}-${lang} "Drascula: The Vampire Strikes Back (${lang})" ${PN} fi done - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} find . -name "P*.*" -execdir doins '{}' + newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat if use sound; then doins audio/* fi dodoc readme.txt drascula.doc + doicon "${DISTDIR}"/${PN}.png make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back" - prepgamesdirs } diff --git a/games-rpg/dreamweb/dreamweb-1.1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild index 60c9c8118bf0..c685cb39ad41 100644 --- a/games-rpg/dreamweb/dreamweb-1.1.ebuild +++ b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit unpacker eutils games +EAPI=6 +inherit unpacker eutils DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city" HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb" @@ -25,7 +25,7 @@ IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it" RDEPEND=">=games-engines/scummvm-1.7[flac]" DEPEND="$(unpacker_src_uri_depends)" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { if use l10n_de ; then @@ -67,43 +67,43 @@ src_unpack() { } src_prepare() { + default rm -rf */license.txt */*.EXE || die } src_install() { - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png if use l10n_de ; then doins -r de - games_make_wrapper dreamweb-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" dreamweb" . + make_wrapper dreamweb-de "scummvm -f -p \"/usr/share/${PN}/de\" dreamweb" . make_desktop_entry ${PN}-de "Dreamweb (Deutsch)" dreamweb fi if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \ ! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then doins -r en_US - games_make_wrapper dreamweb-en_US "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en_US\" dreamweb" . + make_wrapper dreamweb-en_US "scummvm -f -p \"/usr/share/${PN}/en_US\" dreamweb" . make_desktop_entry ${PN}-en_US "Dreamweb (US English)" dreamweb fi if use l10n_en-GB ; then doins -r en_GB - games_make_wrapper dreamweb-en_GB "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en_GB\" dreamweb" . + make_wrapper dreamweb-en_GB "scummvm -f -p \"/usr/share/${PN}/en_GB\" dreamweb" . make_desktop_entry ${PN}-en_GB "Dreamweb (UK English)" dreamweb fi if use l10n_es ; then doins -r es - games_make_wrapper dreamweb-es "scummvm -f -p \"${GAMES_DATADIR}/${PN}/es\" dreamweb" . + make_wrapper dreamweb-es "scummvm -f -p \"/usr/share/${PN}/es\" dreamweb" . make_desktop_entry ${PN}-es "Dreamweb (Español)" dreamweb fi if use l10n_fr ; then doins -r fr - games_make_wrapper dreamweb-fr "scummvm -f -p \"${GAMES_DATADIR}/${PN}/fr\" dreamweb" . + make_wrapper dreamweb-fr "scummvm -f -p \"/usr/share/${PN}/fr\" dreamweb" . make_desktop_entry ${PN}-fr "Dreamweb (Français)" dreamweb fi if use l10n_it ; then doins -r it - games_make_wrapper dreamweb-it "scummvm -f -p \"${GAMES_DATADIR}/${PN}/it\" dreamweb" . + make_wrapper dreamweb-it "scummvm -f -p \"/usr/share/${PN}/it\" dreamweb" . make_desktop_entry ${PN}-it "Dreamweb (Italiano)" dreamweb fi use doc && dodoc -r doc/* - prepgamesdirs } diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild index 4ba62c136c21..3a8d887e4ddb 100644 --- a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild +++ b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit games +EAPI=6 DESCRIPTION="Freedink game data" HOMEPAGE="http://www.freedink.org/" @@ -23,7 +21,6 @@ KEYWORDS="~amd64 ~x86" IUSE="" src_install() { - emake DESTDIR="${D}" DATADIR="${GAMES_DATADIR}" install + emake DESTDIR="${D}" DATADIR="/usr/share" install dodoc README.txt README-REPLACEMENTS.txt - prepgamesdirs } diff --git a/games-rpg/freedink/freedink-108.4.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild index f9fb99c364f5..a40e9cd65da7 100644 --- a/games-rpg/freedink/freedink-108.4.ebuild +++ b/games-rpg/freedink/freedink-108.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit flag-o-matic games +EAPI=6 +inherit flag-o-matic DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)" HOMEPAGE="http://www.freedink.org/" @@ -19,15 +19,19 @@ DEPEND=" >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] - >=media-libs/sdl-ttf-2.0.9" + >=media-libs/sdl-ttf-2.0.9 +" RDEPEND="${DEPEND} - ~games-rpg/freedink-data-1.08.20140901" + ~games-rpg/freedink-data-1.08.20140901 +" DEPEND="${DEPEND} dev-libs/check virtual/pkgconfig - sys-devel/gettext" + sys-devel/gettext +" src_prepare() { + default sed -i \ -e 's#^datarootdir =.*$#datarootdir = /usr/share#' \ share/Makefile.in || die @@ -37,21 +41,7 @@ src_prepare() { } src_configure() { - egamesconf \ + econf \ --disable-embedded-resources \ --localedir="/usr/share/locale" } - -src_install() { - default - dodoc TROUBLESHOOTING - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - einfo - elog "optional dependencies:" - elog " games-util/dfarc (dmod installer and frontend)" - einfo -} diff --git a/games-rpg/queen/queen-1.ebuild b/games-rpg/queen/queen-1-r1.ebuild index 19c0b02dd67c..e9e011cf3398 100644 --- a/games-rpg/queen/queen-1.ebuild +++ b/games-rpg/queen/queen-1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit eutils DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s" HOMEPAGE="http://scummvm.sourceforge.net/" @@ -99,28 +99,27 @@ src_unpack() { } src_install() { - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins -r * newicon "${DISTDIR}"/cat-queen.png queen.png if use l10n_de ; then - games_make_wrapper queen-de "scummvm -f -p \"${GAMES_DATADIR}/${PN}/de\" queen" . + make_wrapper queen-de "scummvm -f -p \"/usr/share/${PN}/de\" queen" . make_desktop_entry ${PN}-de "Flight of the Amazon Queen (German)" queen fi if use l10n_en ; then - games_make_wrapper queen-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" queen" . + make_wrapper queen-en "scummvm -f -p \"/usr/share/${PN}/en\" queen" . make_desktop_entry ${PN}-en "Flight of the Amazon Queen (English)" queen fi if use l10n_fr ; then - games_make_wrapper queen-fr "scummvm -f -p \"${GAMES_DATADIR}/${PN}/fr\" queen" . + make_wrapper queen-fr "scummvm -f -p \"/usr/share/${PN}/fr\" queen" . make_desktop_entry ${PN}-fr "Flight of the Amazon Queen (French)" queen fi if use l10n_he ; then - games_make_wrapper queen-he "scummvm -f -p \"${GAMES_DATADIR}/${PN}/he\" queen" . + make_wrapper queen-he "scummvm -f -p \"/usr/share/${PN}/he\" queen" . make_desktop_entry ${PN}-he "Flight of the Amazon Queen (Hebrew)" queen fi if use l10n_it ; then - games_make_wrapper queen-it "scummvm -f -p \"${GAMES_DATADIR}/${PN}/it\" queen" . + make_wrapper queen-it "scummvm -f -p \"/usr/share/${PN}/it\" queen" . make_desktop_entry ${PN}-it "Flight of the Amazon Queen (Italian)" queen fi - prepgamesdirs } diff --git a/games-rpg/soltys/soltys-1.0-r1.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild index 1a8baca43ff0..e709836c31e9 100644 --- a/games-rpg/soltys/soltys-1.0-r1.ebuild +++ b/games-rpg/soltys/soltys-1.0-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit unpacker eutils games +EAPI=6 +inherit unpacker eutils DESCRIPTION="Classic adventure game" HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys" @@ -20,7 +20,7 @@ IUSE="l10n_en l10n_es l10n_pl" RDEPEND=">=games-engines/scummvm-1.5" DEPEND="$(unpacker_src_uri_depends)" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then @@ -41,24 +41,24 @@ src_unpack() { } src_prepare() { + default rm -rf license.txt soltys-es-v1-0 } src_install() { - insinto "${GAMES_DATADIR}"/${PN} + insinto /usr/share/${PN} doins -r * newicon "${DISTDIR}"/cat-soltys.png soltys.png if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then - games_make_wrapper soltys-en "scummvm -f -p \"${GAMES_DATADIR}/${PN}/en\" soltys" . + make_wrapper soltys-en "scummvm -f -p \"/usr/share/${PN}/en\" soltys" . make_desktop_entry ${PN}-en "Soltys (English)" soltys fi if use l10n_es ; then - games_make_wrapper soltys-es "scummvm -f -p \"${GAMES_DATADIR}/${PN}/es\" soltys" . + make_wrapper soltys-es "scummvm -f -p \"/usr/share/${PN}/es\" soltys" . make_desktop_entry ${PN}-es "Soltys (Español)" soltys fi if use l10n_pl ; then - games_make_wrapper soltys-pl "scummvm -f -p \"${GAMES_DATADIR}/${PN}/pl\" soltys" . + make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" . make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys fi - prepgamesdirs } diff --git a/games-rpg/zsdx/zsdx-1.9.0.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild index f77a8c06fcca..dc00fda49542 100644 --- a/games-rpg/zsdx/zsdx-1.9.0.ebuild +++ b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit cmake-utils gnome2-utils games +EAPI=6 +inherit cmake-utils eutils gnome2-utils DESCRIPTION="A free 2D Zelda fangame" HOMEPAGE="http://www.solarus-games.org/" @@ -15,48 +14,37 @@ KEYWORDS="~amd64 ~x86" IUSE="" RESTRICT="mirror" -RDEPEND=">=games-engines/solarus-1.3.0 - <games-engines/solarus-1.4.0" +RDEPEND=" + >=games-engines/solarus-1.3.0 + <games-engines/solarus-1.4.0 +" DEPEND="app-arch/zip" -DOCS=( ChangeLog readme.txt ) - -src_prepare() { - cmake-utils_src_prepare -} - src_configure() { local mycmakeargs=( - -DSOLARUS_INSTALL_DATAROOTDIR="${GAMES_DATADIR}" - -DSOLARUS_INSTALL_BINDIR="${GAMES_BINDIR}" + -DSOLARUS_INSTALL_DATAROOTDIR="/usr/share" + -DSOLARUS_INSTALL_BINDIR="/usr/bin" ) cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { cmake-utils_src_install newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png # install proper wrapper script - rm -f "${ED%/}${GAMES_BINDIR}"/${PN} - games_make_wrapper ${PN} "solarus \"${GAMES_DATADIR}/solarus/${PN}\"" + rm -f "${ED}"/usr/bin/${PN} + make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"" make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX" - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update } diff --git a/games-server/crossfire-server/crossfire-server-1.71.0.ebuild b/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild index ef6c64bacda7..3012afe88c9b 100644 --- a/games-server/crossfire-server/crossfire-server-1.71.0.ebuild +++ b/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 MY_P="${P/-server/}" -DESCRIPTION="server for the crossfire clients" +DESCRIPTION="Server for the crossfire clients" HOMEPAGE="http://crossfire.real-time.com/" SRC_URI="mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.tar.bz2 mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.maps.tar.bz2 @@ -17,21 +16,24 @@ KEYWORDS="~amd64 ~x86" IUSE="X" RESTRICT="test" -DEPEND="net-misc/curl +RDEPEND=" + net-misc/curl X? ( x11-libs/libXaw - media-libs/libpng:0 - )" -RDEPEND=${DEPEND} + media-libs/libpng:0= + ) +" +DEPEND="${RDEPEND}" src_prepare() { + default rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205 ln -s "${WORKDIR}/arch" "${S}/lib" || die - epatch "${FILESDIR}"/${P}-format.patch + eapply "${FILESDIR}"/${P}-format.patch } src_configure() { - egamesconf --disable-static + econf --disable-static } src_compile() { @@ -42,9 +44,8 @@ src_compile() { src_install() { default - keepdir "${GAMES_STATEDIR}"/crossfire/{account,datafiles,maps,players,template-maps,unique-items} - insinto "${GAMES_DATADIR}/crossfire" + keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items} + insinto /usr/share/crossfire doins -r "${WORKDIR}/maps" - prune_libtool_files --modules - prepgamesdirs + find "${D}" -name '*.la' -delete || die } diff --git a/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch b/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch index 174b785a0b9a..afed04da57f4 100644 --- a/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch +++ b/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch @@ -1,5 +1,5 @@ ---- server/c_chat.c.old 2015-12-15 21:35:30.024866220 +0100 -+++ server/c_chat.c 2015-12-15 21:36:58.479266312 +0100 +--- a/server/c_chat.c.old 2015-12-15 21:35:30.024866220 +0100 ++++ b/server/c_chat.c 2015-12-15 21:36:58.479266312 +0100 @@ -483,7 +483,7 @@ { "You spit over your left shoulder.", "%s spits over his left shoulder." }, { "Strut your stuff.", "%s struts proudly." }, diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild index 35d4eb916f4f..8da30598da0c 100644 --- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild +++ b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop MY_OGG=danslatristesse2-48.ogg DESCRIPTION="3D tabletennis game" @@ -15,40 +15,44 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="vorbis nls" -RDEPEND="virtual/opengl +RDEPEND=" + virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" -S=${WORKDIR}/csmash-${PV} +S="${WORKDIR}/csmash-${PV}" src_unpack() { unpack csmash-${PV}.tar.gz } src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-x-inc.patch \ "${FILESDIR}"/${P}-sizeof-cast.patch \ "${FILESDIR}"/${P}-gcc41.patch \ "${FILESDIR}"/${P}-flags.patch if use vorbis ; then sed -i \ - -e "s:${MY_OGG}:${GAMES_DATADIR}/csmash/${MY_OGG}:" ttinc.h \ + -e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \ || die "sed failed" fi } src_configure() { - egamesconf \ + econf \ $(use_enable nls) \ - --datadir="${GAMES_DATADIR_BASE}" + --datadir="/usr/share" } src_compile() { @@ -59,10 +63,9 @@ src_compile() { src_install() { default if use vorbis ; then - insinto "${GAMES_DATADIR}"/csmash + insinto /usr/share/games/csmash doins "${DISTDIR}"/${MY_OGG} fi newicon win32/orange.ico ${PN}.ico make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico - prepgamesdirs } diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch index 85612b929c59..c7b3b561d2d1 100644 --- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch @@ -1,5 +1,5 @@ ---- configure.old 2010-10-18 15:05:02.000000000 +0200 -+++ configure 2010-10-18 15:05:31.000000000 +0200 +--- a/configure.old 2010-10-18 15:05:02.000000000 +0200 ++++ b/configure 2010-10-18 15:05:31.000000000 +0200 @@ -5516,12 +5516,12 @@ diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch index 0f3e511f09cc..6602c2f09304 100644 --- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch @@ -1,5 +1,5 @@ ---- BallView.h.old 2006-04-11 00:10:37.000000000 +0200 -+++ BallView.h 2006-04-11 00:10:53.000000000 +0200 +--- a/BallView.h.old 2006-04-11 00:10:37.000000000 +0200 ++++ b/BallView.h 2006-04-11 00:10:53.000000000 +0200 @@ -32,7 +32,7 @@ static GLuint m_number[10]; @@ -9,8 +9,8 @@ GLUquadricObj *m_quad; void DrawBall(); ---- matrix.old 2006-04-11 00:13:18.000000000 +0200 -+++ matrix 2006-04-11 00:19:34.000000000 +0200 +--- a/matrix.old 2006-04-11 00:13:18.000000000 +0200 ++++ b/matrix 2006-04-11 00:19:34.000000000 +0200 @@ -42,7 +42,7 @@ /* __BEGIN__BEGIN__ */ diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch index 9237f95978ef..ead10c90400b 100644 --- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch @@ -2,8 +2,8 @@ Don't typecast otherwise C++ will fail to match on some arches. http://bugs.gentoo.org/84187 ---- loadparts.cpp -+++ loadparts.cpp +--- a/loadparts.cpp ++++ b/loadparts.cpp @@ -247,3 +247,3 @@ // concat next line(s) - int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1); diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch index 99c1e2f944fa..e56b51e0b92a 100644 --- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch +++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch @@ -1,8 +1,8 @@ Patch by Jason Bucata. http://bugs.gentoo.org/84187 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -5515,7 +5515,11 @@ fi diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch index d8c588a32206..4e02da8a82a8 100644 --- a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch @@ -1,5 +1,5 @@ ---- src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 -+++ src/asm.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 ++++ b/src/asm.c 2015-10-28 13:23:10.502813377 +0100 @@ -652,7 +652,7 @@ macputs(str); #else @@ -27,8 +27,8 @@ #ifndef VMS textout(outs); #else ---- src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 -+++ src/cdb.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 ++++ b/src/cdb.c 2015-10-28 13:23:10.502813377 +0100 @@ -2760,7 +2760,7 @@ fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName, scrV[idxV[i]]); @@ -38,8 +38,8 @@ for (j = 0; j < warriors; ++j) { fprintf(outp, " %d", warrior[idxV[i]].score[j]); } ---- src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 -+++ src/clparse.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 ++++ b/src/clparse.c 2015-10-28 13:23:10.502813377 +0100 @@ -289,7 +289,7 @@ if (next_input(filep, inputs)) { if (!strcmp(inputs, "-")) { diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild index 2df3782e3915..b7f96156df97 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils games +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs MY_PN="${PN/-sdl/}" MY_PV="${PV/e/-5}" @@ -17,16 +17,22 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sdl X" -DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) +RDEPEND=" + sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) - !sdl? ( !X? ( sys-libs/ncurses:0 ) )" -RDEPEND=${DEPEND} + !sdl? ( !X? ( sys-libs/ncurses:0= ) ) +" +DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" -src_prepare() { - epatch "${FILESDIR}"/${P}-format.patch -} +PATCHES=( "${FILESDIR}"/${P}-format.patch ) + +DOC_CONTENTS=" + There are some macros in /usr/share/pmars/macros + which you should make accessible to pmars by typing + export PMARSHOME=/usr/share/pmars/macros\n +" src_compile() { CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" @@ -68,24 +74,19 @@ src_compile() { } src_install() { - dogamesbin src/${MY_PN} + dobin src/${MY_PN} doman doc/${MY_PN}.6 dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref + readme.gentoo_create_doc - insinto "${GAMES_DATADIR}/${MY_PN}/warriors" + insinto "/usr/share/${MY_PN}/warriors" doins warriors/* - insinto "${GAMES_DATADIR}/${MY_PN}/macros" + insinto "/usr/share/${MY_PN}/macros" doins config/*.mac - - prepgamesdirs } pkg_postinst() { - games_pkg_postinst - echo - ewarn "There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros" - ewarn "which you should make accessible to pmars by typing" - ewarn "export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n" + readme.gentoo_print_elog } diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch index b43707bc403b..8a9a33c43ea4 100644 --- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch +++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch @@ -1,5 +1,5 @@ ---- src/ball.c.orig 2004-06-02 07:00:57.000000000 -0400 -+++ src/ball.c 2004-06-02 07:03:52.000000000 -0400 +--- a/src/ball.c.orig 2004-06-02 07:00:57.000000000 -0400 ++++ b/src/ball.c 2004-06-02 07:03:52.000000000 -0400 @@ -1821,6 +1821,7 @@ } else if( options_cuberef && cuberef_binds!=0 ){ glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]); diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a-r1.ebuild index e68d118c8027..02844b26cb97 100644 --- a/games-sports/foobillard/foobillard-3.0a.ebuild +++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic autotools toolchain-funcs games +EAPI=6 +inherit autotools desktop flag-o-matic toolchain-funcs DESCRIPTION="8ball, 9ball, snooker and carambol game" HOMEPAGE="http://foobillard.sourceforge.net/" @@ -17,14 +17,16 @@ DEPEND="x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu - >=media-libs/freetype-2.0.9 - media-libs/libpng:0 + >=media-libs/freetype-2.0.9:2 + media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) - !sdl? ( media-libs/freeglut )" -RDEPEND=${DEPEND} + !sdl? ( media-libs/freeglut ) +" +RDEPEND="${DEPEND}" src_prepare() { - epatch \ + default + eapply \ "${FILESDIR}"/${P}-no_nvidia.patch \ "${FILESDIR}"/${P}-fbsd.patch \ "${FILESDIR}"/${P}-as-needed.patch \ @@ -37,7 +39,7 @@ src_prepare() { src_configure() { use video_cards_nvidia && append-ldflags -L/usr/$(get_libdir)/opengl/nvidia/lib - egamesconf \ + econf \ --enable-sound \ $(use_enable sdl SDL) \ $(use_enable !sdl glut) \ @@ -49,5 +51,4 @@ src_install() { doman foobillard.6 newicon data/full_symbol.png foobillard.png make_desktop_entry foobillard Foobillard - prepgamesdirs } diff --git a/games-strategy/crimson/crimson-0.5.3.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild index 0cec24d6a050..ad228438eb35 100644 --- a/games-strategy/crimson/crimson-0.5.3.ebuild +++ b/games-strategy/crimson/crimson-0.5.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Tactical war game in the tradition of Battle Isle" HOMEPAGE="http://crimson.seul.org/" @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test zlib" -RDEPEND="media-libs/libsdl[sound,video] +RDEPEND=" + media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net @@ -21,12 +22,13 @@ RDEPEND="media-libs/libsdl[sound,video] DEPEND="${RDEPEND} dev-libs/libxslt test? ( - =app-text/docbook-xml-dtd-4.2* + app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 - )" + ) +" src_configure() { - egamesconf \ + econf \ --enable-sound \ --enable-network \ $(use_with zlib) \ @@ -41,18 +43,7 @@ src_install() { DESTDIR="${D}" \ pixmapsdir="/usr/share/pixmaps" \ install - dodoc NEWS README* THANKS TODO - rm -rf "${D}/${GAMES_DATADIR}/applications" + einstalldocs + rm -rf "${ED}/usr/share/applications" make_desktop_entry crimson "Crimson Fields" - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "Crimson Fields ${PV} is not necessarily save-game compatible with previous versions." - echo - elog "If you have older save files and you wish to continue those games," - elog "you'll need to remerge the version with which you started" - elog "those save-games." } diff --git a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild index ca73bb9543a7..4d1c38437619 100644 --- a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild +++ b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=6 +inherit desktop DESCRIPTION="Re-Write of the game Drug Wars" HOMEPAGE="http://dopewars.sourceforge.net/" @@ -13,22 +13,26 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="nls ncurses gtk gnome sdl" -RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2:0 ) +RDEPEND=" + ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer - )" + ) +" DEPEND="${RDEPEND} virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2009-3591.patch + default + eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch sed -i \ - -e "/priv_hiscore/ s:DPDATADIR:\"${GAMES_STATEDIR}\":" \ + -e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \ -e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \ -e 's:index.html:html/index.html:' \ src/dopewars.c || die @@ -41,8 +45,7 @@ src_configure() { myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest" fi - egamesconf \ - --disable-dependency-tracking \ + econf \ $(use_enable ncurses curses-client) \ $(use_enable nls) \ $(use_with sdl) \ @@ -53,17 +56,9 @@ src_configure() { } src_install() { - default - - dodir /usr/share - if use gnome ; then - mv "${D}/${GAMES_DATADIR}"/gnome "${D}/usr/share" || die - else - rm -r "${D}/${GAMES_DATADIR}"/gnome || die - fi - mv "${D}/${GAMES_DATADIR}"/pixmaps "${D}/usr/share" || die - dohtml -r "${D}/${GAMES_DATADIR}"/doc/*/* - rm -r "${D}/${GAMES_DATADIR}"/doc || die - - prepgamesdirs + emake DESTDIR="${D}" install + rm -r "${ED}"/usr/share/gnome || die + rm -rf "${ED}"/usr/share/doc + make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png + HTML_DOCS="doc/*html" einstalldocs } diff --git a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch index d657bf8744f1..3b8b066a81cd 100644 --- a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch +++ b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch @@ -3,8 +3,8 @@ Patch for CVE-2009-3591 -- bug 288295. Fetched from upstream SVN: http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033 ---- dopewars/trunk/src/serverside.c 2009/03/10 07:18:49 1032 -+++ dopewars/trunk/src/serverside.c 2009/10/05 04:11:32 1033 +--- trunk/src/serverside.c 2009/03/10 07:18:49 1032 ++++ trunk/src/serverside.c 2009/10/05 04:11:32 1033 @@ -504,6 +504,12 @@ break; case C_REQUESTJET: |