version bump

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

5 files changed, 39 insertions, 33 deletions

diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index a2288b20a391..33dbe64c2da3 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-simulation/simutrans
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.31 2013/03/21 01:44:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.32 2013/05/28 23:20:04 mr_bones_ Exp $
+
+*simutrans-0.112.3 (28 May 2013)
+
+  28 May 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/simutrans-0.112.3-Makefile.patch,
+  +files/simutrans-0.112.3-overflow.patch, +simutrans-0.112.3.ebuild,
+  -files/simutrans-0.112.2-Makefile.patch,
+  -files/simutrans-0.112.2-overflow.patch, -simutrans-0.112.2.ebuild:
+  version bump
 
 *simutrans-0.112.2 (21 Mar 2013)
 
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index b5f05614e30b..37eed18685ce 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -3,18 +3,19 @@ AUX simutrans-0.102.2.2-gcc47.patch 1614 SHA256 bf1458e261acfe9638650e9356d6121c
 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
-AUX simutrans-0.112.2-Makefile.patch 2433 SHA256 ffa3c265ecc72ae92f754d4d78d33465b0d0a45facd94f2a235a2c606e4625de SHA512 4b97801f8d4b34dfc006ef09ac8208a7e6b4ffef6fac590e932189a6a2a8df3394fdb5572784ec4e82769f6a7e27e18676cbbf16e200d697c3e9bc86f9d5f48a WHIRLPOOL 4e239072c8e0565366494b07bc0ad930b57432cadd84eda8ebe10766105d83aa019c5cc2e78db56cb75f441736ac4acea3a7b245bc07ae077dd6aa1f451b2dff
-AUX simutrans-0.112.2-overflow.patch 431 SHA256 18e5024fd920f1dbabc4a4c2f53b62283ca5e5dceeae069a9056acd5859810fa SHA512 e46dc6485baf591bb96f5eb504192334a2d262ac29cb11872304d0802942721a0cbb95d5f33bd94bff28e1ad463d75f1931420f8337599f550c72c8437750a6b WHIRLPOOL a8c57a6a6e9aaca451a439522ab29ba444762db934777bf0162966803be5905c4bcf37052c7cc441a5d6c8caffbfc29c7e9e9e18f3258260f9947bd24e4f961e
+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-1.zip 3612453 SHA256 fc7acd1004215e649ec0d62ff2e1f3d7708905c9342ba71a4f9d935104cd2785 SHA512 94273ea3e6b7a4e258fc82dc4ccda3e007b5da432cab6adf4a76c2e86eca6bdf6cd264142fb209f90b9164bf2536a12d5bbe3a89b505bb5f4bdcdcdbe5d0fd70 WHIRLPOOL 1c928e04230327d1eca6f81a2b156c219a3f032418db19a9ed747aebd41c31e26ec5263683c200aa9715b830b07bd497dc7769753449dd49fc80bcab9dec024c
-DIST simupak64-112-2.zip 4117721 SHA256 66ece5a993b8c9dcc22c4cf8c35589ae104a38fc29452490bb5258bad3a4783f SHA512 264dcd1effb230cea28cff1e225f3bec51fe3a196c7366caacbe63ea0982ddef6acaf8f4673083050978c6d147c34a90964bd617de80a5a77d4ff76ac4b54ba9 WHIRLPOOL 7473d40e15bc26bbf96a659e47a0998d441cf15a955bf1f4e090482ad2b375ea110fc824fe2720f70b80c21e73f54d8f541261feb44af1f50f1ac154fadb8087
+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 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
-DIST simutrans-src-112-2.zip 1674060 SHA256 0064e9183a995e85aae88f45cc3aaf6a644b12edd47ddf9ef477f213614700fe SHA512 927076481402381bf12e40410c994d04d6a9e6cb1294295790d7829e1dc08d1e2a7be988809c1fca53f5f43317c00b04130dc125e48759f16bd75f0631fd9ca9 WHIRLPOOL 949b6edf022977f3893e5caabb0c5e0daa175106647fd48ab8ce5dc440fb556c88b0257f3972a6badba909675d4dad4ec56fd8f0e1ba411506da10051f470938
+DIST simutrans-src-112-3.zip 1677347 SHA256 8aa9ded7ac65587d65070b950b50f4094b7f77d33d263d1b821a0fe9f214b849 SHA512 0d63da8bed2298dd4516caea748a10c7c27eec2fb00ced9c76600ec93a975a01efa0fe7b4c8f8a5dc9e035b8c1dcf1f7772dfec54594f41efb8c4790d4da99e9 WHIRLPOOL 7ed9310d49339421fed2c4ca8098f21d367de7ad2d933d1d56d5c25542995657f1a98b34066464fbf916ffa4903338bd519fd1e15437017d7899bc2b4c4466f1
 EBUILD simutrans-0.102.2.2.ebuild 1738 SHA256 87ae54ec19aa2c10d6dcfbc2b0f511c81165db0065d5cbb10262874e81ff2e18 SHA512 26efd3d78cf15a215982dab9bc450884e5c459eaccecac11836032737525ce11bdfc11dfa50d9899597008f8dc503cfbfa2a62b8c4a962ca764cb24e6291b173 WHIRLPOOL e98e0ec3721483e7eb1c820339f4b70607946e6e20a93811a35fc465d54a2c8d63212649c1d142cb954ecc5d427ed053a1e2f2f3777d4873d01895f734cb66d4
 EBUILD simutrans-0.112.1.ebuild 1521 SHA256 8b10fe4302284b556b20541643e09769087c758840732318dfe7573fa5ba16af SHA512 a802a39e192a2b07e733305ab5e25a27ca628c0b0eb9fd9f45ab966504d2064cd2c60c560337520baca66aa20c65734efac219329b93fefbcfd1128279902250 WHIRLPOOL 1665fc145fa90fa810458b164240c8145100ea2c52c79bbff47592a1bdc7bd10717d6365ff65abeb1e3f16c3075f1dcea4ea0b0148f0f431bb96ff8c90dfc209
