summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-10-15 11:29:02 +0000
committerPacho Ramos <pacho@gentoo.org>2014-10-15 11:29:02 +0000
commitc75de99e34c7fa29463f0da36d3f0d1ffced538b (patch)
treea845c55adb429aa9fe3b286856380d2d6e3e7821 /games-fps
parentSupport multilib providers for deps. Bump to EAPI=5. (diff)
downloadgentoo-2-c75de99e34c7fa29463f0da36d3f0d1ffced538b.tar.gz
gentoo-2-c75de99e34c7fa29463f0da36d3f0d1ffced538b.tar.bz2
gentoo-2-c75de99e34c7fa29463f0da36d3f0d1ffced538b.zip
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/ut2003-demo/ChangeLog7
-rw-r--r--games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild33
2 files changed, 26 insertions, 14 deletions
diff --git a/games-fps/ut2003-demo/ChangeLog b/games-fps/ut2003-demo/ChangeLog
index 16bef38ea9e7..aa4f6396b3fe 100644
--- a/games-fps/ut2003-demo/ChangeLog
+++ b/games-fps/ut2003-demo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-fps/ut2003-demo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.31 2013/11/14 22:00:43 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.32 2014/10/15 11:29:02 pacho Exp $
+
+ 15 Oct 2014; Pacho Ramos <pacho@gentoo.org> ut2003-demo-2206-r3.ebuild:
+ Support multilib providers for deps. Bump to EAPI=5.
14 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org>
ut2003-demo-2206-r3.ebuild:
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index f798e9349211..cd2615ca3b44 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.26 2013/11/14 22:00:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.27 2014/10/15 11:29:02 pacho Exp $
+
+EAPI=5
inherit eutils unpacker games
@@ -17,14 +19,21 @@ IUSE=""
RESTRICT="strip"
DEPEND="app-arch/unzip"
-RDEPEND="virtual/opengl
- ~virtual/libstdc++-3.3
+RDEPEND="
sys-devel/bc
- x86? (
- x11-libs/libX11
- x11-libs/libXext )
- amd64? (
- app-emulation/emul-linux-x86-xlibs )"
+ virtual/libstdc++:3.3
+ || (
+ (
+ virtual/opengl[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ )
+ )
+"
S=${WORKDIR}
@@ -78,9 +87,9 @@ src_install() {
# Wrapper and benchmark-scripts
dogamesbin "${FILESDIR}"/ut2003-demo || die "dogamesbin failed"
exeinto "${dir}"/Benchmark
- doexe "${FILESDIR}/"{benchmark,results.sh} || die "doexe failed"
- dosed "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
- "${GAMES_BINDIR}"/${PN} "${dir}"/Benchmark/benchmark \
+ doexe "${FILESDIR}/"{benchmark,results.sh}
+ sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
+ "${ED}/${GAMES_BINDIR}/${PN}" "${ED}/${dir}"/Benchmark/benchmark \
|| die "sed GAMES_PREFIX_OPT"
# Here we apply DrSiN's crash patch