games-simulation/simutrans: version bump.

Closes: https://github.com/gentoo/gentoo/pull/4882

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 345785e75cf75f282c427c819f2190823e803024..50f00c64c63063d9f206303b890df3f3eb528ec5 100644 (file)
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,5 +1,7 @@
 DIST language_pack-Base+texts.zip 1097263 SHA256 3d2e637eb6018ccb5da99614dae7fc6ae1bdb0d8db4b2beea85d7e36ea5edf7c SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248 WHIRLPOOL 679efda1f4bfa0bf71b2f4aa955cee287ee6e9c10d6b3f9070cb799eae5c7acd3651e59f3d8d46688f56ee9781e102e485ab59b6a16a4ee556b18c95b2c35fb3
 DIST simupak64-120-0-1.zip 4051769 SHA256 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78 SHA512 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc WHIRLPOOL 5ae84653b5a138b5a987b7ca6512994f3ba8dff48fffbb94f6fe0bf4845d5537e93734f73174eb328f20b6c9986235ae6c461c55b5efde53a4b81620a3b1da83
 DIST simupak64-120-1-2.zip 4308534 SHA256 125fa5c13a51bb0630ca651fddb8af06a823e8c4d4638bfa1bb2d89e92cc1d54 SHA512 ddc75ad1cafa23d9a7387dc38b14de7414ea7c8bb7caa2afde6d8cdf9c3f5251719966b2274c5bc4ecc9915ec764d517e24b79d5ef199904e3d9185214cba129 WHIRLPOOL 4f91de57be620849f2a278df5510ea390d737a4f063dc659ed2d5f488ce0e631b1c15d6282554574b89316b3b968e4b850db8764b24b714df1a3c5e642e34907
+DIST simupak64-120-2.zip 4453079 SHA256 b3ce4fc99468e6a2601a606251f156e554d2d78f2cc5679c0d9a64a5f50561e8 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357 WHIRLPOOL 332137593544e88e81f69ab1887a2388df07a8610805d6a77af7760ff42f49c11f55cdb7bc7879aa9840106f41e01b2c090859a2499422cdcb8b82555c5b8049
 DIST simutrans-src-120-0-1.zip 3909005 SHA256 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683 SHA512 6f32b6f1c12f45125de8a12c4a034387a784e21fd8cdedcf7b1daefd9174d9a94825e8f68effa2ff1436cce2e2bc8cb5707161f3fa004185ae158400840dc450 WHIRLPOOL 36155184f5806a9cfab742f26e3fc78d5d7d928f99cddabbaf36c7c90d065dab02bb174c07d9633958f8b891b0db8cc5c94e45fd4f22d917b9a037c51a99b69a
 DIST simutrans-src-120-1-3.zip 3447115 SHA256 2d29b849fc39d25a0580091e1377270bddb2cae36c0fc32bd7c2d0f1d7ccfb84 SHA512 ae31dda7bdbd057aaf9c40914eb7ec0c60b21d2790d1ca12aa8db698cd112043a291934f6f460b1d5a8a1984b7defb4a0c4bc9839c81c674834062cc1e49c8bd WHIRLPOOL 273aa58b6e6d7e53a67e092ff5d0a4ef9f00ef3c96bdaf8393a01511c8b655956085f6c94a3f74ab5eeffbe312a4d3d9596a4cfbef57a7053ddd7a1f4d4fbd1d
+DIST simutrans-src-120-2-2.zip 3900947 SHA256 7f22c144377abf1a0ee49432f3f6f5eb9a620567960df31d2ea6399b17cf26fa SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2 WHIRLPOOL ebf7496939a79e58983ba81ff15e1f9118ec0d2ba6ca0aae177602505ef78e1d3c9747436cb2bc7653b3fb574934333da802962b048d2efd172000f3c4a05303

diff --git a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
new file mode 100644 (file)
index 0000000..f9fb48a
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
@@ -0,0 +1,89 @@
+--- a/Makefile 2017-03-29 12:04:15.000000000 +0300
++++ b/Makefile 2017-06-08 01:41:32.605031258 +0300
+@@ -87,8 +87,6 @@
+       CFLAGS += -minline-all-stringops\r
+     endif\r
+   endif\r
+-else\r
+-  CFLAGS += -O\r
+ endif\r
+ \r
+ ifdef DEBUG\r
+@@ -110,6 +108,7 @@
+   endif\r
+ else\r
+   CFLAGS += -DNDEBUG\r
++  CXXFLAGS += -DNDEBUG\r
+ endif\r
+ \r
+ ifdef MSG_LEVEL\r
+@@ -127,6 +126,7 @@
+ ifneq ($(MULTI_THREAD),)\r
+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)\r
+     CFLAGS += -DMULTI_THREAD\r
++    CXXFLAGS += -DMULTI_THREAD\r
+     ifneq ($(OSTYPE),haiku)\r
+       LDFLAGS += -lpthread\r
+     endif\r
+@@ -142,11 +142,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  += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64\r
+ \r
+ \r
+@@ -514,6 +516,7 @@
+     endif\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS)\r
+ endif\r
+ \r
+@@ -553,6 +556,7 @@
+     endif\r
+   endif\r
+   CFLAGS += $(SDL_CFLAGS)\r
++  CXXFLAGS += $(SDL_CFLAGS)\r
+   LIBS   += $(SDL_LDFLAGS)\r
+ endif\r
+ \r
+@@ -568,6 +572,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
+@@ -594,6 +599,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
+@@ -609,6 +615,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
+@@ -616,7 +623,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.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
new file mode 100644 (file)
index 0000000..aab9fb8
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eutils
+
+MY_PV=${PV/0./}
+MY_PV=${MY_PV//./-}
+SIMUPAK="simupak64-${MY_PV%-[0-9]*}.zip"
+
+DESCRIPTION="A free Transport Tycoon clone"
+HOMEPAGE="http://www.simutrans.com/"
+SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
+       http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
+       mirror://sourceforge/simutrans/${SIMUPAK}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+       sys-libs/zlib
+       app-arch/bzip2
+       media-libs/sdl-mixer
+       media-libs/libpng:0
+       media-libs/libsdl[sound,video]"
+
+DEPEND="
+       ${RDEPEND}
+       app-arch/unzip"
+
+S=${WORKDIR}
+
+PATCHES=(
+       "${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_unpack() {
+       unpack simutrans-src-${MY_PV}.zip
+       unpack "${SIMUPAK}"
+
+       # Bundled text files are incomplete, bug #580948
+       cd "${S}/simutrans/text" || die
+       unpack language_pack-Base+texts.zip
+}
+
+src_prepare() {
+       default
+
+       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\]:\"/usr/share/${PN}/\":" \
+               simmain.cc || die
+
+       rm -v simutrans/{simutrans,*.txt} || die
+}
+
+src_install() {
+       newbin build/default/sim ${PN}
+       insinto /usr/share/${PN}
+       doins -r simutrans/*
+       dodoc documentation/*
+       doicon simutrans.ico
+       make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
+}