[gentoo-commits] proj/kde:master commit in: kde-base/kwin/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     2dcb5507d39146f50c76aee7d9a2e39f1811985c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 24 14:44:19 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 24 14:44:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2dcb5507

[kde-base/kwin] Remove opengl USE flag.

kwin requires Qt5Gui built with some form of OpenGL (either regular or ES), so
it seems silly to offer two USE flags for one choice.

This also allows dependencies to be simplified slightly and avoids silly bugs
like bug #514920.

Package-Manager: portage-2.2.10

---
 kde-base/kwin/kwin-4.97.0.ebuild | 9 +++------
 kde-base/kwin/kwin-9999.ebuild   | 9 +++------
 kde-base/kwin/metadata.xml       | 2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/kde-base/kwin/kwin-4.97.0.ebuild b/kde-base/kwin/kwin-4.97.0.ebuild
index f98001a..4b61a30 100644
--- a/kde-base/kwin/kwin-4.97.0.ebuild
+++ b/kde-base/kwin/kwin-4.97.0.ebuild
@@ -12,9 +12,7 @@ inherit kde5
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gles2 +opengl wayland"
-
-REQUIRED_USE="^^ ( gles2 opengl )"
+IUSE="gles2 wayland"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -40,7 +38,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep plasma)
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[gles2=,opengl=]
+	dev-qt/qtgui:5[gles2=,opengl]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtscript:5
 	dev-qt/qtwidgets:5
@@ -66,9 +64,8 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
+	media-libs/mesa[egl,gles2?]
 	x11-proto/xproto
-	gles2? ( media-libs/mesa[egl,gles2] )
-	opengl? ( media-libs/mesa[egl] )
 "
 
 src_configure() {

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 62b2362..d0e1f7d 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -12,9 +12,7 @@ inherit kde5
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
 KEYWORDS=""
-IUSE="gles2 +opengl wayland"
-
-REQUIRED_USE="^^ ( gles2 opengl )"
+IUSE="gles2 wayland"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -40,7 +38,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep plasma)
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[gles2=,opengl=]
+	dev-qt/qtgui:5[gles2=,opengl]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtscript:5
 	dev-qt/qtwidgets:5
@@ -65,9 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
+	media-libs/mesa[egl,gles2?]
 	x11-proto/xproto
-	gles2? ( media-libs/mesa[egl,gles2] )
-	opengl? ( media-libs/mesa[egl] )
 "
 
 src_configure() {

diff --git a/kde-base/kwin/metadata.xml b/kde-base/kwin/metadata.xml
index b7977769..a14e1ec 100644
--- a/kde-base/kwin/metadata.xml
+++ b/kde-base/kwin/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="gles">Enable support for GLES.</flag>
-		<flag name="gles2">Enable support for GLES2.</flag>
+		<flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
 	</use>
 </pkgmetadata>