gentoo resync : 13.06.2020

4 files changed, 25 insertions, 25 deletions

diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 377589cf1cb5..69ae0e5bffc5 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,6 +1,6 @@
-AUX el-wrapper 1646 BLAKE2B b4ddf1c5873b765af1c58a57cdb99b164f6e2558e1523253d4ed7a321ae9dc167dcb6f25271353d90549e24ff15387e087db88fda18f6832549a7e71168c4d98 SHA512 fc4e19608f40155f4e5014595b5497f6ebc0df0378bc430b9cd64c3a3139bcc8101e5831ef53e07866b456000c17d7e8209ff0d16e067fa434240bfc4851ee9e
-AUX eternal-lands-1.9.5.3-build.patch 2629 BLAKE2B 2151293ed631e75345fb2c264113e28d11ccf42471599ab4784f1ae19091602a0b2d1ef56da4a0396a263b7e8672810e12d96d0341666a8589037c41793b3342 SHA512 dba8288ee3309f97d779e0005f6f6234ce39de02badad78fe2b642ed120a09b2cda4b1558acf5bb3478a844c964454f935b407c02f0067ca837ab26c860494a1
+AUX el-wrapper-1.9.5.8 1648 BLAKE2B c429dd1fcd969a12fe6f7dc9df5241608cde6beec2574552c7cdb635fc212c52f2f9e6cfece25727dc9c1d98093762d18426c697c193f78db2aaa0b83e0ef3d8 SHA512 69689617582a31bb2d2b3ea8511b49a55c33332526720f72ea2a82440ba9b2e5bd60586e973b893bcf6a76a85b84831c9cc63e91558790d7b0ce0da93baacc8b
 AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2ec3c855c7dcb49d7aab076ab65c6c1145fa70e6cf98ae25a6d18b77fed63395c552047dae1407885758186ef7f3f9e737fd25a SHA512 feaf805e16bbbf33aaf15d6eb4e6303f1c80f135809952b59da2decdc8f1f2b65487031b7b9b29f969e631afa5bfc124741b385f4adff66d65cc1b0cf983f149
-DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
-EBUILD eternal-lands-1.9.5.3.ebuild 1585 BLAKE2B 81a52c5472b45ca36c2d288e07157b60307baf5e137ad697876b6d54879f5993b581962dc4686ac823fe4d2149ba3548c70bac954e237ce88cac91f66db0b273 SHA512 b9b040232b194b9d63030451c9bf54a7345f07e1e63b2d0f106ca29dc5fe57a52908298c4ece66ce72f46e85023bd072b3c13ee959e3652c986704b026c332ea
+AUX eternal-lands-1.9.5.8-build.patch 2632 BLAKE2B c31b8b0ec050fb9fb9843f5cfc5db21d6a2c843724a4e6e4c683a011a11dc1b8bac4e73125d72f5d012062bbede3377eed7fd81032a8469bbd55b52d84b8d725 SHA512 1c2ee7c49bc703c5cb7a8078930ca1587606d06b7b7147e038e0598ce4c2cd205fc6aa07306544f622ed0c6ff3d4576c316780d1c2db799fd598b060335c346c
+DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
+EBUILD eternal-lands-1.9.5.8.ebuild 1596 BLAKE2B 51bc31d2824cd5c3b4699777ce4b5652d1ba7c82737270a6d2967b8f9b3382c7cc3c61d238bb876fea097f68dc67ad839f1528e6e0e5e122b26ba5df93f2423c SHA512 1003f55fa02512e108c1a6a336d1e3fead3ba95475ac63f371821fc26773639f808f0f9c848ec6a626ee7713d707dce511c5a866545134d9d77b858705e78d2e
 MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
index 9728e4e98156..aae74143d659 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,11 @@ RDEPEND="app-arch/unzip
 	media-libs/cal3d[-16bit-indices]
 	media-libs/freealut
 	media-libs/libpng:0=
-	media-libs/libsdl[X,opengl,video]
+	media-libs/libsdl2[X,opengl,video]
 	media-libs/libvorbis
 	media-libs/openal
-	media-libs/sdl-image
-	media-libs/sdl-net
+	media-libs/sdl2-image
+	media-libs/sdl2-net
 	sys-libs/zlib[minizip]
 	virtual/glu
 	virtual/opengl
