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!)

3 files changed, 40 insertions, 12 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index 5883e52f151d..12d1837b6acd 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/eagle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.54 2012/09/24 00:47:51 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.55 2013/04/21 19:50:41 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> eagle-6.2.0.ebuild,
+  eagle-6.2.1_beta.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
   24 Sep 2012; Mike Frysinger <vapier@gentoo.org> eagle-4.16_p2-r2.ebuild,
   eagle-5.10.0-r1.ebuild, eagle-5.11.0.ebuild, eagle-6.2.0.ebuild,
diff --git a/sci-electronics/eagle/eagle-6.2.0.ebuild b/sci-electronics/eagle/eagle-6.2.0.ebuild
index d8d23a5acca5..5f1102e752a2 100644
--- a/sci-electronics/eagle/eagle-6.2.0.ebuild
+++ b/sci-electronics/eagle/eagle-6.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.2.0.ebuild,v 1.1 2012/07/05 09:06:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.2.0.ebuild,v 1.2 2013/04/21 19:50:41 mgorny Exp $
 
 EAPI="4"
 
@@ -32,11 +32,23 @@ RDEPEND="sys-libs/glibc
 		media-libs/fontconfig
 		dev-libs/openssl
 		virtual/jpeg
-		)
+	)
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs
-		)"
+		|| (
+			(
+				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
+		)
+	)"
 
 # Append ${PV} since that's what upstream installs to
 case "${LINGUAS}" in
diff --git a/sci-electronics/eagle/eagle-6.2.1_beta.ebuild b/sci-electronics/eagle/eagle-6.2.1_beta.ebuild
index 1bb4080c500b..06ae0166c8c3 100644
--- a/sci-electronics/eagle/eagle-6.2.1_beta.ebuild
+++ b/sci-electronics/eagle/eagle-6.2.1_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.2.1_beta.ebuild,v 1.1 2012/07/07 13:00:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.2.1_beta.ebuild,v 1.2 2013/04/21 19:50:41 mgorny Exp $
 
 EAPI="4"
 
@@ -32,11 +32,23 @@ RDEPEND="sys-libs/glibc
 		media-libs/fontconfig
 		dev-libs/openssl
 		virtual/jpeg
-		)
+	)
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs
-		)"
+		|| (
+			(
+				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
+		)
+	)"
 
 S=${WORKDIR}/${P/_beta/}