Require libelf for USE=opencl, bug 536456.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 24 insertions, 17 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 6a201018dbe3..abe633117f08 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.595 2015/01/12 18:30:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.596 2015/01/13 22:47:43 mattst88 Exp $
+
+  13 Jan 2015; Matt Turner <mattst88@gentoo.org> mesa-10.4.2.ebuild:
+  Require libelf for USE=opencl, bug 536456.
 
 *mesa-10.3.7 (12 Jan 2015)
 *mesa-10.4.2 (12 Jan 2015)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 91dd177256d0..a37bc7d0d46f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -35,29 +35,29 @@ EBUILD mesa-10.2.8.ebuild 14933 SHA256 507fb93e474e713a98400d48a43b91a08adfd8169
 EBUILD mesa-10.3.5-r1.ebuild 13777 SHA256 697cefd47365c78fe1e07f1784b3271d7a0d687fb881c91ec959ab1c7058bef3 SHA512 d53946b367c267f73c14eb4760a47568552f2ad3b0d9818e98bf27097b3ab212c7f8baf5bc19f15fb0dc4ce7edc252bdf4eca2ac663d207f4c1958d6f5911e08 WHIRLPOOL c2a18b16913b82a203ad1469228984dffbb0c9157c51892be3420c790619d16d3b68dcd9ef66ffb0051df72a5649d9c13780b5aaad9944906be3ba84be4764ae
 EBUILD mesa-10.3.5.ebuild 14900 SHA256 8c2fa274efdf687ace1591a9f6feda155c845c022f79368b29a8bd24696c11ba SHA512 73d59b896d8e460d20663f307447425ccb2d4e1a022f1591b06b1f9ee2a3506de4759e37561963ef1ef551f445d00d6035050a4a0fb659d3aa43f6883d79072c WHIRLPOOL f98b7aaa3e84bcec8365b45af3e697c7d43813023b428517fa0437ed27b774c3762d45faaadc488741cb24c18906c39d727bbc060a8f84adcfc79e01322f3299
 EBUILD mesa-10.3.7.ebuild 13774 SHA256 b343918d034e07f1ed84c2e197a847b3a1653e6ca38c4212eecb0f255eb01601 SHA512 d7e5b83d2b14c07f30a99294c1d3036882ecd6a3eb491bb5edf91e4deff065adb4c734017246fd5074d57c3158cd2b71691879618652c92290b2aecc1eb017cb WHIRLPOOL 97a15404d3a08a23a3b92ff807a99695473b994cbbd120859b70a8c9686f264871f1ba50521aef8dfd4598141b1c1e74bc8bb11d18f4c28ca5ed4a1680ec34d6
