summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-15 15:51:52 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-15 15:51:52 +0000
commit54274c45d7295ac381951e02abed8dc3af23eaf9 (patch)
treec2fa59207527c2a9a342efb2e7f4ab4977a826d1 /app-emulation/emul-linux-x86-opengl
parentUSE=metalink fails with axtls, polarssl. Bug #513340 (diff)
downloadgentoo-2-54274c45d7295ac381951e02abed8dc3af23eaf9.tar.gz
gentoo-2-54274c45d7295ac381951e02abed8dc3af23eaf9.tar.bz2
gentoo-2-54274c45d7295ac381951e02abed8dc3af23eaf9.zip
Move cross-emul-linux deps to !abi_x86_32?.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-emulation/emul-linux-x86-opengl')
-rw-r--r--app-emulation/emul-linux-x86-opengl/ChangeLog6
-rw-r--r--app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild18
2 files changed, 16 insertions, 8 deletions
diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 0d1dc41410fa..fa365a540e69 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/emul-linux-x86-opengl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.39 2014/05/08 21:46:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.40 2014/06/15 15:51:52 mgorny Exp $
+
+ 15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+ emul-linux-x86-opengl-20140508.ebuild:
+ Move cross-emul-linux deps to !abi_x86_32?.
*emul-linux-x86-opengl-20140508 (08 May 2014)
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild
index 93dc5289bfa8..1419658b763c 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.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/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild,v 1.1 2014/05/08 21:46:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild,v 1.2 2014/06/15 15:51:52 mgorny Exp $
EAPI=5
inherit emul-linux-x86
@@ -10,13 +10,17 @@ LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
KEYWORDS="-* ~amd64 ~amd64-linux"
IUSE="abi_x86_32"
-DEPEND="app-admin/eselect-opengl
- >=app-admin/eselect-mesa-0.0.9"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
- !<app-emulation/emul-linux-x86-xlibs-20100611
- media-libs/mesa
-
+DEPEND="
+ !abi_x86_32? (
+ app-admin/eselect-opengl
+ >=app-admin/eselect-mesa-0.0.9
+ )"
+RDEPEND="
!abi_x86_32? (
+ >=app-emulation/emul-linux-x86-xlibs-20100611
+ !<app-emulation/emul-linux-x86-xlibs-20100611
+ media-libs/mesa
+
!media-libs/freeglut[abi_x86_32(-)]
!media-libs/glew[abi_x86_32(-)]
!media-libs/glu[abi_x86_32(-)]