version bump (bug #396189)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

5 files changed, 189 insertions, 13 deletions

diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index 182d9e128b0c..4493ded86ff0 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/simutrans
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.29 2012/10/04 06:58:18 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.30 2013/01/22 22:33:42 mr_bones_ Exp $
+
+*simutrans-0.112.1 (22 Jan 2013)
+
+  22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/simutrans-0.112.1-Makefile.patch,
+  +files/simutrans-0.112.1-overflow.patch, +simutrans-0.112.1.ebuild:
+  version bump (bug #396189)
 
   04 Oct 2012; Tupone Alfredo <tupone@gentoo.org> simutrans-0.102.2.2.ebuild,
   +files/simutrans-0.102.2.2-gcc47.patch:
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index ac2cfd515c6b..3d0196a3b189 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,19 +1,15 @@
------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.1-Makefile.patch 2433 SHA256 ffa3c265ecc72ae92f754d4d78d33465b0d0a45facd94f2a235a2c606e4625de SHA512 4b97801f8d4b34dfc006ef09ac8208a7e6b4ffef6fac590e932189a6a2a8df3394fdb5572784ec4e82769f6a7e27e18676cbbf16e200d697c3e9bc86f9d5f48a WHIRLPOOL 4e239072c8e0565366494b07bc0ad930b57432cadd84eda8ebe10766105d83aa019c5cc2e78db56cb75f441736ac4acea3a7b245bc07ae077dd6aa1f451b2dff
+AUX simutrans-0.112.1-overflow.patch 431 SHA256 18e5024fd920f1dbabc4a4c2f53b62283ca5e5dceeae069a9056acd5859810fa SHA512 e46dc6485baf591bb96f5eb504192334a2d262ac29cb11872304d0802942721a0cbb95d5f33bd94bff28e1ad463d75f1931420f8337599f550c72c8437750a6b WHIRLPOOL a8c57a6a6e9aaca451a439522ab29ba444762db934777bf0162966803be5905c4bcf37052c7cc441a5d6c8caffbfc29c7e9e9e18f3258260f9947bd24e4f961e
 DIST simulinux-complete-102-2-2.zip 6115022 SHA256 0f7752b7625ecfe18ab29f724321249ca9cc49cc9e05e392b3d19190188a6c98 SHA512 9af231cdc7c254030b061b3f11a09bbfba6569c57757a3589036eb8ee980531877911d44626d5a663fe6cf209a913e7f66a7a480f141aa7c518dabae01e0feb1 WHIRLPOOL e3fa7745f08619c9c8944c7046d18ef539e4ecee98a63645ef93799b5722a881fa4e3f0f4e78a9e1d5ba4225894f15002fcfb0ffbac870585fabffc0f363380c
+DIST simupak64-112-1.zip 3612453 SHA256 fc7acd1004215e649ec0d62ff2e1f3d7708905c9342ba71a4f9d935104cd2785 SHA512 94273ea3e6b7a4e258fc82dc4ccda3e007b5da432cab6adf4a76c2e86eca6bdf6cd264142fb209f90b9164bf2536a12d5bbe3a89b505bb5f4bdcdcdbe5d0fd70 WHIRLPOOL 1c928e04230327d1eca6f81a2b156c219a3f032418db19a9ed747aebd41c31e26ec5263683c200aa9715b830b07bd497dc7769753449dd49fc80bcab9dec024c
 DIST simupak64-addon-food-102-2-1.zip 113454 SHA256 7add9c3e3dc3959c6a39776043a16beb92f6f59190fcae25b29e367c17e24607 SHA512 162ee13cf56d2ec248f4cceb4083586a5029fefb08d4a848ddd73fea114671d7b88267baefd10b63e2d3e4559d1cdef7cd7203e8d931ed5cebddcac6cf23a80d WHIRLPOOL a57cca9e1210c688ce4f0e048de9f0a487b87bbfecaf06e964baeadc2ec18a5456c3f37b04b1b73ee3fca72aa880915c79e832be231a0dfd13baa8d551108aef
+DIST simupak64-addon-food-112-1.zip 125229 SHA256 9f956f4071f6954ef6a6638194493580650376e9c5d32556f04b2426cafc3de3 SHA512 bc69ee995e64b0a6bec969a472240e86a9ec41b5b05825b2bd2471f25503124c9e385fc06b611618b29006d5084aee16e42ddf8fe6c707b5ef35d5668bf3a861 WHIRLPOOL 535d952302f4aa28c2ef8b58d527844e5f798e6893df31cfe8d8a773ca5529dca7174affaadccc04dc2029d2df4c55317f021580704a487f70a08e4ca7a7ed5a
 DIST simutrans-src-102-2-2.zip 2498680 SHA256 b105013ba180706a4790eddf19e007e1955c4ef7daa1c90fb6aaa48c28134351 SHA512 8206c19723a5497b8f156ac9efde402eae15055d7ebf2ce0e6fb9bf2a1cb220a13f601a42583eb252cb362f0641d5c58d8d9afaab3b5ee182f7e9e180d024a4c WHIRLPOOL 1aacf2bb99c6c84d41cfac304a59e195a3cb970e4876273d4d0c9278250da803f7fec9bb92d459530e374a947753631189c553b53422799a5bc921ecc7ace45b
+DIST simutrans-src-112-1.zip 3478226 SHA256 acd0141ecce63f17339f5cc2a8708832908c84745507c1d15c8935514bbb3df7 SHA512 97232c8a567d8fe5e58dbab268f5cbea01b79735ee91b0469a31894a63f6bda3fa17169733da951fdff301f6df12b7844336965ad214f6e6dd11d3e67b6f93eb WHIRLPOOL fdd2a277d337e706157108779ab47bbef20d01fb54efd0d78e2d54bfa033235d3d7d69e70b26845516ede2a10bca28d52b98c1c27c4a7bc5fd4c18120ab34171
 EBUILD simutrans-0.102.2.2.ebuild 1738 SHA256 87ae54ec19aa2c10d6dcfbc2b0f511c81165db0065d5cbb10262874e81ff2e18 SHA512 26efd3d78cf15a215982dab9bc450884e5c459eaccecac11836032737525ce11bdfc11dfa50d9899597008f8dc503cfbfa2a62b8c4a962ca764cb24e6291b173 WHIRLPOOL e98e0ec3721483e7eb1c820339f4b70607946e6e20a93811a35fc465d54a2c8d63212649c1d142cb954ecc5d427ed053a1e2f2f3777d4873d01895f734cb66d4
-MISC ChangeLog 4890 SHA256 032d2f7951914c24f898e8ec4df8bf82448d8405a362ec82de7a4f5778b592a3 SHA512 68fbe4c5f5d288d146885bfbb03ff62365080efc40663185fcd2875257a449a9977501090e4e0463c563c422f3a20d0b679c93d23e54dc4d4801632ff10caacf WHIRLPOOL e9e588c8cbeb619124580e9afa72eda25f0694160672d9059844f1b199aedd36713e6b2fcca695bc06f39cae7eb1a0c962bec666792a0c171516ecfa52bb8997
+EBUILD simutrans-0.112.1.ebuild 1521 SHA256 8b10fe4302284b556b20541643e09769087c758840732318dfe7573fa5ba16af SHA512 a802a39e192a2b07e733305ab5e25a27ca628c0b0eb9fd9f45ab966504d2064cd2c60c560337520baca66aa20c65734efac219329b93fefbcfd1128279902250 WHIRLPOOL 1665fc145fa90fa810458b164240c8145100ea2c52c79bbff47592a1bdc7bd10717d6365ff65abeb1e3f16c3075f1dcea4ea0b0148f0f431bb96ff8c90dfc209
+MISC ChangeLog 5125 SHA256 09e6a679ebaa349f73ad9891708a542c766dbed1a17f6a40c1471aecaadc82e8 SHA512 459bac56249000766bb8aafebd8817399396679126ec32d85b8abce06afd8e5ac8ddcc81097a610f00f41f07757f312f0d39fc074beb4a92227bb17c9c3218be WHIRLPOOL 86169713a1a3b3528ec3282573a36bbd9d8f2aa61bbc77aeb4bc9ff95df4b27b7444e95843c9ebbc47ed77c6e03cd568813218e0ed5117642ceca933677ae3d1
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBtM58ACgkQIY77eQFFFC05nACgoUE49PwJ7/yIzLMPdNIpme4P
-O64AoLsMvGXW05xXIzzEey18ND1AtLym
-=smvm
------END PGP SIGNATURE-----
diff --git a/games-simulation/simutrans/files/simutrans-0.112.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.112.1-Makefile.patch
new file mode 100644
index 000000000000..26a563a58454
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.112.1-Makefile.patch
@@ -0,0 +1,102 @@
+--- Makefile.orig	2013-01-22 16:53:11.574351933 -0500
++++ Makefile	2013-01-22 16:57:38.801999641 -0500
+@@ -90,7 +90,6 @@
+     endif
+   endif
+ else
+-  CFLAGS += -O
+ endif
+ 
+ ifdef DEBUG
+@@ -109,6 +108,7 @@
+   endif
+ else
+   CFLAGS += -DNDEBUG
++  CXXFLAGS += -DNDEBUG
+ endif
+ 
+ ifneq ($(PROFILE),)
+@@ -121,6 +121,7 @@
+ 
+ ifneq  ($(MULTI_THREAD),)
+   CFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
++  CXXFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
+   ifneq  ($(MULTI_THREAD),1)
+     ifeq ($(OSTYPE),mingw)
+ #use lpthreadGC2d for debug alternatively
+@@ -135,10 +136,12 @@
+   REV = $(shell svnversion)
+   ifneq ($(REV),)
+     CFLAGS  += -DREVISION="$(REV)"
++    CXXFLAGS  += -DREVISION="$(REV)"
+   endif
+ endif
+ 
+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
++CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
+ CCFLAGS  += -Wstrict-prototypes
+ 
+ 
+@@ -450,6 +453,7 @@
+ ifeq ($(BACKEND),sdl)
+   SOURCES += simsys_s.cc
+   CFLAGS  += -DUSE_16BIT_DIB
++  CXXFLAGS  += -DUSE_16BIT_DIB
+   ifeq ($(OSTYPE),mac)
+     # Core Audio (Quicktime) base sound system routines
+     SOURCES += sound/core-audio_sound.mm
+@@ -482,6 +486,7 @@
+     endif
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+ endif
+ 
+@@ -491,6 +496,7 @@
+   SOURCES += sound/sdl_mixer_sound.cc
+   SOURCES += music/sdl_midi.cc
+   CFLAGS  += -DUSE_16BIT_DIB
++  CXXFLAGS  += -DUSE_16BIT_DIB
+   ifeq ($(SDL_CONFIG),)
+     SDL_CFLAGS  := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
+     SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
+@@ -505,12 +511,14 @@
+     endif
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
+ endif
+ 
+ ifeq ($(BACKEND),opengl)
+   SOURCES += simsys_opengl.cc
+   CFLAGS  += -DUSE_16BIT_DIB
++  CXXFLAGS  += -DUSE_16BIT_DIB
+   ifeq ($(OSTYPE),mac)
+     # Core Audio (Quicktime) base sound system routines
+     SOURCES += sound/core-audio_sound.mm
+@@ -538,6 +546,7 @@
+     endif
+   endif
+   CFLAGS += $(SDL_CFLAGS)
++  CXXFLAGS += $(SDL_CFLAGS)
+   LIBS   += $(SDL_LDFLAGS)
+   ifeq ($(OSTYPE),mingw)
+     LIBS += -lopengl32
+@@ -553,6 +562,7 @@
+ endif
+ 
+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
+ 
+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)
+   SOURCES += simres.rc
+@@ -560,7 +570,6 @@
+ endif
+ 
+ CCFLAGS  += $(CFLAGS)
+-CXXFLAGS += $(CFLAGS)
+ 
+ BUILDDIR ?= build/$(CFG)
+ PROGDIR  ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.112.1-overflow.patch b/games-simulation/simutrans/files/simutrans-0.112.1-overflow.patch
new file mode 100644
index 000000000000..6597ca071f92
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.112.1-overflow.patch
@@ -0,0 +1,11 @@
+--- besch/reader/obj_reader.cc.orig	2013-01-22 17:22:02.509818038 -0500
++++ besch/reader/obj_reader.cc	2013-01-22 17:22:58.650846577 -0500
+@@ -308,7 +308,7 @@
+ void obj_reader_t::skip_nodes(FILE *fp,uint32 version)
+ {
+ 	obj_node_info_t node;
+-	char load_dummy[OBJ_NODE_INFO_SIZE], *p;
++	char load_dummy[OBJ_NODE_INFO_SIZE + 4], *p; // extra 4 for LARGE_RECORD_SIZE
+ 
+ 	p = load_dummy;
+ 	if(  version==COMPILER_VERSION_CODE_11  ) {
diff --git a/games-simulation/simutrans/simutrans-0.112.1.ebuild b/games-simulation/simutrans/simutrans-0.112.1.ebuild
new file mode 100644
index 000000000000..f2998dbf3060
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.112.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.112.1.ebuild,v 1.1 2013/01/22 22:33:42 mr_bones_ Exp $
+
+EAPI=5
+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/simupak64-${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[audio,video]
+	sys-libs/zlib
+	app-arch/bzip2
+	media-libs/libpng:0
+	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
+VERBOSE=1" > config.default || die
+
+	if use !x86 ; 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
+
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-overflow.patch
+}
+
+src_install() {
+	newgamesbin build/default/sim ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r simutrans/*
+	dodoc documentation/* todo.txt
+	doicon simutrans.ico
+	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+	prepgamesdirs
+}