-EBUILD mesa-10.4.2.ebuild 13695 SHA256 59aa153ee20b03524b14c840dc0496483a3c74d8aa49fa881ffc486e1fd6e0e6 SHA512 72d39af216c1e0d22a9a1ac4d1ea545db2772b63e1f742bbd49b01a1dfd600cacc96275354a4c202aaf7ead50e81c0b820573f441828b9e52d769d3c75c4c0bc WHIRLPOOL 41265f40a3fe08820ecf999ccb297f8a7c642bcf454240fef4b5d8323bc8198e23cc389ecffc5e78bdfec44f33b67aa41dbb003f77fda226d1b0fd54a309da0f
+EBUILD mesa-10.4.2.ebuild 13821 SHA256 edf0ff4e0a3d68776456b9927965e12363b7eb6f3ade0897abadf3de305d333a SHA512 32f89ab1b273a2332d36c19320f3edcec57293904981570264745aa4c7dbb33b33043a1738761d2178e9761e2786dd9612a139479c01a8aa559dc36bae9fa103 WHIRLPOOL e0287c3aac07eb1913e37c15c2e92118d2c97b94f028a19958473677961bbc4b4ef22bc365d0da4ca09f0ccc41ffc9452b0a85a967aa2d32e1c151b5d01bc4ff
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 8d0fcf291314e22dfcc1e4a913320d67390920fae9dcbb1cc664989e8ae80fcd SHA512 71b145c6725f4ccf2ab7f99b45ec366c56fa9d3d0f602525cc95ad47f616563fbb6f8ff499408c6b0352b92b92413e130165fbddc64f4e09a3de3ce854533fc4 WHIRLPOOL 0084102900d7d9d4f2c206cb8f8c4087d0bfe974e60544b8afda1273a759d2a441ec8803f13fd0dc98a3bdef3cde69f11ef42128969e0fef4cc8c1257942765a
 EBUILD mesa-7.11.2.ebuild 9993 SHA256 7b53334b0ce4ccd58e0a6cf64c1211f985321f0a7bc345a3fc5340738798a4aa SHA512 5f6dd871a7ff804ffc6da7b3f8d936595dfa7b1e9d0fe6ce728c8ebf90c4ad8f38231d7a565fa3fce8eeb855ee1bd53abec1e71a6ff0c9c7b5e38c11511d1445 WHIRLPOOL d1fabc18aa97e308058ca2878bdf591c241047ef3b89e145936c859b3524e96cee6077a96d2622bc1ed4ed698c9d0bc2c3e2dacd5bd8b3794bad35f1df387133
 EBUILD mesa-8.0.4-r1.ebuild 10791 SHA256 99d033fcc41f3053bc46793022ba0f7a05b490ee813889022b202568937edff2 SHA512 b8f9b906827f3c66473feb90b3022c671b49783c411a23f61985e3361e9e8545397ba64b0e96cc0314d7f8a004aa31f7a23be57457908b9fb2774ad06e0ff1e3 WHIRLPOOL 12088fffae079e20c38881251f67948fec22d4dab2da46010d24f4b685fb14a783126bdcd1be977eb19a23e41225f897485d7e180a84a2b251b3882d0eb95a64
 EBUILD mesa-9.0.3.ebuild 11113 SHA256 ef9c8cab66b5d57787ed19ccef7e945589a652abdc9eda54cadb41f1e8ab7ebc SHA512 e5d4261beaa7f93c7382b2eab572bda5424b02c2eadcfea5e81ca8a0439fbc40f76a7c3887a57b73249e2c6a8599a42f3a536485ec7ec2ec6d06d4d3cae2901a WHIRLPOOL 91734df6565e97391d86ff5122e33820b82ae74ca8a7ff4c83b825a568ea87a79b1378d612b5f83a40abb5f98f4d71a84718e114a5c5a9bca5aaf9c426a7fdd8
 EBUILD mesa-9.1.6.ebuild 11043 SHA256 4e614a3bb2be81876d09618ed357ed36bde336b53e57794fa14c888990569b1d SHA512 d109bdc955ecc0e6357691c42be1bbde1cb3c2fb27b2a5b6c5013c5d54e587f5f9d486ed03dba1440346e4c4d3ed9366b7f5327754a497d4b2cc25e0b7660e6a WHIRLPOOL b421eb3bbd229a23ae3853745f17116ed77a5cfbdb0dd0b252a664a20de002655dfea626a42f10933eb14b9538f6562ce5b1deb74af3156b2df4510aeba41211
 EBUILD mesa-9.2.5-r1.ebuild 13934 SHA256 f23057faf60d26d7234eb79448efa568700418cbe27abf5dad12ae2e5b6df3fc SHA512 7bc40298c615f01aff79a5fa3f6a285f7e2359ea85c83be98f28cd587eea8026f7e9dbe37cc0176252a07606a682e1be59be91fe8e97c4872ca2bbeb8ef825c0 WHIRLPOOL 01b1f5938ced676b7b0ded85aa14d9ceeb844e3587c5ed527d67f1f40f3b47feaad49137209b21d9388d1209d407ff139d49c814bb5d2d8b41bcd1ab430a7a7d
-MISC ChangeLog 95572 SHA256 7df3321e044975b7030e0df49e41757f665b7960d507624f59ecf577fddfcddc SHA512 520a8f23f8c6602d4b8f0f21bfd59286d873abf7c86a35e6a2478473271f65f1e5f1cab3884514bdf528fa894fa24c7ad286715ebff025dd177c70911b49464c WHIRLPOOL 3d046d9f2346cb4a6d2e34e297acab50e9c141891c1844ec3680014657ecea1290dd8da11d906dec14a4a90d226c66614324b299131d979f9f62809c00e56095
+MISC ChangeLog 95687 SHA256 3f01280d81d7bbb726d62c3d5f1bbb840c2ad69eaacb714ef32e2b758f4894bf SHA512 fa08bf538717a2bc64b81d6ed08eda938b73311f57d71922abf50e05304ad95459b8ec12e65eda1128f7b021319ef4989b4e943dde8ee833111377b1d5ca90fb WHIRLPOOL d30d764b95eb5324f83a7cfeca3c58f87de56e8ab61646f81f104b683e18349e8695d0290ef3327f282728872cf3a8d40c142964f55344b1692f875c3dd7b266
 MISC metadata.xml 2288 SHA256 ae8d2bd2670f9d5409d42b364f56e30a676419ae934fe5c7f7abe8608f95e2ac SHA512 79eeb3773c6f3632f896f31d2266b59e958310a436610fc7676e10465fcbcf205d2dfbe3b31554c92af6a28bf4a59a571ff7104084cb1cb44e33e4cbdc5eed99 WHIRLPOOL a12aa115cc8fa5330070bb4a62ec57d886cfde8d33d23deac5c63b8fb6db40c6dd71c9bab60b2aca2d30e0a2085aac4a0c25b1248dd2289b745c828c78b5b19d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUtBMIAAoJEA/daC2XTKcqJW4P/2SYscio21Mta3WBQYjNuF2f
