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

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

[Johannes Huber]

commit:     19e4afa42355a322a57e3b4345db00eaea75f003
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Feb 10 23:58:19 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 21:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=19e4afa4

kde-apps/konq-plugins: Frameworks merged to master

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 .../files/konq-plugins-ecmmarkastest.patch         |  9 ++++++
 kde-apps/konq-plugins/konq-plugins-9999.ebuild     | 35 +++++++++++++++-------
 kde-apps/konq-plugins/metadata.xml                 |  3 ++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
new file mode 100644
index 0000000..27f0ab8
--- /dev/null
+++ b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
@@ -0,0 +1,9 @@
+--- a/fsview/tests/CMakeLists.txt	2015-02-11 22:27:17.483424809 +0100
++++ b/fsview/tests/CMakeLists.txt	2015-02-11 22:29:56.069432617 +0100
+@@ -1,5 +1,6 @@
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ 
++include(ECMMarkAsTest)
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+ 

diff --git a/kde-apps/konq-plugins/konq-plugins-9999.ebuild b/kde-apps/konq-plugins/konq-plugins-9999.ebuild
index 0f1611f..e6483ea 100644
--- a/kde-apps/konq-plugins/konq-plugins-9999.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-9999.ebuild
@@ -5,28 +5,43 @@
 EAPI=6
 
 KMNAME="kde-baseapps"
-inherit kde4-meta
+KDE_TEST="true"
+inherit kde5
 
 DESCRIPTION="Various plugins for konqueror"
 KEYWORDS=""
-IUSE="debug tidy"
+IUSE="speech tidy"
 
 DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kdesu)
 	$(add_kdeapps_dep libkonq)
-	tidy? ( app-text/htmltidy )
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+	tidy? (
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kwidgetsaddons)
+		app-text/htmltidy
+	)
 "
 RDEPEND="${DEPEND}
-	!kde-misc/konq-plugins
-	$(add_kdeapps_dep kcmshell)
 	$(add_kdeapps_dep konqueror)
+	$(add_plasma_dep kde-cli-tools)
 "
 
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-ecmmarkastest.patch" )
+
 src_configure() {
 	local mycmakeargs=(
-		-DKdeWebKit=OFF
-		-DWebKitPart=OFF
-		-DWITH_LibTidy=$(usex tidy)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tidy LibTidy)
 	)
-
-	kde4-meta_src_configure
+	kde5_src_configure
 }

diff --git a/kde-apps/konq-plugins/metadata.xml b/kde-apps/konq-plugins/metadata.xml
index 2fdbf33..8ad5e62 100644
--- a/kde-apps/konq-plugins/metadata.xml
+++ b/kde-apps/konq-plugins/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="speech">Build text-to-speech plugin</flag>
+	</use>
 </pkgmetadata>