Re-apply build and dependency fixes which were mistakenly dropped, bug #538086.

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

3 files changed, 30 insertions, 19 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 2ae983c7fbc9..1f540f17241e 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # 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.602 2015/02/08 20:07:10 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.603 2015/02/10 09:47:52 chithanh Exp $
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-10.4.4.ebuild:
+  Re-apply build and dependency fixes which were mistakenly dropped, bug
+  #538086.
 
 *mesa-10.3.7-r1 (08 Feb 2015)
 *mesa-10.3.7-r2 (08 Feb 2015)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7ca280ed051d..b77f2abf3d4b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -38,31 +38,31 @@ EBUILD mesa-10.3.5.ebuild 14900 SHA256 8c2fa274efdf687ace1591a9f6feda155c845c022
 EBUILD mesa-10.3.7-r1.ebuild 14960 SHA256 1d33cd364e996865ad787a2f7f8958fe6b3ff42fe81e0b04401e1f4a35fd7fdf SHA512 99facb07e9ad51eb3cb0faceb767ca68240255181dc4c93d04ea3e98dbcdbe2472ed70c849eec5855d109be19cb43127fbb5396a026b1264ed1d60c0742e7dcb WHIRLPOOL dc5165416803a18256923ce3040eadaccbcec774e7248f29c4c2e09684bf5274c0737d64b694c12c367a1d1abb2956b6bf6242cd4fd4aeefa0b0cf05eaf8217a
 EBUILD mesa-10.3.7-r2.ebuild 13834 SHA256 f7a4c4072d6c1a3e943c7ad9807f4236917c4fc2cab00db941db5fe191890ada SHA512 95cacef6c9489539ae1f5d66e26bc28266aa9492048cf1fb83904b67d1b8b70432bc48cb617a43bd207f574b6ee6e661422b14dcdafa6cb9a6fb9f016f9747f3 WHIRLPOOL aaad9e947a7c86d6f0c43e9531a2bda8f102de08cccf49d6a6b03fedabc0f5ac5eba75dddf61f26dbc6bb865599e41d7b0bdc3042b99699b7f370a639e575371
 EBUILD mesa-10.4.3.ebuild 13807 SHA256 3e73db9e5af5c2fce6133705b447322dc6c3f3079ef6a5a03bbc35057a36f660 SHA512 d78b76e744c2e35e339f2f410c27f4a8a1e6c2c3dd475662f4d5ad097167520c9eef75dc840caa3e7516c59f89f3a20345724efde140c99311642db0b5adc41a WHIRLPOOL d5ba9c1cb22c471f58979425f674fa9bd504bd0b31dcb07543597e485db038111e7bc36041c7f7abba8246bcddee37ff6b9700c60d2efa567f6971ae4b054ebf
-EBUILD mesa-10.4.4.ebuild 13753 SHA256 1530d609fc3c6e07542398e50aad3a4e2e31a32554a2d48ea7e690e40734a0f3 SHA512 3f7ab15073b981125c641929b0b6aadc6e5f52235d08b565e054971eb76d7c27aa1ab34ba93802dce93294495d263204474fd2ab57d72a6f0c11b49f064f1181 WHIRLPOOL ca924d59c419a754c1e7a9dfc6f2cec139360ffb4efb248219a892c33be36301d5c3ce921755ffb5ba59e4405437048b5bd1a99584ad776ad0adb00a1782f652
+EBUILD mesa-10.4.4.ebuild 13941 SHA256 85483960a0f7bf0b84671c12c21f13a92c20a724e25aa2f10ab28c5e61a7a22f SHA512 e5de1e136b0906fd4517f38d52c776c232dec7c2ad6d3085dbf3d3db0c33b900fd4e557598a8c1756c5ebc00bc0c7d80149c9c9b33cc5d839f8c7f0035549ccb WHIRLPOOL 51db310ccb7ae0287277261e14fccc226c0f8ca663692e6c3135d7284816bfc2700c970cf304546c2e4d8b72dfafe60a6f319d309ee8d886f1114cb31d812760
 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 96716 SHA256 aca83e1543763e772a3801676f0d5038e32b33a82a0361ac9eb475471649f465 SHA512 e49f0f61715b151ca26886d38ca676aa04f8662c3b7d19e7379dcb469bf2849609acec85bdb0627364140510dd1b14361047e7d80ba79603b395eb7706a88b68 WHIRLPOOL eb0eecb07ed360ec67cbd791882a53c4a34855eb5421ff84d3a376fd21e0674be057adb35fe2966ca0f05ab3497f0ce6c26ab5aabbcd87a335aba4cda3f5f1d2