-snXBzWFcgEXxpTuFrLtvF8qaLbuOqmKeD8bmlrGc9j31FonjV8mrDX5YlSyys8qG
-tKitPK0gkjYOKlk3eVMQ3gLmcoIPYuc8vl8SSzUyNK2jU8ut9NrhuHwCAEGTx2E/
-hbKiVsx4SDhdC0aWEK1U3MZfKX7kqmfc8vchpbXQthc/yRKBdx7Zt3AYjpdKhOaI
-+lYMl1XZp9v3jrsVZGTy7YVUnq2TsmzofMiL72dOvV3P/qQ9BeA1nrBrTlZ55c0c
-ej10UUCHNwDDcZAuCMHWLPQ7GktddXdlmGknmqJGiMDcxOh9UDzMPKapW5YMcn4u
-LLsNP6/K7DIFOvOkFDYG8MeG4UorUATmN6KraczWPohlCsavS+RK1IJpPvMz8rQH
-4NJUXffZi4IgROKHDcX2zzxELQ2CYV35h5EigfakW8NX3KVW9wONsnuQnxaLunjC
-9vr8GjIfxNdxTfyksErlidgz3ZbfjQMf9HlF7edPaIvIf8gXpcPtxHwZAebYUssE
-4UTimpZGxCWxmbVO/rMNKyP5vpqJWoNiaVwW/8j6L+7bmL5jq+gfNsu1Wyu+324F
-tXN/85eBIYQ6Zg5jf0wUB+18UJKqmIlS3yB9U3NWPNZukLM6ZkpwacHILVBxHICm
-2KqPKUwdUrPLIqxoXN05
-=1FjI
+iQIcBAEBCAAGBQJUtaDSAAoJEA/daC2XTKcqDSkP/1waEd46mWzlNRl+NNX8r7pX
+L4zt5qddZyhhw8i3WyF59PuwEDuoyxRCZVIT6BT0hmeH3I6M+ysx+VPoXqf0svpe
+zJ0/bVpiF62kb4Fbjq4zYgQ9ACqul1nuV9cNTIt8ieIqYMSo9eJNa85zn/RGH4yV
+zhY0DpbFq87zVpqrWYnUzpoOriagp0Z6XXaXzu9FeRYts3xuTYkU8Kv4wyAPcyAA
+uhUkhow/B17XiqLUmO7zzMplnXqSpLCk3Ck5McCmmxOmnzr0b3x0Eo87siM31/83
+SyhgZGq1zNgb/LRIcjHAegTtQpoCg3LdwHZsmlsZggLIgiuN/uJXHB0LvRlriwM1
+E6L9a2Ne0cPaIrgILUVBg5EaQktPrqEGpSfNj3jbsPrUHwftnDFo1BdbX1gJ6C8E
+slfXFzszuG3X9WQFBUl6tzNoGacP4qqi35Z8CuajQZuSfnMAGrX0HoI02lW1pZUk
+vR86V5vUqzz4s4Pgr4NCQvYY+Gy6y6zH1n3aUZ7erDYSMw+ZPUSyOozwXoQDqOji
+sUG8lrzoEaXuiG9XpGhV8dzhEVvuFPlyLlJehwaaZgaFCyPPcUOieZL5WXa7Jdi5
+wW928qFyRqrnF8VrHC8tOfDQC600gTJJJoIxuRfpKrCXBuia2S4Ryueikgjpt22M
+ec+cRoEBmzEnSsQ2rv6p
+=x0O5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.4.2.ebuild b/media-libs/mesa/mesa-10.4.2.ebuild
index 64c3b40efceb..620acb028402 100644
--- a/media-libs/mesa/mesa-10.4.2.ebuild
+++ b/media-libs/mesa/mesa-10.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.2.ebuild,v 1.1 2015/01/12 18:30:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.2.ebuild,v 1.2 2015/01/13 22:47:43 mattst88 Exp $
 
 EAPI=5
 
@@ -126,6 +126,10 @@ RDEPEND="
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc
+				|| (
+					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				)
 			)
 	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )