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

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

commit:     498c9bc4e6fa0233ebd1732c1ce2e3d5a799c371
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 17 14:00:01 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 17 14:00:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=498c9bc4

[kde-base/oxygen] Make building KWin decoration optional wrt bug #522580.

Package-Manager: portage-2.2.10

---
 kde-base/oxygen/metadata.xml           |  3 +++
 kde-base/oxygen/oxygen-5.0.1.ebuild    | 12 ++++++++++--
 kde-base/oxygen/oxygen-5.0.2.ebuild    | 12 ++++++++++--
 kde-base/oxygen/oxygen-5.0.9999.ebuild | 12 ++++++++++--
 kde-base/oxygen/oxygen-9999.ebuild     | 12 ++++++++++--
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/kde-base/oxygen/metadata.xml b/kde-base/oxygen/metadata.xml
index a23f444..7dbf732 100644
--- a/kde-base/oxygen/metadata.xml
+++ b/kde-base/oxygen/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="kwin">Build window decoration for KWin</flag>
+	</use>
 </pkgmetadata>

diff --git a/kde-base/oxygen/oxygen-5.0.1.ebuild b/kde-base/oxygen/oxygen-5.0.1.ebuild
index 38b72fe..d082739 100644
--- a/kde-base/oxygen/oxygen-5.0.1.ebuild
+++ b/kde-base/oxygen/oxygen-5.0.1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE window manager theme"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
 KEYWORDS=" ~amd64"
-IUSE=""
+IUSE="+kwin"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -22,13 +22,21 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdebase_dep kwin)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
+	kwin? ( $(add_kdebase_dep kwin) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/kdebase-cursors:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwin KDecorations)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-base/oxygen/oxygen-5.0.2.ebuild b/kde-base/oxygen/oxygen-5.0.2.ebuild
index 38b72fe..d082739 100644
--- a/kde-base/oxygen/oxygen-5.0.2.ebuild
+++ b/kde-base/oxygen/oxygen-5.0.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE window manager theme"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
 KEYWORDS=" ~amd64"
-IUSE=""
+IUSE="+kwin"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -22,13 +22,21 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdebase_dep kwin)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
+	kwin? ( $(add_kdebase_dep kwin) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/kdebase-cursors:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwin KDecorations)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-base/oxygen/oxygen-5.0.9999.ebuild b/kde-base/oxygen/oxygen-5.0.9999.ebuild
index fb591da..9c9a348 100644
--- a/kde-base/oxygen/oxygen-5.0.9999.ebuild
+++ b/kde-base/oxygen/oxygen-5.0.9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE window manager theme"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
 KEYWORDS=""
-IUSE=""
+IUSE="+kwin"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -22,13 +22,21 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdebase_dep kwin)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
+	kwin? ( $(add_kdebase_dep kwin) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/kdebase-cursors:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwin KDecorations)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-base/oxygen/oxygen-9999.ebuild b/kde-base/oxygen/oxygen-9999.ebuild
index fb591da..9c9a348 100644
--- a/kde-base/oxygen/oxygen-9999.ebuild
+++ b/kde-base/oxygen/oxygen-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="KDE window manager theme"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
 KEYWORDS=""
-IUSE=""
+IUSE="+kwin"
 
 DEPEND="
 	$(add_frameworks_dep frameworkintegration)
@@ -22,13 +22,21 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
-	$(add_kdebase_dep kwin)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	x11-libs/libxcb
+	kwin? ( $(add_kdebase_dep kwin) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/kdebase-cursors:4
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwin KDecorations)
+	)
+
+	kde5_src_configure
+}