public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2016-04-01  2:45 Michael Sterrett
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett @ 2016-04-01  2:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8f4dbb0f3ee942b078562276e972fd959c4a37c2
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 02:44:19 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 02:44:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4dbb0f

games-simulation/simutrans: version bump

Package-Manager: portage-2.2.26

 games-simulation/simutrans/Manifest                |  2 +
 .../files/simutrans-0.120.1.3-Makefile.patch       | 89 ++++++++++++++++++++++
 .../simutrans/simutrans-0.120.1.3.ebuild           | 54 +++++++++++++
 3 files changed, 145 insertions(+)

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 03971e0..5ddd2b6 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,2 +1,4 @@
 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 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

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

diff --git a/games-simulation/simutrans/simutrans-0.120.1.3.ebuild b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
new file mode 100644
index 0000000..85f6186
--- /dev/null
+++ b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/3/2}.zip"  #FIXME: rev bump when .3 is released
+
+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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2017-06-30 13:16 Patrice Clement
  0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2017-06-30 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cf8b49e07c8f4729742111b899f0cd1b4dbf0716
Author:     Sergey Alirzaev <zl29ah <AT> gmail <DOT> com>
AuthorDate: Wed Jun  7 22:44:53 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:16:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf8b49e0

games-simulation/simutrans: version bump.

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

 games-simulation/simutrans/Manifest                |  2 +
 .../files/simutrans-0.120.2.2-Makefile.patch       | 89 ++++++++++++++++++++++
 .../simutrans/simutrans-0.120.2.2.ebuild           | 73 ++++++++++++++++++
 3 files changed, 164 insertions(+)

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 345785e75cf..50f00c64c63 100644
--- 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
index 00000000000..f9fb48ab682
--- /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/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
new file mode 100644
index 00000000000..aab9fb8ef31
--- /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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2020-10-23 17:13 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-10-23 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     fb75467bcf4b8c308ebbc5b9121a6f42d43680d3
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri Oct 23 14:50:59 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 17:08:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb75467b

games-simulation/simutrans: Delete old ebuild.

It doesn't compile since 2018.

Bug: https://bugs.gentoo.org/664634
Bug: https://bugs.gentoo.org/724470
Bug: https://bugs.gentoo.org/739360

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/15314
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-simulation/simutrans/Manifest                |  3 -
 .../files/simutrans-0.120.2.2-Makefile.patch       | 89 ----------------------
 .../simutrans/simutrans-0.120.2.2.ebuild           | 71 -----------------
 3 files changed, 163 deletions(-)

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 404b39b85fe..ee3db6e423f 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,6 +1,3 @@
-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
 DIST simutrans-src-122-0.zip 4534293 BLAKE2B c4117baf82530adced1fbb60e099176b7b63ade07e10f741e19e41aedd4b65f5d7b6ab60145f3bce7ff88def9836eac88323b14aa74f2ce5f1c76eeaa6beb713 SHA512 7a044ceda9359847353c1dcd23c380d1ddcca901fd674a25b66d7bd0ede7f974525c5fc3b37781977e9946626f30b538c483166983ab8b7be9e73903dc9be0bd
 DIST simutrans_PAK128.german_2.0_for_ST_122.0.zip 186572954 BLAKE2B 1f21655660f947767657f79fa45f66cd434888c37596e17dbd8400ce684251c33617dc78096c34b23bad3f241cc4641029d0f12b5f09d199013582c89fa02ab3 SHA512 9e6250b333e6b31e0ad23f2629409c2b4914e5fb9cb0304baa1e70f0c268d5eca7db27d77b51f18fff57569df56eecb82c8ec9b48c3a3efacf7d47501546347d
 DIST simutrans_coalwagonfix.rar 10769 BLAKE2B 4ebb14c5585fcb09b2c9e70451a0a4f1133d1bf7a184c898463c4393026dcbaf10954430d83e64cd7430ec3e3708e0d51f04b805ac0c32656c138b001e617079 SHA512 503c795b4fdc168cc925a3b5ff385880dd28c8e3214a7c5aeb80e937378cf19b1f2408d19f2ab6ef066f47d6f6ab0955e6d5ec59981d1e76fbe3cd661b8bd22e

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
deleted file mode 100644
index f9fb48ab682..00000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
deleted file mode 100644
index f175a36b9e0..00000000000
--- a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2022-08-28  8:22 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2022-08-28  8:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c4949b8926f053ad70e7f02b609e8c02d37fec4c
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun Aug  7 16:40:23 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 08:22:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4949b89

