summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2012-11-04 06:02:12 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2012-11-04 06:02:12 +0000
commit0e51ae5524fb97c9c58edb2b0475f00d0679f9e0 (patch)
tree7f05201d2bfdd71a945f3a79b5959289bcbcdcfa /games-strategy/ufo-ai
parentRemove /var/run so that it does not trigger portage's symlink protection on c... (diff)
downloadgentoo-2-0e51ae5524fb97c9c58edb2b0475f00d0679f9e0.tar.gz
gentoo-2-0e51ae5524fb97c9c58edb2b0475f00d0679f9e0.tar.bz2
gentoo-2-0e51ae5524fb97c9c58edb2b0475f00d0679f9e0.zip
don't try to use the system mini-xml (bug #440026)
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/ufo-ai')
-rw-r--r--games-strategy/ufo-ai/ChangeLog6
-rw-r--r--games-strategy/ufo-ai/ufo-ai-2.4.ebuild10
2 files changed, 11 insertions, 5 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index e88b7e1bb8d1..296f17e9bc0a 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-strategy/ufo-ai
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.40 2012/07/16 19:05:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.41 2012/11/04 06:02:12 mr_bones_ Exp $
+
+ 04 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> ufo-ai-2.4.ebuild:
+ don't try to use the system mini-xml (bug #440026)
16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
-files/ufo-ai-2.3.1-libpng15.patch, -ufo-ai-2.3.1-r1.ebuild:
@@ -160,4 +163,3 @@
ufo-ai-0.10.040218.ebuild, files/0.10.040218-Makefile.patch:
Initial import. Ebuild submitted by Pol <blenderman@tiscali.be>. Closing bug
#42418.
-
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
index f3e1022e820e..885310f833b5 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.4.ebuild,v 1.3 2012/06/08 11:48:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.4.ebuild,v 1.4 2012/11/04 06:02:12 mr_bones_ Exp $
EAPI=3
inherit eutils flag-o-matic games
@@ -47,8 +47,12 @@ DEPEND="!dedicated? (
S=${WORKDIR}/${MY_P}-source
src_prepare() {
- has_version '>=sys-libs/zlib-1.2.5.1-r1' && sed -i \
- -e '1i#define OF(x) x' src/common/ioapi.h
+ if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
+ sed -i -e '1i#define OF(x) x' src/common/ioapi.h || die
+ fi
+
+ # don't try to use the system mini-xml
+ sed -i -e '/mxml/d' configure || die
epatch "${FILESDIR}"/${P}-locale.patch