summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-15 13:52:54 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-15 13:52:54 +0000
commitcb85a9ee32c35f455be5cab5d25cdc9adc4ed3ad (patch)
tree80ad9a1923bb64ff4a4d5b3242deb7f0645221ce /sci-electronics
parentEnable multilib support, required for media-video/ffmpeg. (diff)
downloadgentoo-2-cb85a9ee32c35f455be5cab5d25cdc9adc4ed3ad.tar.gz
gentoo-2-cb85a9ee32c35f455be5cab5d25cdc9adc4ed3ad.tar.bz2
gentoo-2-cb85a9ee32c35f455be5cab5d25cdc9adc4ed3ad.zip
Update multilib dependencies. Support emul-linux-x86-free systems.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/eagle/ChangeLog7
-rw-r--r--sci-electronics/eagle/eagle-6.5.0.ebuild30
2 files changed, 23 insertions, 14 deletions
diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index 533585565a69..4a12bc03cf3a 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-electronics/eagle
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.58 2013/12/19 20:13:07 idl0r Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.59 2014/06/15 13:52:54 mgorny Exp $
+
+ 15 Jun 2014; Michał Górny <mgorny@gentoo.org> eagle-6.5.0.ebuild:
+ Update multilib dependencies. Support emul-linux-x86-free systems.
*eagle-6.5.0 (19 Dec 2013)
diff --git a/sci-electronics/eagle/eagle-6.5.0.ebuild b/sci-electronics/eagle/eagle-6.5.0.ebuild
index 5df39b92eba5..0d6c77f69d35 100644
--- a/sci-electronics/eagle/eagle-6.5.0.ebuild
+++ b/sci-electronics/eagle/eagle-6.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.5.0.ebuild,v 1.1 2013/12/19 20:13:07 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.5.0.ebuild,v 1.2 2014/06/15 13:52:54 mgorny Exp $
EAPI="5"
@@ -33,19 +33,25 @@ RDEPEND="sys-libs/glibc
media-libs/fontconfig
)
amd64? (
- app-emulation/emul-linux-x86-baselibs
|| (
(
- x11-libs/libX11[abi_x86_32]
- x11-libs/libXext[abi_x86_32]
- x11-libs/libXrender[abi_x86_32]
- x11-libs/libXrandr[abi_x86_32]
- x11-libs/libXcursor[abi_x86_32]
- x11-libs/libXi[abi_x86_32]
- media-libs/freetype[abi_x86_32]
- media-libs/fontconfig[abi_x86_32]
+ dev-libs/openssl[abi_x86_32(-)]
+ sys-libs/zlib[abi_x86_32(-)]
)
- app-emulation/emul-linux-x86-xlibs
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+ || (
+ (
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ x11-libs/libXrender[abi_x86_32(-)]
+ x11-libs/libXrandr[abi_x86_32(-)]
+ x11-libs/libXcursor[abi_x86_32(-)]
+ x11-libs/libXi[abi_x86_32(-)]
+ media-libs/freetype[abi_x86_32(-)]
+ media-libs/fontconfig[abi_x86_32(-)]
+ )
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
)
)"