summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-06-26 18:02:17 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-06-26 18:02:17 +0000
commita20ca3bb5ec02bcdee8e98be7ec81c56e33fb7b2 (patch)
tree287d74db9770d3614063eb6a631155fbe21f9acc /games-simulation
parentNon-maintainer commit: Fix mysql_config references for build failures wrt bug... (diff)
downloadhistorical-a20ca3bb5ec02bcdee8e98be7ec81c56e33fb7b2.tar.gz
historical-a20ca3bb5ec02bcdee8e98be7ec81c56e33fb7b2.tar.bz2
historical-a20ca3bb5ec02bcdee8e98be7ec81c56e33fb7b2.zip
old
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Diffstat (limited to 'games-simulation')
-rw-r--r--games-simulation/simutrans/ChangeLog7
-rw-r--r--games-simulation/simutrans/Manifest30
-rw-r--r--games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch96
-rw-r--r--games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch11
-rw-r--r--games-simulation/simutrans/simutrans-0.112.3.ebuild62
5 files changed, 7 insertions, 199 deletions
diff --git a/games-simulation/simutrans/ChangeLog b/games-simulation/simutrans/ChangeLog
index d0a90eed7ebc..8cf07d36f9ed 100644
--- a/games-simulation/simutrans/ChangeLog
+++ b/games-simulation/simutrans/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-simulation/simutrans
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.40 2015/05/27 11:15:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/ChangeLog,v 1.41 2015/06/26 18:02:12 mr_bones_ Exp $
+
+ 26 Jun 2015; 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:
+ old
27 May 2015; Agostino Sarubbo <ago@gentoo.org> simutrans-0.120.0.1.ebuild:
Stable for x86, wrt bug #549386
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index a3d2dc8d0ca8..5cb58c17fa06 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,34 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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
EBUILD simutrans-0.120.0.1.ebuild 1334 SHA256 2f5e59e55ee29e4e3139f48f783235f54a4c3aeb74c7fbb6d1c80e651289f5b5 SHA512 fd8ebae789c09a58359a21166acff509de17d2a232d1d9187a618de1d7d6eea91577917dcc2db3885c36588cc2a84500b2dd34d4b5a79e085258e0a72c63f3bd WHIRLPOOL 52fab1093bd49ea4757bf701da5cc22183421846a203a6c997f45dfbaeff9e976e2337601c1870eb064158c391fd10fa2ef051355e46c04328720725aae74e77
-MISC ChangeLog 6988 SHA256 cf52934c00638dac38087eb8ac5930bb000d8f82ec05822501c4d6a56109e0ce SHA512 d11d1173e76cb95e9447d83e1fbabbff209be21c1f449dab261e8a1e8eebbc3672a00226c32f5c7ca4ae13f7bdb846b71a318e8abbb06568dee95c0066f460d0 WHIRLPOOL 68b9db55572bdee7dabcff83670000283269a2511b13f9b89541e91af3a2d38bbcd13481f6149a970bb96b7aa27f537a4d9dd3f0c36c9bb490446cac4b3fb383
+MISC ChangeLog 7169 SHA256 2044db2dce438cc30320b9f73e9c5ddd7f7e44926c9d7bedc0f0e6457a505822 SHA512 b8250ce5fb434ef18bd03639aa8dbedf226ffb463fe9897cab5bad2d7d4d1d6e15429df0c10afc3e81f2ec8c77aaafe7a0aa536e345174a54de3ffdd9206ed10 WHIRLPOOL fc0c1f7f248092195191abb605d0d503999973c4be430aa86b98b8c1cc93a7a085e007d088f95648d385f103f36259c92b294ff28d11923c3d7dbe28ca177a16
MISC metadata.xml 238 SHA256 69883a0fa20c5828bb13ce16ded264e8f304330c5264a7ce1056c08294e9b640 SHA512 2a58b5e3d041b6d44bd893cb6e01d6dc5440db0a468bbdc37c1ce76983655b2639b29e6e8e3b43dd02ee5c8457ae037b1c9aba1b78d2ea9be86bba0272155f5e WHIRLPOOL 9abd017d91c96b9346269ac91e472473054d35c45e4e5b0c2888371a68fc159ff97c934b1f38587191dc7a4ee6241bae01e8831a6923d35ac47cc1bfa7ae1849
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfssGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijOQP/3hlGrqg9HGEmwmB6bkHKXhC
-/mvbtISdHpq2G4/UjuuAlsEV76u/VyyZVwCrVqK6yM/7wVduPGu63oy4OUrT2Qnz
-vL/KmhwiYvpuoyJcQ3eYJf+kLQ9s4zlguS/OlmrV58scg7OYL4qsfaYdHoutkfms
-AniXVFh++wjVwbov/JmPHItCISU0DY/XqfwnXlGEjU/9ZJcqFcR6yhT2M5ZePYdg
-UFX0UlUTKb6mZaIpE6PsXbA1WnF+KscHSarim9LITY/+7wVuwG0lMTM82f9uijV4
-w0JlDkNxGLrY8jqxAub+MoiuBkaIIVw+GOOjeG+fg5nPscY5cAciZ+zRGTisoRP8
-gwPbmSrGdu+QjLhPv5RQkJdWypkhelnJ65yPYnqxZ3yePp3WLJoPY4lFgqYAWUlp
-3L6CMP5YSqN+GCp3p1jacsytcc2HimhyhXy0J7Zx/e+AkcqYeVOUfY0dx8D0VdrY
-Z1txel+uaqjbCbELF2avMcSEtkGOdWyyF7DMgYJQQRv90eywawYY6cuh8cOs4/35
-17SXogpaNLUwZfhC3w2wbiO8TdFramH6O/QZwVtT4it3Dmts2kOzY20kVkyxAjfq
-g8NbNqHPQIx5/7bl85JqylJR1YjTTmQh8JSy6nsTKtW+yx2ebqac/BweYU1JN8Mo
-0qOSMUs9cgW5jn/rM3r3
-=ensE
------END PGP SIGNATURE-----
diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
deleted file mode 100644
index a27316438002..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -88,8 +88,6 @@
- endif
- endif
- endif
--else
-- CFLAGS += -O
- endif
-
- ifdef DEBUG
-@@ -108,6 +106,7 @@
- endif
- else
- CFLAGS += -DNDEBUG
-+ CXXFLAGS += -DNDEBUG
- endif
-
- ifneq ($(PROFILE),)
-@@ -120,6 +119,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
-@@ -134,10 +134,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
-
-
-@@ -456,6 +458,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
-@@ -488,6 +491,7 @@
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
- endif
-
-@@ -497,6 +501,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
-@@ -511,6 +516,7 @@
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer
- endif
-
-@@ -544,6 +550,7 @@
- endif
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lglew32
- ifeq ($(OSTYPE),mingw)
- LIBS += -lopengl32
-@@ -559,6 +566,7 @@
- endif
-
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)
- SOURCES += simres.rc
-@@ -566,7 +574,6 @@
- endif
-
- CCFLAGS += $(CFLAGS)
--CXXFLAGS += $(CFLAGS)
-
- BUILDDIR ?= build/$(CFG)
- PROGDIR ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
deleted file mode 100644
index b50f3b888422..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- {
- 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.3.ebuild b/games-simulation/simutrans/simutrans-0.112.3.ebuild
deleted file mode 100644
index fdcefd508632..000000000000
--- a/games-simulation/simutrans/simutrans-0.112.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.112.3.ebuild,v 1.4 2014/10/12 08:52:39 ago 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/simulinux-${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
-
- if use !x86 ; then
- echo "FLAGS+= -DUSE_C" >> config.default || die
- 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
- 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/*
- doicon simutrans.ico
- make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
- prepgamesdirs
-}