Support multilib dependencies.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 72 insertions, 16 deletions

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index d8797f719e94..043c55cf294a 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.32 2013/08/22 16:01:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.33 2013/09/21 17:10:34 mgorny Exp $
+
+*emul-linux-x86-opengl-20130224-r1 (21 Sep 2013)
+
+  21 Sep 2013; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-opengl-20130224-r1.ebuild:
+  Support multilib dependencies.
 
   22 Aug 2013; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Change maintainer to the Gentoo multilib project.
diff --git a/app-emulation/emul-linux-x86-opengl/Manifest b/app-emulation/emul-linux-x86-opengl/Manifest
index e72080bb9604..53649832c6ba 100644
--- a/app-emulation/emul-linux-x86-opengl/Manifest
+++ b/app-emulation/emul-linux-x86-opengl/Manifest
@@ -5,25 +5,26 @@ DIST emul-linux-x86-opengl-20121202.tar.xz 61856276 SHA256 4a29503b10bac48fff415
 DIST emul-linux-x86-opengl-20130224.tar.xz 62753352 SHA256 6c2d102af8f7bffa24e514641bfd1b4c23dec991afb6ef8509113281659f10a1 SHA512 8359bda53b14bce5f7f815da88f45a1b4a497a8e12fa98767d1260ebf92eac8726e43f0b7a0a98749d8c2561941915eb7b5c63d298f0913bf60da2933ed1a568 WHIRLPOOL 7f8accad8140b4c44b42b583fc9667398baf4fe1460c3b0f41fc597811430df0aefa3b3b27d90a7d60c4ed5fb346874c6565b9558aa23a663b4df0d3525124ec
 DIST glu-9.0.0.tbz2 238294 SHA256 d3eb3582e688519147f48b689da85095ba4f893eaef154f9d788f485f7060773 SHA512 6a0898bc259923d6c7213dcd3d6121945af678815698edd06c03fdae37ac2269e7588e8f0905e3c0f9195ea53ffaa2337ccfc465b6fa90c29145387ae2e99141 WHIRLPOOL be6135e52de7964d6740f8718855cb2c234ff3d3fc1a90d951de863f0929f0652dd72703967ecca78dd4d724a6fea66735f04c8dd31f0f1e159869d4315d0a17
 EBUILD emul-linux-x86-opengl-20121202-r1.ebuild 1001 SHA256 91de807b1c283149245c85f005c5bc1e81ca2bac876bc160055acd4fc9275ee9 SHA512 45b653b156251827246b242b1d506a1ad5506fd9ad9a6463251768d581d14522d9c0ae7310def44049baf0043cd3f1570781857bbc39476658c15223518b8b64 WHIRLPOOL 3a27e2f2f2838f0ce41dad140625fe9f40463654760bdd09646c9aa4bcf70113be8a41e0d913ce193a6f8c3efe5cccc4dac06796d6755081b8ed239abf638a55
+EBUILD emul-linux-x86-opengl-20130224-r1.ebuild 1361 SHA256 1273b612654cf8586fdcd2d4f60efab7f7a63fe1d9147e8691abad47deb7064f SHA512 b4fe3835d0fc3c27fcd56305fcb1c923e428968350ba934e17f28edf2be6d77d2a962512b1aed9cdc48a8a6804a235d2414d70e2c2aec92a34701537093a9ab3 WHIRLPOOL 6b3742a8933ed24b67e3a5ffad449d1da6d2355fa23b9a094a52ceca7cb71fe7e1236bd261fd27008bec5d7568199c82adf09c82eecf72d14c2850430ac7cf51
 EBUILD emul-linux-x86-opengl-20130224.ebuild 827 SHA256 ebbed0b1abb45bc01c6cbade9ef3bcc7808e9210d9157ea4e2ea3d2cab3d6b4a SHA512 ae069027eb732121d22a2a3698930f7b14788464adace3acb686c5cc3e6140a159155cf62625a692706af08da5bdd71d8163a10b58ef6d450a78f1a0f68c7f6b WHIRLPOOL dad264bf4c9368006981f5cb93253bd03826a2b634527a2bbcc8cd76224a8120379d3cb17a89bf1d3387c2b8156c3f50f97f0fe5f38646d45750002481a32e3d
