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

[Johannes Huber]

commit:     a16442f1498a82c70d80c320c1907a589e5679a0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 21:53:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 22:07:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a16442f1

kde-apps/kdegraphics-mobipocket: Frameworks merged to master

Package-Manager: portage-2.3.0

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

 .../kdegraphics-mobipocket-5.9999.ebuild           | 27 ----------------------
 .../kdegraphics-mobipocket-9999.ebuild             | 15 ++++++++----
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5.9999.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5.9999.ebuild
deleted file mode 100644
index d7b02d7..0000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS=""
-IUSE="+thumbnail"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	thumbnail? ( $(add_frameworks_dep kio) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
index 72bbaf0..164fe21 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
@@ -4,16 +4,23 @@
 
 EAPI=6
 
-inherit kde4-base
+KDE_BLOCK_SLOT4="false"
+inherit kde5
 
 DESCRIPTION="Library to support mobipocket ebooks"
 KEYWORDS=""
-IUSE="debug"
+IUSE="+thumbnail"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	thumbnail? ( $(add_frameworks_dep kio) )
+"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
+		-DBUILD_thumbnailers=$(usex thumbnail)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }