Fix build failure when all USE flags are disabled, bug #522824.

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

3 files changed, 32 insertions, 22 deletions

diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog
index b9eadc32bd8c..2c459f14974f 100644
--- a/x11-apps/mesa-progs/ChangeLog
+++ b/x11-apps/mesa-progs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/mesa-progs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.108 2014/09/15 02:30:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.109 2014/09/15 09:22:29 chithanh Exp $
+
+  15 Sep 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-progs-8.2.0.ebuild:
+  Fix build failure when all USE flags are disabled, bug #522824.
 
   15 Sep 2014; Patrick Lauer <patrick@gentoo.org> mesa-progs-8.2.0.ebuild:
   Temporarily drop keywords #522824
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 0d999c9f55f8..35b41c6bd103 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mesa-demos-8.1.0.tar.bz2 10045237 SHA256 9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828 SHA512 4832690cd7fb7bb4caccde039cb68baf9213e102ca9212541da499941879b719c1a7ee4038b3e0fde42a92bd6589a90b8ec842982aba81ff507e6ea55054a9ed WHIRLPOOL b9495d62f092d92e50a90cff42d6b21945c1dfd12113492932bba0a981c84ec87c2292492be49b27458a3cdbe36a3aad361a17d367f84b8e63fe1878331d4e59
 DIST mesa-demos-8.2.0.tar.bz2 10071635 SHA256 e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de WHIRLPOOL faa4dfb6ee32d81a4569f883d587ea96e76da1c97df26effaff1fc2827b359de40bb61a5b87f46e13993bada2d37ca333cfb1f2023f953829c4d6fb886553899
 EBUILD mesa-progs-8.1.0.ebuild 3096 SHA256 3ee80c4bf09498a3e906b3ed5271d739e143aa80b71aba5f1788923269b4fb21 SHA512 451c7e022eeeaec90be95434a7da1ac74bfd29660b97cfac72590f39969bb8418553f2eb499eb60c9d47710a690e21df64904b94d8dd75fd376a31cd85ab52ec WHIRLPOOL 6d8c3c3ddef7f56c9ab24d824053293d40a555ff8d6170bcf04ca66e439e909fd82dc9d4ea84c89883db8a6f0f1917d2a71bd6b20980460421cde7da4156356e
-EBUILD mesa-progs-8.2.0.ebuild 2890 SHA256 5770295ddf10ab9ac2a198871f0de215c331d4bfb6372ef5ed6a4fe7e126e5d0 SHA512 bc5eb900ef018a3c9e62cd1e1418aeddd751367e84bb474f8bb0a5c77cff16a907042e17eda217139b6051f7ead74ce84848bac16c29c295750e5e6ec674f37f WHIRLPOOL df77d1c1f5b87be82d356a2627b58a3ccaba90ef0eef3945b7a7b5bd5fbaed802dcffa76effe8bde05b6d2ccf7e5e2d18b4c826b0fccec40dd0ea8272f7234ba
-MISC ChangeLog 13328 SHA256 6a29e9b27a608f075a454d8a0cdfa59c90a8b701e096e67a68f974068c631c6c SHA512 f9f0a87281d40492ee44056edc0ea62aaf0c6eddffe26b62ea60e6b53609b3e6a481274f7156d2141668dcb5e03e88b4d7f82cc7ee825f4db317b997ac4f61c4 WHIRLPOOL 5ab482ccf9eb5fd405370af2073730076eba55858e41b5c02ac6bf44d46e36ecaa7771fd67ac596d2b37271568ca4ed7359c1e83d1ea0b3656f711393f39339b
+EBUILD mesa-progs-8.2.0.ebuild 2478 SHA256 4d882c84efcc532ef108e206795e85b4c05c5dc44f78c47d57ea4b21750d8884 SHA512 b7f2e87f3f4cb7b146e90b061189e3b34977d595ede310a7412132cd44a32043aff9504c0ecec0498303380007a30f5b61beb0513175f261c7fd369b586f893a WHIRLPOOL 6c83976af4c3f16c93d9ea8fa083d080ff5c5c9e7b603a89c9f7ddec60b31239fd54121fe51919abd4da0937a519f478e11deb6ec5f3843f7dad916c08365a47
+MISC ChangeLog 13492 SHA256 393ac2998dda1b26ec415767117ee90e6876914b5f086a0f3ee0171ede0a5bd6 SHA512 159c738057767b02fcfaf40d976c8548425c4e5b726844c689a95c534362e56a95eba8ccbd2a061b1761c7803f4c7c51044619366076e682dd06220f5853f0a6 WHIRLPOOL 570235fae39c869002b9b998e98ea3e2c6a62000f31874a37d948e09ec02ec37aeca58e1d3bfb46e853f1b129b0373aa25a038ef82bc4ba043c460dc7ae2c171
 MISC metadata.xml 345 SHA256 a2b83b889a0143614c05089af651c08a0eeb260d5284b7067ce477ec54167421 SHA512 e2ba5de419e23e255a80194b7ea8aceda7fbd8a1848df44524fe0615a40b3e0c5e473966d56ec21c6be3cc70a26f4a29b73c60fd8b69ac3f0727b3ee48736807 WHIRLPOOL 1d642dc3f27a1b747b3a08175813987f5405cbc0d67a5870b707007326fe4e249db494a048ad1a25d34d131f6225e20c574a76cf594778413edc099ba2e1d3ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJUFq/5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR8y0P/ivUpjwuP6tqYtIH7CmwwTxJ
+QxwqOkS7Ao0poVEL1os09rR/202H2h4uiKM01gC7LoadMJC/M6g4gJBXqWlwn8ER
+66IXR55lzO+LuCxOOlSGQkeOgavpvYfvy9HCvqxPYThJ+niewQe87bKoIy9nZ52l
+tFVgXmjkTmPWf8S2JZUpjhVerU1G/v2EzS5pw26c4g3D5XjMZkGR2G/F+Gcd9uhM
+AIJD9tw//U5MiXex9o4/uUShBOWe2EomdrjxRx5NrXIB/7uvFImssN1B3QZTRw0J
+bAAZ/FNU3CC7+sGir3IqA+U8fG02tyPfIPZuOAFAiY7ggrid9gFpLLtfZZRpekgU
+RSBss+g+bZMIv+d+pztmxh2MqvS0KuKuPlYgRp6qL9VqAUQRNnJARVoQteN5nioX
+ud2OUJhXjspmded5A+x2viLQ2CV4X1vV7Tt4KbMi2yrqBPXD3FLcmSxSHbnHEb/l
+xGF1Vj2uPFJh11nZlZCQDLMstA7iPcjIaeytSM0jNPuY/DDvxu45MpDssY21RP+x
+UYlUMBnIVvv34B+m5LnAg8xDXlRv0a/aSb9F+PQ42O7rlr0r5vQBb2ZPRxah/1lK
+Sr+eMvbPXiWqFcTOod6Tsn+N0nrzGO41eFQdPMwN1kknBTL2IZFNagDLpFmJAaUM
+eHXgYescC0cJHzlL8y+B
+=zZ6n
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index f2cd8402a4ce..18c49caeb8c7 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.2 2014/09/15 02:30:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.3 2014/09/15 09:22:29 chithanh Exp $
 
 EAPI=5
 
@@ -25,9 +25,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-# temporarily remove keywords #522824
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="egl gles1 gles2"
 
 RDEPEND="
@@ -55,22 +53,8 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	# We're not using the complete buildsystem if we only want to build
-	# glxinfo and glxgears.
-	if use egl || use gles1 || use gles2; then
-		default_src_configure
-	fi
-}
-
 src_compile() {
-	if ! use egl && ! use gles1 && ! use gles2; then
-		tc-export CC
-		emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo
-		emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears
-	else
-		emake -C src/xdemos glxgears glxinfo
-	fi
+	emake -C src/xdemos glxgears glxinfo
 
 	if use egl; then
 		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo