summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-27 11:11:36 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-27 11:11:36 +0000
commita62f4556cc5f12e8bd6fa00d520b8369b20128cb (patch)
treedf01910e2ebd8dfa78517e91f863bb7c4a7f0549 /games-action
parentsec. patch wrt Bug #515050, add IUSE, doc build, fix test phase, rm vuln. ver... (diff)
downloadgentoo-2-a62f4556cc5f12e8bd6fa00d520b8369b20128cb.tar.gz
gentoo-2-a62f4556cc5f12e8bd6fa00d520b8369b20128cb.tar.bz2
gentoo-2-a62f4556cc5f12e8bd6fa00d520b8369b20128cb.zip
Support multilib packages in dependencies. Remove unnecessary dependencies.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/descent3-demo/ChangeLog6
-rw-r--r--games-action/descent3-demo/descent3-demo-1.4.0a.ebuild23
2 files changed, 16 insertions, 13 deletions
diff --git a/games-action/descent3-demo/ChangeLog b/games-action/descent3-demo/ChangeLog
index bb7a9db112c3..9355a411c546 100644
--- a/games-action/descent3-demo/ChangeLog
+++ b/games-action/descent3-demo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-action/descent3-demo
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/ChangeLog,v 1.12 2014/04/15 11:41:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/ChangeLog,v 1.13 2014/06/27 11:11:36 mgorny Exp $
+
+ 27 Jun 2014; Michał Górny <mgorny@gentoo.org> descent3-demo-1.4.0a.ebuild:
+ Support multilib packages in dependencies. Remove unnecessary dependencies.
15 Apr 2014; Ulrich Müller <ulm@gentoo.org> descent3-demo-1.4.0a.ebuild:
Fix LICENSE, add mirror and bindist restrictions, bug 506810.
@@ -50,4 +53,3 @@
+descent3-demo-1.4.0a.ebuild:
Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
#120371.
-
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
index d323aaf98772..c03efdb8ce56 100644
--- a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
+++ b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild,v 1.13 2014/04/15 11:41:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild,v 1.14 2014/06/27 11:11:36 mgorny Exp $
EAPI=4
@@ -18,16 +18,17 @@ RESTRICT="mirror bindist strip"
DEPEND="games-util/loki_patch"
RDEPEND="sys-libs/glibc
- virtual/opengl
- x86? (
- x11-libs/libX11
- x11-libs/libXext
- =media-libs/libsdl-1.2* )
- amd64? (
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-compat
- app-emulation/emul-linux-x86-sdl
- >=sys-libs/lib-compat-loki-0.2 )"
+ || (
+ (
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ )
+ )"
dir="${GAMES_PREFIX_OPT}/${PN}"
QA_PREBUILT="${dir:1}/descent3_demo.x86