subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-rpg\/egoboo\/"

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

2016-05-05 Thread Michael Sterrett

commit: 7cdac109164557d331b73e7b6fe7479fa81a4d29
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri May  6 01:59:19 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri May  6 02:49:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdac109

games-rpg/egoboo: set RDEPEND

Package-Manager: portage-2.2.26

 games-rpg/egoboo/egoboo-2.8.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-rpg/egoboo/egoboo-2.8.1.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1.ebuild
index 7bdee75..4a6dae8 100644
--- a/games-rpg/egoboo/egoboo-2.8.1.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,6 +22,7 @@ DEPEND="virtual/opengl
media-libs/sdl-ttf
net-libs/enet:0
dev-games/physfs"
+RDEPEND=${DEPEND}
 
 src_prepare() {
edos2unix src/game/platform/file_linux.c \
@@ -32,7 +33,7 @@ src_prepare() {
-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-e "s:@GENTOO_CONFDIR@:${GAMES_SYSCONFDIR}/${PN}:" \
src/game/platform/file_linux.c || die "sed failed"
-   rm -rf src/enet || die "failed removing enet"
+   rm -rf src/enet || die
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

2021-06-08 Thread Ionen Wolkens

commit: 121b4d8833f5ad90cf991429b35dd128ef891009
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Sep 10 16:28:32 2020 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  8 19:31:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121b4d88

games-rpg/egoboo: remove old version

This ebuild is last net-libs/enet:0 user.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17493
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/egoboo-2.8.1-r1.ebuild | 56 -
 1 file changed, 56 deletions(-)

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
deleted file mode 100644
index 13cf1806ff6..000
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
-HOMEPAGE="http://egoboo.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-   dev-games/physfs
-   media-libs/libsdl[joystick,video]
-   media-libs/sdl-image
-   media-libs/sdl-mixer[vorbis]
-   media-libs/sdl-ttf
-   net-libs/enet:0
-   virtual/glu
-   virtual/opengl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
-   -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-   src/game/platform/file_linux.c || die "sed failed"
-   rm -rf src/enet || die
-}
-
-src_compile() {
-   emake -C src/game PROJ_NAME=egoboo-2.x
-}
-
-src_install() {
-   dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
-
-   insinto /usr/share/${PN}
-   doins -r basicdat modules
-   insinto /etc/${PN}
-   doins -r controls.txt setup.txt
-
-   newbin src/game/egoboo-2.x ${PN}
-
-   newicon basicdat/icon.bmp ${PN}.bmp
-   make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
-}

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

2021-06-08 Thread Ionen Wolkens

commit: 9deeeb5ab78d9423a09e19ecacfd43cf942de622
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun  8 17:29:06 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  8 19:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9deeeb5a

games-rpg/egoboo: add github remote-id

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
index d8a2d5fe278..81210c44d66 100644
--- a/games-rpg/egoboo/metadata.xml
+++ b/games-rpg/egoboo/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Games Project


+   egoboo/egoboo
egoboo

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

2021-06-29 Thread Ionen Wolkens

commit: 671d46737165eecb6d91bb39e4c05e391a3b40af
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 29 19:49:20 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 29 20:53:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671d4673

games-rpg/egoboo: add .desktop icon, EAPI 7->8

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/Manifest   | 1 +
 games-rpg/egoboo/egoboo-2.8.1-r2.ebuild | 9 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 5a4082211d9..27a34b8b655 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1 +1,2 @@
 DIST egoboo-2.8.1.tar.gz 150029960 BLAKE2B 
582db0f3c033523f7b55e205aec5f7012301e3edb7a4667f49d6c4a26f99572b4652e3cf4b8ed0f9e4c4cf2f6129615a315955d0193f851fc7c16ab7eaf7e482
 SHA512 
5793a63ba90f461ae99bcb81bf4ddf287b203bc2d401e1f697f1f4f93e1d681954e09b23938eb1a36e7dd535e2d12b8882efd77572cc63392cad5f9462ac3054
+DIST egoboo.png 7903 BLAKE2B 
a9ba1d15bd2363d7155b817bcf4d4ce1c378d6a5f2266774772e288a862d1ed1659bb67ec0f73eb089ee8e31725035b7fc2f29c490ace7e17cb336bc9479c9ab
 SHA512 
6a18c269f9159f7b0cf9201662f9755b3317156849ed126d215aa104ae88faeb4950911821a74720b20ccac74498cb4473e2c1170596207b496ca8efb37c1247

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
index e3b415e57a8..bf1c7737e7f 100644
--- a/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
 DESCRIPTION="3D dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="
+   mirror://sourceforge/${PN}/${P}.tar.gz
+   https://dev.gentoo.org/~ionen/distfiles/${PN}.png";
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -53,5 +55,6 @@ src_install() {
insinto /etc/${PN}
doins controls.txt setup.txt
 
-   make_desktop_entry ${PN} Egoboo applications-games "Game;"
+   doicon "${DISTDIR}"/${PN}.png
+   make_desktop_entry ${PN} Egoboo
 }

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/files/, games-rpg/egoboo/

2016-10-15 Thread Austin English

commit: 337eed8c76386be0311cbeff448f1a4cbccbcdf6
Author: Austin English  gentoo  org>
AuthorDate: Sat Oct 15 09:06:16 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Sat Oct 15 10:16:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337eed8c

games-rpg/egoboo: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-rpg/egoboo/egoboo-2.8.1-r1.ebuild  | 60 
 games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch | 12 ++---
 2 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
new file mode 100644
index ..4d36a95
--- /dev/null
+++ b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
+HOMEPAGE="http://egoboo.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+   dev-games/physfs
+   media-libs/libsdl[joystick,video]
+   media-libs/sdl-image
+   media-libs/sdl-mixer[vorbis]
+   media-libs/sdl-ttf
+   net-libs/enet:0
+   virtual/glu
+   virtual/opengl"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+   edos2unix src/game/platform/file_linux.c \
+   src/game/network.c \
+   src/game/Makefile
+   default
+   sed -i \
+   -e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
+   -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+   src/game/platform/file_linux.c || die "sed failed"
+   rm -rf src/enet || die
+}
+
+src_compile() {
+   emake -C src/game PROJ_NAME=egoboo-2.x
+}
+
+src_install() {
+   dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
+
+   insinto /usr/share/${PN}
+   doins -r basicdat modules
+   insinto /etc/${PN}
+   doins -r controls.txt setup.txt
+
+   newbin src/game/egoboo-2.x ${PN}
+
+   newicon basicdat/icon.bmp ${PN}.bmp
+   make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
+}

diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch 
b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
index 36cb33b..2f1205a 100644
--- a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
@@ -1,5 +1,5 @@
 src/game/platform/file_linux.c.old 2012-04-29 21:45:29.627419281 +0200
-+++ src/game/platform/file_linux.c 2012-04-29 21:45:29.628419211 +0200
+--- a/src/game/platform/file_linux.c   2012-04-29 21:45:29.627419281 +0200
 b/src/game/platform/file_linux.c   2012-04-29 21:45:29.628419211 +0200
 @@ -79,9 +79,9 @@
  strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", 
SDL_arraysize( linux_dataPath ) );
  #else
@@ -12,8 +12,8 @@
  #endif
  
  // the log file cannot be started until there is a user data path to dump 
the file into
 src/game/network.c.old 2012-04-29 20:14:31.482179973 +0200
-+++ src/game/network.c 2012-04-29 20:14:52.077730184 +0200
+--- a/src/game/network.c   2012-04-29 20:14:31.482179973 +0200
 b/src/game/network.c   2012-04-29 20:14:52.077730184 +0200
 @@ -37,7 +37,7 @@
  #include "egoboo_setup.h"
  #include "egoboo.h"
@@ -23,8 +23,8 @@
  #include "file_common.h"
  
  #include 
 src/game/Makefile.old  2012-04-29 20:17:09.303070070 +0200
