From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/
Date: Tue, 1 Aug 2023 07:09:32 +0000 (UTC) [thread overview]
Message-ID: <1690873150.73ada977ef07568523904dbe2faad6acdfb97afd.sam@gentoo> (raw)
commit: 73ada977ef07568523904dbe2faad6acdfb97afd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 1 06:59:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 06:59:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ada977
games-simulation/openttd: drop 13.0, 13.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-simulation/openttd/Manifest | 2 -
games-simulation/openttd/openttd-13.0.ebuild | 131 --------------------------
games-simulation/openttd/openttd-13.1.ebuild | 134 ---------------------------
3 files changed, 267 deletions(-)
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index a54bceea3c07..c18777a14612 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,4 +1,2 @@
-DIST openttd-13.0-source.tar.xz 7422316 BLAKE2B 8aa384847681a61c74e1d56c86600fe7ba273d4721bf2b290dcbdced830e7b6872ae458d02d986877c92d5027bbfe8e9eccbcc74b791b3e9332c142fbc078953 SHA512 a2436eb8aae6967e1e3bcf5f67c2346a8f80af723509d668157e785424c2245086b10077783857acf8840068a37a0e9094f04fda36887ef7e799f360075a8e8a
-DIST openttd-13.1-source.tar.xz 7407360 BLAKE2B 2d289defa38583c95f90322964ba43756468d7fa50087267119f00ccc3688e68e22631f41b091d44b1afaa878f8621f27ba58a0623d5be9420b61833dba8d6e7 SHA512 059eb71da295e8d7bdf939d9c02ff0bb5dbfbfe3fe1f40e7d370918b4c6b7a57c56d039a72c3fb42067159cbb08d956d07f700828f8a9e1e938a5d6550033813
DIST openttd-13.3-source.tar.xz 7417568 BLAKE2B dbeacb0e40af76feda5fd9946a63267e4ce9f342be4479bca24e04be7dbf05453184396e2b78f62ee045d636f70f5969ee1b1f045c68961a80875f7788a570d2 SHA512 bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
diff --git a/games-simulation/openttd/openttd-13.0.ebuild b/games-simulation/openttd/openttd-13.0.ebuild
deleted file mode 100644
index abf0f06f0a0e..000000000000
--- a/games-simulation/openttd/openttd-13.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-RDEPEND="
- dedicated? (
- acct-group/openttd
- acct-user/openttd
- app-misc/dtach
- )
- !dedicated? (
- allegro? ( media-libs/allegro:5 )
- fluidsynth? ( media-sound/fluidsynth )
- icu? (
- dev-libs/icu-layoutex:=
- dev-libs/icu-le-hb
- >=dev-libs/icu-58.1:=
- )
- sdl? ( media-libs/libsdl2[sound,video] )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype:2
- sys-libs/zlib:=
- )
- )
- lzma? ( app-arch/xz-utils )
- lzo? ( dev-libs/lzo:2 )
- png? ( media-libs/libpng:= )
- zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=games-util/grfcodec-6.0.6_p20210310
- virtual/pkgconfig
-"
-PDEPEND="
- !dedicated? (
- openmedia? (
- >=games-misc/openmsx-0.4.0
- >=games-misc/opensfx-1.0.1
- )
- )
- openmedia? ( >=games-misc/opengfx-0.6.1 )
- timidity? ( media-sound/timidity++ )
-"
-
-DOCS=( docs/directory_structure.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_prepare() {
- # Drop automagic LTO usage
- sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die
-
- # Don't force _FORTIFY_SOURCE via CMake
- # (we already set it in the toolchain by default with a minimum level
- # of _FORTIFY_SOURCE=2)
- sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_BINDIR=bin
- -DCMAKE_INSTALL_DATADIR=share
- -DOPTION_DEDICATED=$(usex dedicated)
- -DOPTION_USE_ASSERTS=$(usex debug)
- -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
- -DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
- -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
- -DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
- -DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
- -DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
- # N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
- # with USE="allegro -sdl" combination flags. There no other way to
- # completely disable SDL1 support.
- -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
- -DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
- -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use dedicated ; then
- newconfd "${FILESDIR}"/openttd.confd-r1 openttd
- newinitd "${FILESDIR}"/openttd.initd-r3 openttd
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use openmedia ; then
- elog
- elog "OpenTTD was compiled without the 'openmedia' USE flag."
- elog
- elog "In order to play, you must at least install"
- elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
- elog "following 6 files from a version of Transport Tycoon Deluxe"
- elog "(Windows or DOS) to shared or personal location."
- elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info."
- elog
- elog "From the Windows version you need: "
- elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
- elog "OR from the DOS version you need: "
- elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
- fi
-}
diff --git a/games-simulation/openttd/openttd-13.1.ebuild b/games-simulation/openttd/openttd-13.1.ebuild
deleted file mode 100644
index 20010db20802..000000000000
--- a/games-simulation/openttd/openttd-13.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-# TODO: On master (after 13.x):
-# - icu-layoutex is gone (https://github.com/OpenTTD/OpenTTD/commit/81d4fa69990abbc18bd83d60658b0eedd66b7447)
-# - icu-le-hb looks like it might be too (https://github.com/OpenTTD/OpenTTD/issues/6922)
-RDEPEND="
- dedicated? (
- acct-group/openttd
- acct-user/openttd
- app-misc/dtach
- )
- !dedicated? (
- allegro? ( media-libs/allegro:5 )
- fluidsynth? ( media-sound/fluidsynth )
- icu? (
- dev-libs/icu-layoutex:=
- dev-libs/icu-le-hb
- >=dev-libs/icu-58.1:=
- )
- sdl? ( media-libs/libsdl2[sound,video] )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype:2
- sys-libs/zlib:=
- )
- )
- lzma? ( app-arch/xz-utils )
- lzo? ( dev-libs/lzo:2 )
- png? ( media-libs/libpng:= )
- zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=games-util/grfcodec-6.0.6_p20210310
- virtual/pkgconfig
-"
-PDEPEND="
- !dedicated? (
- openmedia? (
- >=games-misc/openmsx-0.4.0
- >=games-misc/opensfx-1.0.1
- )
- )
- openmedia? ( >=games-misc/opengfx-0.6.1 )
- timidity? ( media-sound/timidity++ )
-"
-
-DOCS=( docs/directory_structure.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_prepare() {
- # Drop automagic LTO usage
- sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die
-
- # Don't force _FORTIFY_SOURCE via CMake
- # (we already set it in the toolchain by default with a minimum level
- # of _FORTIFY_SOURCE=2)
- sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_BINDIR=bin
- -DCMAKE_INSTALL_DATADIR=share
- -DOPTION_DEDICATED=$(usex dedicated)
- -DOPTION_USE_ASSERTS=$(usex debug)
- -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
- -DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
- -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
- -DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
- -DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
- -DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
- # N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
- # with USE="allegro -sdl" combination flags. There no other way to
- # completely disable SDL1 support.
- -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
- -DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
- -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use dedicated ; then
- newconfd "${FILESDIR}"/openttd.confd-r1 openttd
- newinitd "${FILESDIR}"/openttd.initd-r3 openttd
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use openmedia ; then
- elog
- elog "OpenTTD was compiled without the 'openmedia' USE flag."
- elog
- elog "In order to play, you must at least install"
- elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
- elog "following 6 files from a version of Transport Tycoon Deluxe"
- elog "(Windows or DOS) to shared or personal location."
- elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info."
- elog
- elog "From the Windows version you need: "
- elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
- elog "OR from the DOS version you need: "
- elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
- fi
-}
next reply other threads:[~2023-08-01 7:09 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 7:09 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-26 5:15 [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/ Sam James
2025-01-26 5:15 Sam James
2024-07-24 7:12 Sam James
2023-08-01 7:09 Sam James
2023-06-27 11:28 Sam James
2023-06-14 2:48 Sam James
2023-04-16 7:33 Sam James
2023-03-09 20:13 Ionen Wolkens
2023-02-08 21:13 Sam James
2022-04-12 7:54 Sam James
2021-11-12 1:31 Sam James
2021-10-24 4:06 Sam James
2021-10-24 4:06 Sam James
2021-08-14 3:48 Sam James
2021-08-07 5:36 Sam James
2021-04-06 18:18 Sam James
2020-11-11 11:22 Lars Wendler
2020-11-11 11:22 Lars Wendler
2020-10-01 15:47 James Le Cuirot
2020-06-05 8:37 Stefan Strogin
2020-06-05 8:28 Stefan Strogin
2020-04-16 20:44 James Le Cuirot
2020-04-16 20:44 James Le Cuirot
2020-04-16 20:44 James Le Cuirot
2020-04-14 21:59 James Le Cuirot
2019-10-14 12:10 Lars Wendler
2019-07-09 10:03 Lars Wendler
2019-07-09 10:03 Lars Wendler
2019-04-15 14:54 Lars Wendler
2019-04-15 14:54 Lars Wendler
2019-04-03 12:20 Lars Wendler
2018-07-16 9:21 Lars Wendler
2018-03-27 12:39 Lars Wendler
2018-02-04 6:06 Lars Wendler
2017-09-30 4:58 Michael Palimaka
2017-09-30 4:58 Michael Palimaka
2017-07-18 23:06 Lars Wendler
2017-06-14 22:21 James Le Cuirot
2017-05-15 13:15 Lars Wendler
2017-01-01 17:19 Lars Wendler
2016-12-26 17:04 Lars Wendler
2016-11-08 8:35 Lars Wendler
2016-11-06 15:26 Lars Wendler
2016-11-06 15:26 Lars Wendler
2016-02-14 10:11 Agostino Sarubbo
2016-01-15 9:03 Agostino Sarubbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1690873150.73ada977ef07568523904dbe2faad6acdfb97afd.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox