summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2013-05-02 19:33:03 +0000
committerRichard Yao <ryao@gentoo.org>2013-05-02 19:33:03 +0000
commit300e4cb4badbde5b0356c70d485445588d899793 (patch)
tree2cfc029f60d1fe5d4a186b8fac56e57043f7310b /app-emulation
parentVersion bump to 12.2.0 (diff)
downloadgentoo-2-300e4cb4badbde5b0356c70d485445588d899793.tar.gz
gentoo-2-300e4cb4badbde5b0356c70d485445588d899793.tar.bz2
gentoo-2-300e4cb4badbde5b0356c70d485445588d899793.zip
Merge hasufell's changes into 12.2.0
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/crossover-bin/ChangeLog5
-rw-r--r--app-emulation/crossover-bin/crossover-bin-12.2.0.ebuild19
2 files changed, 21 insertions, 3 deletions
diff --git a/app-emulation/crossover-bin/ChangeLog b/app-emulation/crossover-bin/ChangeLog
index b4e873bc9184..49d593905f1e 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.4 2013/05/02 19:30:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.5 2013/05/02 19:33:03 ryao Exp $
+
+ 02 May 2013; Richard Yao <ryao@gentoo.org> crossover-bin-12.2.0.ebuild:
+ Merge hasufell's changes into 12.2.0
*crossover-bin-12.2.0 (02 May 2013)
diff --git a/app-emulation/crossover-bin/crossover-bin-12.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-12.2.0.ebuild
index 4a59f7466c86..82d9caff6f35 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.2.0.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.2.0.ebuild,v 1.1 2013/05/02 19:30:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.0.ebuild,v 1.2 2013/05/02 19:33:03 ryao 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? (