-EBUILD simutrans-0.112.2.ebuild 1519 SHA256 0c96120179711fdd12f90e438b9248272aad15220d078fccd4fb04198d4e26be SHA512 5953aefd547418cd58641c7b8cee4d1d1af753b315e1316b2eed3f57eaebfdc7fa466fda99447a0862f5d823fa035d28dcdd935e72de3c23a1bd9e45c8d8ed16 WHIRLPOOL 27453993308be218029bd721920f0396f1068e2584dc2f90fc6915aef546318b3ad2737d9bec7d28725f028132d0b97e5b152cbd7da8d4b0ecb203594d3879eb
-MISC ChangeLog 5343 SHA256 a7767e34687f303c1551e704b10d62b9f8b4c9cb6e3d9a7e29791386ad4902dd SHA512 123181f8c5693932ffbe852376caa8db5964e1728ee5e578a8e87df51ebdaf841d093226c9dcbaaa0414dd402cc8cce6601d672878be293abc8c15ec3bcddaeb WHIRLPOOL 05aa1b7570db19407c649f34854636bb1e6f1b1c7c65a3baccd526cbeb5464612daeaf7a2d3ed24e1d0293371c4133688080e8871fec14a9df7955bb45cbf5da
+EBUILD simutrans-0.112.3.ebuild 1580 SHA256 9406889b55c612b363796d154ea777403843fb7826830388c7602a2b22da3014 SHA512 ee0bf72b4c9f6885836272e64a7e7b612650e511784b56d1ecdffd5980124f228a02395a2f443139208e2036f6fb348f73e43327e9a65366306e6d4a24b75fe5 WHIRLPOOL 4c4a852ab51015ae2e4b153d0c63e03ffb8e46f5ad60caa46203823959732996cbfd542653e5db7f9f11eebe4de6bce112bd2b8fd376746d91eb3cd729862d63
+MISC ChangeLog 5674 SHA256 f00ad7ccc4c3675a2c04b5f075b00b74c59d61fa96c3e916dc24b6224f9e0782 SHA512 8567fa2cfaf7db59035d7947b57b1970d283f677d190d12e69d508e25fa6479887586f579e25b3643fd535e78a9ad0616da638c80f3a14ac0113ecd11e6ff41e WHIRLPOOL 78df6be46193f408428027791567bee0d4dc206734f9b1aa00ce09b67d3cdee674931b646df1c9ecbc3a0b399b99cb8b00f4dd5170ec4d92a8a876ea0f16fd7b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-simulation/simutrans/files/simutrans-0.112.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
index 26a563a58454..3becef9ae9eb 100644
--- a/games-simulation/simutrans/files/simutrans-0.112.2-Makefile.patch
+++ b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
@@ -1,14 +1,15 @@
---- Makefile.orig	2013-01-22 16:53:11.574351933 -0500
-+++ Makefile	2013-01-22 16:57:38.801999641 -0500
-@@ -90,7 +90,6 @@
+--- Makefile.orig	2013-05-28 17:58:03.379228527 -0400
++++ Makefile	2013-05-28 17:58:24.768491369 -0400
+@@ -88,8 +88,6 @@
+       endif
      endif
    endif
- else
+-else
 -  CFLAGS += -O
  endif
  
  ifdef DEBUG