games-simulation/simutrans: silence svn and git warnings

This commit sets svn to 0 and removes the check. The check could never
have been 1, because we are not in an svn. For the same reason it also
sets GIT_HASH to nothing instead of trying to run git.

The svn revision is supplied in the ebuild, because it is needed for
network games.

Closes: https://bugs.gentoo.org/859226
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...utrans-123.0.1-silence-svn-and-git-errors.patch | 46 ++++++++++++++++++++++
 .../simutrans/simutrans-123.0.1-r1.ebuild          |  2 +
 2 files changed, 48 insertions(+)

diff --git a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
new file mode 100644
index 000000000000..05d40c5cd5e0
--- /dev/null
+++ b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
@@ -0,0 +1,46 @@
+From 51b78d7e6021ed7787991d6122da52293fbafa89 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sun, 7 Aug 2022 18:33:46 +0200
+Subject: [PATCH] silence svn and git errors
+
+---
+ Makefile     | 2 +-
+ configure.ac | 9 ++-------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 69f2b8a..c683b8a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -254,7 +254,7 @@ else
+   endif
+ endif
+ 
+-GIT_HASH := $(shell git rev-parse --short=7 HEAD 2>/dev/null 1>/dev/null; echo $$?)
++GIT_HASH := 
+ ifneq ($(GIT_HASH),)
+   GIT_HASH := $(shell git rev-parse --short=7 HEAD)
+   $(info Git hash is 0x$(GIT_HASH))
+diff --git a/configure.ac b/configure.ac
+index e776f6b..41cd584 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,13 +141,8 @@ else
+ fi
+ 
+ 
+-# are we in a svn?
+-if svn info
+-then
+-	AC_SUBST(svn, 1)
+-else
+-	AC_SUBST(svn, 0)
+-fi
++# we are not in an svn
++AC_SUBST(svn, 0)
+ 
+ 
+ #switch off assembler on 64 bit (MISSING: Check for GNU Assembler and i86)
+-- 
+2.35.1
+

diff --git a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild b/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
index 368ac8ebd062..0c6442d9b393 100644
--- a/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
+++ b/games-simulation/simutrans/simutrans-123.0.1-r1.ebuild
@@ -48,6 +48,8 @@ BDEPEND="
 "
 RESTRICT="test" # Opens the program and doesn't close it.
 