-+++ src/game/Makefile  2012-04-29 20:18:21.047023847 +0200
+--- a/src/game/Makefile2012-04-29 20:17:09.303070070 +0200
 b/src/game/Makefile2012-04-29 20:18:21.047023847 +0200
 @@ -33,8 +33,7 @@
  # the compiler options

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/, games-rpg/egoboo/files/

2021-06-08 Thread Ionen Wolkens

commit: cdf85e47c763e8c81cafa24b1c9a0f880cd208cb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun  8 17:39:54 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  8 19:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf85e47

games-rpg/egoboo: rebase patch to drop edos2unix

edos2unix was only to accomodate a patch with wrong line terminators.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/egoboo-2.8.1-r1.ebuild  |  5 +-
 games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch | 93 ++--
 2 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
index f1770edacd1..13cf1806ff6 100644
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit desktop edos2unix
+inherit desktop
 
 DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/";
@@ -29,9 +29,6 @@ PATCHES=(
 )
 
 src_prepare() {
-   edos2unix src/game/platform/file_linux.c \
-   src/game/network.c \
-   src/game/Makefile
default
sed -i \
-e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \

diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch 
b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
index 2f1205a4511..36e8adf6dc7 100644
--- a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
@@ -1,56 +1,37 @@
 a/src/game/platform/file_linux.c   2012-04-29 21:45:29.627419281 +0200
-+++ b/src/game/platform/file_linux.c   2012-04-29 21:45:29.628419211 +0200
-@@ -79,9 +79,9 @@
- strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", 
SDL_arraysize( linux_dataPath ) );
- #else
- // these are read-only directories
--strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( 
linux_configPath ) );
-+strncpy( linux_configPath, "@GENTOO_CONFDIR@", SDL_arraysize( 
linux_configPath ) );
- strncpy( linux_binaryPath, "/games/",  SDL_arraysize( 
linux_binaryPath ) );
--strncpy( linux_dataPath,   "/share/games/egoboo-2.x/", SDL_arraysize( 
linux_dataPath ) );
-+strncpy( linux_dataPath,   "@GENTOO_DATADIR@", SDL_arraysize( 
linux_dataPath ) );
- #endif
- 
- // the log file cannot be started until there is a user data path to dump 
the file into
 a/src/game/network.c   2012-04-29 20:14:31.482179973 +0200
-+++ b/src/game/network.c   2012-04-29 20:14:52.077730184 +0200
-@@ -37,7 +37,7 @@
- #include "egoboo_setup.h"
- #include "egoboo.h"
- 
--#include "enet/enet.h"
-+#include 
- #include "file_common.h"
- 
- #include 
 a/src/game/Makefile2012-04-29 20:17:09.303070070 +0200
-+++ b/src/game/Makefile2012-04-29 20:18:21.047023847 +0200
-@@ -33,8 +33,7 @@
- # the compiler options
- 
--CC  := gcc
--INC := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions 
-I./file_formats -I./platform
--LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU 
-lSDL_image -lphysfs -lenet
-+INC := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
-+LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs 
-lenet -lm
- 
- # use different options if the environmental variable PREFIX is defined
- ifdef ($(PREFIX),"")
-@@ -43,7 +43,7 @@
-   OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX
- endif
- 
--CFLAGS  := ${OPT} ${INC}
-+CFLAGS  += ${INC} -DENET11
- 
- #
- # definitions of the target projects
-@@ -52,7 +52,7 @@
- all: ${EGO_BIN}
- 
- ${EGO_BIN}: ${EGO_OBJ} 
--  ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS}
-+  ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS}
- 
- clean:
-   rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
+--- a/src/game/Makefile
 b/src/game/Makefile
+@@ -34,5 +34,4 @@
+ 
+-CC  := gcc
+-INC := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions 
-I./file_formats -I./platform
+-LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU 
-lSDL_image -lphysfs -lenet
++INC := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
++LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs 
-lenet -lm
+ 
+@@ -45,3 +44,3 @@
+ 
+-CFLAGS  := ${OPT} ${INC}
++CFLAGS  += ${INC} -DENET11
+ 
+@@ -55,3 +54,3 @@
+ ${EGO_BIN}: ${EGO_OBJ} 
+-  ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS}
++  ${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS}
+ 
+--- a/src/game/network.c
 b/src/game/network.c
