old

(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 7 insertions, 207 deletions

diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index 03a704b69040..e5ce394e6f8a 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-simulation/simutrans
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.36 2014/10/12 08:52:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.37 2014/10/27 18:51:36 mr_bones_ Exp $
+
+  27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/simutrans-0.102.2.2-gcc46.patch,
+  -files/simutrans-0.102.2.2-gcc47.patch, -files/simutrans-0.102.2.2-zlib.patch,
+  -simutrans-0.102.2.2.ebuild:
+  old
 
   12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> simutrans-0.112.3.ebuild:
   Stable for x86, wrt bug #522124
diff --git a/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch b/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch
deleted file mode 100644
index 8773c8288797..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tpl/slist_tpl.h.old	2011-05-09 14:01:02.299244745 +0200
-+++ tpl/slist_tpl.h	2011-05-09 14:01:39.973619614 +0200
-@@ -8,6 +8,7 @@
- #ifndef tpl_slist_tpl_h
- #define tpl_slist_tpl_h
- 
-+#include <cstddef>
- #include <iterator>
- #include <typeinfo>
- #include "../dataobj/freelist.h"
diff --git a/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc47.patch b/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc47.patch
deleted file mode 100644
index 31c8fff31014..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.102.2.2-gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- gui/curiositylist_stats_t.cc.old	2012-10-04 08:46:47.623621825 +0200
-+++ gui/curiositylist_stats_t.cc	2012-10-04 08:47:12.429854860 +0200
-@@ -151,7 +151,8 @@
- 		get_unique_attractions( sortby, sortreverse );
- 	}
- 
--	for (uint32 i=0; i<attractions.get_count()  &&  yoff<end; i++) {
-+	uint32 i;
-+	for (i=0; i<attractions.get_count()  &&  yoff<end; i++) {
- 		const gebaeude_t* geb = attractions[i];
- 
- 		int xoff = offset.x+10;
---- tpl/hashtable_tpl.h.old	2012-10-03 13:51:30.558014602 +0200
-+++ tpl/hashtable_tpl.h	2012-10-03 17:18:43.988237496 +0200
-@@ -48,7 +48,7 @@
- 		while(iter.next()) {
- 			node_t node = iter.get_current();
- 
--			if(comp(node.key, key) == 0) {
-+			if(this->comp(node.key, key) == 0) {
- 				return node.object;
- 			}
- 		}
-@@ -61,7 +61,7 @@
- 		while(iter.next()) {
- 			node_t &node = iter.access_current();
- 
--			if(comp(node.key, key) == 0) {
-+			if(this->comp(node.key, key) == 0) {
- 				return &node.object;
- 			}
- 		}
-@@ -84,7 +84,7 @@
- 		while(iter.next()) {
- 			node_t &node = iter.access_current();
- 
--			if(comp(node.key, key) == 0) {
-+			if(this->comp(node.key, key) == 0) {
- 				// duplicate
- 				return false;
- 			}
-@@ -111,7 +111,7 @@
- 
- 		while(iter.next()) {
- 			node_t &node = iter.access_current();
--			if(comp(node.key, key) == 0) {
-+			if(this->comp(node.key, key) == 0) {
- 				value_t value = node.object;
- 				node.object = object;
- 				return value;
-@@ -138,7 +138,7 @@
- 
- 		while(iter.next()) {
- 			node_t node = iter.get_current();
--			if(comp(node.key, key) == 0) {
-+			if(this->comp(node.key, key) == 0) {
- 				bags[code].remove( node );
- 
- 				return node.object;
diff --git a/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch b/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch
deleted file mode 100644
index 966480232e58..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.102.2.2-zlib.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- dataobj/loadsave.cc.old	2012-03-23 20:37:16.071335099 +0100
-+++ dataobj/loadsave.cc	2012-03-23 20:39:53.600282699 +0100
-@@ -82,7 +82,7 @@
- 		if(fp==NULL) {
- 			return false;
- 		}
--		gzgets(fp, buf, 80);
-+		gzgets((gzFile)fp, buf, 80);
- 	}
- 	saving = false;
- 
-@@ -237,11 +237,11 @@
- 		}
- 		if(is_zipped()) {
- 			int err_no;
--			const char *err_str = gzerror( fp, &err_no );
-+			const char *err_str = gzerror((gzFile)fp, &err_no );
- 			if(err_no!=Z_OK  &&  err_no!=Z_STREAM_END) {
- 				success =  err_no==Z_ERRNO ? strerror(errno) : err_str;
- 			}
--			gzclose(fp);
-+			gzclose((gzFile)fp);
- 		}
- 		else if(  is_bzip2()  ) {
- 			if(   saving  ) {
-@@ -280,7 +280,7 @@
- 		return bse!=BZ_OK;
- 	}
- 	else {
--		return gzeof(fp) != 0;
-+		return gzeof((gzFile)fp) != 0;
- 	}
- }
- 
-@@ -288,7 +288,7 @@
- void loadsave_t::lsputc(int c)
- {
- 	if(is_zipped()) {
--		gzputc(fp, c);
-+		gzputc((gzFile)fp, c);
- 	}
- 	else if(is_bzip2()) {
- 		uint8 ch = c;
-@@ -309,14 +309,14 @@
- 		return bse==BZ_OK ? c[0] : -1;
- 	}
- 	else {
--		return gzgetc(fp);
-+		return gzgetc((gzFile)fp);
- 	}
- }
- 
- long loadsave_t::write(const void *buf, size_t len)
- {
- 	if(is_zipped()) {
--		return gzwrite(fp, const_cast<void *>(buf), len);
-+		return gzwrite((gzFile)fp, const_cast<void *>(buf), len);
- 	}
- 	else if(is_bzip2()) {
- 		BZ2_bzWrite( &bse, bzfp, const_cast<void *>(buf), len);
-@@ -338,7 +338,7 @@
- 		return (long)len&~(bse-BZ_OK);
- 	}
- 	else {
--		return gzread(fp, buf, len);
-+		return gzread((gzFile)fp, buf, len);
- 	}
- }
- 
diff --git a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild b/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
deleted file mode 100644
index a751a909ed1d..000000000000
--- a/games-simulation/simutrans/simutrans-0.102.2.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.102.2.2.ebuild,v 1.7 2014/05/15 17:01:35 ulm Exp $
-
-EAPI=2
-inherit flag-o-matic eutils games
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-MY_FOOD_PV=${MY_PV/%-2/-1}
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="http://www.simutrans.com/"
-SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	mirror://sourceforge/simutrans/simulinux-complete-${MY_PV}.zip
-	mirror://sourceforge/simutrans/simupak64-addon-food-${MY_FOOD_PV}.zip"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[sound,video]
-	sys-libs/zlib
-	media-libs/libpng
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	strip-flags # bug #293927
-	echo "BACKEND=mixer_sdl
-COLOUR_DEPTH=16
-OSTYPE=linux
-FLAGS=-DSTEPS16" > config.default \
-	|| die "echo failed"
-
-	if use amd64; then
-		echo "FLAGS+=-DUSE_C" >> config.default
-	fi
-	# make it look in the install location for the data
-	sed -i \
-		-e "s:argv\[0\]:\"${GAMES_DATADIR}/${PN}/\":" \
-		simmain.cc \
-		|| die "sed failed"
-
-	# Please don't override our CFLAGS, kthx
-	sed -i \
-		-e '/-O$/d' \
-		Makefile \
-		|| die "sed failed"
-
-	rm -f simutrans/simutrans
-	epatch "${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-zlib.patch
-}
-
-src_install() {
-	newgamesbin sim ${PN} || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r simutrans/* || die "doins failed"
-	dodoc documentation/* todo.txt
-	doicon simutrans.ico
-	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
-	prepgamesdirs
-}