summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-04-22 18:05:45 +0000
committerMichał Górny <mgorny@gentoo.org>2013-04-22 18:05:45 +0000
commit9aefb0db3924599723734ce106fccfaf29644566 (patch)
treed839122eea8f5618572f17977552530e4d298481 /app-emulation
parentVersion bump (diff)
downloadgentoo-2-9aefb0db3924599723734ce106fccfaf29644566.tar.gz
gentoo-2-9aefb0db3924599723734ce106fccfaf29644566.tar.bz2
gentoo-2-9aefb0db3924599723734ce106fccfaf29644566.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 'app-emulation')
-rw-r--r--app-emulation/crossover-bin/ChangeLog5
-rw-r--r--app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild19
2 files changed, 21 insertions, 3 deletions
diff --git a/app-emulation/crossover-bin/ChangeLog b/app-emulation/crossover-bin/ChangeLog
index 7faec090bbd0..c58997eccf13 100644
--- a/app-emulation/crossover-bin/ChangeLog
+++ b/app-emulation/crossover-bin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/crossover-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.2 2013/03/27 18:30:31 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.3 2013/04/22 18:05:45 mgorny Exp $
+
+ 22 Apr 2013; Michał Górny <mgorny@gentoo.org> crossover-bin-12.1.2.ebuild:
+ Support multilib libraries alternatively to emul-linux-x86-xlibs.
27 Mar 2013; Richard Yao <ryao@gentoo.org> crossover-bin-12.1.2.ebuild:
Fix mistake caused by last minute correction to make repoman happy.
diff --git a/app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild
index dcf1d0a132e7..201c6bc75c62 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.1.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/app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild,v 1.2 2013/03/27 18:30:31 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.1.2.ebuild,v 1.3 2013/04/22 18:05:45 mgorny Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -37,7 +37,22 @@ MLIB_DEPS="amd64? (
v4l? ( app-emulation/emul-linux-x86-medialibs )
app-emulation/emul-linux-x86-baselibs
app-emulation/emul-linux-x86-soundlibs
- app-emulation/emul-linux-x86-xlibs
+ || (
+ (
+ >=media-libs/freetype-2.0.0[abi_x86_32]
+ x11-libs/libICE[abi_x86_32]
+ x11-libs/libSM[abi_x86_32]
+ x11-libs/libX11[abi_x86_32]
+ x11-libs/libXau[abi_x86_32]
+ x11-libs/libXdmcp[abi_x86_32]
+ x11-libs/libXext[abi_x86_32]
+ x11-libs/libXi[abi_x86_32]
+ x11-libs/libXrandr[abi_x86_32]
+ x11-libs/libXxf86vm[abi_x86_32]
+ x11-libs/libxcb[abi_x86_32]
+ )
+ app-emulation/emul-linux-x86-xlibs
+ )
)"
X86_DEPS="x86? (