+@@ -39,3 +39,3 @@
+ 
+-#include "enet/enet.h"
++#include 
+ #include "file_common.h"
+--- a/src/game/platform/file_linux.c
 b/src/game/platform/file_linux.c
+@@ -81,5 +81,5 @@
+ // these are read-only directories
+-strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( 
linux_configPath ) );
++

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/files/, games-rpg/egoboo/

2021-06-08 Thread Ionen Wolkens

commit: 7964ef4f59218cdca029662389efe8e6343f9944
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun  8 19:13:11 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  8 19:40:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7964ef4f

games-rpg/egoboo: EAPI-7 bump, fix inputs

Also:
- prefix support
- don't call CC directly
- tighten sdl deps (game can't start without png/opengl)
- remove .bmp icon, format not supported by xdg

Closes: https://bugs.gentoo.org/654574
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/egoboo-2.8.1-r2.ebuild| 40 +++---
 .../files/egoboo-2.8.1-keyboard-inputs.patch   | 12 +++
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
index 0ee1e0999c4..e3b415e57a8 100644
--- a/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
@@ -1,57 +1,57 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
-DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
+DESCRIPTION="3D dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/";
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+RDEPEND="
dev-games/physfs
-   media-libs/libsdl[joystick,video]
-   media-libs/sdl-image
+   media-libs/libsdl[joystick,opengl,video]
+   media-libs/sdl-image[png]
media-libs/sdl-mixer[vorbis]
media-libs/sdl-ttf
net-libs/enet:1.3=
virtual/glu
virtual/opengl"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-enet-1.3.patch
+   "${FILESDIR}"/${P}-keyboard-inputs.patch
 )
 
 src_prepare() {
default
-   sed -i \
-   -e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
-   -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-   src/game/platform/file_linux.c || die "sed failed"
-   rm -rf src/enet || die
+
+   sed -e "s|@GENTOO_CONFDIR@|${EPREFIX}/etc/${PN}|" \
+   -e "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" \
+   -i src/game/platform/file_linux.c || die
 }
 
 src_compile() {
-   emake -C src/game PROJ_NAME=egoboo-2.x
+   emake -C src/game PROJ_NAME=egoboo-2.x CC="$(tc-getCC)"
 }
 
 src_install() {
-   dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
+   newbin src/game/egoboo-2.x ${PN}
+
+   dodoc BUGS.txt Changelog.txt doc/*.{txt,pdf}
 
insinto /usr/share/${PN}
doins -r basicdat modules
-   insinto /etc/${PN}
-   doins -r controls.txt setup.txt
 
-   newbin src/game/egoboo-2.x ${PN}
+   insinto /etc/${PN}
+   doins controls.txt setup.txt
 
-   newicon basicdat/icon.bmp ${PN}.bmp
-   make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
+   make_desktop_entry ${PN} Egoboo applications-games "Game;"
 }

diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-keyboard-inputs.patch 
b/games-rpg/egoboo/files/egoboo-2.8.1-keyboard-inputs.patch
new file mode 100644
index 000..5df3af7c1c5
--- /dev/null
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-keyboard-inputs.patch
@@ -0,0 +1,12 @@
+Fix being only able move down and right when using keyboard.
+https://bugs.gentoo.org/654574
+http://egoboo.sourceforge.net/phpBB3/viewtopic.php?p=61333#p61333
+--- a/src/game/game.c
 b/src/game/game.c
+@@ -2054,4 +2054,4 @@
+ {
+-joy_pos.x = ( control_is_pressed( INPUT_DEVICE_KEYBOARD,  
CONTROL_RIGHT ) - control_is_pressed( INPUT_DEVICE_KEYBOARD,  CONTROL_LEFT ) );
+-joy_pos.y = ( control_is_pressed( INPUT_DEVICE_KEYBOARD,  
CONTROL_DOWN ) - control_is_pressed( INPUT_DEVICE_KEYBOARD,  CONTROL_UP ) );
++joy_pos.x = ( (int)control_is_pressed( INPUT_DEVICE_KEYBOARD,  
CONTROL_RIGHT ) - (int)control_is_pressed( INPUT_DEVICE_KEYBOARD,  CONTROL_LEFT 
) );
++joy_pos.y = ( (int)control_is_pressed( INPUT_DEVICE_KEYBOARD,  
CONTROL_DOWN ) - (int)control_is_pressed( INPUT_DEVICE_KEYBOARD,  CONTROL_UP ) 
);
+

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/, games-rpg/egoboo/files/

2021-06-08 Thread Ionen Wolkens

commit: 1697cc49c1dff7cfeff0a20faea32d197903b516
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Sep 10 16:27:27 2020 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  8 19:31:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1697cc49

games-rpg/egoboo: migrate to enet-1.3 support

Added patch that adapts package to use enet 1.3 API.

Closes: https://bugs.gentoo.org/628038
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Azamat H. Hackimov  gmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-rpg/egoboo/egoboo-2.8.1-r2.ebuild| 57 ++
 games-rpg/egoboo/files/egoboo-2.8.1-enet-1.3.patch | 21 
 2 files changed, 78 insertions(+)

diff --git a/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild 
b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
new file mode 100644
index 000..0ee1e0999c4
--- /dev/null
+++ b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop
+
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
+HOMEPAGE="http://egoboo.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-games/physfs
+   media-libs/libsdl[joystick,video]
+   media-libs/sdl-image
+   media-libs/sdl-mixer[vorbis]
+   media-libs/sdl-ttf
+   net-libs/enet:1.3=
+   virtual/glu
+   virtual/opengl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-gentoo.patch
+   "${FILESDIR}"/${P}-enet-1.3.patch
+)
+
+src_prepare() {
+   default
+   sed -i \
+   -e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
+   -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+   src/game/platform/file_linux.c || die "sed failed"
+   rm -rf src/enet || die
+}
+
+src_compile() {
+   emake -C src/game PROJ_NAME=egoboo-2.x
+}
+
+src_install() {
+   dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
+
+   insinto /usr/share/${PN}
+   doins -r basicdat modules
+   insinto /etc/${PN}
+   doins -r controls.txt setup.txt
+
+   newbin src/game/egoboo-2.x ${PN}
+
+   newicon basicdat/icon.bmp ${PN}.bmp
+   make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
+}

diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-enet-1.3.patch 
b/games-rpg/egoboo/files/egoboo-2.8.1-enet-1.3.patch
new file mode 100644
index 000..dbde2db5386
--- /dev/null
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-enet-1.3.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/628038
+From: "Azamat H. Hackimov" 
+Date: Thu, 10 Sep 2020 18:39:45 +0300
+Subject: [PATCH] Add support for enet-1.3
+--- a/src/game/network.c
 b/src/game/network.c
+@@ -1847,3 +1847,3 @@
+ /// @todo Should I limit client bandwidth here?
+-net_myHost = enet_host_create( NULL, 1, 0, 0 );
++net_myHost = enet_host_create( NULL, 1, 0, 0, 0 );
+ if ( NULL == net_myHost )
+@@ -1863,3 +1863,3 @@
+ address.port = NET_EGOBOO_PORT;
+-net_gameHost = enet_host_connect( net_myHost, &address, 
NET_EGOBOO_NUM_CHANNELS );
++net_gameHost = enet_host_connect( net_myHost, &address, 
NET_EGOBOO_NUM_CHANNELS, 0 );
+ if ( NULL == net_gameHost )
+@@ -1906,3 +1906,3 @@
+ log_info( "sv_hostGame: Creating game on port %d\n", NET_EGOBOO_PORT 
);
+-net_myHost = enet_host_create( &address, MAX_PLAYER, 0, 0 );
++net_myHost = enet_host_create( &address, MAX_PLAYER, 0, 0, 0 );
+ if ( NULL == net_myHost )

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/files/, games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/, games-rpg/egoboo/files/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/files/, games-rpg/egoboo/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/egoboo/, games-rpg/egoboo/files/

8 matches

Site Navigation

Mail list logo

Footer information