Drop r600-llvm-compiler USE flag. Upstream only wants active developers to use this.

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

3 files changed, 25 insertions, 30 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 1d9b42db475f..84bbf47b5797 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # 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.620 2015/02/28 22:23:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.621 2015/03/01 19:29:20 mattst88 Exp $
+
+  01 Mar 2015; Matt Turner <mattst88@gentoo.org> mesa-10.5.0_rc3.ebuild:
+  Drop r600-llvm-compiler USE flag. Upstream only wants active developers to use
+  this.
 
   28 Feb 2015; Matt Turner <mattst88@gentoo.org> mesa-10.0.4.ebuild,
   mesa-10.1.6.ebuild, mesa-10.2.8.ebuild, mesa-10.3.5.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 73ef26384975..4d25216b0ad9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -40,29 +40,29 @@ EBUILD mesa-10.3.7-r1.ebuild 14986 SHA256 e6c77b667da8f448b627e30734e1eaf6edb7f5
 EBUILD mesa-10.3.7-r2.ebuild 13867 SHA256 b6c0f1790f695a2b64395a4b9a79df224c04ea600dc23adad47590d5cadad638 SHA512 2aae25397edddc2ab1f716d7f853f549c3a4dc4464c4931ced7ab1e4aa8999982c40d1ecb969536f543f1e8dc79c09b369313e029482e9871c9629d2beb527b1 WHIRLPOOL 76130a4357fb6e3f6cf2ff66579b873d4a2f1effb58faf688c6e7404eb6e7defeedc897f7f7ae59934346f9ebe5374da7899d2cf38d09886c122e75114df2c56
 EBUILD mesa-10.4.3.ebuild 13840 SHA256 51736954b467dd112973539c2e492454384b34bdc954da0a6e91a5a8fed42b61 SHA512 e7485a93adb4a7c15e6c42c8c20fe074883eeab51f6faf63d6068884cce7fa04e57d1eb76e51c12ec497ae542aa6434f86ae85a17506fa8186d73ecb970bdafe WHIRLPOOL 5b1f00e7694118303f4b9a5a432d7f4ee42bc37321b7f2749a5ac977f173fac5906b01770d2df071b3fa1042e1f9bff2c691ccc05799687e0f952b0100d7d1e4
 EBUILD mesa-10.4.4.ebuild 13841 SHA256 bf93ac6975da85d3d6cff6253a5ba10cfa87592af89141016fda8d5ca80bb31e SHA512 5fc5e34beffab6c3107aadbaf510e541d2d9727cb7039977ab6fe3c95d898808ec68222e7d2f4b099eaaa350675c11b91e4a5f82c8950a36fa6a1c94f9dfceea WHIRLPOOL 346790de8c1a187c6e904124e4b7e07162fd8ff5efc518bceaa88ba3b6eb71d8d7a22b319c0021cc2ce2e12c267b7f50bab1b7e414727633fa047246fdbd310a
