commit: 160c3a2a2c472bb27b168197e7342a3874becd40 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri May 21 19:21:45 2021 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Jun 28 22:13:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160c3a2a
games-simulation/openttd: remove old and live versions Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20913 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-simulation/openttd/Manifest | 1 - .../openttd/files/openttd-1.10.3-icu68.patch | 28 ---- .../openttd/files/openttd-1.9.0-cflags.patch | 56 ------- .../openttd-1.9.0-dont_compress_manpages.patch | 34 ---- games-simulation/openttd/metadata.xml | 1 - games-simulation/openttd/openttd-1.10.3.ebuild | 177 --------------------- games-simulation/openttd/openttd-9999.ebuild | 176 -------------------- 7 files changed, 473 deletions(-) diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 4baf99cfbbe..e1bd78d5f72 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,2 +1 @@ -DIST openttd-1.10.3-source.tar.xz 6815924 BLAKE2B f700304e723fe5c3fa9781432a387e061595bbc8de42f565ad57ac265d9e4bc14cbc659a3f6551019bfb31b8b56b180c272c6753a12b4cd2e13016a98dfe1679 SHA512 d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4 DIST openttd-1.11.2-source.tar.xz 6783972 BLAKE2B c71fd98a480566aede29f84afbd100b6d0dfa80311860907a7287d2d5bed74bd492c2b1012cd83f45fe68d60fb0c2378e1384530a84c28bd7fbd907b45110491 SHA512 9a6364bf19627db9f8ec58bfa85fa3a8febf1109f3b5fb9053bef810ac2d0c41df91b58f0b253dd45320a29cae2e8485df794afa7b5240f19759f98fd65c35ea diff --git a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch b/games-simulation/openttd/files/openttd-1.10.3-icu68.patch deleted file mode 100644 index 9596ab66606..00000000000 --- a/games-simulation/openttd/files/openttd-1.10.3-icu68.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 842e0ed5e3220a0e5ab19e7b0892c9c72c230ae7 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Fri, 30 Oct 2020 18:45:20 +0100 -Subject: [PATCH] Fix: build with icu-68.1 - -icu-68.1 removed public macro definitions for TRUE and FALSE - -Signed-off-by: Lars Wendler <[email protected]> ---- - src/gfx_layout.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gfx_layout.cpp b/src/gfx_layout.cpp -index 584a71273..ebd1afaa8 100644 ---- a/src/gfx_layout.cpp -+++ b/src/gfx_layout.cpp -@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const - - le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const - { -- return FALSE; -+ return false; - } - - /** --- -2.29.2 - diff --git a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch deleted file mode 100644 index 86eb16168db..00000000000 --- a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6d72f33efe9f911d1427795a06c13d9dcd6fa222 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Wed, 3 Apr 2019 14:11:42 +0200 -Subject: [PATCH] Don't mess with our CFLAGS - -Signed-off-by: Lars Wendler <[email protected]> ---- - config.lib | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git a/config.lib b/config.lib -index f65aaa535..7789c0bea 100644 ---- a/config.lib -+++ b/config.lib -@@ -1499,11 +1499,6 @@ make_cflags_and_ldflags() { - # No debug, add default stuff - OBJS_SUBDIR="release" - -- if [ "$enable_profiling" = "0" ]; then -- # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) -- CFLAGS="-fomit-frame-pointer $CFLAGS" -- fi -- CFLAGS="-O2 $CFLAGS" - else - OBJS_SUBDIR="debug" - -@@ -1511,14 +1506,6 @@ make_cflags_and_ldflags() { - if [ $enable_debug -ge 1 ]; then - CFLAGS="$CFLAGS -g -D_DEBUG" - fi -- if [ $enable_debug -ge 2 ]; then -- CFLAGS="$CFLAGS -fno-inline" -- fi -- if [ $enable_debug -ge 3 ]; then -- CFLAGS="$CFLAGS -O0" -- else -- CFLAGS="$CFLAGS -O2" -- fi - fi - - if [ $enable_debug -le 2 ]; then -@@ -1543,11 +1530,6 @@ make_cflags_and_ldflags() { - CFLAGS="$CFLAGS -fno-expensive-optimizations" - fi - -- if [ "$enable_profiling" != "0" ]; then -- CFLAGS="$CFLAGS -pg" -- LDFLAGS="$LDFLAGS -pg" -- fi -- - if [ "$with_threads" = "0" ]; then - CFLAGS="$CFLAGS -DNO_THREADS" - fi --- -2.21.0 - diff --git a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch deleted file mode 100644 index d151dbf3693..00000000000 --- a/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch +++ /dev/null @@ -1,34 +0,0 @@ -From da54b0365997181979d5c7131e99957424d4a167 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Wed, 3 Apr 2019 13:53:50 +0200 -Subject: [PATCH] Do not compress man-pages by default - -Signed-off-by: Lars Wendler <[email protected]> ---- - Makefile.bundle.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.bundle.in b/Makefile.bundle.in -index eaf7134dd..1c2523181 100644 ---- a/Makefile.bundle.in -+++ b/Makefile.bundle.in -@@ -77,7 +77,6 @@ endif - ifdef MAN_DIR - $(Q)mkdir -p "$(BUNDLE_DIR)/man/" - $(Q)cp "$(ROOT_DIR)/docs/openttd.6" "$(BUNDLE_DIR)/man/" -- $(Q)gzip -9 "$(BUNDLE_DIR)/man/openttd.6" - endif - $(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/" - $(Q)cp "$(ROOT_DIR)/media/openttd."*.png "$(BUNDLE_DIR)/media/" -@@ -219,7 +218,7 @@ endif - ifdef MAN_DIR - ifndef DO_NOT_INSTALL_MAN - $(Q)install -d "$(INSTALL_MAN_DIR)" -- $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz" -+ $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6" - endif - endif - ifdef MENU_DIR --- -2.21.0 - diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml index b7a1255795f..cd19f79bf53 100644 --- a/games-simulation/openttd/metadata.xml +++ b/games-simulation/openttd/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="allegro">Add support for Allegro</flag> - <flag name="aplaymidi">Enables midi music in game, using aplaymidi as an external player</flag> <flag name="fluidsynth">Compile with support for FluidSynth</flag> <flag name="openmedia">Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag> <flag name="lzo">Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag> diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild b/games-simulation/openttd/openttd-1.10.3.ebuild deleted file mode 100644 index 0af63df64cf..00000000000 --- a/games-simulation/openttd/openttd-1.10.3.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="https://www.openttd.org/"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"; -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"; - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl2[sound,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0= - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch - "${FILESDIR}"/${P}-icu68.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzma) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \ - ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - 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 ~/.openttd/data/ or" - elog "/usr/share/${PN}/data/." - 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" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild deleted file mode 100644 index c685cc3c576..00000000000 --- a/games-simulation/openttd/openttd-9999.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg - -MY_PV="${PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="https://www.openttd.org/"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"; -else - SRC_URI="https://proxy.binaries.openttd.org/openttd-releases/${MY_PV}/${MY_P}-source.tar.xz"; - KEYWORDS="~amd64 ~ppc64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aplaymidi debug dedicated iconv icu +lzma lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl2[sound,video] - icu? ( - dev-libs/icu-layoutex - dev-libs/icu-le-hb - >=dev-libs/icu-58.1:= - ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib:= - ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( - media-libs/libpng:0= - sys-libs/zlib:= - ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-cflags.patch - "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch -) - -src_configure() { - local myopts=( - --binary-dir="bin" - --disable-strip - --doc-dir="share/doc/${PF}" - --install-dir="${D}" - --menu-group="Game;Simulation;" - --prefix-dir="${EPREFIX}/usr" - $(use_with cpu_flags_x86_sse sse) - $(use_with iconv) - $(use_with lzma) - $(use_with lzo liblzo2) - $(use_with png) - $(usex debug '--enable-debug=3' '') - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - --without-allegro - - --without-fluidsynth - ) - - if use dedicated ; then - myopts+=( --enable-dedicated ) - else - myopts+=( - $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '') - $(use_with truetype freetype) - $(use_with icu) - --with-sdl - ) - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=( --with-zlib ) - else - myopts+=( --without-zlib ) - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="" \ - ./configure ${myopts[@]} || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} || die - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - 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 ~/.openttd/data/ or" - elog "/usr/share/${PN}/data/." - 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" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -}