@@ -42,7 +42,7 @@ BDEPEND="${DEPEND}
 S="${WORKDIR}/Eternal-Lands-${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.9.5.3-build.patch"
+	"${FILESDIR}/${PN}-1.9.5.8-build.patch"
 	"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
 )
 
@@ -66,7 +66,7 @@ src_compile() {
 
 src_install() {
 	dobin el.linux.bin
-	newbin "${FILESDIR}"/el-wrapper el
+	newbin "${FILESDIR}"/el-wrapper-1.9.5.8 el
 	newicon -s 48 elc.png ${PN}.png
 	make_desktop_entry el "Eternal Lands"
 
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
index ab392d334207..3439c2a11625 100644
--- a/games-rpg/eternal-lands/files/el-wrapper
+++ b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
@@ -18,8 +18,8 @@ if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
 
 		tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`"
 		trap "rm -r $tmpdir" EXIT
-		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir
-		unzip $tmpdir/el_195_1_data_files.zip -d $elc
+		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.7/el_195_p7_data_files.zip -P $tmpdir
+		unzip $tmpdir/el_195_p7_data_files.zip -d $elc
 
 		echo
 		echo "The game sound and music are optional, you can download \
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
index 28f4ab0da542..d4aaa2bd415f 100644
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
@@ -1,7 +1,7 @@
-From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
+From 0f93097a58d78e0ba9d51d48f56b470047b27210 Mon Sep 17 00:00:00 2001
 From: Stefan Strogin <steils@gentoo.org>
-Date: Tue, 14 May 2019 20:34:47 +0300
-Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS
+Date: Fri, 5 Jun 2020 07:19:47 +0300
+Subject: [PATCH] Respect {C,CXX,LD}FLAGS
 
 Upstream-Status: Inappropriate [Gentoo-specific]
 Signed-off-by: Stefan Strogin <steils@gentoo.org>
@@ -10,7 +10,7 @@ Signed-off-by: Stefan Strogin <steils@gentoo.org>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.linux b/Makefile.linux
-index c57aeeeb..a0839c5c 100644
+index eb57e0e..c9bbc73 100644
 --- a/Makefile.linux
 +++ b/Makefile.linux
 @@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
@@ -18,17 +18,17 @@ index c57aeeeb..a0839c5c 100644
  	$(shell pkg-config zlib --cflags)
  
 -CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CFLAGS += -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
  
 -CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
 +CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
  
--LDFLAGS=$(shell pkg-config sdl --libs) \
-+LDFLAGS += $(shell pkg-config sdl --libs) \
+-LDFLAGS=$(shell pkg-config sdl2 --libs) \
++LDFLAGS += $(shell pkg-config sdl2 --libs) \
  	$(shell pkg-config libxml-2.0 --libs) \
- 	$(shell pkg-config SDL_net --libs) \
- 	$(shell pkg-config SDL_image --libs) \
-@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+ 	$(shell pkg-config SDL2_net --libs) \
+ 	$(shell pkg-config SDL2_image --libs) \
+@@ -112,7 +112,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
  DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
  #(shell echo $OBJ |sed s/\.o/\.P/))
  
@@ -37,7 +37,7 @@ index c57aeeeb..a0839c5c 100644
  
  ifndef CC
  CC=gcc
-@@ -127,8 +127,8 @@ all: $(EXE)
+@@ -128,8 +128,8 @@ all: $(EXE)
  
  # the compile targets
  $(EXE): $(OBJS)
@@ -48,7 +48,7 @@ index c57aeeeb..a0839c5c 100644
  
  #recompile on Makefile or conf change
  #.depend $(OBJS): Makefile.linux make.conf
-@@ -136,14 +136,14 @@ $(EXE): $(OBJS)
+@@ -137,14 +137,14 @@ $(EXE): $(OBJS)
  DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
  
  $(COBJS): %.o: %.c Makefile.linux make.conf
@@ -66,5 +66,5 @@ index c57aeeeb..a0839c5c 100644
  		mv ".deps/$@.pp" ".deps/$@.P"; \
  	else rm -f ".deps/$@.pp"; exit 1; \
 -- 
-2.21.0
+2.27.0