Adjust dependencies on llvm versions to match working combinations. Restore keywords that appear to have been mistakenly dropped.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

7 files changed, 40 insertions, 18 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 3390e4b02101..3621365f1d0c 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.629 2015/03/14 13:50:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.630 2015/03/17 11:43:43 chithanh Exp $
+
+  17 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-10.2.8.ebuild, mesa-10.3.7-r1.ebuild, mesa-10.3.7-r2.ebuild,
+  mesa-10.4.4.ebuild, mesa-10.5.1.ebuild:
+  Adjust dependencies on llvm versions to match working combinations. Restore
+  keywords that appear to have been mistakenly dropped.
 
   14 Mar 2015; Markus Meier <maekke@gentoo.org> mesa-10.3.7-r1.ebuild:
   arm stable, bug #530652
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3ada586ef729..9456cfd63a93 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -14,18 +14,30 @@ DIST MesaLib-10.4.4.tar.bz2 7507100 SHA256 f18a967e9c4d80e054b2fdff8c130ce6e6d1f
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST mesa-10.5.1.tar.xz 6973916 SHA256 ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679 SHA512 71d7154b6950637f14289f8f4e6a846636264a3b794a47b2774e685e2ddf36593d4291ff9e5e24b302ce7d35b925702b1373ea11249bdb8c51537e0411ca9003 WHIRLPOOL 8c3768ca0a82655b1c7fc6cbe4625f1dceb935e9933dddacc36ca917f7773ee42a78e4c48be0116d52528665169207fba8f5f0b3ee58c2cf3970b328bd831648
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
-EBUILD mesa-10.2.8.ebuild 14971 SHA256 13c738620bdd571e152bc45ccf2773aebb95e86868182234f0eaacaf3b3750c4 SHA512 2223c328dd2d06c8735a8e72c2406b6a997d8ccce847f6c0494bf7f553ef39bf73f2fbb3359eabb09bf48f14e695b80e936032743efc761a3dd3e1f73803f49a WHIRLPOOL 3f384e50478c31adad7ea9cc0dc98fe433ba10aff0686ce775e6e87a752e270a825176753dc97d4b699a92747f600c55cda4a34560bd54f5bd55b93d9982a36e
-EBUILD mesa-10.3.7-r1.ebuild 15039 SHA256 916413dea9f198dedcb04a61cf2cd58fa94ac162373f2fd84d597c03b2d93434 SHA512 0ea37e11bc718e101a4f115b66299e7e671b0165114b178373f049f2722d6ce330db356520cfc7e4a9a77d3ad2fcf5c258809f5dbb44266d737357a68b0af13b WHIRLPOOL 2cff2b057adf92cfae03c96239befb868ff9aa023d42f880b6d54632c7857248a287279e6f64b4db2e62ac13ce5349563f0a42456a9948ce2b1a28be13bd4465
-EBUILD mesa-10.3.7-r2.ebuild 13923 SHA256 5824043f36c6c6bfad999ea43c3ee235dc994099f34838f259b8dbfcd6927e6c SHA512 7108ff2703940e73ccaa0a4dbddb926af671a6554e508a0c5674f1eb3a675ba8026a0816e8272e48c789fcba9bc069a7c0f2321b272edd02cbe58c85924a0a4c WHIRLPOOL d0bdfd3400c9145e4cc2ce51ff4453b980b4e501d5c0c91e45ee58506a66d57597879070ce8bbaa9d8e2decce0004014b7b09da558d8b101069dd7e8bc786f15
-EBUILD mesa-10.4.4.ebuild 13844 SHA256 0e5c7c14a94d528afdbdf87d221913354bd6e14af2eb9911a3d1adb4d488527b SHA512 eaea45ca7699a7075fc27dd213fd41ab28d3e7ee9d6a26a5478bbe4abd19a9373642ffdd9873eddc38c4ceb04faca0f8808ee1f9f84da7daeca47b32c14e833c WHIRLPOOL 609cf0c77c7b3909cae5eecacac9923d4eefc6bd7fa02da5da66d00234407cb8933d596f0546606d959001955b36818578dc6ad94b5f09731869d22d5e85ce34
-EBUILD mesa-10.5.1.ebuild 12577 SHA256 72cc5bb8bce1c4c459d2f83883dd374e546db225aa0937e128c5ca6bdef23447 SHA512 a78f6faa7583bbb0bdd4a2940575b28a7436819c8469999d9658d49f6c553a9176c87f16c8f8339f0a7aaeda4d7a889e590e7e15d8475eb2687d65796af807cc WHIRLPOOL 89a95b7b837c0344a2837f1b9ebeeacfbe98886d8561dabc9f575a13211d469e677d7ac1be55a341bcc21111aa286c6e58cb7ceeb5d8320e3b0ef6ea4476f2af
+EBUILD mesa-10.2.8.ebuild 14993 SHA256 b52dad1287968ea7d4624e1a46e500ac418bb567e928fdc7fb4518e30415e198 SHA512 e968ceab359b59602f717b5121c44ddddfda6ac2b5870778df38d07577fe023c21e513dcc34bba94412db66422b28ccbf1aa3a9b25d0159e85d6acec8eb7123d WHIRLPOOL 94390c1542f9291f16145ee431f30b574372afcc11d6fd778b5be927ae099b7d724b43e8dff447c9d13cda823ea0d3f097968f256f25f7438f4059a271d3b779
+EBUILD mesa-10.3.7-r1.ebuild 15063 SHA256 b7f7ef7dd6b34dc87024e31c4250214bf0f8405bf3a083abafdf5d5a6d0c237b SHA512 051e435fcc70894bd598a39545a7a928bd58c2ef75ae0d4d1134b8767c2cba6f2588016c593c1844deeaf35048aeb28132653175cc33108b06efab45aac22f8e WHIRLPOOL 48068017bfef4c48a2398ad4014d278b22f2332abee24a961017dfdca5f9d6baf4f176d1e80b8408f68c374b850f7d23ed3c2afa39d4d7f6fe650d1f7e61fb95
+EBUILD mesa-10.3.7-r2.ebuild 13945 SHA256 9a68029b60377228b94ad20f8335c486fa63acfad331ca2dfe7aa3b63c929130 SHA512 7f4c411776086b5c8763d1978311d338fde2b6bcba3f0cc11acef934d5b7014193b6e75b47abcfbaa6b6639e3a6cb721e74c8d46acebe532778df49528224867 WHIRLPOOL 4bfdc01646def19cf2c81c68ce82723600743a54bfa9cd5a1bf3ee78ec13e1308c9b43504de18f5519951f3b493345b9e591111308ca9de63f3dcba97155daa0
+EBUILD mesa-10.4.4.ebuild 13882 SHA256 2da30b2726be54b3d0c5b527c9c4d77f3bfc03458e33e4f6ef8d9c08ecc2f61b SHA512 165a834938790bea30e9b15fe1f8a7b9443e2261b3b9e2a7a806f7b2be1bd0d9c45f29ee406000c7493ef1d5564a27c30f4dee6a3a77f654c687c8aef6c39084 WHIRLPOOL 51c72efdd02b82d2283bcde52edcb3a5fc639cbaff044dbce540fbb3b6396833bf26dd3fb3d2fd5d3e2569b6af9b0dbd464707346baca287863613ee1eb9d5a2
+EBUILD mesa-10.5.1.ebuild 12584 SHA256 612b002519ce306523f1d58d545e0ec0a67af34d4aee148aec4766467a60380c SHA512 3efc2851f1ef6a0607a760d3fbf706367083551da3a50ae889636b3375a7f94ce3c211600bd3fa5d90713fec09de3889a586f038b091acf64d9ea7b67836eda0 WHIRLPOOL 4ffed5596f97b616ca3762385e76a6a540daa76ccaa0e39034d288b80d0c5d7e7d81f91157fff5dd49c850a5e2337dc6ec147a93e27e909d603b9b1a241ad4f5
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 74f720308774a1ec5eb34247c5d95387de6cf3f548f3ef732e872f39b92f5018 SHA512 54871242df8ff2550bf46815f2f4a66af63681cad04590a2f9ee0d008f2e025d52a4e55727fff81678398b0291d4a54a1563284e94544cece337920a96fc93e3 WHIRLPOOL cfe191eb30d36f1f22a082ef0e37fe4f283a57800f8c892c65d4cfe2ad150d1d20fb671349d6f0944624c40632090449ecfd99750a4c1a69001800987fc74f55
-MISC ChangeLog 100703 SHA256 65ec05ea4578c03d06ee95af3ba1c892bd57198b03e87029dd4d632d03afc09d SHA512 ab591038bac08e6c780df5167c79f8055400b761f62e73f28d5d54379c1ad91a84d61cea44e5075b90b1b93c376f70ba959a0a53a5cbf2a1e5f6ea6292c84dd3 WHIRLPOOL aae7504491f47ebe803360ae5c5bd6fdcbf40f6e0169d6fdd341ef8e2dfffcfb14b1e8db3b93bb40137c4841b001438b75141fdc4e2369c342c113a21968b2fb
+MISC ChangeLog 101019 SHA256 422a865f150e1000d4f02f9369f1a20c81842bb538f39ac63798dcf19d2b4912 SHA512 5959c922ee0ef23323f9a2468db092043b1e3fe3a50c6c4389945e727f1d45b8939d26e785c9dff39619d7bce9c83acb328f4cdfa4040f369b6a43964e25b691 WHIRLPOOL c977d6d8b70076ae4dfcdc69055b44fc67592a2e0a9eaa3e0102ae89902bc0032871504bde3a98729ef91ce6fdc74e0ea1011f84aa5cbfda4fd4f7a988f507eb
 MISC metadata.xml 1937 SHA256 b1c243ea287b20ad89f349d4d6274735d0bee6fd4b3309c6a9a0fbc063633c2e SHA512 445b1923de09a43ee10b6df629e48dd114003a2edf482de865f16816b2011d90b058e7cbc5e81face2ffdbac3cb94443f35aeea5cea93a9213f77a8aa822b459 WHIRLPOOL 56eb282ac574bff06e7dbc0bcb26b364ee1fd7827975327d59e3a94530c1cd7e7f843fe6be0bdab9a5956e34301ea3148c17e30b757fb904434a706ae6889023
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUEPbgACgkQkKaRLQcq0GKx2QCfbgqDLzr6RsC07PMzf/a8hKj7
-bT8An2GG09jcMeq1fXjiCyrl2qT2gElz
-=Uj9H
+iQJ8BAEBCABmBQJVCBONXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRAVQQAJSIkcYeq4en6ThKkBYxsQkK
+nEzUxAYZCHRxVjmONsHwbRmy0sFNaDn92m0PPUVlj3obxoTrIVLUinOTM35Nr+rM
++o144I35HBxU2B0egL3iRedUyjOzt5vGwg04xGPXKWo3AZ+iGMKarJhKiigQ9/T5
+amuE7xGjwLP6MCX4ktSesm5sK3fEkOxDpU++LD1E9YvSViSJl4MW0MaL84ioxSFa
+BTO3taNi6VA5XtLCshnKeJK6HMOf4i/VSBtPTbewp5/JedXOK847gAUZ2RiOGk85
+MC/YMDauVfrlePpcU0P/9bgC6EsDMqyoFyN7iIjMJRvwacEZyXdjOhdaMF3FEiVP
+orQwS6f2Ix9wetRZHTaAar5Md6eDmmcV+7g9ZhZEqe381+hduzU5S5nrmRZo2owg
+0j8X1fgi0RsSwgxkGLP/ymjYSaLJyjRZtgIqlc2g5p2la2h1byVerChn/x0kbUW+
+0JusQKGDW2fnPrOSqZIT/zbd/eT6nRz66znys4bvmLACxZLyc9epeSesyn2d9E2B
+G4c2cdEWvwCvwy/V7C7BhatwuklgZsBE3qbkT3uy4yn6elcsauGEC17eA+KyEzUP
+TzdQBV6JH5bVap07G78EjLILUyKp2CMNrlJSNhjtAXdaC2ucFDmwTEwsBXVVfWTO
+DeSG94uEEgZ/aC7tzonw
+=bh69
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.2.8.ebuild b/media-libs/mesa/mesa-10.2.8.ebuild
index 7cfe36ec055d..5207589f0ffb 100644
--- a/media-libs/mesa/mesa-10.2.8.ebuild
+++ b/media-libs/mesa/mesa-10.2.8.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.2.8.ebuild,v 1.14 2015/02/28 22:23:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.8.ebuild,v 1.15 2015/03/17 11:43:43 chithanh Exp $
 
 EAPI=5
 
