From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1542420-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5850E15801B
for <garchives@archives.gentoo.org>; Tue, 1 Aug 2023 07:09:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5F386E0DC7;
Tue, 1 Aug 2023 07:09:35 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3E276E0DC7
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Aug 2023 07:09:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 11CC9340831
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Aug 2023 07:09:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 747B1EA8
for <gentoo-commits@lists.gentoo.org>; Tue, 1 Aug 2023 07:09:32 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1690873150.73ada977ef07568523904dbe2faad6acdfb97afd.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-simulation/openttd/Manifest games-simulation/openttd/openttd-13.0.ebuild games-simulation/openttd/openttd-13.1.ebuild
X-VCS-Directories: games-simulation/openttd/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 73ada977ef07568523904dbe2faad6acdfb97afd
X-VCS-Branch: master
Date: Tue, 1 Aug 2023 07:09:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e302a05f-7b86-45d7-9fb4-e743922f1233
X-Archives-Hash: 9cf7ea6c28e6aa12deef8765117fe2b8
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
-}