Support multilib libraries alternatively to emul-linux-x86-xlibs.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 58 insertions, 28 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/Manifest b/sci-electronics/eagle/Manifest
index 18a5509da429..9d2df8090da2 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -13,24 +13,26 @@ DIST eagle-lin-ger-4.16r2.tgz 9018957 SHA256 6c570e41668da23e1f473da3bfd879cbeb7
 EBUILD eagle-4.16_p2-r2.ebuild 2752 SHA256 280c6f3b021cfe873dd2511942ac75dbce45d64d1b6bc479aa1f3581bb24ce3b SHA512 4a2ea6db7d7b699e5d0978e92d5f3da22d59b83922c37cd4b71be5330f1ede4347dba3c36a0e41c421d74d07da0a282ea1b4a3ec26a59c5d0e31c7982218c0b9 WHIRLPOOL 5be4c4227fc186d9d1310831e67dc2bc609a038475f02df8dec7d89f91b17dc746f29887f9c71c0bd7d0874deb9250a7fbcbe1bc7600b4a1cd9473939af29909
 EBUILD eagle-5.10.0-r1.ebuild 3044 SHA256 0250ad9b53bfba22e868918c0029bc3c697e474d71be34a3f8c69927e2f5f98c SHA512 6bb160caa54dbc521842bdcb03fd3d5686a5bde98b34be35fb0d3314d135bb809d6823d7ba0b2040375c1ae813a036114710f7a13b9bdd7a9200f867b22fb3f0 WHIRLPOOL 053ed634d0fde054e1d692805447ee6dcdc09cc54715a39957c25ccb6e44ebdab3e6f068264ab73d5663243ef812c0e6e848ccc839b27738422c0e3a4674c222
 EBUILD eagle-5.11.0.ebuild 3082 SHA256 e4e45dbd10d65cc8f88f9f39b612a8eaf38d12c7fdfcde09663ebf70eb8ef177 SHA512 5eee8f55bca458d1ae319fb0e36fe2b6315212ea36bc182a97c1cbd65f60307b8b9acc0783bb915f6fbccfc07b8d0c311f68208757ed5055389ed7f6e0ac8a47 WHIRLPOOL ba05b8038c9c104389704b5754f854a25fd1508d878894b9ee678ce035916b8932811638541a960c75756b3131f462ee5c7a49a4d5ec5ff9147b57cbbefdf793
