gentoo resync : 14.07.2018

4 files changed, 177 insertions, 0 deletions

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
new file mode 100644
index 000000000000..5b83f40f1580
--- /dev/null
+++ b/games-simulation/simutrans/Manifest
@@ -0,0 +1,6 @@
+AUX simutrans-0.120.2.2-Makefile.patch 2015 BLAKE2B 1a3aac151b1ead4355d4206064d1c773813789b0463b2cb90494ce759cfcd31b9ce7db5f8d52c055d9364bd7fec2e8096437e023e1e618f58a53b58666f98cdf SHA512 2d85d4a048a40c6a3581492f50f7d2364cfd36f6d0496fcf89406ed1d7ad091b218700b2e8d1f26e0bdd346b3f449e0c0d30ef4bffed30b351c1e424ce7a4439
+DIST language_pack-Base+texts.zip 1097263 BLAKE2B 08678f36a2425b84bf5f440a546af7ca6507ee17bdcfd3096335c20ce60c23a5375eb133f597806bed28db2d9ed067669e83a4df47443be0cb48bf151ba91ef2 SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248
+DIST simupak64-120-2.zip 4453079 BLAKE2B 910f7937d5eabe8c97f9b9fb6b1d0a63ffe5c7a897a83d5649581f629c1e6d000442399f3e181c0a6e2b08a6f9948354df1848b84df6c2d37bd65d4c303d1626 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
+DIST simutrans-src-120-2-2.zip 3900947 BLAKE2B 69e9f78883d1b611bc76bbff1dc46ab1a645580ec0114f342aeb5e243c643c0fa4d3684e8102a0196f95320b4f93a0a50a93bb61802e81236f286a2989ac646f SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2
+EBUILD simutrans-0.120.2.2.ebuild 1498 BLAKE2B 9ac5acaa5c8a3181e2e92a8c8c3def5a564bff80de99f1f90e6389480e5e2a6955321259c4504b42b5a5b2f70e289b925e1bb97ded6c8db1967613dd384ec2f0 SHA512 20cbfabc2f86bab1d741d6ccaab13070587e9e668db536cd48bcc1fde86b9b6e43e92da7daa51a77d573abdc345ddb40925660d72a2ac466ae93fc10e4cf0fc7
+MISC metadata.xml 332 BLAKE2B cbfe0465e3d6ce4bdda79fcac0b10b477c384630855de37cb25500225eaaf628a2b8a5bfc95f73d90c5f4b8ed0d213fbb7f8a28ee7e5333c59048d5002cb5886 SHA512 c8e6f7d4963c82a5d993a6edc3d8dfc925ffc9df28fbbadf6d2fa91f5f34c9afb4fc8f821a8a7e2e99522ec9bf2d2bc0a7f620337d2097f13af77016846dad36
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
index 000000000000..f9fb48ab682f
--- /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

+     endif

+   endif

+-else

+-  CFLAGS += -O

+ endif

+ 

+ ifdef DEBUG

+@@ -110,6 +108,7 @@
+   endif

+ else

+   CFLAGS += -DNDEBUG

++  CXXFLAGS += -DNDEBUG

+ endif

+ 

+ ifdef MSG_LEVEL

+@@ -127,6 +126,7 @@
+ ifneq ($(MULTI_THREAD),)

+   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)

+     CFLAGS += -DMULTI_THREAD

++    CXXFLAGS += -DMULTI_THREAD

+     ifneq ($(OSTYPE),haiku)

+       LDFLAGS += -lpthread

+     endif

+@@ -142,11 +142,13 @@
+     endif

+     ifneq ($(REV),)

+       CFLAGS  += -DREVISION="$(REV)"

++      CXXFLAGS  += -DREVISION="$(REV)"

+     endif

+   endif

+ endif

+ 

+ CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

++CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

+ CCFLAGS  += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

+ 

+ 

+@@ -514,6 +516,7 @@
+     endif

+   endif

+   CFLAGS += $(SDL_CFLAGS)

++  CXXFLAGS += $(SDL_CFLAGS)

+   LIBS   += $(SDL_LDFLAGS)

+ endif

+ 

+@@ -553,6 +556,7 @@
+     endif

+   endif

+   CFLAGS += $(SDL_CFLAGS)

++  CXXFLAGS += $(SDL_CFLAGS)

+   LIBS   += $(SDL_LDFLAGS)

+ endif

+ 

+@@ -568,6 +572,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

+   endif

+   CFLAGS += $(SDL_CFLAGS)

++  CXXFLAGS += $(SDL_CFLAGS)

+   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer

+ endif

+ 

+@@ -594,6 +599,7 @@
+     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

+   endif

+   CFLAGS += $(SDL_CFLAGS)

++  CXXFLAGS += $(SDL_CFLAGS)

+   LIBS   += $(SDL_LDFLAGS) -lglew32

+   ifeq ($(OSTYPE),mingw)

+     LIBS += -lopengl32

+@@ -609,6 +615,7 @@
+ endif

+ 

+ CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

+ 

+ ifneq ($(findstring $(OSTYPE), cygwin mingw),)

+   SOURCES += simres.rc

+@@ -616,7 +623,6 @@
+ endif

+ 

+ CCFLAGS  += $(CFLAGS)

+-CXXFLAGS += $(CFLAGS)

+ 

+ BUILDDIR ?= build/$(CFG)

+ PROGDIR  ?= $(BUILDDIR)

diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
new file mode 100644
index 000000000000..9d88e43fb074
--- /dev/null
+++ b/games-simulation/simutrans/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">simutrans</remote-id>
+	</upstream>
+</pkgmetadata>
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
index 000000000000..f175a36b9e03
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 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
+	printf "BACKEND=mixer_sdl\nCOLOUR_DEPTH=16\nOSTYPE=linux\nVERBOSE=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 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
+}