summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2006-11-07 03:54:27 +0000
committerTristan Heaven <tristan@gentoo.org>2006-11-07 03:54:27 +0000
commit0dfde029be7f3dff1944c97708790bf6b06e7bdf (patch)
treea5e2d9c3aaa22854103c7564bae44169d63f7185 /games-strategy
parentx86 stable (diff)
downloadhistorical-0dfde029be7f3dff1944c97708790bf6b06e7bdf.tar.gz
historical-0dfde029be7f3dff1944c97708790bf6b06e7bdf.tar.bz2
historical-0dfde029be7f3dff1944c97708790bf6b06e7bdf.zip
Fix locale issue and add RESTRICT=test, bug #144100
Package-Manager: portage-2.1.2_rc1-r4
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/ufo2000/ChangeLog7
-rw-r--r--games-strategy/ufo2000/ufo2000-0.7.1062.ebuild20
2 files changed, 13 insertions, 14 deletions
diff --git a/games-strategy/ufo2000/ChangeLog b/games-strategy/ufo2000/ChangeLog
index acef25070a34..5304ac7b95fb 100644
--- a/games-strategy/ufo2000/ChangeLog
+++ b/games-strategy/ufo2000/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-strategy/ufo2000
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.17 2006/09/27 14:25:32 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ChangeLog,v 1.18 2006/11/07 03:54:27 nyhm Exp $
+
+ 07 Nov 2006; Tristan Heaven <nyhm@gentoo.org>
+ -files/ufo2000-0.6.627-gcc41.patch, -ufo2000-0.6.627.ebuild,
+ ufo2000-0.7.1062.ebuild:
+ Fix locale issue and add RESTRICT=test, bug #144100
27 Sep 2006; Tristan Heaven <nyhm@gentoo.org> ufo2000-0.6.627.ebuild:
Add inherit eutils
diff --git a/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild b/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild
index b8d6e0eba582..50396e9aaefb 100644
--- a/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild
+++ b/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild,v 1.2 2006/09/27 09:37:32 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.7.1062.ebuild,v 1.3 2006/11/07 03:54:27 nyhm Exp $
-inherit flag-o-matic games
+inherit toolchain-funcs games
DESCRIPTION="Free multiplayer remake of X-COM (UFO: Enemy Unknown)"
HOMEPAGE="http://ufo2000.sourceforge.net/"
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ppc x86"
IUSE="vorbis"
+RESTRICT="test"
RDEPEND="dev-libs/expat
>=dev-games/hawknl-1.66
@@ -30,10 +31,8 @@ src_unpack() {
cd "${S}"
sed -i \
- -e "s/\bCX\b/CXX/g" \
- -e "/^CXX/d" \
- -e "/^CC/d" \
- -e 's/\^ \$(LIBS)/^ -Wl,-z,noexecstack $(LIBS)/' \
+ -e "/^CX/s/g++/$(tc-getCXX)/" \
+ -e "/^CC/s/gcc/$(tc-getCC)/" \
makefile \
|| die "sed failed"
@@ -44,16 +43,11 @@ src_unpack() {
}
src_compile() {
- local myconf="no_dumbogg=1"
-
- use vorbis && myconf=""
-
- append-flags -Wa,--noexecstack
- append-ldflags -Wl,-z,noexecstack
emake \
DATA_DIR="${GAMES_DATADIR}/${PN}" \
OPTFLAGS="${CXXFLAGS}" \
- ${myconf} \
+ UFO_SVNVERSION=exported \
+ $(use vorbis || echo no_dumbogg=1) \
|| die "emake failed"
}