From 6a02dc1bf5b2f4ab17bedfaeeb613f62f4395027 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Sun, 25 Sep 2011 19:31:41 +0000
Subject: [PATCH] Starting with mesa-7.12 we'll need gles2 useflag, bug 383589

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
---
 kde-base/kwin/ChangeLog            |  5 ++++-
 kde-base/kwin/Manifest             | 30 +++++++++++++++---------------
 kde-base/kwin/kwin-4.7.1-r1.ebuild |  7 +++++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 26f88194d55d..594f67a4eddb 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.246 2011/09/25 11:29:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.247 2011/09/25 19:31:41 dilfridge Exp $
+
+  25 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> kwin-4.7.1-r1.ebuild:
+  Starting with mesa-7.12 we'll need gles2 useflag, bug 383589
 
   25 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.6.5.ebuild,
   -kwin-4.6.5-r1.ebuild, -kwin-4.7.1.ebuild:
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index cbbd34389db9..020aa37d01b4 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -14,23 +14,23 @@ DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338
 EBUILD kwin-4.6.3-r1.ebuild 1774 RMD160 9407c2e5ab194ad6231f0482b14e616a2e7f4a7b SHA1 4d2720f72d3e14500c8e116f62312e9a721391db SHA256 b06642d5fc28e99122f77c20a691c7ac544df78ecd8a75c7167a094e01a141c0
 EBUILD kwin-4.6.5-r2.ebuild 1849 RMD160 b68f85198105f1764e5b1fa56fc2bc14e10ede0f SHA1 c82217931b9ed608969793c1a646902041778bbd SHA256 bcff2c8c7823cc2d00384bbe732ed9ddc7016b669f9c89dd1f8f3e49c6c524e4
 EBUILD kwin-4.7.0-r1.ebuild 1609 RMD160 c9473ca41c856b0f42b7e9f07ebb2e4316b03532 SHA1 e9a6cfe51aa6c8bdc4da14f923cc51e5995e4851 SHA256 d34983166fe9dd5a8de33a769e0d58023740a24e59de861b6bf81a433dd096e5
-EBUILD kwin-4.7.1-r1.ebuild 1654 RMD160 868759fc88f51aa8e34f4bd0889317e3de7aaaab SHA1 7d56288802c6736fc55280b79df8337ca45258c5 SHA256 848f3b6d4e07df002806cb9aebd2fdfe933f22fd2286e749c621689845780d26
-MISC ChangeLog 30401 RMD160 5a4f7c68e737d27ea9d1b9730af48125619bbf37 SHA1 9ca5134cb0a228402c8310bf3e4263b4fe86fdb9 SHA256 a70961527bca83020c199765f47b080b7afb5d66bf6866ddab6dd3ddca5e7237
+EBUILD kwin-4.7.1-r1.ebuild 1744 RMD160 6f1322d57e4c14c92955301c928fa72b37e6a8c4 SHA1 83d697ba297d452d92f6413dca5dc346bfdfcffb SHA256 46a648cf27b1fefa50f061c012c574e84f736ceaea5e692da0597c111cb4b09c
+MISC ChangeLog 30544 RMD160 dd91d382ea4922a630ad48bff694d8170d965042 SHA1 423f188a6c05b3f250805884e770a0368cc4f267 SHA256 86f47ed5ee0523f94a90b2dfad2df51e346a8938877cfa7472389d7160199675
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOfxDSAAoJEEb+UGWnxTyH5yEQAIYTPBZmC3TkEmfCzmxffUbQ
-GHpTfc27CVsOtOp5zCeLrzWvpU3aGnQqQfcFAr2gvYhnqqkjA/R3vFz0/KtzeT6q
-CpZ9GaUksbyW2q/uzgzrEP+oiVwaxqYrT6zTpMbKBtDgFqpKme2QB09YQgaXI2EW
-VCPUSIeXHkR2eWjwprDXMBVslK2JU/t6P0vinR55cayL2PMjT0dJJpU7uJ7faF+X
-iU2MXQVt6xBbc4SObSuMI85YZiRlIvlUN+JYL23aSocIjoAVJoodVrl6MgRyQrqk
-YhdP9tB2oSCKYMhYqhneSue3v4vKggx84CmORqwvR7d8GlHLrF2UnPmANAcirOSI
-o0STzenA6oZ7qTvQpOdyLUNy7x3LtRFL9K5KorsahwLQp245NUUmM829vUtyPPqS
-TLnPBaRdaVY8mxb8Fjg6lfDUEU0EqRyFdiJ2JVGLAqGYkY9txs0y59CrNHnO7znI
-H+9pMMrEc9u4I1416kO8/rfXSG4S6oIJO5KKtekbyPHUjiFxt4Dn/4E6hYTmZhO7
-2Car+6RLR2kAqkchFKHlJ5vdB8LcJaMwwXJC2dUIVLiYMH+d/5/U3wWGgOeII7fb
-m24fEJM6FWD/MYDfeKWOYmTYWFWgGpCNtq5ZT3zcfjUxW5H3kaxmeB8NQkrpZh3H
-R0UIJ8dhCjOJDjECgfiY
-=+93V
+iQIcBAEBCgAGBQJOf4G8AAoJENwGBM22xffebEIP/27JTzPiVH8Fa84mBB1nCmpo
+QmQQLfdBKooisdjb0oQiyarjbBP4w9X1fuly19E2iUj82rOFP6YQQT9qoR5If31J
+QrV1XkczIm5bu+i45XNuYlLSvGr6ASB3iGhqC2MLx/tTooOYJWlUt9VoH98Io1Hj
+IkBI0SHPwlbIeoB5PYI6DC7MbfThf3yEAfd/JLmae7/Jb7xdWboAdHMKWD7UFxKl
+xDFV+2L8oaBgpX7cFyvzPPkezMRm/sEUPCo943tQX5hSWRc5JLHEWd2ipV0Qis6u
+JGkWpWkoIQjmCXyq0KrK1CpQfmkP1z3BN9DT+ixHbSBdEHobRW2u64nwghzYSdkZ
+OqxOHJtLnVNwjfNALu+8hB9t/iSIWVn3/l1MAv5zNZ3IXUZfMaUZSlSoRwauZ3vB
+kgucoFTX0sydDCrrAeEgqPDw5DzLaCic4imvKkG9Rm//DMNcaycefhnej2dguwiI
+pIZA3Ro6fZipG77igzOAdXPQmIyz5dQynEi6rtvDnYgJnQO+wDC/1jlKBeDsb4o4
+7NT1AaromIbJpgVE+/OQwPVbOBZe23rKTtpSQXY+rrfwnAyQlxl8dQdptwoNX5AZ
+OIIV5noAhwBze6+8h5iQpX9OGbZwttWIN50blfjb7tR1SACWcR1l2zPVaW3fFTir
+BWA/yimUfhdSVanUN0f6
+=oc6u
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/kwin-4.7.1-r1.ebuild b/kde-base/kwin/kwin-4.7.1-r1.ebuild
index c39eb07fa9a2..7945c37c8dbb 100644
--- a/kde-base/kwin/kwin-4.7.1-r1.ebuild
+++ b/kde-base/kwin/kwin-4.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.1-r1.ebuild,v 1.1 2011/09/13 20:12:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.1-r1.ebuild,v 1.2 2011/09/25 19:31:41 dilfridge Exp $
 
 EAPI=4
 
@@ -22,7 +22,10 @@ COMMONDEPEND="
 	>=x11-libs/libXrandr-1.2.1
 	x11-libs/libXrender
 	opengl? ( >=media-libs/mesa-7.10 )
-	gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
+	gles? (
+		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
+			>=media-libs/mesa-7.12[egl(+),gles2] )
+	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
-- 
2.26.2