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

[Stefan Strogin]

commit:     ac0a8e3b8b0cedff61c3249dfda566181850fb8f
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 05:42:39 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 05:42:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0a8e3b

games-rpg/eternal-lands: drop old 1.9.5.3

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-rpg/eternal-lands/Manifest                   |  1 -
 .../eternal-lands/eternal-lands-1.9.5.3.ebuild     | 75 ----------------------
 games-rpg/eternal-lands/files/el-wrapper           | 53 ---------------
 .../files/eternal-lands-1.9.5.3-build.patch        | 70 --------------------
 4 files changed, 199 deletions(-)

diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 9431423a1e2..848ae6b0d7f 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,2 +1 @@
-DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
 DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0

diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
deleted file mode 100644
index 9728e4e9815..00000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs xdg
-
-DESCRIPTION="A 3D fantasy MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="https://github.com/raduprv/Eternal-Lands/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="app-arch/unzip
-	dev-libs/libxml2
-	media-libs/cal3d[-16bit-indices]
-	media-libs/freealut
-	media-libs/libpng:0=
-	media-libs/libsdl[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl-image
-	media-libs/sdl-net
-	sys-libs/zlib[minizip]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	media-libs/glew"
-BDEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-S="${WORKDIR}/Eternal-Lands-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.5.3-build.patch"
-	"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i "s/FEATURES/EL_FEATURES/g" make.defaults || die
-	sed -i "s/FEATURES/EL_FEATURES/g" Makefile.linux || die
-
-	# Remove bundled minizip
-	rm io/{crypt,ioapi,unzip,zip}.h || die
-	rm io/{ioapi,unzip,zip}.c || die
-
-	cp Makefile.linux Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	use doc && emake docs
-}
-
-src_install() {
-	dobin el.linux.bin
-	newbin "${FILESDIR}"/el-wrapper el
-	newicon -s 48 elc.png ${PN}.png
-	make_desktop_entry el "Eternal Lands"
-
-	dodoc CHANGES TODO
-	use doc && dodoc -r docs/html/
-}

diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper
deleted file mode 100644
index ab392d33420..00000000000
--- a/games-rpg/eternal-lands/files/el-wrapper
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash -e
-
-elc=~/.elc
-datadir=$elc/el_data
-browser=xdg-open
-
-if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
-   [[ ! -e $elc/el.ini ]]; then
-
-	[[ -e $elc ]] || mkdir -p $elc
-
-	if [[ ! -e $datadir ]]; then
-		echo
-		echo "The \"Eternal Lands\" launcher is downloading the game data..."
-		echo "It is only needed before the first start."
-		echo "The default data location is ~/.elc/el_data"
-		echo
-
-		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
-
-		echo
-		echo "The game sound and music are optional, you can download \
-them now or any time later from the official website and unpack into \
-~/.elc/el_data/sound and ~/.elc/el_data/music"
-		while true; do
-			read -r -n 1 -p "Download the game sound and music now? (y/n) " yn
-			case $yn in
-				[Yy]) break;;
-				[Nn]) break;;
-				*) echo -e "\nPlease answer Yes or No.";;
-			esac
-		done
-		echo
-
-		if [[ $yn == [Yy] ]]; then
-			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/eternallands-sound_1.9.4.zip -P $tmpdir
-			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/music_full.zip -P $tmpdir
-			unzip $tmpdir/eternallands-sound_1.9.4.zip -d $datadir
-			mkdir $datadir/music
-			unzip $tmpdir/music_full.zip -d $datadir/music
-		fi
-
-		rm -r $tmpdir
-	fi
-
-	[[ -e $elc/servers.lst ]] || cp $datadir/servers.lst $elc/
-	[[ -e $elc/el.ini ]] || cp $datadir/el.ini $elc/
-fi
-
-exec /usr/bin/el.linux.bin -dir="$datadir" -b="$browser" "$@"

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.3-build.patch
deleted file mode 100644
index 28f4ab0da54..00000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@g.o>
-Date: Tue, 14 May 2019 20:34:47 +0300
-Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS
-
-Upstream-Status: Inappropriate [Gentoo-specific]
-Signed-off-by: Stefan Strogin <steils@g.o>
----
- Makefile.linux | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.linux b/Makefile.linux
-index c57aeeeb..a0839c5c 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
- 	$(shell pkg-config vorbisfile --cflags) \
- 	$(shell pkg-config zlib --cflags)
- 
--CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+CFLAGS += $(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) \
- 	$(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
- DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
- #(shell echo $OBJ |sed s/\.o/\.P/))
- 
--EXE=el.x86.linux.bin
-+EXE=el.linux.bin
- 
- ifndef CC
- CC=gcc
-@@ -127,8 +127,8 @@ all: $(EXE)
- 
- # the compile targets
- $(EXE): $(OBJS)
--	@echo "  LINK $(EXE)"
--	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
-+	@echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)"
-+	@$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
- 
- #recompile on Makefile or conf change
- #.depend $(OBJS): Makefile.linux make.conf
-@@ -136,14 +136,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
--	@echo "  CC   $@"
-+	@echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
- 	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
- $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
--	@echo "  CXX  $@"
-+	@echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
- 	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
--- 
-2.21.0
-