[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/

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

commit:     931cdfeb518a8a5070f17434b3f06a005f00c2d9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 18:01:04 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 18:01:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=931cdfeb

[kde-apps/gwenview] Introduce X USE flag.

Upstream commit: 9b4ce7bb0cb728762fb405f2a0cad1217818c993

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.2.ebuild       | 10 ++++++++--
 kde-apps/gwenview/gwenview-15.04.49.9999.ebuild |  8 ++++++--
 kde-apps/gwenview/gwenview-9999.ebuild          |  8 ++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild b/kde-apps/gwenview/gwenview-15.04.2.ebuild
index e922a53..1d6f426 100644
--- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	http://gwenview.sourceforge.net/
 "
 KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop"
+IUSE="semantic-desktop X"
 
 # Not released: USE="kipi raw"
 # kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
@@ -47,8 +47,11 @@ DEPEND="
 	media-libs/libpng:0=
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
-	x11-libs/libX11
 	semantic-desktop? ( $(add_plasma_dep baloo) )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
 "
 
 RDEPEND="${DEPEND}"
@@ -59,6 +62,9 @@ src_configure() {
 #		$(cmake-utils_use_find_package kipi KF5Kipi)
 #		$(cmake-utils_use_find_package raw KF5KDcraw)
 #	)
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
 
 	# Workaround for bug #479510
 	if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then

diff --git a/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild b/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
index 48fd099..8f2732f 100644
--- a/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.49.9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	http://gwenview.sourceforge.net/
 "
 KEYWORDS=""
-IUSE="kipi raw semantic-desktop"
+IUSE="kipi raw semantic-desktop X"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -44,10 +44,13 @@ DEPEND="
 	media-libs/libpng:0=
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
-	x11-libs/libX11
 	kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
 	raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
 	semantic-desktop? ( $(add_plasma_dep baloo) )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
 "
 
 RDEPEND="${DEPEND}"
@@ -56,6 +59,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
 	)
 
 	if use semantic-desktop; then

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 48fd099..8f2732f 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	http://gwenview.sourceforge.net/
 "
 KEYWORDS=""
-IUSE="kipi raw semantic-desktop"
+IUSE="kipi raw semantic-desktop X"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -44,10 +44,13 @@ DEPEND="
 	media-libs/libpng:0=
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
-	x11-libs/libX11
 	kipi? ( $(add_kdeapps_dep libkipi '' 5.9999) )
 	raw? ( $(add_kdeapps_dep libkdcraw '' 5.9999) )
 	semantic-desktop? ( $(add_plasma_dep baloo) )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
 "
 
 RDEPEND="${DEPEND}"
@@ -56,6 +59,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
 	)
 
 	if use semantic-desktop; then