+MISC ChangeLog 96892 SHA256 44449cf6d578494f6f747544ed3ea06f0db94722c5a2d76999fdea9fd43944b4 SHA512 dbda6f7d1f023d06a13d3985d33249b1f7d1adad74a772734dddd2cc92338d3067129fb711fecdbb9ab67cb661a994c3468e3bf0c84fa812facb63bde7f869ea WHIRLPOOL faa15f0329384ebf8dfd844cd28556712639e07415fa94080224e5c05bd40193d7d94d3b05ef1969dd288391d0e316e71dd06e8b36be22349048a4036e7732d0
 MISC metadata.xml 2404 SHA256 5f1078b6c20d702857df5c10bf06090287ea6778018c9a41a3e5c32609d320ae SHA512 2fb42a0145c765e26bae2b44c0e43641e7f6948a0b6e238827eb44e612521dfc5defaa2a0d5c9cd70f76512280fa9849ba71241f22b164be9858d7db0aff9007 WHIRLPOOL 4af80f8aada5bcbe5e7f0dbe94ec10b81c3b50a4cad87c932772f43bac76722c6d2d10dfd8e5323284b009369296372ef68028b64f3f8e7eb267c60479df6368
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU18H9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU2dPaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRvN0P/1olgqYEQSv64F9usblpFd4r
-yXD5O4FlfHQCfGaqOakFQTyRQrmdpzMTMEDLAemO6yQug/aCmlcl364A9cIcxz5H
-HIRO5FzfVQEMGZVZfKfEXfBzk42op2SeeyI5uf2WhbgwDwlDyGIhtVZSxo5KrBvv
-GtYGtdHBR4SU1vKAJBMjugUBKTLXLY55maKx1EgZqN2RCWogfSGAU0BkCOXeYuKH
-ix0FwiskUB/9gn/Q7Q1UT9kqhkZfAnjItr4jFNrUaXeHCw3y0jcgzNPtETV0xKSX
-seCaYGPs33M+/lcKvYBH7tkLJjkE5lm2i6kkgqVnRubeMiYWcv5y7EWsX0QuVTKW
-O0c+DE4A5NO9TXKqeYD1Mey0V6O+FqgqaRXsJwOwiFMHC2fnyqkZndmA3QBsIZpN
-lI0WUDSkkmbfR+bNGtF5irhdKgoRgdwrTB9sMgtmjRrvOFmqwSEZO3SAr2AgNy9O
-Lj1sKHMLIkipV873Tu2DqteOF56+U4WWjxH3xALll/Ae+sr3CsV51KpQf5y0FwwI
-tbd9fBoKj7/PB8ufBkj8W+npHaUi34crP0V03yu7Qt9bcMaTvBLFUyzS37edYzqE
-QxJjHjSLYrBk13M8jTBYro1Dua2RDU0mdiNEArNb/BF6nuwL789tpwo/wOCajdVG
-URDtKoaHN+Okoe31UgUm
-=5P2U
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRPegP/jPApwsYbzFj3E2aFOXpvWVu
+o7ZgPW97BrbqCxn8P6FjxBoEZVfoGQXBFw8cZJJdsFrDXx1+D3IASksrAEB2ZUuf
+Oht9swNOZUUqjdPYz8RvDihOPezzbHRvVzW773Pqn3SjCPlcHv64EN4MvOh/vj0H
+SjGqT0K4yfTaZorcKMhEk2SVxinF69Lum5UOsM+K5uGhajenPOLPwsBK3Trr5Mpe
+vSxOOCAgzm1fRz1sabefvAg1z63YzHisldgbG1L+bOVoJwHxXQ5+4S70dVSMTejO
++tKe7UCdZMYrMuP2Zq5Ry25c+fvwriCZVskHmTiwcfyDC2sVZYnY6G/Z44mkiEv1
+yD05WHt0/sYb0sGc3CfaDk4SYSbegcfEq+tDFOP07abuYnFo+yCJ88aglAVNzTvz
+8b7bTHsJRaKLoTXfPntT8LYa1Ng9mvjPP+5mXblGhU3GH5ZKwttSaG85kmnWLFfo
+Ysinm4myKbiaFAprDZDLkNtWKveTtK8bSjHDrqlIkLYafv8/Q9DZK+vjPuE/Lpeq
+hGtK7Qb5bGRjPswfONDPbMLKS93ULgXhh9PX7dbwW4Vb0WAGb1BUdG77ALo9ib6b
+4A9oS+ZBm9JJ9+sdU5iT8zh+sR7WCE7Hp1cjOjJhGqt7EEzYNyJLyvydZCN7Mntm
+AL2JcJwYVMBSutxUrAUY
+=PPEe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-10.4.4.ebuild b/media-libs/mesa/mesa-10.4.4.ebuild
index 5a7b0d81e509..52522777a21d 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.1 2015/02/08 19:11:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.4.4.ebuild,v 1.2 2015/02/10 09:47:52 chithanh Exp $
 
 EAPI=5
 
@@ -80,7 +80,7 @@ REQUIRED_USE="
 	video_cards_radeon? ( || ( classic gallium ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
+	video_cards_r300?   ( gallium llvm )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
@@ -127,6 +127,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}] )
@@ -210,6 +214,8 @@ src_prepare() {
 		epatch
 	fi
 
+	epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
+
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch