gentoo resync : 15.06.2021

7 files changed, 133 insertions, 118 deletions

diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 0f97ee50d6ed..8633b2e209fb 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,4 +1,6 @@
-AUX egoboo-2.8.1-gentoo.patch 2233 BLAKE2B c2cf8754e956d1032461d9ee1ea6dae42e1969042647ec37bfc65f2fe702863386de406bfa35df76392bd38e65e10a9ec5956c84a83191fda767f53afee22121 SHA512 277e453c95ee908b064987eae732b37a6ee9c2d903532017eb8a8951458a16b5195694f8165ba7146b1ca609be6155e4df20212b8c3cb3b056c4249bc4f3e1f3
+AUX egoboo-2.8.1-enet-1.3.patch 1027 BLAKE2B 8aa4c6764ffdde9b0d6f62b4be2ae94f9235f1f7ad0c22eac4d2909de0a27c20c007f043c094b526bf2094547740217b060859cbdad5094e5ff95f1420437752 SHA512 13a7a2e44f338784687d08e5ff8f91b0ef8a4de397d10fcd87ab5d2cfa1597113cd51a915ba8c44ac1d74cacb593176139a1d6d2ef411c47fb0d4a9ed76727e0
+AUX egoboo-2.8.1-gentoo.patch 1440 BLAKE2B c8c6357bb541aa27ae24be81b4fe042d3527015ef06b53b3a15d918294c4b532c164c1228bdb08e0fcb81a8b619357b035fa19e4297912b9d054d3c74feb76e3 SHA512 62c782ff972c5257ef1758e9e755c77f264d4c76c4c71c324baf72d4ca79184ffefe4fbe31cfae18f31580b306c19ec3ef6e25796edd688ee1052a385685ad51
+AUX egoboo-2.8.1-keyboard-inputs.patch 861 BLAKE2B 45e831ec4d27276bb073115036ad4187a6aa8ca6a00a9640994abbb4bfa5d056277954721210a800db9310c6c5f471d8ba0bd49e7394cd61e8ed0b3609e7ec35 SHA512 ed5f3caab6760c0533e700900270ec85a587529b33c9b5703201f92619d33e4ad4db5cb8df58a22c7b1c5fbad2ab41f8b7092091f6b1d9b473a2c7a750af77e6
 DIST egoboo-2.8.1.tar.gz 150029960 BLAKE2B 582db0f3c033523f7b55e205aec5f7012301e3edb7a4667f49d6c4a26f99572b4652e3cf4b8ed0f9e4c4cf2f6129615a315955d0193f851fc7c16ab7eaf7e482 SHA512 5793a63ba90f461ae99bcb81bf4ddf287b203bc2d401e1f697f1f4f93e1d681954e09b23938eb1a36e7dd535e2d12b8882efd77572cc63392cad5f9462ac3054
-EBUILD egoboo-2.8.1-r1.ebuild 1257 BLAKE2B 61c1a97534213c00bf943d07d43cadcc0128ebe2e0e847485046e5451712c845750b8e07ab3832b2cd9cb632507505cee2b16e9a1d077210cc0cf266c1d1d717 SHA512 b3f00ccd715fd83c2dcde4cce7b4dde7996a8f0a09d60c2b14d00dde19fb3d5ba4eb84324310ce569b25a773c2d3f1891ff22a0095648fbf87c41c413941f438
-MISC metadata.xml 329 BLAKE2B e5d902b3bdacb0c6028e113c2617030dc6730c03b278cafc1ca077053ac9c9dc472d39a842fb18a506c979ae4f52dd21c1f4166f9e8f07289b8c66d6344c62a8 SHA512 c3152f5db54eb4ae254c36981adb9556ff0eb37b267cd1dd25efc1428249d826e4c37b6166034acf98229f6f3ac681d7edb9681c69fd2f88e9394dff04fbd5fb
+EBUILD egoboo-2.8.1-r2.ebuild 1220 BLAKE2B c891daf0fae15d3e4ee8e4f910f7d9ec023e76d2365fde1bcb1e5847f24c059f5f4404dc46cf1597d0e2abca9e7039706166e4dc927ff44657b633c3a7fbbb43 SHA512 09430d7f380086516bea0695352f81e78307053959372e08a6b672ac7933945ba87a4c10f5454fbcf3fde017a01c54ff10540e4ab5c46a5138e93b361fd088d8
+MISC metadata.xml 382 BLAKE2B af9cc5f58ff4b0017af2970fedc2fa02765ec5c6e55da1bde8c0a3ec28dd421af58d8dbed45917760c471e985a2c67228abe9e5f90881f03b084b8ab42fc3305 SHA512 bb4c4c39003a71b2d01b1bdbd3f78870909f9c41df0a316fad947d0db1c26ad7cff1d9c5346a502ae44ddd679aaf60148d5bde55c3c3508ce35753dfb90c85b9
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 f1770edacd10..000000000000
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop edos2unix
-
-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() {
-	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/egoboo-2.8.1-r2.ebuild b/games-rpg/egoboo/egoboo-2.8.1-r2.ebuild
new file mode 100644
index 000000000000..e3b415e57a83
--- /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=7
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-games/physfs
+	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"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-enet-1.3.patch
+	"${FILESDIR}"/${P}-keyboard-inputs.patch
+)
+
+src_prepare() {
+	default
+
+	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 CC="$(tc-getCC)"
+}
+
+src_install() {
+	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 controls.txt setup.txt
+
+	make_desktop_entry ${PN} Egoboo applications-games "Game;"
+}
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 000000000000..dbde2db53861
--- /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" <azamat.hackimov@gmail.com>
+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 )

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 2f1205a45118..36e8adf6dc73 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 <enet/enet.h>
- #include "file_common.h"
- 
- #include <stdarg.h>
---- a/src/game/Makefile	2012-04-29 20:17:09.303070070 +0200
-+++ b/src/game/Makefile	2012-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 <enet/enet.h>

+ #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 ) );

++    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

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 000000000000..5df3af7c1c5a
--- /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 ) );

+ 

diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
index d8a2d5fe278b..81210c44d66a 100644
--- a/games-rpg/egoboo/metadata.xml
+++ b/games-rpg/egoboo/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">egoboo/egoboo</remote-id>
 		<remote-id type="sourceforge">egoboo</remote-id>
 	</upstream>
 </pkgmetadata>