commit:     1c284527f144d928e9d40a2898531c67744429e5
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 01:02:05 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 01:02:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c284527

games-simulation/openttd: version bump (bug #579056)

Package-Manager: portage-2.2.26

 games-simulation/openttd/Manifest                  |   1 +
 .../openttd/files/openttd-1.6.0-cflags.patch       |  42 +++++
 games-simulation/openttd/openttd-1.6.0.ebuild      | 174 +++++++++++++++++++++
 3 files changed, 217 insertions(+)

diff --git a/games-simulation/openttd/Manifest 
b/games-simulation/openttd/Manifest
index b5c1cf7..a6bd3e0 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1 +1,2 @@
 DIST openttd-1.5.3-source.tar.gz 10042384 SHA256 
a5525de811ff83e89774d9a7344c7f63ec282b956c3f015af259fd79f54d18e5 SHA512 
8185ea4b8e5ac9456c7067a5d662b4a2e1724e14fc0455705ec3b72943421cc5cb10cb67a4f483c47ff2fa6621a219cababd08e21086209a53241a74607b5466
 WHIRLPOOL 
839067c2c6f8f87ea74df376f3d3d5e2a126c5198f69efce1205603da67d97c1a1b0d5dc3b349aa92f916179ccc48581418b5aa1e9e7e250f636fae78bcbf7ac
+DIST openttd-1.6.0-source.tar.gz 10064454 SHA256 
32f63477aba1ccf238dfe0538a6660163c2b725e077978e570e38d023d269cad SHA512 
d235e6e094b2e3fda0cf58a2dce1e5d779654bee638def60f00da4e7c6443b00a6f3b204d5a63cf56e141074c8aa3700ce7e9f1b1eccbb5cd36260f1892ad501
 WHIRLPOOL 
497272ccc3836710a68cabfbf5b925a30c3d23ee332e5ba5fa24a2b79b199d2b7ce6bd22507ea977986382ae32193247b9eedee638419d1e6f41165f5fa8abd9

diff --git a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch 
b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
new file mode 100644
index 0000000..bb7f768
--- /dev/null
+++ b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
@@ -0,0 +1,42 @@
+--- openttd-1.4.4/config.lib
++++ openttd-1.4.4/config.lib
+@@ -1450,12 +1450,6 @@
+                       CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing 
-fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
+                       LDFLAGS="$LDFLAGS -noixemul"
+               fi
+-
+-              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"
+ 
+@@ -1466,14 +1460,6 @@
+                               CFLAGS="$CFLAGS -G0"
+                       fi
+               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
+@@ -1498,11 +1484,6 @@
+               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

diff --git a/games-simulation/openttd/openttd-1.6.0.ebuild 
b/games-simulation/openttd/openttd-1.6.0.ebuild
new file mode 100644
index 0000000..403e495
--- /dev/null
+++ b/games-simulation/openttd/openttd-1.6.0.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+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 ~ppc ~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:= )
+               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 )"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-cflags.patch
+}
+
+src_configure() {
+       # 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}" \
+               --binary-dir="${GAMES_BINDIR}" \
+               --data-dir="${GAMES_DATADIR}/${PN}" \
+               --install-dir="${D}" \
+               --icon-dir=/usr/share/pixmaps \
+               --menu-dir=/usr/share/applications \
+               --icon-theme-dir=/usr/share/icons/hicolor \
+               --man-dir=/usr/share/man/man6 \
+               --doc-dir=/usr/share/doc/${PF} \
+               --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 ${PN}
+               rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
+       fi
+       rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+       prepgamesdirs
+}
+
+pkg_preinst() {
+       games_pkg_preinst
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       gnome2_icon_cache_update
+       games_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 "${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
+}

Reply via email to