old

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

6 files changed, 8 insertions, 235 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/Manifest b/games-simulation/simutrans/Manifest
index a9b19c90d35a..b0e6b5c072e5 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,35 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX simutrans-0.102.2.2-gcc46.patch 280 SHA256 e9cf8557799fb825b9f395b0d48071bbf00459d373f93e86c7e6e8b0c92d91c6 SHA512 c4c1b1a9f704c3382cff011c3d6b4a39f7e9fd38e84871b584224b5d306dc254a64f9794de1167f14eb0a2ca2969b0ccd8ac0414a8df608a5f0ed109396e4cd4 WHIRLPOOL 3d290dee14fcd2eb30a398488671cd680e25cea712ef2e6d3548c79be1f16d32402fbff2f1954705eb27939fbe95fa808a8bbf8c1c0e0d29235756264c906c59
-AUX simutrans-0.102.2.2-gcc47.patch 1614 SHA256 bf1458e261acfe9638650e9356d6121c6d1c8e9c765f77147419e209cbb54749 SHA512 c3ff980647a45e02355fd9e25853691eb8d7eac777871fceeb150fb4c827e6c16fc4760e73c924efb77a65b7eb49732472e43b88635bbe84177b5f34b5b84758 WHIRLPOOL d368cb4ecd7539233b7fbce0c0e670f1e444c3935973de77fa527298eea6988bd9436fbeccb47de65d054744f90766fa0f0f41f3bd910b22a590aa662b0f6498
-AUX simutrans-0.102.2.2-zlib.patch 1491 SHA256 3d037ceb8fd2a45b732b681dcbf7d8a40d2216a5240d594c6fdbd55bd61e475d SHA512 c134e52989b1026cdd6189fb0cf3d97d416ad97aa71952a816d269e0a6046b9aa158a894b7f2fdae479269e9382870acea441293fa47f8a4b099147051390add WHIRLPOOL 80e683b37b5af2a03fe1ebb0c6a64a198526739c0def706e2f78abf8c761f87bedd28071174a4dec20565ef382c6f1b92c4fae0f88d122454bf15e063dff0d7a
 AUX simutrans-0.112.3-Makefile.patch 2211 SHA256 2b0aadae180dad008c94c1a763b8d2931c92b6fef95b8e60a611b82fb6c8189b SHA512 a5db7b6d26b0967e947ce9ce0e1fa808f9ec567e28db23babd54978e522a6890a8e0601f11841fb8d9ff7fe3369bef0f61c1f35eb16551da8011434cc30dbe0c WHIRLPOOL 1b7956a6afe3f196c51b99f2541981604e9db333349e509a5048f7ee8480f067cea74c631cb0cd0c3686cb74ca7d9acb4295421faae3cf9182345f8069c883c6
 AUX simutrans-0.112.3-overflow.patch 431 SHA256 18e5024fd920f1dbabc4a4c2f53b62283ca5e5dceeae069a9056acd5859810fa SHA512 e46dc6485baf591bb96f5eb504192334a2d262ac29cb11872304d0802942721a0cbb95d5f33bd94bff28e1ad463d75f1931420f8337599f550c72c8437750a6b WHIRLPOOL a8c57a6a6e9aaca451a439522ab29ba444762db934777bf0162966803be5905c4bcf37052c7cc441a5d6c8caffbfc29c7e9e9e18f3258260f9947bd24e4f961e
 DIST simulinux-112-3.zip 3071766 SHA256 2ca8375b44b433e7034dd17515d1f8319d4a04e18960d0d8c828cf7603199e92 SHA512 9e051989761d0c469b070af99b95ad04f1f96e85513664d5ff13b564404bed579217d90f92e5e80069288d0e5db0887a1f1ca9a62250895a58f63ad592d62e7c WHIRLPOOL f2a844e981ec4db115ef9e36e18e8bce8f494063d4d3d1e13e56c9837c382d6559954ef2002e26a40accf82da088aa5cd91001ac7f834134f50472840692b920
