version bump (bug #520650)

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

diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index e5ce394e6f8a6d0e43004c5220ac80b140ba5f5a..cc7999d8b6f4860e35762ed5030e4e3fb42344a0 100644 (file)
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,14 @@
 # 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.37 2014/10/27 18:51:36 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.38 2015/04/12 20:42:02 mr_bones_ Exp $
+
+*simutrans-0.120.0.1 (12 Apr 2015)
+
+  12 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/simutrans-0.120.0.1-Makefile.patch, +simutrans-0.120.0.1.ebuild,
+  files/simutrans-0.112.3-Makefile.patch,
+  files/simutrans-0.112.3-overflow.patch:
+  version bump (bug #520650)
 
   27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -files/simutrans-0.102.2.2-gcc46.patch,

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index b0e6b5c072e5d56035d444055beb773995784f23..2c04e103aee8c9ec95f279d54436478c978f68be 100644 (file)
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,8 +1,12 @@
-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
+AUX simutrans-0.112.3-Makefile.patch 2139 SHA256 21f33d9953ddba238c2552a658bd0d3e23d6b0df84f0b2a35477ab634cd1cfbd SHA512 f3503dc61c1e369055a2b3046f795471d14c0c580c8f48ce93d70c8de2a7d1f56d66ce9c5d94d66cbaab2db22195b76d2b50734dae4a6ca8e3d9c026dd4ca45a WHIRLPOOL 27c1a42f68bc49752d372734500d3df678cb5ef139c3a7dcacba54402772271795e588b19f7f0d44f6dc0f579e2e08b7298a716eddbc300a0220542f03cb90e5
+AUX simutrans-0.112.3-overflow.patch 359 SHA256 eb691f1d3ee1d1fde823c493f058cc473dc1fec7773b6167a8c1528cc1d78972 SHA512 13015bf16838ae5ba192ca089fcb975f99628b6cd4d1bb7ba52cd007b4c3538c581ea0000b517f86993dfe434aa7ca0413d70d00aefa37451c2202389aa62018 WHIRLPOOL f4084999634b8a879b2ee579e71984fd3f479a23aa242a152573f5647104ebc7508863fbe0874b0f1cea1e7dbcec920e419f95844be97a580bb2760512bb540f
+AUX simutrans-0.120.0.1-Makefile.patch 2048 SHA256 6d9baeb8f427ce1cc03d22691d63467297f095a552aecba0613614eb42bdd22f SHA512 174a93b8bb52273af849d20b32b286a2b16f7392b1572be4f71a430872d030dd829b4b99512c24bc619245e25701a39d233619305775a65e51db3af7298719f4 WHIRLPOOL a8249d853d71a821cae53bdae67e6786c8d14dd692963a1bd2179e65904fb7c6ebfd5292da64aed1e0b1241ab244055d84f2883f253845c0758d4ac795a92dd5
 DIST simulinux-112-3.zip 3071766 SHA256 2ca8375b44b433e7034dd17515d1f8319d4a04e18960d0d8c828cf7603199e92 SHA512 9e051989761d0c469b070af99b95ad04f1f96e85513664d5ff13b564404bed579217d90f92e5e80069288d0e5db0887a1f1ca9a62250895a58f63ad592d62e7c WHIRLPOOL f2a844e981ec4db115ef9e36e18e8bce8f494063d4d3d1e13e56c9837c382d6559954ef2002e26a40accf82da088aa5cd91001ac7f834134f50472840692b920
 DIST simupak64-112-3.zip 4117394 SHA256 dc443d9ddc1f36e10435f672a03f86d4ad83e33926045b14664f6d2580b56e8b SHA512 7e5997efb52c36a1871e25ca3f278088aa5450f6ba4abb447dd3881438bda4473571166b79719cb8b5879f878538e74c5375683b8d76ddbdd5c575de690c44a9 WHIRLPOOL aa92bd5882827e6c1cb54a99bf92ff6251c31fb37072457b802d499e47e3b3ea5ff52592e56d04d71c6e1e8b2588c57c195793233a0b5322247651a2a3b02d6a
+DIST simupak64-120-0-1.zip 4051769 SHA256 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78 SHA512 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc WHIRLPOOL 5ae84653b5a138b5a987b7ca6512994f3ba8dff48fffbb94f6fe0bf4845d5537e93734f73174eb328f20b6c9986235ae6c461c55b5efde53a4b81620a3b1da83
 DIST simutrans-src-112-3.zip 1677347 SHA256 8aa9ded7ac65587d65070b950b50f4094b7f77d33d263d1b821a0fe9f214b849 SHA512 0d63da8bed2298dd4516caea748a10c7c27eec2fb00ced9c76600ec93a975a01efa0fe7b4c8f8a5dc9e035b8c1dcf1f7772dfec54594f41efb8c4790d4da99e9 WHIRLPOOL 7ed9310d49339421fed2c4ca8098f21d367de7ad2d933d1d56d5c25542995657f1a98b34066464fbf916ffa4903338bd519fd1e15437017d7899bc2b4c4466f1
+DIST simutrans-src-120-0-1.zip 3909005 SHA256 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683 SHA512 6f32b6f1c12f45125de8a12c4a034387a784e21fd8cdedcf7b1daefd9174d9a94825e8f68effa2ff1436cce2e2bc8cb5707161f3fa004185ae158400840dc450 WHIRLPOOL 36155184f5806a9cfab742f26e3fc78d5d7d928f99cddabbaf36c7c90d065dab02bb174c07d9633958f8b891b0db8cc5c94e45fd4f22d917b9a037c51a99b69a
 EBUILD simutrans-0.112.3.ebuild 1572 SHA256 2030b88b6068ad47b66d9191b4b79843d420f5b4e2cedb94334134ba4449190c SHA512 cafd29fd8b42cf3cfb1d24b5b42fcaf703b46e342c1599d6022408c8be5cc28c524e36ecdd57f4b787d5b370ad83275c6440501dcb8fc4e858188f3d87516ac1 WHIRLPOOL f2cffcbc887cd175db6cf5ef88e87f9a1af1e8c396413906a8bfad7f73c3a4ff04b3d3f2e8333a34e583c0e91689c640d5ad447afdc6732cc5097abb3b52ae92
-MISC ChangeLog 6489 SHA256 c523cfaac36b1176293dfc4734d72e3d03bc76db25b2ceff3014c81e7a86a19b SHA512 e789b56ea4194ede0bdfdd15156d7e4860d3d8252bf09e8f351b8ad4bea18d231c5181cf7aa58748d3dd24b846c6943f448f27964527ee4ca17357d28e15469c WHIRLPOOL 04ed1120b77f29f0fee6e931745c96a8a8f7be4bd7d4205f6f93d7638100fd4d6ec1cc40765ac9ed08cae6a859cca675f31a938f89aa1451bd0ee9f2c60c9272
+EBUILD simutrans-0.120.0.1.ebuild 1342 SHA256 83c94bf6286744783dc02571d06c14794bdc793bae0f09b09b536725007b05d4 SHA512 8cd933a3179844cbc9e3aa7c95b64471d24cd8082bdbb7ce243b1477c53c645f561f2b59c8e86d8992afaf2be23c7d6e1c00d88919d8a45ba9440d637737840f WHIRLPOOL 5b161f050995e65911388f70277a514b7142f404d1c8f75a93a4f0d8821691895b16a3b271affc66ba358ee17d90d0f371bdddbf254b319a18f4f6c4baf8fab2
+MISC ChangeLog 6768 SHA256 5e428dced368879c835f78f1a0b662e9fe0dc330e6311b50e49dedaa3a607f3a SHA512 ccd82875b0f9df5c2a79751294415b429d99715e4e7b45883d8f6715cabcf8945a4c16c7de767a2e3f80fb7fdf4b2735c6524cda2978f37c50e7849ad825b89f WHIRLPOOL af84201002defa23ae1ad140bea09b6670aa8153f0009d105d2e60270c73f26390b6c45bfc07ae836643dc52bf27b745b861386c04f9de676773e1ce3ee73cf6
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada

diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
index 3becef9ae9eb2f66e791ccd0355519beea9c619e..a27316438002d87cf08af5aeb3589e1dcf0a8067 100644 (file)
--- a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
+++ b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig      2013-05-28 17:58:03.379228527 -0400
-+++ Makefile   2013-05-28 17:58:24.768491369 -0400
+--- Makefile.orig
++++ Makefile
 @@ -88,8 +88,6 @@
        endif
      endif

diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
index 6597ca071f92d96606b7488fe06c381aa7593f4b..b50f3b8884225f8ab0a555638e1b2425d60874ec 100644 (file)
--- a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
+++ b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
@@ -1,5 +1,5 @@
---- 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
+--- besch/reader/obj_reader.cc.orig
++++ besch/reader/obj_reader.cc
 @@ -308,7 +308,7 @@
  void obj_reader_t::skip_nodes(FILE *fp,uint32 version)
  {

diff --git a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
new file mode 100644 (file)
index 0000000..d1ff41f
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
@@ -0,0 +1,89 @@
+--- Makefile.orig
++++ Makefile
+@@ -81,8 +81,6 @@
+   ifeq ($(findstring $(OSTYPE), amiga haiku mac),)\r
+     CFLAGS += -minline-all-stringops\r
+   endif\r
+-else\r
+-  CFLAGS += -O\r
+ endif\r
+ \r
+ ifdef DEBUG\r
+@@ -101,6 +99,7 @@
+   endif\r
+ else\r
+   CFLAGS += -DNDEBUG\r
++  CXXFLAGS += -DNDEBUG\r
+ endif\r
+ \r
+ ifneq ($(PROFILE),)\r
+@@ -114,6 +113,7 @@
+ ifneq ($(MULTI_THREAD),)\r
+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)\r
+     CFLAGS += -DMULTI_THREAD\r
++    CXXFLAGS += -DMULTI_THREAD\r
+     ifeq ($(OSTYPE),mingw)\r
+ #use lpthreadGC2d for debug alternatively\r
+       LDFLAGS += -lpthreadGC2\r
+@@ -132,11 +132,13 @@
+     endif\r
+     ifneq ($(REV),)\r
+       CFLAGS  += -DREVISION="$(REV)"\r
++      CXXFLAGS  += -DREVISION="$(REV)"\r
+     endif\r
+   endif\r
+ endif\r
+ \r
+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
++CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)\r
+ CCFLAGS  += -Wstrict-prototypes\r
+ \r
+ \r
+@@ -492,6 +494,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS)\r
+ endif\r
+ \r
+@@ -523,6 +526,7 @@
+     SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS)\r
+ endif\r
+ \r
+@@ -538,6 +542,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer\r
+ endif\r
+ \r
+@@ -564,6 +569,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS) -lglew32\r
+   ifeq ($(OSTYPE),mingw)\r
+     LIBS += -lopengl32\r
+@@ -579,6 +585,7 @@
+ endif\r
+ \r
+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)\r
+ \r
+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)\r
+   SOURCES += simres.rc\r
+@@ -586,7 +593,6 @@
+ endif\r
+ \r
+ CCFLAGS  += $(CFLAGS)\r
+-CXXFLAGS += $(CFLAGS)\r
+ \r
+ BUILDDIR ?= build/$(CFG)\r
+ PROGDIR  ?= $(BUILDDIR)\r

diff --git a/games-simulation/simutrans/simutrans-0.120.0.1.ebuild b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
new file mode 100644 (file)
index 0000000..263c253
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.120.0.1.ebuild,v 1.1 2015/04/12 20:42:02 mr_bones_ Exp $
+
+EAPI=5
+inherit flag-o-matic eutils games
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+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"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[sound,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
+
+       # 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
+       rm -f simutrans/{simutrans,*.txt}
+}
+
+src_install() {
+       newgamesbin build/default/sim ${PN}
+       insinto "${GAMES_DATADIR}"/${PN}
+       doins -r simutrans/*
+       dodoc documentation/*
+       doicon simutrans.ico
+       make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+       prepgamesdirs
+}