[games-fps/redeclipse] Bump to 1.5.2

Package-Manager: portage-2.2.20
Manifest-Sign-Key: A018DE8C

4 files changed, 98 insertions, 56 deletions

diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
index ae1f772..131aae8 100644
--- a/games-fps/redeclipse/Manifest
+++ b/games-fps/redeclipse/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST redeclipse_1.4_nix.tar.bz2 678617164 SHA256 a0dfc527b0f437170a423b55df68a97e1b6e60d8c9fb6c842519b6670c1e69bf SHA512 d9bbafeb5a417391befe53d757252e8de6f6e54c11b11db52f216d66ee11d3fe3dad432385b25868fb3e17f2af7a8462c44a39d2746da58ae761d82ab41d78f1 WHIRLPOOL ff0bae34ce8f3ab9d91590d3116a1069f6bde563c17bfe34878b6fab35a80c7781f9b879046cc7a150212e5cfc81ef5a319f7d5445bad71861412cc84ceaacdd
+DIST redeclipse_1.5.2_nix.tar.bz2 810733795 SHA256 f30b13750701401983a0faf5c9d9903dd65284e9b96aa487e77293473ec93e08 SHA512 80ffc2d354ce69c0dc10cacb5a33aaf15aa87ed6e84a4c2e1f1e358423b64b2edddd607a136083dc34ad851da4775fcce9da0762b867269df18c3dec35963ac9 WHIRLPOOL 9fb6b9d6b3c247e811b1f19df57c33e1447229982c8d94f5e7d672557d1498a8a2c9b053fa426df7e9b17b3d4d1db1e76c040b9dbc5fd05a1b325195d4dbbcfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlFwN3wACgkQz+A7F6AY3oynHgEAlzgntX3PBS11YAEmfpcyCuc0
-82vpid65xNZ7+1HwGroBAMN/boiSMe7flafZ4yjAKTP6w39m7g8sFKGpQjCDHyov
-=6CyC
+iF4EAREIAAYFAlWiJb0ACgkQz+A7F6AY3oyBCwD8DIJpDJjTXLxMfuqjA+o/e9h7
+/ui4+BiqcdbsQZ79dfwBANwYlHrmAdGVbQgPb4xwNZ35BkGA3XUHCnnXaQbVO+Bb
+=pzl/
 -----END PGP SIGNATURE-----
diff --git a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
deleted file mode 100644
index fbca38b..0000000
--- a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar redeclipse-1.4.orig/src/engine/server.cpp redeclipse-1.4/src/engine/server.cpp
---- redeclipse-1.4.orig/src/engine/server.cpp	2013-04-18 23:14:32.899377004 +0600
-+++ redeclipse-1.4/src/engine/server.cpp	2013-04-18 23:18:12.528384587 +0600
-@@ -1407,13 +1407,13 @@
-         chdir(dir);
-     }
- #endif
--    loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r"))
-+    loopi(3) if(!fileexists(findfile("/usr/share/games/redeclipse/data/config/keymap.cfg", "r"), "r"))
-     {
-         if(i != 2) chdir("..");
-         else fatal("could not find data directory");
-     }
--    addpackagedir("data");
--    defformatstring(gamedata)("game/%s", server::gameid());
-+    addpackagedir("/usr/share/games/redeclipse/data");
-+    defformatstring(gamedata)("/usr/share/games/redeclipse/game/%s", server::gameid());
-     addpackagedir(gamedata);
-     execfile("version.cfg", false, EXEC_VERSION);
-     if(wanthome)
diff --git a/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch b/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch
new file mode 100644
index 0000000..5b8d9b1
--- /dev/null
+++ b/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch
@@ -0,0 +1,76 @@
+--- redeclipse-1.5.2.orig/src/Makefile	2015-07-11 14:20:26.607791059 +0500
++++ redeclipse-1.5.2/src/Makefile	2015-07-11 14:37:20.846741852 +0500
+@@ -37,7 +37,7 @@
+ CXX_TEMP:=$(CXX)
+ override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
+ 
+-INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include
++INCLUDES= -I. -Ishared -Iengine -Igame
+ 
+ 
+ STRIP=
+@@ -81,7 +81,7 @@
+ endif
+ endif
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifneq (,$(findstring linux,$(PLATFORM)))
+ CLIENT_LIBS+= -lrt
+@@ -156,7 +156,7 @@
+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINDLL) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+ else
+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
+-SERVER_LIBS= -Lenet -lenet -lz
++SERVER_LIBS= -lenet -lz
+ endif
+ SERVER_OBJS= \
+ 	shared/crypto-standalone.o \
+@@ -170,17 +170,12 @@
+ 	engine/server-standalone.o \
+ 	game/server-standalone.o
+ 
+-LIBENET= enet/libenet.a
+-
+ GENKEY_OBJS= engine/genkey.o shared/crypto-standalone.o
+ 
+ all:
+ 
+ default: all
+ 
+-clean-enet:
+-	$(MAKE) -C enet clean
+-
+ clean-client:
+ 	@rm -fv $(CLIENT_PCH) $(CLIENT_OBJS) $(APPCLIENT)$(BIN_SUFFIX)
+ 
+@@ -190,7 +185,7 @@
+ clean-genkey:
+ 	@rm -fv $(GENKEY_OBJS) genkey$(BIN_SUFFIX)
+ 
+-clean: clean-enet clean-client clean-server clean-genkey
++clean: clean-client clean-server clean-genkey
+ 
+ %.h.gch: %.h
+ 	$(CXX) $(CXXFLAGS) -x c++-header -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
+@@ -256,9 +251,6 @@
+ 
+ install: install-client install-server
+ 
+-$(LIBENET):
+-	$(MAKE) -C enet
+-
+ depend:
+ 	makedepend -Y -I. -Ishared -Iengine -Igame $(subst .o,.cpp,$(CLIENT_OBJS))
+ 	makedepend -a -o-standalone.o -Y -I. -Ishared -Iengine -Igame -DSTANDALONE $(subst -standalone.o,.cpp,$(SERVER_OBJS))
+--- redeclipse-1.5.2.orig/src/engine/engine.h	2015-07-11 14:20:25.554791110 +0500
++++ redeclipse-1.5.2/src/engine/engine.h	2015-07-11 15:01:02.790672864 +0500
+@@ -3,6 +3,7 @@
+ 
+ #include "version.h"
+ #include "cube.h"
++#include <enet/enet.h>
+ 
+ #define LAN_PORT 28799
+ #define MASTER_PORT 28800
diff --git a/games-fps/redeclipse/redeclipse-1.4.ebuild b/games-fps/redeclipse/redeclipse-1.5.2.ebuild
index e049e27..23f6a53 100644
--- a/games-fps/redeclipse/redeclipse-1.4.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,7 +10,7 @@ MAJOR_VERSION=$(get_version_component_range 1-2)
 
 DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
 HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix.tar.bz2"
+SRC_URI="http://www.indiedb.com/downloads/mirror/86141/100/0789359bfb023138a8c5520fcb632b7d -> ${PN}_${PV}_nix.tar.bz2"
 
 # According to doc/license.txt file
 LICENSE="HPND ZLIB CC-BY-SA-3.0"
@@ -30,32 +30,14 @@ DEPEND="!dedicated? (
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-#S=${WORKDIR}/${PN}
-
 src_prepare() {
-	# Respect GAMES_DATADIR
-	epatch "${FILESDIR}"/${P}_gamesdatadir.patch
-#	sed -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
-#		-e "s:::"
-#
-#		-i src/engine/server.cpp
-
 	# Unbundle enet
-	sed	-e "s:\(client\)\: libenet:\1\::" \
-		-e "s:\(server\)\: libenet:\1\::" \
-		-e "s:-Lenet/.libs ::" \
-		-e "s:-Ienet/include ::" \
-		-i src/core.mk
-	sed -e ":src/enet \\:d" -i src/dist.mk
+	epatch "${FILESDIR}/${P}_unbundle-enet.patch"
 	rm -r src/enet
 
-	#respect LDFLAGS
-#	sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
-#		-e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
-#		-i src/core.mk
-
 	# Menu and mans
 	sed -e "s:@APPNAME@:${PN}:" \
+		-e "/^Keywords=/s/$/;/" \
 		src/install/nix/redeclipse.desktop.am \
 		> src/install/nix/redeclipse.desktop
 
@@ -72,11 +54,9 @@ src_prepare() {
 		-e "s:@REDECLIPSE@:${PN}:g" \
 		doc/man/redeclipse-server.6.am \
 		> doc/man/redeclipse-server.6
-
 }
 
 src_compile() {
-#	cd src
 	if ! use dedicated ; then
 		emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server
 	else
@@ -85,18 +65,24 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin src/${PN}_server
-	doman doc/man/redeclipse-server.6
-	dodoc readme.txt doc/examples/servinit.cfg
-	if ! use dedicated ; then
-		dogamesbin src/redeclipse
+	local dir="${GAMES_PREFIX_OPT}/${PN}"
+	insinto "${dir}"
+	doins -r config data
 
-		insinto "${GAMES_DATADIR}"/${PN}
-		doins -r data game
+	exeinto "${dir}"
+	doexe src/redeclipse_server_linux
+	if ! use dedicated ; then
+		doexe src/redeclipse_linux
 		newicon src/install/nix/${PN}_x128.png ${PN}.png
 		domenu src/install/nix/redeclipse.desktop
 		doman doc/man/redeclipse.6
 	fi
 
+	games_make_wrapper "${PN}" "${dir}/redeclipse_linux" "${dir}"
+	games_make_wrapper "${PN}_server" "${dir}/redeclipse_server_linux" "${dir}"
+
+	doman doc/man/redeclipse-server.6
+	dodoc readme.txt doc/examples/servinit.cfg
+
 	prepgamesdirs
 }