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

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

commit:     d1c41a43085418df8ad303967330bc255d57b91e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Oct 16 13:57:38 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 18:24:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1c41a43

kde-apps/libkface: Frameworks merged to master

Package-Manager: portage-2.2.20.1

 kde-apps/libkface/libkface-5.9999.ebuild | 35 --------------------------------
 kde-apps/libkface/libkface-9999.ebuild   | 21 ++++++++++++++++---
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/kde-apps/libkface/libkface-5.9999.ebuild b/kde-apps/libkface/libkface-5.9999.ebuild
deleted file mode 100644
index ad62929..0000000
--- a/kde-apps/libkface/libkface-5.9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
-HOMEPAGE="http://api.kde.org/4.x-api/kdegraphics-apidocs/libs/libkface/libkface/html/index.html"
-
-LICENSE="GPL-2"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/opencv-3[contrib]
-"
-RDEPEND="${DEPEND}
-	!media-libs/libkface
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV3=ON
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/libkface/libkface-9999.ebuild b/kde-apps/libkface/libkface-9999.ebuild
index 65e1b8c..fc4c3d3 100644
--- a/kde-apps/libkface/libkface-9999.ebuild
+++ b/kde-apps/libkface/libkface-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
 HOMEPAGE="http://api.kde.org/4.x-api/kdegraphics-apidocs/libs/libkface/libkface/html/index.html"
@@ -14,6 +14,21 @@ IUSE=""
 
 KEYWORDS=""
 
-DEPEND=">=media-libs/opencv-2.4.9"
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/opencv-3[contrib]
+"
 RDEPEND="${DEPEND}
-	!media-libs/libkface"
+	!media-libs/libkface
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV3=ON
+	)
+
+	kde5_src_configure
+}