summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-04-21 18:47:04 +0000
committerMichał Górny <mgorny@gentoo.org>2013-04-21 18:47:04 +0000
commit0e1e6c9e94db5696642ededb9bb4fd1e34d40070 (patch)
tree434c0adf3dfc7ed2bdfbaa959cca6c9a56b31825 /x11-misc
parentinitial import wrt #346699 (diff)
downloadgentoo-2-0e1e6c9e94db5696642ededb9bb4fd1e34d40070.tar.gz
gentoo-2-0e1e6c9e94db5696642ededb9bb4fd1e34d40070.tar.bz2
gentoo-2-0e1e6c9e94db5696642ededb9bb4fd1e34d40070.zip
Support multilib libraries alternatively to emul-linux-x86-xlibs.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/virtualgl/ChangeLog5
-rw-r--r--x11-misc/virtualgl/virtualgl-2.3.2.ebuild15
2 files changed, 16 insertions, 4 deletions
diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index 06d8472fdebb..f5181c9076de 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/virtualgl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.11 2013/03/17 16:13:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.12 2013/04/21 18:47:04 mgorny Exp $
+
+ 21 Apr 2013; Michał Górny <mgorny@gentoo.org> virtualgl-2.3.2.ebuild:
+ Support multilib libraries alternatively to emul-linux-x86-xlibs.
17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Add proxy-maintainers to metadata.xml
diff --git a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
index bd3d56516a94..570d5675ea32 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.3 2013/02/05 17:38:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.4 2013/04/21 18:47:04 mgorny Exp $
EAPI="4"
inherit cmake-utils multilib
@@ -23,9 +23,18 @@ RDEPEND="ssl? ( dev-libs/openssl )
x11-libs/libX11
x11-libs/libXext
x11-libs/libXv
- multilib? ( app-emulation/emul-linux-x86-xlibs
+ multilib? (
+ || (
+ (
+ x11-libs/libX11[abi_x86_32]
+ x11-libs/libXext[abi_x86_32]
+ x11-libs/libXv[abi_x86_32]
+ )
+ app-emulation/emul-linux-x86-xlibs
+ )
app-emulation/emul-linux-x86-baselibs
- app-emulation/emul-linux-x86-opengl )
+ app-emulation/emul-linux-x86-opengl
+ )
virtual/glu
virtual/opengl"
DEPEND="${RDEPEND}"