+PATCHES=( "${FILESDIR}"/${PN}-123.0.1-silence-svn-and-git-errors.patch )
+
 src_unpack() {
 	unpack "simutrans-src-${MY_PV}.zip"
 	use minimal || unpack "simutrans_${MY_PAK_64}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2022-08-28  8:22 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2022-08-28  8:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d15e3beb750dfc37daafb509c6f91b1539cd3275
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun Aug  7 17:43:25 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 08:22:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15e3beb

games-simulation/simutrans: drop 0.122.0-r1

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/26777
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-simulation/simutrans/Manifest                |   8 --
 .../files/simutrans-0.122.0-Fix-Makefile.patch     |  21 ----
 games-simulation/simutrans/metadata.xml            |   4 -
 .../simutrans/simutrans-0.122.0-r1.ebuild          | 106 ---------------------
 4 files changed, 139 deletions(-)

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 29eca65dd026..0b49b78ebdee 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,12 +1,4 @@
-DIST simutrans-src-122-0.zip 4534293 BLAKE2B c4117baf82530adced1fbb60e099176b7b63ade07e10f741e19e41aedd4b65f5d7b6ab60145f3bce7ff88def9836eac88323b14aa74f2ce5f1c76eeaa6beb713 SHA512 7a044ceda9359847353c1dcd23c380d1ddcca901fd674a25b66d7bd0ede7f974525c5fc3b37781977e9946626f30b538c483166983ab8b7be9e73903dc9be0bd
 DIST simutrans-src-123-0-1.zip 4771334 BLAKE2B c83edba188225c07bea9aa50d8899a251d3b9f50160aada6839d519bc99f52ef57bd95e7cfdf8db5d6c5efffb9fd421b4b8d8283b7998a352fdd7327332244c4 SHA512 87bc96c201126bc735693dea83a320e79f4b4a0fa6940aa9a6d2f8ef6025788f941a3c816febe3dc8a23ff786a2f016df2ef8a61492bb5ed4a834c721f8fc0a1
 DIST simutrans.svg 2677 BLAKE2B c60f386b13908cda641f8cb41918f8f0b1c70f9104d14ee368d221bf013970de3aee05b009ad56af07710833218d5e15cd24c51da4dae4e964f1c877a820fce0 SHA512 317b9059a1cc863eed778f60d6c3f4569a3cee192fb6f9210aed2cf65f76f098dd5a17020de11d3beb30b9e7a1a49876c0610e7d31e24e141c6ce31747b3809a
-DIST simutrans_PAK128.german_2.0_for_ST_122.0.zip 186572954 BLAKE2B 1f21655660f947767657f79fa45f66cd434888c37596e17dbd8400ce684251c33617dc78096c34b23bad3f241cc4641029d0f12b5f09d199013582c89fa02ab3 SHA512 9e6250b333e6b31e0ad23f2629409c2b4914e5fb9cb0304baa1e70f0c268d5eca7db27d77b51f18fff57569df56eecb82c8ec9b48c3a3efacf7d47501546347d
-DIST simutrans_coalwagonfix.rar 10769 BLAKE2B 4ebb14c5585fcb09b2c9e70451a0a4f1133d1bf7a184c898463c4393026dcbaf10954430d83e64cd7430ec3e3708e0d51f04b805ac0c32656c138b001e617079 SHA512 503c795b4fdc168cc925a3b5ff385880dd28c8e3214a7c5aeb80e937378cf19b1f2408d19f2ab6ef066f47d6f6ab0955e6d5ec59981d1e76fbe3cd661b8bd22e
-DIST simutrans_language_pack-Base+texts-0.122.0.zip 1172877 BLAKE2B 6a1646d8bd1e74a54506cd32508b5dd9da3d2ce77c7920049fea6bd42c6b46b91e9b248860a352380a5f2bb1393f2bbc9b837dcb347c132c7132f6813a608212 SHA512 d87b4f65188f6efd7e277f6ae5796584e58a1302dae7246cd7b6e3c06d8cdc81c5eae647e12cdf7598230c588f66f5682d2be0e6628311343daf4bd46b441278
 DIST simutrans_language_pack-Base+texts-123.0.1.zip 1228228 BLAKE2B cf7bd6dd40f1c5a79bec73a8f3bd993fdeb8abe725b1294cef7e0fa7fe374aa18a563cfd81907d7b3a67a5898594730448b4f9038515415a8b44d99ecc5eb8ea SHA512 4d6b66f810fedaf50734d178e329592e174c48ca36611b15403075b02a3a626581993093e6fd6e6f297c973c5f928a054a557cd135fa487c79df3c2f1f6e0ea0
-DIST simutrans_pak128-2.8.1.zip 97430218 BLAKE2B 95b6788fd8e4f539b232e9de563227704f16c05951d8cd42ca3faf6b9f625d08108bda068417e9e04c14db8ee6fe860e9b8d958c703719223de770da36ee686b SHA512 c4635a446d9874fe1cf1a15a1ca8eaa50a0888c7679df540aa7509e30db6cb8f9519a27aad10dc481a7762c6c16bb5df64e18665652dcd777885adf0dae6736a
-DIST simutrans_pak128.Britain.1.18-120-3.zip 67251660 BLAKE2B 6dbebdf77985e2610f4283b1ae252a19cbfcc37cc1c6974e4132300f87c7d881bd87aba29bb01974d56d261ee6694fd81d0d4b09eb0a2854e38de6f278f91b53 SHA512 234a6c3dffa236ae98ba3372efb2e2b2808c0dcc0933ea5f339aa639e0705674435599e27228f0ee82f24af49ffbd7cb7c6c076ff6569a7ce622c6b8009c8472
-DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e77157674847d757a23f329aa452c9ea6c096f875d665bb2090df34886437a2d35519c83b38f03d06566bf052c1ffe3cad718c7c3dfe SHA512 f61ad804d63027e181bb99a92f48d23cf6a6f47047a1ba9e8f83383cc4e6d603c7fe260d0846613d43765d3fc933bf13ae063d8d8176f8aef41db8d6bf187773
-DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
 DIST simutrans_simupak64-123-0.zip 5209700 BLAKE2B 432985b056d2a6ea30a63bb3ce278b6dfa7b02dde390cdbedea68e87538b6fa1626ebe8c2490d1b6e569b53ffa6952c1d72a1e41789a81f05ba3b4705f3b4c7e SHA512 0814bf1b41f8b9d458ffe124a237499f0d9e8105269b983d75c16eb87e164bfa0cd49ff153f603ed56f98e4a04edd483f765230e6e1a182c52fa09eb41c92b71

diff --git a/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
deleted file mode 100644
index 5effe170758b..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile	2020-10-15 08:32:29.000000000 +0200
-+++ b/Makefile	2020-10-23 17:59:29.008159331 +0200
-@@ -17,8 +17,7 @@
- SDL_CONFIG      ?= sdl-config
- SDL2_CONFIG     ?= pkg-config sdl2
- #SDL2_CONFIG     ?= sdl2-config
--FREETYPE_CONFIG ?= freetype-config
--#FREETYPE_CONFIG ?= pkg-config freetype2
-+FREETYPE_CONFIG ?= pkg-config freetype2
-
- BACKENDS      = allegro gdi sdl sdl2 mixer_sdl mixer_sdl2 posix
- OSTYPES       = amiga beos freebsd haiku linux mingw mac openbsd
-@@ -91,8 +90,6 @@
-       endif
-     endif
-   endif
--else
--  CFLAGS += -O
- endif
-
- ifdef DEBUG

diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
index 5384b5810c9d..bdfc12b3f89d 100644
--- a/games-simulation/simutrans/metadata.xml
+++ b/games-simulation/simutrans/metadata.xml
@@ -15,9 +15,5 @@
 	</upstream>
 	<use>
 		<flag name="minimal">Don't install any PakSets (scenario data)</flag>
-		<flag name="pak128">Install more detailed scenario data</flag>
-		<flag name="pak128-britain">Install British scenario data</flag>
-		<flag name="pak128-german">Install German scenario data</flag>
-		<flag name="pak192-comic">Install comic-like scenario data</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
deleted file mode 100644
index 8a03e83ca8d1..000000000000
--- a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic xdg
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-SIMUPAK_64="simupak64-${MY_PV%-[0-9]*}-0.zip"
-SIMUPAK_128_V="2.8.1"
-SIMUPAK_128_BRITAIN="pak128.Britain.1.18-120-3.zip"
-SIMUPAK_128_GERMAN="PAK128.german_2.0_for_ST_122.0.zip"
-SIMUPAK_192_COMIC="pak192.comic.0.5.zip"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="https://www.simutrans.com/"
-SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	https://tastytea.de/files/simutrans_language_pack-Base+texts-${PV}.zip
-	mirror://sourceforge/simutrans/${SIMUPAK_64} -> simutrans_${SIMUPAK_64}
-	pak128? ( https://download.sourceforge.net/simutrans/pak128/pak128%20for%20ST%20120.4.1%20%28${SIMUPAK_128_V}%2C%20priority%20signals%20%2B%20bugfix%29/pak128.zip -> simutrans_pak128-${SIMUPAK_128_V}.zip )
-	pak128-britain? ( mirror://sourceforge/simutrans/${SIMUPAK_128_BRITAIN} -> simutrans_${SIMUPAK_128_BRITAIN} )
-	pak128-german? ( mirror://sourceforge/simutrans/${SIMUPAK_128_GERMAN} -> simutrans_${SIMUPAK_128_GERMAN} )
-	pak192-comic? (
-		mirror://sourceforge/simutrans/${SIMUPAK_192_COMIC} -> simutrans_${SIMUPAK_192_COMIC}
-		https://www.dropbox.com/s/3wwyrajrr2oqzo6/coalwagons.rar?dl=1 -> simutrans_coalwagonfix.rar
-	)"
-S=${WORKDIR}
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pak128 +pak128-britain +pak128-german +pak192-comic truetype upnp zstd"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/zstd
-	media-libs/libpng:0
-	media-libs/libsdl2[sound,video]
-	media-libs/sdl-mixer[midi]
-	sys-libs/zlib
-	truetype? ( media-libs/freetype )
-	upnp? ( net-libs/miniupnpc:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unrar
-	app-arch/unzip
-	virtual/imagemagick-tools[png]
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/simutrans-0.122.0-Fix-Makefile.patch" )
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	unpack "simutrans_${SIMUPAK_64}"
-	use pak128 && unpack "simutrans_pak128-${SIMUPAK_128_V}.zip"
-	use pak128-britain && unpack "simutrans_${SIMUPAK_128_BRITAIN}"
-	use pak128-german && unpack "simutrans_${SIMUPAK_128_GERMAN}"
-	if use pak192-comic; then
-		unpack "simutrans_${SIMUPAK_192_COMIC}"
-		cd simutrans/pak192.comic || die
-		unpack "simutrans_coalwagonfix.rar" # Fixes invisible wagons.
-	fi
-
-	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
-	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	strip-flags # bug #293927
-
-	cat > config.default <<-EOF || die
-		BACKEND=mixer_sdl
-		OSTYPE=linux
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 0)
-		USE_FREETYPE=$(usex truetype 1 0)
-		USE_ZSTD=$(usex zstd 1 0)
-		VERBOSE=1
-		STATIC=0
-	EOF
-
-	# make it look in the install location for the data
-	sed -i -e "s:argv\[0\]:\"/usr/share/${PN}/\":" simmain.cc || die
-}
-
-src_compile() {
-	default
-
-	# Convert icon to PNG for Desktop Entry.
-	convert simutrans.ico simutrans.png || die
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto /usr/share/${PN}
-	doins -r simutrans/*
-	doicon simutrans.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
@ 2025-02-27 13:34 Petr Vaněk
  0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2025-02-27 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ab6e0062c94e108d8b9f8840d0cf786453688d5f
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 13:17:08 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 13:34:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6e0062

games-simulation/simutrans: drop 124.1

Closes: https://bugs.gentoo.org/935134
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 games-simulation/simutrans/Manifest                |   3 -
 .../files/simutrans-124.1-fix-miniupnpc-api.patch  |  42 --------
 games-simulation/simutrans/simutrans-124.1.ebuild  | 114 ---------------------
 3 files changed, 159 deletions(-)

diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 6b11d1e4bbdc..b63c62ce5b5d 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,6 +1,3 @@
-DIST simutrans-src-124-1.zip 5965405 BLAKE2B 15e9365df40d9e26f50b63d2e2e2d6f4e03bc5111a28ca3fbe454cfd7339ebbbf3fb99f8f060604f7ca6861fb4220aa9aa0bcd275d98abea6825cbb08956e814 SHA512 f2c95e67ed90a44044264d81dbd1b8db7999a3f192bbfb09f775404924b7583bbf12e1a5841c1e8968ed9bba1bdaff0ca4c913aee83eba5b247c8860a3801c0e
 DIST simutrans-src-124-2-1.zip 5463858 BLAKE2B 034dabd8a74a9dc9d57f72d92179a27c97a718a27470938d4054283d45e0d6b3a9bb34e31ec3b2574e90e1f9d1ebf27a2343ee760818ebc8b109f758fc45a131 SHA512 e8cd229a08e52542f0760227889f0db30017f43ddf44789770a6d6fe9e76d6b82288d2174381e4ab22391cacad97201dc10bc83d1e51a8947b82c5a013450d35
-DIST simutrans_language_pack-Base+texts-124.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
 DIST simutrans_language_pack-Base+texts-124.2.1.zip 1234798 BLAKE2B a2a3aed3783156fa8738087107898d284d867109ad0f50d0435efb391fca9fe1f3d14e225e21deb199e213148abeece4eb47257f3e1c91d0b82d3680fae34d4f SHA512 3007662f6e3132966a2bff1384bf32fba9cf6a55df5cd4e337b08c67d7397ad13fd924831709415c015b72a7f7ae0bba432fa13e23c87f14709cd7e0dfa7b939
-DIST simutrans_simupak64-124-1.zip 5095713 BLAKE2B fdb31043917bd9736cacc6f17a06e0b440a79e077491333491d700bb45b0ec4097d8a13ef34b1a94001cb06c4732250e856b59f7b7faf1537c94860367e16a20 SHA512 fb434104aaf485f78becd99e075fa11d58e59b5e2ee5dfc592b21aec6906f01951bce20181fcb1dacb44ea1d390b4241f1935b4b978474292409c6cf1b6bc849
 DIST simutrans_simupak64-124-2.zip 5092179 BLAKE2B d953368405ff560eafc25eaa5412a72f3ad7b2344ee9e3ada09922d0291768fb710c4ec9a4ebc0823ac84a4226178c81befaf11c958d771bb15f6f7c7c344f6d SHA512 f2edd7ca15966d7c0284637c3f90d335fd34202d8120e92297de4cc451a6c9c543532e3d5ea38181f59e70db4a6d0bae4da0c240556391e3d5872e782e6bb73d

diff --git a/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch b/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch
deleted file mode 100644
index 4ea1a7c51298..000000000000
--- a/games-simulation/simutrans/files/simutrans-124.1-fix-miniupnpc-api.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# adapted from <https://github.com/simutrans/simutrans/commit/089b83b>
-
-From 089b83b03acfb2c1db9f2d22cc10e94ff8ed63be Mon Sep 17 00:00:00 2001
-From: prissi <prissi@8aca7d54-2c30-db11-9de9-000461428c89>
-Date: Mon, 3 Jun 2024 03:31:47 +0000
-Subject: [PATCH] Back to nightly and fix the API for miniupnpc
-
-git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11273 8aca7d54-2c30-db11-9de9-000461428c89
----
-
-diff --git a/src/simutrans/network/network.cc b/src/simutrans/network/network.cc
-index 5acf10e5c..52669ad9d 100644
---- a/src/simutrans/network/network.cc
-+++ b/src/simutrans/network/network.cc
-@@ -981,7 +981,12 @@ bool prepare_for_server( char *externalIPAddress, char *externalAltIPAddress, in
- 		struct UPNPUrls urls;
- 		struct IGDdatas data;
- 
-+#if MINIUPNPC_API_VERSION <= 17
- 		UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) );
-+#else
-+		char wanaddr[64] = "uset";
-+		UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr));
-+#endif
- 		// we must know our IP address first
- 		if(  UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) ==  UPNPCOMMAND_SUCCESS  ) {
- 			// this is our ID (at least the routes tells us this)
-@@ -1040,7 +1045,13 @@ void remove_port_forwarding( int port )
- 		struct UPNPUrls urls;
- 		struct IGDdatas data;
- 
--		UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof(lanaddr) );
-+#if MINIUPNPC_API_VERSION <= 17
-+		UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
-+#else
-+		char wanaddr[64] = "uset";
-+		UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(lanaddr));
-+#endif
-+
- 		// we must know our IP address first
- 		if(  UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIPAddress) ==  UPNPCOMMAND_SUCCESS  ) {
- 			// this is our ID (at least the routes tells us this)

diff --git a/games-simulation/simutrans/simutrans-124.1.ebuild b/games-simulation/simutrans/simutrans-124.1.ebuild
deleted file mode 100644
index 60803bf4b9a5..000000000000
--- a/games-simulation/simutrans/simutrans-124.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop flag-o-matic toolchain-funcs xdg
-
-MY_PV=${PV//./-}
-MY_PAK_64="simupak64-${MY_PV}.zip"
-# Required for network games, published in release announcement on the forums
-MY_SVN_REVISION="11164"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="https://www.simutrans.com/"
-SRC_URI="
-	https://downloads.sourceforge.net/simutrans/simutrans-src-${MY_PV}.zip
-	!minimal? ( https://downloads.sourceforge.net/simutrans/${MY_PAK_64} -> simutrans_${MY_PAK_64} )
-	https://tastytea.de/files/gentoo/simutrans_language_pack-Base+texts-${PV}.zip
-"
-S="${WORKDIR}"
-
-# NOTE: get the latest language pack from:
-# https://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="minimal +midi fontconfig upnp zstd"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/freetype
-	media-libs/libpng:0=
-	media-libs/libsdl2[sound,video]
-	sys-libs/zlib
-	midi? ( media-sound/fluidsynth:=[sdl] )
-	fontconfig? ( media-libs/fontconfig )
-	upnp? ( net-libs/miniupnpc:= )
-	zstd? ( app-arch/zstd )
-"
-# miniupnpc restriction: bug #935134
-RDEPEND="
-	${DEPEND}
-	midi? ( media-sound/fluid-soundfont )
-	!<games-simulation/simutrans-paksets-${PV}
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RESTRICT="test" # Opens the program and doesn't close it.
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-124.0-disable-svn-check.patch
-	"${FILESDIR}"/${P}-fix-miniupnpc-api.patch
-)
-
-src_unpack() {
-	unpack "simutrans-src-${MY_PV}.zip"
-	cd simutrans || die "could not cd to ‘simutrans’"
-	use minimal || unpack "simutrans_${MY_PAK_64}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd text || die "could not cd to ‘simutrans/text’"
-	unpack "simutrans_language_pack-Base+texts-${PV}.zip"
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	strip-flags # bug #293927
-	append-flags -fno-strict-aliasing # bug #859229
-
-	eautoreconf
-}
-
-src_configure() {
-	default
-
-	# NOTE: some flags need to be 0, some need to be empty to turn them off
-	cat > config.default <<-EOF || die
-		BACKEND=sdl2
-		OSTYPE=linux
-		OPTIMISE=0
-		STATIC=0
-		WITH_REVISION=${MY_SVN_REVISION}
-		MULTI_THREAD=1
-		USE_UPNP=$(usex upnp 1 '')
-		USE_FREETYPE=1
-		USE_ZSTD=$(usex zstd 1 '')
-		USE_FONTCONFIG=$(usex fontconfig 1 '')
-		USE_FLUIDSYNTH_MIDI=$(usex midi 1 '')
-		VERBOSE=1
-
-		HOSTCC = $(tc-getCC)
-		HOSTCXX = $(tc-getCXX)
-	EOF
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto usr/share/${PN}
-	doins -r simutrans/*
-	doicon src/simutrans/${PN}.svg
-	domenu src/linux/simutrans.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Since 124.0 simutrans allows you to download PakSets to your home directory,"
-	elog "therefore games-simulation/simutrans-paksets has been deprecated."
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-27 13:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-27 13:34 [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/ Petr Vaněk
  -- strict thread matches above, loose matches on Subject: below --
2022-08-28  8:22 Joonas Niilola
2022-08-28  8:22 Joonas Niilola
2020-10-23 17:13 Michał Górny
2017-06-30 13:16 Patrice Clement
2016-04-01  2:45 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox