[gentoo-commits] proj/gamerlay:master commit in: games-strategy/glest/, games-strategy/glest/files/

[Vadim A. Misbakh-Soloviov]

commit:     46f799ab1e1167af047d75d8ba333e56d8da3a13
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Feb  4 06:34:53 2018 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Feb  4 06:37:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=46f799ab

games-strategy/glest: drop due to many problems:

	- Semidead upstream
	- not compatible with modern GCC
	- not compatible with modern glibc

	Fixes https://bugs.gentoo.org/616150

 .../glest/files/glest-3.2.2-gentoo.patch           | 151 ---------------------
 .../glest/files/glest-3.2.2-xerces-c.patch         |  49 -------
 games-strategy/glest/glest-3.2.2-r1.ebuild         |  85 ------------
 games-strategy/glest/metadata.xml                  |   5 -
 4 files changed, 290 deletions(-)

diff --git a/games-strategy/glest/files/glest-3.2.2-gentoo.patch b/games-strategy/glest/files/glest-3.2.2-gentoo.patch
deleted file mode 100644
index 633fe37..0000000
--- a/games-strategy/glest/files/glest-3.2.2-gentoo.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -urN glest-source-3.2.2/glest_game/ai/ai_interface.h glest-source-3.2.2_mod/glest_game/ai/ai_interface.h
---- glest-source-3.2.2/glest_game/ai/ai_interface.h	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/glest_game/ai/ai_interface.h	2009-04-15 12:25:04.000000000 +0400
-@@ -84,7 +84,11 @@
- 	bool isFreeCells(const Vec2i &pos, int size, Field field);
- 
- private:
--	string getLogFilename() const	{return "ai"+intToStr(factionIndex)+".log";}
-+	string getLogFilename() const	{
-+	  string logfn=getenv("HOME");
-+	  logfn+="/.glest/ai"+intToStr(factionIndex)+".log";
-+	  return logfn;
-+	}
- };
- 
- }}//end namespace
-diff -urN glest-source-3.2.2/glest_game/ai/ai_rule.cpp glest-source-3.2.2_mod/glest_game/ai/ai_rule.cpp
---- glest-source-3.2.2/glest_game/ai/ai_rule.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/glest_game/ai/ai_rule.cpp	2009-04-15 11:19:02.000000000 +0400
-@@ -17,6 +17,8 @@
- #include "unit.h"
- #include "leak_dumper.h"
- 
-+#include <limits.h>
-+
- using Shared::Graphics::Vec2i;
- 
- namespace Glest{ namespace Game{
-diff -urN glest-source-3.2.2/glest_game/game/game.cpp glest-source-3.2.2_mod/glest_game/game/game.cpp
---- glest-source-3.2.2/glest_game/game/game.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/glest_game/game/game.cpp	2009-04-15 12:21:29.000000000 +0400
-@@ -443,7 +443,8 @@
- 		}
- 		else if(key=='E'){
- 			for(int i=0; i<100; ++i){
--				string path= "screens/screen" + intToStr(i) + ".tga";
-+				string path=getenv("HOME");
-+				path+="/.glest/screens/screen" + intToStr(i) + ".tga";
- 				
- 				FILE *f= fopen(path.c_str(), "rb");
- 				if(f==NULL){
-diff -urN glest-source-3.2.2/glest_game/main/main.cpp glest-source-3.2.2_mod/glest_game/main/main.cpp
---- glest-source-3.2.2/glest_game/main/main.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/glest_game/main/main.cpp	2009-04-15 12:32:04.000000000 +0400
-@@ -114,6 +114,17 @@
- // =====================================================
- 
- int glestMain(int argc, char** argv){
-+	if (!getenv("HOME"))
-+		throw runtime_error("HOME external variable is not set");
-+
-+	char path[PATH_MAX];
-+	snprintf(path, PATH_MAX, "%s/.glest", getenv("HOME"));
-+	mkdir(path, 0750);
-+
-+	snprintf(path, PATH_MAX, "%s/.glest/screens", getenv("HOME"));
-+	mkdir(path, 0750);
-+
-+	chdir("@GENTOO_DATADIR@");
- 
- 	MainWindow *mainWindow= NULL;
- 	Program *program= NULL;
-diff -urN glest-source-3.2.2/glest_game/main/program.cpp glest-source-3.2.2_mod/glest_game/main/program.cpp
---- glest-source-3.2.2/glest_game/main/program.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/glest_game/main/program.cpp	2009-04-15 12:11:51.000000000 +0400
-@@ -196,9 +196,11 @@
- 	updateTimer.init(GameConstants::updateFps, maxTimes);
- 	updateCameraTimer.init(GameConstants::cameraFps, maxTimes);
- 
--    //log start
--	Logger &logger= Logger::getInstance();
--	logger.setFile("glest.log");
-+  //log start
-+ 	char path[PATH_MAX];
-+	snprintf(path, PATH_MAX, "%s/.glest/glest.log", getenv("HOME"));
-+ 	Logger &logger= Logger::getInstance();
-+	logger.setFile(path);
- 	logger.clear();
- 
- 	//lang
-diff -urN glest-source-3.2.2/shared_lib/sources/util/leak_dumper.cpp glest-source-3.2.2_mod/shared_lib/sources/util/leak_dumper.cpp
---- glest-source-3.2.2/shared_lib/sources/util/leak_dumper.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/shared_lib/sources/util/leak_dumper.cpp	2009-04-15 12:04:49.000000000 +0400
-@@ -52,7 +52,9 @@
- }
- 
- AllocRegistry::~AllocRegistry(){
--	dump("leak_dump.log");
-+	char path[PATH_MAX];
-+	snprintf(path, PATH_MAX, "%s/.glest/leak_dump.log", getenv("HOME"));
-+	dump(path);
- }
- 
- void AllocRegistry::allocate(AllocInfo info){
-diff -urN glest-source-3.2.2/shared_lib/sources/util/profiler.cpp glest-source-3.2.2_mod/shared_lib/sources/util/profiler.cpp
---- glest-source-3.2.2/shared_lib/sources/util/profiler.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/shared_lib/sources/util/profiler.cpp	2009-04-15 12:01:52.000000000 +0400
-@@ -71,9 +71,11 @@
- Profiler::~Profiler(){
- 	rootSection->stop();
- 
--	FILE *f= fopen("profiler.log", "w");
-+	char path[PATH_MAX];
-+	snprintf(path, PATH_MAX, "%s/.glest/profiler.log", getenv("HOME"));
-+	FILE *f= fopen(path, "w");
- 	if(f==NULL)
--		throw runtime_error("Can not open file: profiler.log");
-+		throw runtime_error("Can not open file: %s",path);
- 
- 	fprintf(f, "Profiler Results\n\n");
- 
-diff -urN glest-source-3.2.2/shared_lib/sources/util/properties.cpp glest-source-3.2.2_mod/shared_lib/sources/util/properties.cpp
---- glest-source-3.2.2/shared_lib/sources/util/properties.cpp	2009-04-15 11:17:19.000000000 +0400
-+++ glest-source-3.2.2_mod/shared_lib/sources/util/properties.cpp	2009-04-15 13:09:33.000000000 +0400
-@@ -15,6 +15,9 @@
- #include <stdexcept>
- #include <cstring>
- 
-+#include <limits.h>
-+#include <stdlib.h>
-+
- #include "conversion.h"
- #include "leak_dumper.h"
- 
-@@ -34,9 +37,13 @@
- 
- 	this->path= path;
- 
--	fileStream.open(path.c_str(), ios_base::in);
-+	char str[PATH_MAX];
-+	snprintf(str, PATH_MAX, "%s/.glest/%s", getenv("HOME"), path.c_str());
-+	fileStream.open(str, ios_base::in);
- 	if(fileStream.fail()){
--		throw runtime_error("Can't open propertyMap file: " + path);
-+		fileStream.open(path.c_str(), ios_base::in); // use defaults
-+		if(fileStream.fail())
-+		throw runtime_error("Can't open propertyMap file: " + path + " cwd: "+ getenv("PWD"));
- 	}
- 
- 	propertyMap.clear();
-@@ -71,7 +78,9 @@
- void Properties::save(const string &path){
- 	ofstream fileStream;
- 
--	fileStream.open(path.c_str(), ios_base::out | ios_base::trunc);
-+	char str[PATH_MAX];
-+	snprintf(str, PATH_MAX, "%s/.glest/%s", getenv("HOME"), path.c_str());
-+	fileStream.open(str, ios_base::out | ios_base::trunc);
- 
- 	fileStream << "; === propertyMap File === \n";	
- 	fileStream << '\n';

diff --git a/games-strategy/glest/files/glest-3.2.2-xerces-c.patch b/games-strategy/glest/files/glest-3.2.2-xerces-c.patch
deleted file mode 100644
index 98e9f40..0000000
--- a/games-strategy/glest/files/glest-3.2.2-xerces-c.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urN glest-source-3.2.1/shared_lib/sources/xml/xml_parser.cpp glest-source-3.2.1.mod/shared_lib/sources/xml/xml_parser.cpp
---- glest-source-3.2.1/shared_lib/sources/xml/xml_parser.cpp	2009-02-13 18:52:25.000000000 +0300
-+++ glest-source-3.2.1.mod/shared_lib/sources/xml/xml_parser.cpp	2009-04-15 11:13:46.000000000 +0400
-@@ -87,10 +87,17 @@
- 	
- 	try{
- 		ErrorHandler errorHandler;
--		DOMBuilder *parser= (static_cast<DOMImplementationLS*>(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
--		parser->setErrorHandler(&errorHandler);
--		parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
--		parser->setFeature(XMLUni::fgDOMValidation, true);
-+#if XERCES_VERSION_MAJOR < 3		
-+ 		DOMBuilder *parser= (static_cast<DOMImplementationLS*>(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-+ 		parser->setErrorHandler(&errorHandler);
-+ 		parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
-+ 		parser->setFeature(XMLUni::fgDOMValidation, true);
-+#else		
-+		DOMLSParser *parser = (static_cast<DOMImplementationLS*>(implementation))->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-+ 		DOMConfiguration  *config = parser->getDomConfig();
-+		config->setParameter(XMLUni::fgXercesSchemaFullChecking, true);
-+		config->setParameter(XMLUni::fgDOMValidate, true);
-+#endif		
- 		DOMDocument *document= parser->parseURI(path.c_str());
- 		
- 		if(document==NULL){
-@@ -119,9 +126,20 @@
- 		}
- 		
- 		LocalFileFormatTarget file(path.c_str());
--		DOMWriter* writer = implementation->createDOMWriter();
--		writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
--		writer->writeNode(&file, *document);
-+#if XERCES_VERSION_MAJOR < 3		
-+ 		DOMWriter* writer = implementation->createDOMWriter();
-+ 		writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-+ 		writer->writeNode(&file, *document);
-+#else		
-+		DOMLSSerializer *serializer = implementation->createLSSerializer();
-+		DOMLSOutput* output=implementation->createLSOutput();
-+		DOMConfiguration* config=serializer->getDomConfig();
-+		config->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint,true);
-+		output->setByteStream(&file);
-+		serializer->write(document,output);
-+		output->release();
-+		serializer->release();
-+#endif
- 		document->release();
- 	}
- 	catch(const DOMException &e){

diff --git a/games-strategy/glest/glest-3.2.2-r1.ebuild b/games-strategy/glest/glest-3.2.2-r1.ebuild
deleted file mode 100644
index 654ed74..0000000
--- a/games-strategy/glest/glest-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.2.2.ebuild,v 1.1 2009/07/11 00:36:39 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="http://www.glest.org/"
-SRC_URI="http://www.titusgames.de/${PN}-source-${PV}.tar.bz2
-	mirror://sourceforge/glest/${PN}_data_3.2.1.zip"
-
-LICENSE="GPL-2 glest-data"
-SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86" # ppc: bug #145478
-IUSE="editor"
-
-RDEPEND="media-libs/libsdl[joystick,video]
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,iconv] )
-	virtual/opengl
-	virtual/glu
-	dev-lang/lua
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S=${WORKDIR}/${PN}-source-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-{gentoo,xerces-c}.patch
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		glest_game/main/main.cpp \
-		|| die "sed failed"
-
-		sed -i \
-		-e '/Lang/s:\.lng::' \
-		glest.ini \
-		|| die "sed failed"
-
-	sed -i \
-		-e 's:-O3 -DNDEBUG:-DNDEBUG:' \
-		Jamrules \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use editor || NOWX="--with-wx-config=disabled_wx"
-	egamesconf \
-		--with-vorbis=/usr \
-		--with-ogg=/usr \
-		${NOWX}
-}
-
-src_compile() {
-	local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[0-9]\+\).*/\1/; p }")
-	jam -dx -q ${jamopts} || die "jam failed"
-}
-
-src_install() {
-	dogamesbin glest || die "dogamesbin glest failed"
-	if use editor ; then
-	    dogamesbin glest_editor || die "dogamesbin glest_editor failed"
-	fi
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins glest.ini || die "doins glest.ini failed"
-
-	cd "${WORKDIR}"/glest_game
-	doins -r servers.ini \
-		data maps scenarios techs tilesets || die "doins data failed"
-	dodoc docs/readme.txt || die "dodoc docs/readme.txt failed"
-
-	newicon techs/magitech/factions/magic/units/archmage/images/archmage.bmp \
-		${PN}.bmp || die "newicon failed"
-	make_desktop_entry glest Glest /usr/share/pixmaps/${PN}.bmp
-	prepgamesdirs
-}

diff --git a/games-strategy/glest/metadata.xml b/games-strategy/glest/metadata.xml
deleted file mode 100644
index 4a5a466..0000000
--- a/games-strategy/glest/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>playboys</herd>
-</pkgmetadata>