-@@ -109,6 +108,7 @@
+@@ -108,6 +106,7 @@
    endif
  else
    CFLAGS += -DNDEBUG
@@ -16,7 +17,7 @@
  endif
  
  ifneq ($(PROFILE),)
-@@ -121,6 +121,7 @@
+@@ -120,6 +119,7 @@
  
  ifneq  ($(MULTI_THREAD),)
    CFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
@@ -24,7 +25,7 @@
    ifneq  ($(MULTI_THREAD),1)
      ifeq ($(OSTYPE),mingw)
  #use lpthreadGC2d for debug alternatively
-@@ -135,10 +136,12 @@
+@@ -134,10 +134,12 @@
    REV = $(shell svnversion)
    ifneq ($(REV),)
      CFLAGS  += -DREVISION="$(REV)"
@@ -37,7 +38,7 @@
  CCFLAGS  += -Wstrict-prototypes
  
  
-@@ -450,6 +453,7 @@
+@@ -456,6 +458,7 @@
  ifeq ($(BACKEND),sdl)
    SOURCES += simsys_s.cc
    CFLAGS  += -DUSE_16BIT_DIB
@@ -45,7 +46,7 @@
    ifeq ($(OSTYPE),mac)
      # Core Audio (Quicktime) base sound system routines
      SOURCES += sound/core-audio_sound.mm
-@@ -482,6 +486,7 @@
+@@ -488,6 +491,7 @@
      endif
    endif
    CFLAGS += $(SDL_CFLAGS)
@@ -53,7 +54,7 @@
    LIBS   += $(SDL_LDFLAGS)
  endif
  
-@@ -491,6 +496,7 @@
+@@ -497,6 +501,7 @@
    SOURCES += sound/sdl_mixer_sound.cc
    SOURCES += music/sdl_midi.cc
    CFLAGS  += -DUSE_16BIT_DIB
@@ -61,7 +62,7 @@
    ifeq ($(SDL_CONFIG),)
      SDL_CFLAGS  := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
      SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
-@@ -505,12 +511,14 @@
+@@ -511,6 +516,7 @@
      endif
    endif
    CFLAGS += $(SDL_CFLAGS)
@@ -69,22 +70,15 @@
    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 @@
+@@ -544,6 +550,7 @@
      endif
    endif
    CFLAGS += $(SDL_CFLAGS)
 +  CXXFLAGS += $(SDL_CFLAGS)
-   LIBS   += $(SDL_LDFLAGS)
+   LIBS   += $(SDL_LDFLAGS) -lglew32
    ifeq ($(OSTYPE),mingw)
      LIBS += -lopengl32
-@@ -553,6 +562,7 @@
+@@ -559,6 +566,7 @@
  endif
  
  CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
@@ -92,7 +86,7 @@
  
  ifneq ($(findstring $(OSTYPE), cygwin mingw),)
    SOURCES += simres.rc
-@@ -560,7 +570,6 @@
+@@ -566,7 +574,6 @@
  endif
  
  CCFLAGS  += $(CFLAGS)
diff --git a/games-simulation/simutrans/files/simutrans-0.112.2-overflow.patch b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
index 6597ca071f92..6597ca071f92 100644
--- a/games-simulation/simutrans/files/simutrans-0.112.2-overflow.patch
+++ b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
diff --git a/games-simulation/simutrans/simutrans-0.112.2.ebuild b/games-simulation/simutrans/simutrans-0.112.3.ebuild
index 7ace1e68dc98..2dc6050ac56e 100644
--- a/games-simulation/simutrans/simutrans-0.112.2.ebuild
+++ b/games-simulation/simutrans/simutrans-0.112.3.ebuild
@@ -1,18 +1,17 @@
 # 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.2.ebuild,v 1.1 2013/03/21 01:44:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.112.3.ebuild,v 1.1 2013/05/28 23:20:04 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"
+	mirror://sourceforge/simutrans/simulinux-${MY_PV}.zip
+	mirror://sourceforge/simutrans/simupak64-${MY_PV}.zip"
 
 LICENSE="Artistic"
 SLOT="0"
@@ -47,10 +46,13 @@ VERBOSE=1" > config.default || die
 	epatch \
 		"${FILESDIR}"/${P}-Makefile.patch \
 		"${FILESDIR}"/${P}-overflow.patch
+	rm -f simutrans/{simutrans,*.txt}
+	mv simutrans/get_pak.sh "${T}" || die
 }
 
 src_install() {
 	newgamesbin build/default/sim ${PN}
+	dogamesbin "${T}"/get_pak.sh
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r simutrans/*
 	dodoc documentation/*