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

[Johannes Huber]

commit:     0b19a3560ef9962b6542342d55fa0edcada4f725
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jan 29 00:00:13 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 30 23:32:55 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b19a356

[kde-apps/gwenview] Add US kipi + raw, make tests optional

Package-Manager: portage-2.2.15

---
 .../files/gwenview-9999-tests-optional.patch       | 28 ++++++++++++++++++++++
 kde-apps/gwenview/gwenview-9999.ebuild             | 18 ++++++++++----
 kde-apps/gwenview/metadata.xml                     |  3 +++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch b/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch
new file mode 100644
index 0000000..b5d1248
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt	2015-01-29 00:15:10.245160459 +0100
++++ b/CMakeLists.txt	2015-01-29 00:16:41.950314278 +0100
+@@ -36,7 +36,7 @@
+     set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test Concurrent Svg OpenGL)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Concurrent Svg OpenGL)
+ 
+ find_package(Phonon4Qt5 4.6.60 NO_MODULE)
+ include_directories(BEFORE ${PHONON_INCLUDES})
+@@ -101,11 +101,15 @@
+ add_subdirectory(app)
+ # add_subdirectory(importer)
+ add_subdirectory(part)
+-add_subdirectory(tests)
+ add_subdirectory(icons)
+ add_subdirectory(images)
+ add_subdirectory(cursors)
+ add_subdirectory(color-schemes)
+ add_subdirectory(doc)
+ 
++if(BUILD_TESTING)
++   find_package(Qt5Test CONFIG REQUIRED)
++   add_subdirectory(tests)
++endif()
++
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 88ae87c..5d176c0 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE image viewer"
@@ -12,7 +14,7 @@ HOMEPAGE="
 	http://gwenview.sourceforge.net/
 "
 KEYWORDS=""
-IUSE="semantic-desktop"
+IUSE="kipi raw semantic-desktop"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -43,13 +45,21 @@ DEPEND="
 	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_kdeplasma_dep baloo) )
 "
-RDEPEND="${DEPEND}
-	!kde-base/gwenview:4
-"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-9999-tests-optional.patch )
 
 src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
 	# Workaround for bug #479510
 	if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
 		mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index a23f444..0776135 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<use>
+		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
+	</use>
 	<herd>kde</herd>
 </pkgmetadata>