From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4BC4C13832E for ; Tue, 2 Aug 2016 21:22:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B02CD21C04E; Tue, 2 Aug 2016 21:22:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D036F21C074 for ; Tue, 2 Aug 2016 21:22:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCE64340B27 for ; Tue, 2 Aug 2016 21:22:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF00B2442 for ; Tue, 2 Aug 2016 21:22:07 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1470172912.19e4afa42355a322a57e3b4345db00eaea75f003.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/files/, kde-apps/konq-plugins/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch kde-apps/konq-plugins/konq-plugins-9999.ebuild kde-apps/konq-plugins/metadata.xml X-VCS-Directories: kde-apps/konq-plugins/files/ kde-apps/konq-plugins/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 19e4afa42355a322a57e3b4345db00eaea75f003 X-VCS-Branch: master Date: Tue, 2 Aug 2016 21:22:07 +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: 79508fc3-60ba-4832-aac8-88dfc10d41d2 X-Archives-Hash: 401bc8ba68b97cf4c466b3617599b334 commit: 19e4afa42355a322a57e3b4345db00eaea75f003 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Feb 10 23:58:19 2015 +0000 Commit: Johannes Huber gentoo 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 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 @@ kde@gentoo.org Gentoo KDE Project + + Build text-to-speech plugin +