From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 02962138BED for ; Fri, 16 Oct 2015 18:24:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F37DA21C00C; Fri, 16 Oct 2015 18:24:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BB8E21C011 for ; Fri, 16 Oct 2015 18:24:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96275340A42 for ; Fri, 16 Oct 2015 18:24:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DE6310CF for ; Fri, 16 Oct 2015 18:24:22 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445019850.d1c41a43085418df8ad303967330bc255d57b91e.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkface/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkface/libkface-5.9999.ebuild kde-apps/libkface/libkface-9999.ebuild X-VCS-Directories: kde-apps/libkface/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d1c41a43085418df8ad303967330bc255d57b91e X-VCS-Branch: master Date: Fri, 16 Oct 2015 18:24:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d8b248f7-b0ed-4bf7-a474-bfc2d2acc6d7 X-Archives-Hash: bff37b6a292a0f699ba5cfee9d348c66 commit: d1c41a43085418df8ad303967330bc255d57b91e Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Oct 16 13:57:38 2015 +0000 Commit: Michael Palimaka gentoo 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 +}