summaryrefslogtreecommitdiff
path: root/games-simulation/openttd
diff options
context:
space:
mode:
Diffstat (limited to 'games-simulation/openttd')
-rw-r--r--games-simulation/openttd/Manifest11
-rw-r--r--games-simulation/openttd/files/openttd-1.9.0-cflags.patch56
-rw-r--r--games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch34
-rw-r--r--games-simulation/openttd/files/openttd.initd19
-rw-r--r--games-simulation/openttd/openttd-1.7.2.ebuild170
-rw-r--r--games-simulation/openttd/openttd-1.9.0.ebuild (renamed from games-simulation/openttd/openttd-1.7.1-r1.ebuild)91
-rw-r--r--games-simulation/openttd/openttd-9999.ebuild51
7 files changed, 175 insertions, 257 deletions
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index b02ceb429c44..5ec7aef5a5b6 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,13 +1,12 @@
AUX openttd-1.6.0-cflags.patch 1028 BLAKE2B bc71e2620a834b37f5957d3da885dcd5e692fcca238c7e87949a36e24029677f036da9773d786b44022e4f8d920ea25f881ed782ec107f9c963558e9411b9d98 SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f
AUX openttd-1.8.0-icu61.patch 2009 BLAKE2B a48deea2af2433ffbca27636687c5310da93410af557310fc86cfc0ec0a1dc249b7436a09a995c7f16a1dafb69399bb5c12b9b25f1eeb4e7b0abe481cf9b4158 SHA512 db470433bcc68688b1a4cf71a514879c139300a778feb3f832bff0400b578d4b7720df6e259a86013334a661fce56c66d74aaf709d0027cf9638f006bebca10e
AUX openttd-1.8.0-icu62.patch 4036 BLAKE2B d90afd00fbc8f20f2a71f317d31952711a038d909c6d5ecd81a383a99d37db4607138251ae3c0563cea06f04332c9b233505dc48f01f3882f614c97f87a74734 SHA512 da67257f56dd9a8812a9fdd5a2535ddbd0f23eca931d426500dc762313197ff941f50a39a5a1fd2e47aa12bd5a3eb2a2bb3978a3748dbf06e8c63c7a010f6a1b
-AUX openttd.initd 412 BLAKE2B 04a18d4a8cd30a600b2e033792714f2a8bee16e0b9207d6609a3c1ef2101a611cf17d028af23c61fcaef3233c7199e45612b90a5c9af14e992a5d7d74b1695f6 SHA512 eb14a32baa8a6601945e5f0cd844e2dc9620661ee4ab841d5085b75a0fb4a1ea8698b9292a489d63792d1163a13c7843795ef843fe0babdeac0a0468313667a3
+AUX openttd-1.9.0-cflags.patch 1418 BLAKE2B 4c279bca0360d202d183488f61a19a5abc768cf55c2bb1ebaaa58ecd59f61584d4865bd7fc91260f14bd750b623884b88b6900e1c9cb89c007b32534e62ab510 SHA512 df1eeca21325b09c849191f7a60d0be1eee107a40b3cbb846f5c845d560f61a847ac66c427772c8e980d2ab2f51ccaa539938dd36c143f9af558293f9cf5c755
+AUX openttd-1.9.0-dont_compress_manpages.patch 1137 BLAKE2B aa03bf141f1dac450b90ad9b54f4022dc981e041f40cd5ad9b7b522910788fcf30c85ac8ee3ba480c76df67f11b8258de7fe785259796b67bebc1a49ce1ed6e3 SHA512 0985a5826dddfb9a03bfc686de5ae2a36362d635865fde9ec2ee340672556d82517db94197d7de04630ba7558bee5ad4543debafd46e5dfd2bbec2eaa9354a18
AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-1.7.1-source.tar.gz 10090311 BLAKE2B 339171cd2895398ee1fedcfd24d1126fbc060b6d4530b267310b3f220448f8e6469a726e71e9882bea117585ea7b9f7271205f576ee2b26de6dec079f57f1620 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3
-DIST openttd-1.7.2-source.tar.gz 10097175 BLAKE2B a027b6ca6d3116dc3e6ad6ae43965682107268e367032418200cf1c1e16c5b5dad39c275ea57d923f17564d80cceb0e9909dc5aaf7ee230242f0ce0f46f06b1a SHA512 44d25061c42cb9c81baa67a40ff31a6681dcbb121c61db74c5179a31f189919471a82b7fd3f79c2cdeef02af5b47ec35fdbdc7feed74ca2360c028869fe772e8
DIST openttd-1.8.0-source.tar.xz 6521016 BLAKE2B b3a608fd21d21f861af6eba235c028a59f071ab4698cfdcdd499b6ea7ece853679b064935368d95330414a24ac90aaa3c426afc12a2e135d5b0a48170879b807 SHA512 a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a
-EBUILD openttd-1.7.1-r1.ebuild 4811 BLAKE2B 0a362bab76f8ffd48b5f565111aeee4517dc0e3b5c6b93e823189dd314ca83649827173611fca36ca529375c60ceebd654c4f5959dc0c959d0c38a5ba684cf40 SHA512 e54396fa54e8e065be21964fea386b1b734c72395e156b343eec1e2789393bf381093e7212e8ff673dfb849d9d36afc4c11bfc70620543dda7462bda9ccc8787
-EBUILD openttd-1.7.2.ebuild 4811 BLAKE2B 1ff782a7493162f1c76b93c45bbe5509c2d5f090d518e41428b0d04adeb3205ca9ced894b85011c92bc65ce67fe6c581b5685da9c7233d03e0e5f291d1d979ad SHA512 586fcfd067dc19abf56d3064fd7478ea2c7cb4cc38a870bee7d79fc615056b8183b420908897d3739686dcd4f5d5054b3e836d8410ca85a8d0cce92228dc86ee
+DIST openttd-1.9.0-source.tar.xz 6575956 BLAKE2B 31d663b2f8aa67d9e3eb7899795468e8641671bb977957fdc6e55c8dedf3f2a00757de67ed034bf6180cc6091006a1b0bfba8af22d09744eb839a54ca662cbd9 SHA512 fcc044ea93810c99e9b3e80676676272c6f0efb43faa7ef4bfa7184aea793680df22504a1831837cc5ae8481e898d0636b992d1ddb8560cd4848463343adba2d
EBUILD openttd-1.8.0.ebuild 4942 BLAKE2B 2ceb5e797c44317559daa6e051a98338aba0fda1cdcf01edb8132ede0f8a648d06491833b0764d0973ac2041c8642619a225b2d90839da44a6c75ab808bc265e SHA512 17185feba1d39f17bf150f95e087f5d31be94cc6c57ef9f62da9de78b6375052a09ea3aed26d4bf4d47a39ff6759752a77281d0fd117c3a459f76ac733dfbe90
-EBUILD openttd-9999.ebuild 4938 BLAKE2B 588a3bf43ba454ecf67dfdf979a33360c51ed5af550380ee3d8931222fdd39acd84911b65011252b64f4c5bd3baac0c10c9f4ad76840cc5b2c11bd26b7d4aac6 SHA512 baab0384b8eb72d5852739727e373d529ab69d8aa36ef9b710ab14d9b7978b3195fa09ba7a3cf8e56d4bf88054f3796472589d11a5e8550c8e0086ac733380d6
+EBUILD openttd-1.9.0.ebuild 5059 BLAKE2B 546a1d14347679495b60a397bc55d9a452c461e18c45751943c8f19983d5b5164e03843702f1b26cbe7f0d6e0909303f610f52735c6740e7cdc746d653d910b3 SHA512 abf97e9de9e170c619355f5d0b3dc509da9094c0bc620ed6982f5b47a3cc519ba0338ee500664e288d6e55c24477e610c39ca36d5ea90cce47aa5906cc9655ee
+EBUILD openttd-9999.ebuild 4877 BLAKE2B e5e8fce784cc41262792ac0657bbaa241c075ac79edc58b7f1de180a35ca8aba1cc0cd7ac5c315eae6fa258efc2d291cac77590d130d2fc37a075b402cf0fb42 SHA512 aea87497dbdd2fb75681dd1e885eca49b5a500a0508d987b494347fc0bb6e517c79060daef07a70085c27610f77154371a8be37395e3e53ede20dc99caf8221f
MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/files/openttd-1.9.0-cflags.patch b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
new file mode 100644
index 000000000000..86eb16168dbc
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.9.0-cflags.patch
@@ -0,0 +1,56 @@
+From 6d72f33efe9f911d1427795a06c13d9dcd6fa222 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 14:11:42 +0200
+Subject: [PATCH] Don't mess with our CFLAGS
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ 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
new file mode 100644
index 000000000000..d151dbf36931
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.9.0-dont_compress_manpages.patch
@@ -0,0 +1,34 @@
+From da54b0365997181979d5c7131e99957424d4a167 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 3 Apr 2019 13:53:50 +0200
+Subject: [PATCH] Do not compress man-pages by default
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ 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/files/openttd.initd b/games-simulation/openttd/files/openttd.initd
deleted file mode 100644
index 7a719587c7d6..000000000000
--- a/games-simulation/openttd/files/openttd.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting OpenTTD dedicated server"
- start-stop-daemon --start -q --exec /usr/games/bin/openttd -- -D -f > /dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping OpenTTD dedicated server"
- start-stop-daemon --stop -q -n openttd
- eend $?
-}
diff --git a/games-simulation/openttd/openttd-1.7.2.ebuild b/games-simulation/openttd/openttd-1.7.2.ebuild
deleted file mode 100644
index f6e90e926ac5..000000000000
--- a/games-simulation/openttd/openttd-1.7.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
- media-libs/libsdl[sound,X,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
- )
- )
- lzo? ( dev-libs/lzo:2 )
- iconv? ( virtual/libiconv )
- png? ( media-libs/libpng:0 )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- 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.6.0-cflags.patch
-)
-
-src_configure() {
- local myopts=()
- # 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.
- local myopts+=( --without-allegro )
-
- # libtimidity not needed except for some embedded platform
- # nevertheless, it will be automagically linked if it is
- # installed. Hence, we disable it.
- myopts+=( --without-libtimidity )
-
- use debug && myopts+=( --enable-debug=3 )
-
- if use dedicated ; then
- myopts+=( --enable-dedicated )
- else
- use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
- myopts+=(
- $(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.
- CFLAGS="" ./configure \
- --disable-strip \
- --prefix-dir="${EPREFIX%/}/usr" \
- --binary-dir="bin" \
- --install-dir="${D}" \
- --menu-group="Game;Simulation;" \
- ${myopts[@]} \
- $(use_with iconv) \
- $(use_with png) \
- $(use_with cpu_flags_x86_sse sse) \
- $(use_with lzo liblzo2) \
- || 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}
- fi
- rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- 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 "${GAMES_DATADIR}/${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
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-simulation/openttd/openttd-1.7.1-r1.ebuild b/games-simulation/openttd/openttd-1.9.0.ebuild
index f24302009a47..49368f0e59a7 100644
--- a/games-simulation/openttd/openttd-1.7.1-r1.ebuild
+++ b/games-simulation/openttd/openttd-1.9.0.ebuild
@@ -1,16 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils gnome2-utils
+EAPI=7
+inherit xdg
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
+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"
-KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
RESTRICT="test" # needs a graphics set in order to test
@@ -24,14 +33,18 @@ RDEPEND="!dedicated? (
truetype? (
media-libs/fontconfig
media-libs/freetype:2
- sys-libs/zlib
+ sys-libs/zlib:=
)
)
lzo? ( dev-libs/lzo:2 )
iconv? ( virtual/libiconv )
- png? ( media-libs/libpng:0 )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+ png? (
+ media-libs/libpng:0
+ sys-libs/zlib:=
+ )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig"
PDEPEND="
!dedicated? (
@@ -45,28 +58,41 @@ PDEPEND="
openmedia? ( >=games-misc/opengfx-0.4.7 )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-cflags.patch
+ "${FILESDIR}"/${PN}-1.9.0-cflags.patch
+ "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
)
src_configure() {
- local myopts=()
- # 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.
- local myopts+=( --without-allegro )
-
- # libtimidity not needed except for some embedded platform
- # nevertheless, it will be automagically linked if it is
- # installed. Hence, we disable it.
- myopts+=( --without-libtimidity )
-
- use debug && myopts+=( --enable-debug=3 )
+ 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 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
+
+ # libtimidity not needed except for some embedded platform
+ # nevertheless, it will be automagically linked if it is
+ # installed. Hence, we disable it.
+ --without-libtimidity
+
+ --without-fluidsynth
+ )
if use dedicated ; then
myopts+=( --enable-dedicated )
else
- use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
myopts+=(
+ $(usex aplaymidi '--with-midi=/usr/bin/aplaymidi' '')
$(use_with truetype freetype)
$(use_with icu)
--with-sdl
@@ -80,18 +106,7 @@ src_configure() {
# configure is a hand-written bash-script, so econf will not work.
# It's all built as C++, upstream uses CFLAGS internally.
- CFLAGS="" ./configure \
- --disable-strip \
- --prefix-dir="${EPREFIX%/}/usr" \
- --binary-dir="bin" \
- --install-dir="${D}" \
- --menu-group="Game;Simulation;" \
- ${myopts[@]} \
- $(use_with iconv) \
- $(use_with png) \
- $(use_with cpu_flags_x86_sse sse) \
- $(use_with lzo liblzo2) \
- || die
+ CFLAGS="" ./configure ${myopts[@]} || die
}
src_compile() {
@@ -108,11 +123,11 @@ src_install() {
}
pkg_preinst() {
- gnome2_icon_savelist
+ xdg_pkg_preinst
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_pkg_postinst
if ! use lzo ; then
elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
@@ -166,5 +181,5 @@ pkg_postinst() {
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_pkg_postrm
}
diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild
index 8289f42f6d0a..0299cc25d762 100644
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit gnome2-utils
+EAPI=7
+inherit xdg
MY_PV="${PV/_rc/-RC}"
MY_P="${PN}-${MY_PV}"
@@ -13,8 +13,9 @@ if [[ "${PV}" == *9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD.git"
else
- SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.xz"
+ 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"
@@ -32,14 +33,18 @@ RDEPEND="!dedicated? (
truetype? (
media-libs/fontconfig
media-libs/freetype:2
- sys-libs/zlib
+ sys-libs/zlib:=
)
)
lzo? ( dev-libs/lzo:2 )
iconv? ( virtual/libiconv )
- png? ( media-libs/libpng:0 )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+ png? (
+ media-libs/libpng:0
+ sys-libs/zlib:=
+ )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig"
PDEPEND="
!dedicated? (
@@ -52,32 +57,30 @@ PDEPEND="
)
openmedia? ( >=games-misc/opengfx-0.4.7 )"
-S="${WORKDIR}/${MY_P}"
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-cflags.patch
+ "${FILESDIR}"/${PN}-1.9.0-cflags.patch
+ "${FILESDIR}"/${PN}-1.9.0-dont_compress_manpages.patch
)
src_configure() {
local myopts=(
- --disable-strip
- --prefix-dir="${EPREFIX%/}/usr"
--binary-dir="bin"
+ --disable-strip
+ --doc-dir="share/doc/${PF}"
--install-dir="${D}"
--menu-group="Game;Simulation;"
- $(use_with iconv)
- $(use_with png)
+ --prefix-dir="${EPREFIX}/usr"
$(use_with cpu_flags_x86_sse sse)
+ $(use_with iconv)
$(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
- # libtimidity not needed except for some embedded platform
- # nevertheless, it will be automagically linked if it is
- # installed. Hence, we disable it.
- --without-libtimidity
+
+ --without-fluidsynth
)
if use dedicated ; then
@@ -109,17 +112,17 @@ src_install() {
default
if use dedicated ; then
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- rm -rf "${ED%/}"/usr/share/{applications,icons,pixmaps}
+ rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
fi
- rm -f "${ED%/}"/usr/share/doc/${PF}/COPYING
+ rm -f "${ED}"/usr/share/doc/${PF}/COPYING
}
pkg_preinst() {
- gnome2_icon_savelist
+ xdg_pkg_preinst
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_pkg_postinst
if ! use lzo ; then
elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
@@ -173,5 +176,5 @@ pkg_postinst() {
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_pkg_postrm
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 13:28:39 +0000