summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Weiler <pylon@gentoo.org>2007-05-12 15:37:37 +0000
committerLars Weiler <pylon@gentoo.org>2007-05-12 15:37:37 +0000
commita0163895cbc742867d971c7158084a964fe42222 (patch)
tree08e6b8dd8d57c572c378bb9edb6d3215ad912489
parentStable on ppc64; bug #178018 (diff)
downloadgentoo-2-a0163895cbc742867d971c7158084a964fe42222.tar.gz
gentoo-2-a0163895cbc742867d971c7158084a964fe42222.tar.bz2
gentoo-2-a0163895cbc742867d971c7158084a964fe42222.zip
Updated ebuild with patches from maedhros in bug #176474.
(Portage version: 2.1.2.7)
-rw-r--r--games-simulation/openttd/ChangeLog5
-rw-r--r--games-simulation/openttd/openttd-0.5.1.ebuild22
2 files changed, 15 insertions, 12 deletions
diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index e1f63bb1a651..0eff85f4f966 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-simulation/openttd
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.39 2007/04/21 11:50:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.40 2007/05/12 15:37:37 pylon Exp $
+
+ 12 May 2007; Lars Weiler <pylon@gentoo.org> openttd-0.5.1.ebuild:
+ Updated ebuild with patches from maedhros in bug #176474.
*openttd-0.5.1 (21 Apr 2007)
diff --git a/games-simulation/openttd/openttd-0.5.1.ebuild b/games-simulation/openttd/openttd-0.5.1.ebuild
index 9bc1bec5fdfc..b8bb4b9d8d8d 100644
--- a/games-simulation/openttd/openttd-0.5.1.ebuild
+++ b/games-simulation/openttd/openttd-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.1.ebuild,v 1.1 2007/04/21 11:50:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.5.1.ebuild,v 1.2 2007/05/12 15:37:37 pylon Exp $
inherit eutils games
@@ -17,12 +17,14 @@ SRC_URI="${SB}/${P}-source.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
-IUSE="alsa debug dedicated png scenarios timidity unicode zlib"
+IUSE="alsa debug dedicated iconv png scenarios timidity zlib"
-DEPEND="!dedicated? ( media-libs/libsdl >=media-libs/fontconfig-2.3.2 )
+DEPEND="!dedicated? ( media-libs/libsdl
+ media-libs/fontconfig
+ )
+ iconv? ( virtual/libiconv )
png? ( media-libs/libpng )
- zlib? ( sys-libs/zlib )
- unicode? ( virtual/libiconv )"
+ zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}
!dedicated? (
timidity? ( media-sound/timidity++ )
@@ -56,23 +58,21 @@ src_compile() {
local myopts=""
use debug && myopts="${myopts} DEBUG=1"
use dedicated && myopts="${myopts} DEDICATED=1"
+ use iconv && myopts="${myopts} WITH_ICONV=1"
use png && myopts="${myopts} WITH_PNG=1"
use zlib && myopts="${myopts} WITH_ZLIB=1"
- use unicode && myopts="${myopts} WITH_ICONV=1"
if ! use dedicated ; then
- myopts="${myopts} WITH_SDL=1"
+ myopts="${myopts} WITH_SDL=1 WITH_FREETYPE=1 WITH_FONTCONFIG=1"
if ! use timidity; then
use alsa && myopts="${myopts} MIDI=/usr/bin/aplaymidi"
fi
fi
- # parallel build not supported
- emake -j1 \
+ emake \
MANUAL_CONFIG=1 \
UNIX=1 \
WITH_NETWORK=1 \
INSTALL=1 \
- RELEASE=${PV} \
USE_HOMEDIR=1 \
DEST_DIR=${D} \
PERSONAL_DIR=.openttd \
@@ -116,7 +116,7 @@ src_install() {
newinitd "${FILESDIR}"/openttd.initd openttd
fi
- dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/console.txt docs/multiplayer.txt
+ dodoc readme.txt known-bugs.txt changelog.txt docs/Manual.txt docs/multiplayer.txt
dohtml -a html,gif,png,svg docs/*
newdoc scripts/readme.txt readme_scripts.txt
doman docs/openttd.6