-EBUILD mesa-10.5.0_rc3.ebuild 12973 SHA256 a7fac0c484aad6422e6d083681cdbccca40bc5bf0d9ee1b1095fd4aa79f52a2b SHA512 043f680541b37202d29bd9a53b0e92ba9f25e890da1e127dcd9454caca2649aad156490c967499615ae2d61b4e79e0764cfa517bdf96557d6bb85590faa3b839 WHIRLPOOL 4805e3ac7f6bcb2663fc38f7105de9e853b311d33007c37be242b0cc60ce6e0a997b32f26e96b9759eba59b6cd9e8d53dd095327ce53dbe4d4afa1ce1d5442cc
+EBUILD mesa-10.5.0_rc3.ebuild 12608 SHA256 554406ae2ecc49d4671985bf1d06f6b55110f3bbbe63132601f8882ffe962205 SHA512 5d8d6dbe1824b9f44fe949811cdc22cbe52b5c5f0203a256c09f45da7b2c5d2f847c44a2af451ef9992a76a08abfb9ab6415f305f6a6acc4488628feb01ce6e4 WHIRLPOOL b5417d161917b7aceba8804d92f2a3f132297c5845ce664b8a4e5ba2d6a5ed8ac4bbdd6c7371de4d5017108a18103b5a120c673691374f8fa1e29b2dc1f1df88
 EBUILD mesa-7.10.3.ebuild 9833 SHA256 74f720308774a1ec5eb34247c5d95387de6cf3f548f3ef732e872f39b92f5018 SHA512 54871242df8ff2550bf46815f2f4a66af63681cad04590a2f9ee0d008f2e025d52a4e55727fff81678398b0291d4a54a1563284e94544cece337920a96fc93e3 WHIRLPOOL cfe191eb30d36f1f22a082ef0e37fe4f283a57800f8c892c65d4cfe2ad150d1d20fb671349d6f0944624c40632090449ecfd99750a4c1a69001800987fc74f55
 EBUILD mesa-7.11.2.ebuild 10025 SHA256 1bbf89651720ff25670a0c5a8fc5664c79468da1829d4a71971c80ce0c52de70 SHA512 9e6a98c9ba5144ea48110c5893e972abe6016763ffc1a43ba21bfed00e810c9a5783f9e90a29040104833295c298327a00d2a89d0b77abfc4bde53e22d7e4362 WHIRLPOOL d19aa668c202c948a1318c9a022d05d9a4029c34299dc6e29272456405b201b822b914ff273080169f5da5611b96513d26784374868849c04191ec2ea034e8d8
 EBUILD mesa-8.0.4-r1.ebuild 10823 SHA256 761568a982c1bc3f0ef9bc02d8cac3f4715a7b410e895aefec4d22e6afe61a7a SHA512 8f34c985dc983e3c7dcd98557de38d22124685644ac93a9ef89757385644cf61d8f9dffa28d8f423280f442c1b519f7cab4dbc14ca4361dc0449faedb2896792 WHIRLPOOL 7724e72bb7c2438c2661140bcf3587d8409d547f59e3906ea4413ad01cf2e88a5a2fc38d15218cbbb40634a4615740923c1fc601b75ce448931b162a17a41fe1
 EBUILD mesa-9.0.3.ebuild 11145 SHA256 379a630b8fed1b34d257a935f7bac35b695e4b66b6be0cdc8960f374d8bff834 SHA512 55a765bfdc4ff99f29681d75d55298795000d35390adb7ab1a8a8c7c376ee5fcf31992ffd5e9339e1dd1f228788f3f147a31dddc141f658e4eea334ce41ee386 WHIRLPOOL 624501d0d91dc5f9a46ae974edd325fd61b642e8c31564538bd69b4bd63eccb0409f129336d6cd116acd67586dc2262ee401072699b9f498add64973c5c44f0c
 EBUILD mesa-9.1.6.ebuild 11075 SHA256 eb99e3b72fc2398fd9719caf780f9e3738db295572964f168102eeb6542f6c8a SHA512 2a406cd612f5ffc905adb76dbcf153e4bc61f010f9192949760aaa6809d4bbf05a533c23c823df3bb1b1b07ab3e1e6f4ee2ea14c2231a4c93973bd40c5411879 WHIRLPOOL 64c34ae571a1dd28a877e8be2bb2adcbd864d94bd53ae9769bcf61ac9716401de678bdcdd42e20b716e8611604b394eb1e7967925815458373ed505b6565eac5
 EBUILD mesa-9.2.5-r1.ebuild 13966 SHA256 224dffb84e94cfef85977df598fae25c3d156f2914cf6f9e9d56c60d033d00de SHA512 63f08a5427fe4f475f643bf58f2f4b320b3f393b32ea7e8e4b25677d4774f0f5055135c459b779205ae68ec079544ac9c9131e1a2bad8f149d6c481aa84b7cbe WHIRLPOOL 6d8b0f4563a603a6d029ac5a5acbcc38456b82dea281101d62f2c25bce65db374bf9ab6b374f67f3efad7ca54b126f16294d8ae42e7cea2f902f4ae17da5323b