-EBUILD eagle-6.2.0.ebuild 3057 SHA256 9becb334dab71cc8faef732c2f276645a4f301d4a5a5986a0e4ddf6aafad6ec3 SHA512 bbda00b3ef341024e4698c770962ed6006697267ea64268552674e3e06d97ce909c1203116e2d4fe8e157024dfe78214bcdc0d57cf47ee033ee1193a6c9498a7 WHIRLPOOL e91c9c43647094cbc817f4a3e3463c107325a920addeed1ca3a9c7e83284c829cf54375ded7186236147ebfbcbd40a8fdea0ee25257a761a2b2d1276d19c3eda
-EBUILD eagle-6.2.1_beta.ebuild 3101 SHA256 359b766ef1581a89d90d273cbd2eaccad457fe31b937336b6baf91d7898be852 SHA512 78e1e3168cd02a554adc91a0d84a814d480422f98e4161a8085aa0b0781c80c8228708529d6c1a6ba43218729d77ef4978c9c5da5be47a01d9a1bf2efb716578 WHIRLPOOL 23f306e91f80443ab756317b5f59074a62798f70a926314544ccbdfbd5cc801d9b7dab55acf6ed74b37d27d198553c0cd749c24fba58f0477c8099b55e198a9b
-MISC ChangeLog 8934 SHA256 0be48ea5917a322a04344cf57850696b19b53fb6f96ccd0eeef73b5194f9c254 SHA512 858662ec4787740329bad86b84e94756e10541b3d28f457b65a35128452dfab5ef24c568347208bfe6c598444927ad0a62000c3786b008ee8495bcbe48ff5c87 WHIRLPOOL 82fce16014f4a9b2f88c44004fa40e8f2d50739cd10a03afbf480a8eb0b15b4f9ba2f2790b6dc598cc334e08efe6bf32eeaaab54f2f47ba5776c2445f7450e0c
+EBUILD eagle-6.2.0.ebuild 3357 SHA256 8827f7ac81838f994f886fdc81bf3523e0390076fbd2cd1c2a3d555c73638f75 SHA512 d87f55791967dc63278bd67d7fd40b61f84178289a97aa0efdfe2ecdc2775ca1c2819a3dcfe3b9cd3d4f04bcc11b274c75dd4dd74ae37d78f4a62d04aa89e372 WHIRLPOOL 3b746ebe8662cdceca09eefcdbe6ac2998e6cd46d82f8731f3a812ba6155d8a6896d2f4f786e0867b2ae567fd44749880e19e5f11c3aa6149b4a41f1b0fffb83
+EBUILD eagle-6.2.1_beta.ebuild 3401 SHA256 f78773a75132051e3881e7a946bfd7f175ef1f8bd2f4ff3eab74249e5f80c631 SHA512 5c8c0055f55f54ce0005b49fee5acd7688fb3c815c916367c97410e215e6c4bf7756e003580b3247c803cd5fcd3d52469aec3b877dc09e1714e50e46b84e09ed WHIRLPOOL ee743405c1c65e6dd94e1bf5a261d2515744e22e843257893261f70f1e76c1e2718c7bea15e1b01bd683ce403813b3690e02dcf8f21a9db7e981dd8a266c70d4
+MISC ChangeLog 9100 SHA256 1c763f7fd6d97e78118182822e27e38301a4426f5b2357feaac286c6402925f6 SHA512 2cfa768cdd28323a9fb01c7c20f38d737b87c0d932c594480694ae705e211a35bd04930fe8d5c303e209aae6c0d67f4eaf08356f6c3c73f8139122772a5d0c8d WHIRLPOOL 6ea1e9ab14d7c81f3e09cfdff6775370621ab3749702f3a127d4bde5cf2922b3148c7db2d6a86196a9b8091b079692a0b1b4b4e63a25978631e46c0c19b9dae5
 MISC metadata.xml 662 SHA256 f730df9feb1f2d52f8ea5883a737398585c13be2123d43fc43576b18e09b2926 SHA512 ad00f74a78966b6d23ccb471abbf101671bfe1d385bc256b6812f4f08cc3e1439abf9a30c110c8d3cd74456573bd9c64c3768959739b780ee78fc817bec1b284 WHIRLPOOL 018a706ba8264eb20f489d3e91ef050ffffd9fd023ac1d11f5e9edafc5dbab4b07ec1bf81d36cbf65fe2b3cad7c31225469a5b9fd5430fc023934a052a722574
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQX62+AAoJELEHsLL7fEFWq/UQAIA28TmnO1e9ItRVp4hwdCI9
-gT72vXDm5TAZj8xd/WUeY6OM1utrrm3iFYmoOv/jyAz4tgh9ollGVImxKQOupqHg
-KGx3SZiDhjqBgU32ROa0Yo02dB9B4Ep/y0fdzPeeaegSn34/zc2xmEwdu05mZYQg
-KTa0SEaX4kkj7rGJdtHJeP/SNh4NoKgyJOlyuVqLpDKys7HmHEAbKzoi3jXb7F79
-Gi8klAnpGV4lLpcTbDfLavR/ONeozu6K8flETcslIGEHjuyahYsRMgymK9iqFMcd
-OKueSA34/vfpEHeEplXwDqCErm9/dKPjLpwnfMde5YZWCDbwAA7gmmuMVmc+JVhH
-cukNCH4endnAlyCO81EbsQocm+saEaYv3tqOdy6vSHw3kwyw/brRgYoFJMQB5nhd
-JMc8QXvXc8+YnKUhAKgVDiSSxHp1zCqPGMH0O+xycxjmx3fk+7tf+XPiTStnYLpj
-+mI8eAYR1stRK53SvwtkyerHLgTTU4uuRYuGRcwO7O4++m86tBzDBwBGSdt47eO0
-XBPY+9nVuDLSJy+qwVavByWXjxpnmpol1UbMIyE8g9xBVQmodBJf0M1kHymT3tSZ
-kaiTbC7S5WOOqjdrBL5lxWX750OL4VFjdLQAIPxaZKUj7H76F0bfnZwUVruW86QS
-djJsiwod9VtY5L7JAnud
-=GR2r
+iQJ8BAEBCABmBQJRdENnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDXCQP/36mIHo4+Gt23zuXnOz+jE1b
++h/2zrSdeF1V18dfA1oPyPiC1Q45Bzp3iUkuvTdrwWTqjj1gsEUbTOMzXTLIL0ov
+4WakZUNKFT1XGOeRmoUImbTa9yAqV3oCuU5AfMQwoTUxgiRSf7GygHNmLjomaNaQ
+54fL0VcLS+Yo/dIbzzMAv6BtR2N8CtyZSOtkTgn5/ekV6c7kdylxNk60HRVqITl+
+El7d3XpPgJ5b6odD7kgjpulo1j3U5pWx/8+YJ+awpir3yGNR4jndtuZKnAZKt1nO
+Yf7NqPb9k65lf0shUxLj6/FW0RpEe7JaWI6dzHCZhAshQAowSM52MdiILuDC1+w8
+GNuF0XNxJK52ORd3Co+u0ZmI/e+/NGXV/MOYIzWw6VTqqFrw/zSZFFOIIhhMjFt4
+BOVqldS2VFjrXH2lGacQ1RprhMKPzfDknUgP4loqNz93ZN1HEjbfC+0EO2OSF55A
+0dxsyWOVn2i7GgABYXCA8dQAgPKecypFgJulNA3ztHKIYMligC7cVmCh0C11pscj
+AmnF45Ry67pbyYoaaI8PK6QfSQsQIwz7LZfPNsHl3/mM6XzRKLNEqc/69+S72VLR
+M0XCzcQV16RJCQdkEgTpqZkdlKmXdoIEp6Syanj1eXy7LlzzYwiSQw47AJbz2F1i
+1Jbym2sVdjZMiTkINxjN
+=p0Dv
 -----END PGP SIGNATURE-----
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/}