-DIST simulinux-complete-102-2-2.zip 6115022 SHA256 0f7752b7625ecfe18ab29f724321249ca9cc49cc9e05e392b3d19190188a6c98 SHA512 9af231cdc7c254030b061b3f11a09bbfba6569c57757a3589036eb8ee980531877911d44626d5a663fe6cf209a913e7f66a7a480f141aa7c518dabae01e0feb1 WHIRLPOOL e3fa7745f08619c9c8944c7046d18ef539e4ecee98a63645ef93799b5722a881fa4e3f0f4e78a9e1d5ba4225894f15002fcfb0ffbac870585fabffc0f363380c
 DIST simupak64-112-3.zip 4117394 SHA256 dc443d9ddc1f36e10435f672a03f86d4ad83e33926045b14664f6d2580b56e8b SHA512 7e5997efb52c36a1871e25ca3f278088aa5450f6ba4abb447dd3881438bda4473571166b79719cb8b5879f878538e74c5375683b8d76ddbdd5c575de690c44a9 WHIRLPOOL aa92bd5882827e6c1cb54a99bf92ff6251c31fb37072457b802d499e47e3b3ea5ff52592e56d04d71c6e1e8b2588c57c195793233a0b5322247651a2a3b02d6a
-DIST simupak64-addon-food-102-2-1.zip 113454 SHA256 7add9c3e3dc3959c6a39776043a16beb92f6f59190fcae25b29e367c17e24607 SHA512 162ee13cf56d2ec248f4cceb4083586a5029fefb08d4a848ddd73fea114671d7b88267baefd10b63e2d3e4559d1cdef7cd7203e8d931ed5cebddcac6cf23a80d WHIRLPOOL a57cca9e1210c688ce4f0e048de9f0a487b87bbfecaf06e964baeadc2ec18a5456c3f37b04b1b73ee3fca72aa880915c79e832be231a0dfd13baa8d551108aef
-DIST simutrans-src-102-2-2.zip 2498680 SHA256 b105013ba180706a4790eddf19e007e1955c4ef7daa1c90fb6aaa48c28134351 SHA512 8206c19723a5497b8f156ac9efde402eae15055d7ebf2ce0e6fb9bf2a1cb220a13f601a42583eb252cb362f0641d5c58d8d9afaab3b5ee182f7e9e180d024a4c WHIRLPOOL 1aacf2bb99c6c84d41cfac304a59e195a3cb970e4876273d4d0c9278250da803f7fec9bb92d459530e374a947753631189c553b53422799a5bc921ecc7ace45b
 DIST simutrans-src-112-3.zip 1677347 SHA256 8aa9ded7ac65587d65070b950b50f4094b7f77d33d263d1b821a0fe9f214b849 SHA512 0d63da8bed2298dd4516caea748a10c7c27eec2fb00ced9c76600ec93a975a01efa0fe7b4c8f8a5dc9e035b8c1dcf1f7772dfec54594f41efb8c4790d4da99e9 WHIRLPOOL 7ed9310d49339421fed2c4ca8098f21d367de7ad2d933d1d56d5c25542995657f1a98b34066464fbf916ffa4903338bd519fd1e15437017d7899bc2b4c4466f1