-MISC ChangeLog 6663 SHA256 06e2913170929142469b17509c99eae2ea4988a39e08e9bec6feda792f552c31 SHA512 e19c3b3b6775e2cf94d78f94b46fadc55b532605d148c3a2acc3fb62a9313434c998f3a9af8bec071fcac3a3a4d32e07e471da3b9e3f509382ced6481fce71bb WHIRLPOOL e8ce4a7e920765e5be95c93d8b723293f21ec9884f6064bad68d4a98bcbca7b74f7f97097df9df0b9f30d3524b899bd9a6a6611cd1c3198e121d55c2c0b2d8be
+MISC ChangeLog 6842 SHA256 13d19b7fad43e5db5c5952e30ff0f616bff93a85b3cdf7e424325e23273547c7 SHA512 3b7d58810dd1569a2dc072a6ba15db4a0fcaf3e22d66ebd95389f550263f0ac94922173b405af8ad5748c82d6959c67d8bffb2d8bba85de5762bbb752672a504 WHIRLPOOL f65da71bab0513c75297cb56028486e8ac5870d2337bf8384393e4b247f2cdffb3b49c4003dca3f2c5040273080f14fcdb8839e00fead32c355c3ea997834256
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSFjXUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSPdMzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHpYQAIx6GmvNPGHjQziVTD/u0Gcf
-N9IaqgpgMEegxC275KoMbtZKd3ViTxBGbpUFIHwVqE/5yHo6hj7Jjc65YgA5/dIG
-EJSYRliSY4MQFFDjSFNiDxw+qgE95T19kK8DLfztRjIi7W9M4ANS6XzsEhHFdXW4
-5eVLQqBCOT82Utxk+elbbynlboqkL+eNzBQWiLogl1pOKi6hPJ/hcLWy3oK/CUMJ
-DqLHj6w0Erx2NsWpTMPk/fZZfwr3KL1xol8036IbzyIy1XgA9lLGk3ntXUI7utMj
-M5CBM1ryWXGJcimI03zzHxmT8ehgIsC4TeiRid1P8L6jL1mz43Ux+dD59dOTYbe/
-0QTjUXhWqAyA+ERlYW3DT8jRs5+OLMOGxB8a/+/MLqes98DJAQy+fUnt12XFzJdA
-KdnhPQv3vmvnHnQRNAPcr1L6G4SB2tDsJGsPoYaFLvuKFNAH/nmbXJsk4eCkfw+D
-Z9kiRyaL2X46NyGO5QSmooi9rECt6TrKqW719osfr2JAQDfYCPMVkSCqxImIZ3o5
-6pAj7p32EiSlGcU3HxacL17nET8z6xJVmSgl3kEp2eDO+2FP0ZKVk8REwJs5oYAi
-jUPutWKeecTkwcMik5ok9mlflMTIEf6IZrIZW5fuCU8nCIbkrQLonRxVsi3woFnq
-M2NOkOxsudwko6sKlB6p
-=15t+
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtl8P/AxC7qCrERX+bFbeMLrz10pr
+paBBIo+y78WTJSkFRAsd2/zuhk37i4UzEZOU2WPzaGcItFJMR3FcVaPnru5Bx1At
+ZYIXv0dWXvCNmXlFH+GNcUhxR4/Ro79lvfBjexdhcKBYb78Lnl9GxoNC3Yw6zUoH
+ZkLPbOzJeOjUI5eLus35U//06rlNy35X3943wFommuHxiuNPPTOaR3tG2sxu46za
+k+YqyWN3xqAlqDat4sd1CRkdpLS834qtJrPy9fRrRrjYPGCRvyLmaPGPwXSpl1bL
+W0M2ktGxI53gEGou5BoUzt89WWRv9LLf5junlTlADt/XSCre6iKbhi/tBfhO+SjC
+n6z0ii4l1jaRB1E2CWdC/tSZTefdsWcNv2pxtgtGCybuiPkTOKVu5VpFvJV7gS4h
+MbURPxovOnh40jhoe8buFmTyUAjOgTMFtNK1e6/ijMJQQfQ0rNDw621sAlGzNSYD
+qkTX5L1WNxqaMEd34KnF7/vSgEfzDaKwEz53/im/4Fu/pbgHns9aahcrukWE9CHA
+hgFNxpD+JXzN8udDqSmbEgis0VP/SR0j4pPpvKWq8qwAUjHVqHs+11c4np+6SLrn
+jdXGWlYcoG6A3ul83VPsCe5zE1Vau1OXoyO3oaAIvI82MMr5NJ16o5DSOWMSpXmy
+4yKmpD4QjqLoVS819atL
+=wcXA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild
new file mode 100644
index 000000000000..e2d469c90a7e
--- /dev/null
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild,v 1.1 2013/09/21 17:10:34 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
+LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="abi_x86_32"
+
+DEPEND="app-admin/eselect-opengl
+	>=app-admin/eselect-mesa-0.0.9"
+RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
+	!<app-emulation/emul-linux-x86-xlibs-20100611
+	media-libs/mesa
+
+	!abi_x86_32? (
+		!media-libs/freeglut[abi_x86_32(-)]
+		!media-libs/glew[abi_x86_32(-)]
+		!media-libs/glu[abi_x86_32(-)]
+		!media-libs/mesa[abi_x86_32(-)]
+	)
+	abi_x86_32? (
+		media-libs/freeglut[abi_x86_32(-)]
+		media-libs/glew[abi_x86_32(-)]
+		media-libs/glu[abi_x86_32(-)]
+		media-libs/mesa[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	use abi_x86_32 && return
+	emul-linux-x86_src_prepare
+	rm -f "${S}/usr/lib32/libGL.so" || die
+	rm -f "${S}/usr/lib32/libGL.so.1" || die
+}
+
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
+}
+
+pkg_postinst() {
+	use abi_x86_32 && return
+	# Update GL symlinks
+	eselect opengl set --use-old || die
+	# And the same for mesa (bug #355393)
+	eselect mesa set 32bit --auto || die
+}