-MISC ChangeLog 99187 SHA256 492168c7c3f27f3ab27656fff7d7aa2f0f9f3986a0d5c7e6db82db68be52a97d SHA512 d74e4397d3873c0c1538f75be704f3c83d686d5288b82895b62d8d060c6f9d49f770a36c9f4d8f6f81103a3e3458ae3952b2743b4d0e30cf163d4d0acd3cbcd9 WHIRLPOOL 7889af86b144a1d9f1e4e69c4ca4aecd73b0a6bc81fc9a5886dfea6df8043576ad1417028c8872347242f97fd46be39a69bd6a6efdf9e00f8df43d72d12cb94b
+MISC ChangeLog 99350 SHA256 15e77c7c2b96b7eea163e28d7158413c0a4a4a4ee3a3433a70ad0014dbc8c199 SHA512 a0d56f3dddaa005f7b64bb495e16e887d0f410133317a79cac72e3ba82d5e2f26e23b332c33e61482991942b75d524b8792001a847c817873f585831f1ebcc0e WHIRLPOOL 4a23696395be80c1fb7f6e349e87486da1879c8c9d0652809ea41b5e956da5b614dfc96cc081d3db125d5cc286666f3f7b8e0e8c4b55f0681ed8e766559bc3a9
 MISC metadata.xml 2404 SHA256 5f1078b6c20d702857df5c10bf06090287ea6778018c9a41a3e5c32609d320ae SHA512 2fb42a0145c765e26bae2b44c0e43641e7f6948a0b6e238827eb44e612521dfc5defaa2a0d5c9cd70f76512280fa9849ba71241f22b164be9858d7db0aff9007 WHIRLPOOL 4af80f8aada5bcbe5e7f0dbe94ec10b81c3b50a4cad87c932772f43bac76722c6d2d10dfd8e5323284b009369296372ef68028b64f3f8e7eb267c60479df6368
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8j/JAAoJEA/daC2XTKcqKTAP/1sj9ji1tbRZTLAmOU4Ls3Ht
-ev5MrGps/h1G01ydVgW4jmoLyx1YXv1f9G7CmYQHY2Z5QpgnjpHridqAIryTowFb
-L0kL6Y0WhLNp4MgNf1W5NAylKgZ1vA2sBLANED5maTjb/o/hBpM1x3sMlydI7KuE
-L8KB6OM12u0NXvqNnjs/t1iViE4RF8ltVJ1H0LFniqg/dZV/RsEi3Z3pTXJ7kNLY
-pWCLtbnwxZq4bvaVXbY1DnJ1GxT/mSY4eUMdKTKZt+uPHI+2ZNMAeLYboHDx9RBY
-BSqwnK3tF3B9Z1gnDEYnJEnprEOD/WG5vT84PpDoqO0nmETAuMoVsJvzRU9v7n+E
-ptD41xziiqHr8MdQWZbzPxdy8Notd/brA8mHHx6ulcJ1S3e6phIjI2i/LSdYBGNy
-njUBPpIIaRnJ5WfiMuA1g2VBUZAzK+U3bG1+E4w5rV4FX/pfGIHaBZ/9Z9L9GKq9
-FjLMg6EEOn2EhsQFGkA52HnMhSobCrcCd4cSTjZlEsDO4VbHnhERsx0b6D86/9H3
-RndtWYgVLyxaNRyKg5WXKOcW4rNzyUiXygvvILXpapk4253sbdyjEmkz76QmlE29
-wwHNlWXjotjCUEHUKJ0A4G6pwPJ+d6VByXd7R8tUcNC2m7jHwDBwaDLfrDhiNvxN
-Du/3jSqsXjGhbboVFnV4
-=iFR5
+iQIcBAEBCAAGBQJU82iWAAoJEA/daC2XTKcqtIEP/R2c8ejYHFrm2j+siGuOHaZC
+3YgwdQL5anBniygFbPgfkFETFpkHKm0Hq4IUYl7+sWey/PKbfHXkX3+sz3SWOK3U
+2tidlEx/Tvgi68TbvrZBOvMTw9j3ckCETOTSYT8QIyqL6cz+gvPidR3uA7ISNynq
+/VdEITJV/J0G85+81/AYXV4Gfzy7WEfv7Hm3DaMaIi8H5w11xwEM7aR8nE2t/Pvf
+eLC2RpMxate9x/3AxuZHPJZY7FGCiORaoVl3ZHNT/essUlZv8EnS5wdR0GZHWo9l
+NoaNCnkHqHu+IVten8rjTSPyLBmKJ/T7819i+P8hk6nR4IDICFjDKYkjr3v4OyDG
+fo61JVbjf7/BnecxG+wi8bQbDLf3DCdgxit+7adsY05319SXX6SnklgA3b75TesR
+9XYuv8gnB2v1B4E3VYlQtGx88PELOs0yq+E4Dtz1/9vPIlmVmZHqsPuivcqi+ONA
+1N1EPcmBa7R/QytmlhA4gu4x6XZO7IC5Xa4S0KIQvBaSUtP0tzAU3rrIsvNFw/X5
+lJ9dqKtAH5DAjajRyR5tUgvkpEv4yoFpzcB1++wf1fbKxw5+Jlw2OdhaUzR+FLlU
+YaVbEraF/bxgmZDjMjVKpdWQg6JdJIa+9WRAks/eh7FANWaGmqG63uZN5vFil1Fl
+eGwiBgSCc7RJFcFxkjlH
+=+gsZ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.5.0_rc3.ebuild b/media-libs/mesa/mesa-10.5.0_rc3.ebuild
index 6bc7fc1ca119..92ed94a4b775 100644
--- a/media-libs/mesa/mesa-10.5.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-10.5.0_rc3.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.0_rc3.ebuild,v 1.2 2015/02/28 22:23:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.5.0_rc3.ebuild,v 1.3 2015/03/01 19:29:20 mattst88 Exp $
 
 EAPI=5
 
@@ -43,29 +43,22 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-	+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
+	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+	wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
 	llvm?   ( gallium )
-	opencl? (
-		gallium
-		llvm
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
+	opencl? ( gallium llvm )
 	openmax? ( gallium )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
 	vaapi? ( gallium )
 	vdpau? ( gallium )
 	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic ) )
+	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_ilo?    ( gallium )
@@ -147,7 +140,6 @@ done
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	llvm? (
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
@@ -232,7 +224,6 @@ multilib_src_configure() {
 			$(use_enable d3d9 nine)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openmax omx)
-			$(use_enable r600-llvm-compiler)
 			$(use_enable vaapi va)
 			$(use_enable vdpau)
 			$(use_enable xa)