-EBUILD simutrans-0.102.2.2.ebuild 1735 SHA256 719d53dbc28cdd7db1987391bed3e80fb816863a1df26cbb00e22a51dd374461 SHA512 fa8108ac59f959147e8decfa3580349a55223101e4db753ae9ab6abde43ca09020f30ad8ff6791c419ae98ae45ed7266ba3c3101447e1458eb6f64badc956b1c WHIRLPOOL 8d40aefee6744eba8bec15825e2647f7d9ccb81f919ce5df8eb1dd2478f7c8cd52a9eea4415cd242ea5969838730e79eb13551c93cb7279c4f042ce6def84fbe
 EBUILD simutrans-0.112.3.ebuild 1572 SHA256 2030b88b6068ad47b66d9191b4b79843d420f5b4e2cedb94334134ba4449190c SHA512 cafd29fd8b42cf3cfb1d24b5b42fcaf703b46e342c1599d6022408c8be5cc28c524e36ecdd57f4b787d5b370ad83275c6440501dcb8fc4e858188f3d87516ac1 WHIRLPOOL f2cffcbc887cd175db6cf5ef88e87f9a1af1e8c396413906a8bfad7f73c3a4ff04b3d3f2e8333a34e583c0e91689c640d5ad447afdc6732cc5097abb3b52ae92
-MISC ChangeLog 6267 SHA256 f035a2369a82a4015d08f4fd9cc3cd7bb396d586a8d83fd2576b9c82ba83c72e SHA512 3615d55102c515d159078622cf0c79ea19b52dd7b8b32bf729a4f420eb56c292aece1c05049f6f3c75fa1a24da8a2a89b2a4a2f8a2e2dd8ebf7a9a65f367a11f WHIRLPOOL ca36a29b7dd7704a5f4672329a29fead5a63eb219b1e4b0d8dcf060c2c120b72f1dd8e64f7b64c1268dadcc0e5d19668ee527f1c95dca5c0f17fbc3ebb201fac
+MISC ChangeLog 6489 SHA256 c523cfaac36b1176293dfc4734d72e3d03bc76db25b2ceff3014c81e7a86a19b SHA512 e789b56ea4194ede0bdfdd15156d7e4860d3d8252bf09e8f351b8ad4bea18d231c5181cf7aa58748d3dd24b846c6943f448f27964527ee4ca17357d28e15469c WHIRLPOOL 04ed1120b77f29f0fee6e931745c96a8a8f7be4bd7d4205f6f93d7638100fd4d6ec1cc40765ac9ed08cae6a859cca675f31a938f89aa1451bd0ee9f2c60c9272
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUOkFYAAoJELp701BxlEWfScQQAJmSFP4OLqV5Bdc4EnAJfnzA
-7rvwiESrSQ8uwXeSW+O6k/TeXA9dPPdrJcMfFnGHVlTGQHZZ9Vhwz+hy1iqCrVQP
-glH//uoPPhDfYUAEv1bbWUMgwk78IjOyBm9oDQGDnEBzPKvjMMRNTCAYP3iLTccT
-/UqB+9Tv+oJ9bNqTX8xCLlsTFqibLtI1bm3QtwPQ9GVK/DPeZ5+jcJKHe5JavFCo
-etKhpy0bCiwQKRJST35gACCwvA/j74Sqq3AaMX9jeJNY4+mq7wgT9Uf7qchgyOmR
-B16u9G5IRQdlff0ICLpE3OU1jOcG9v8uD23XI+dE+9r+GZ1onIIz+EppkZOIFBpl
-7HprmXI2z7K5kLpzueJL+/Io28gOb19TguvQM/cCyrWFIEdSCrOzya+hOokb+AW4
-Y6TdyFqGkKMwkTeng2lTtJZqGmgfDF1KGqvZWNlrzbS/DcWi+U7SCcIIDuoLbSaK
-2SuqYwBxra5MqnGRF2xY44hNqOkoEW3cHmX6axKmGRRYilw7U4QzHc70JHBK+7ae
-WbTU2ofNHa9Ut2nCQs6sYwtdVHeYwmvGbG7jHBMrDRqM4ZL9RKbILjjWiQlYT/vX
-2QdzaFzlmSU7AC/YYd3CHaQ5qOyIfQDctQoP9W+Tmpl6J9BXvJcn59W20OpmNnos
-XlfYDvj//bbzhiA6g5R8
-=0cUc
------END PGP SIGNATURE-----
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
-}