@@ -120,6 +120,7 @@ RDEPEND="
 				) )
 		)
 		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+		<sys-devel/llvm-3.6
 	)
 	opencl? (
 				app-admin/eselect-opencl
diff --git a/media-libs/mesa/mesa-10.3.7-r1.ebuild b/media-libs/mesa/mesa-10.3.7-r1.ebuild
index 4cd6ad081bf8..df92bed77efa 100644
--- a/media-libs/mesa/mesa-10.3.7-r1.ebuild
+++ b/media-libs/mesa/mesa-10.3.7-r1.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.3.7-r1.ebuild,v 1.12 2015/03/14 13:50:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7-r1.ebuild,v 1.13 2015/03/17 11:43:43 chithanh Exp $
 
 EAPI=5
 
@@ -120,6 +120,7 @@ RDEPEND="
 				) )
 		)
 		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+		<sys-devel/llvm-3.6
 		video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
 	)
 	opencl? (
diff --git a/media-libs/mesa/mesa-10.3.7-r2.ebuild b/media-libs/mesa/mesa-10.3.7-r2.ebuild
index a64c6026ab51..78ac49484d2b 100644
--- a/media-libs/mesa/mesa-10.3.7-r2.ebuild
+++ b/media-libs/mesa/mesa-10.3.7-r2.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.3.7-r2.ebuild,v 1.3 2015/03/01 19:35:16 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7-r2.ebuild,v 1.4 2015/03/17 11:43:43 chithanh Exp $
 
 EAPI=5
 
@@ -120,6 +120,7 @@ RDEPEND="
 				) )
 		)
 		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+		<sys-devel/llvm-3.6
 		video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
 	)
 	opencl? (
diff --git a/media-libs/mesa/mesa-10.4.4.ebuild b/media-libs/mesa/mesa-10.4.4.ebuild
index 09370f8274ac..3dace36fa941 100644
--- a/media-libs/mesa/mesa-10.4.4.ebuild
+++ b/media-libs/mesa/mesa-10.4.4.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.4.ebuild,v 1.6 2015/03/03 08:59:53 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.4.ebuild,v 1.7 2015/03/17 11:43:43 chithanh Exp $
 
 EAPI=5
 
@@ -39,7 +39,7 @@ fi
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
 LICENSE="MIT SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!bindist? ( bindist )"
 
 INTEL_CARDS="i915 i965 ilo intel"
@@ -124,6 +124,7 @@ RDEPEND="
 				) )
 		)
 		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+		<sys-devel/llvm-3.6
 	)
 	opencl? (
 				app-admin/eselect-opencl
diff --git a/media-libs/mesa/mesa-10.5.1.ebuild b/media-libs/mesa/mesa-10.5.1.ebuild
index 41617ab869df..c9de76fe0fa5 100644
--- a/media-libs/mesa/mesa-10.5.1.ebuild
+++ b/media-libs/mesa/mesa-10.5.1.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.5.1.ebuild,v 1.1 2015/03/14 01:22:33 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.5.1.ebuild,v 1.2 2015/03/17 11:43:43 chithanh Exp $
 
 EAPI=5
 
@@ -31,7 +31,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!bindist? ( bindist )"
 
 INTEL_CARDS="i915 i965 ilo intel"