Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/, kde-apps/konq-plugins/files/
Date: Wed, 21 Sep 2016 14:37:08
Message-Id: 1474468611.b0cf9cfe74499a35256863f1c6a1cb19072da981.kensington@gentoo
1 commit: b0cf9cfe74499a35256863f1c6a1cb19072da981
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Sep 18 21:01:55 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 21 14:36:51 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0cf9cfe
7
8 kde-apps/konq-plugins: Package merged into konqueror
9
10 Package-Manager: portage-2.3.0
11
12 .../files/konq-plugins-ecmmarkastest.patch | 9 -----
13 kde-apps/konq-plugins/konq-plugins-9999.ebuild | 47 ----------------------
14 kde-apps/konq-plugins/metadata.xml | 3 --
15 3 files changed, 59 deletions(-)
16
17 diff --git a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
18 deleted file mode 100644
19 index 27f0ab8..0000000
20 --- a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
21 +++ /dev/null
22 @@ -1,9 +0,0 @@
23 ---- a/fsview/tests/CMakeLists.txt 2015-02-11 22:27:17.483424809 +0100
24 -+++ b/fsview/tests/CMakeLists.txt 2015-02-11 22:29:56.069432617 +0100
25 -@@ -1,5 +1,6 @@
26 - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
27 -
28 -+include(ECMMarkAsTest)
29 -
30 - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
31 -
32
33 diff --git a/kde-apps/konq-plugins/konq-plugins-9999.ebuild b/kde-apps/konq-plugins/konq-plugins-9999.ebuild
34 deleted file mode 100644
35 index e6483ea..0000000
36 --- a/kde-apps/konq-plugins/konq-plugins-9999.ebuild
37 +++ /dev/null
38 @@ -1,47 +0,0 @@
39 -# Copyright 1999-2016 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -# $Id$
42 -
43 -EAPI=6
44 -
45 -KMNAME="kde-baseapps"
46 -KDE_TEST="true"
47 -inherit kde5
48 -
49 -DESCRIPTION="Various plugins for konqueror"
50 -KEYWORDS=""
51 -IUSE="speech tidy"
52 -
53 -DEPEND="
54 - $(add_frameworks_dep karchive)
55 - $(add_frameworks_dep kcrash)
56 - $(add_frameworks_dep kdelibs4support)
57 - $(add_frameworks_dep kio)
58 - $(add_frameworks_dep khtml)
59 - $(add_frameworks_dep kparts)
60 - $(add_frameworks_dep kdesu)
61 - $(add_kdeapps_dep libkonq)
62 - $(add_qt_dep qtwidgets)
63 - speech? ( $(add_qt_dep qtspeech) )
64 - tidy? (
65 - $(add_frameworks_dep kiconthemes)
66 - $(add_frameworks_dep kwidgetsaddons)
67 - app-text/htmltidy
68 - )
69 -"
70 -RDEPEND="${DEPEND}
71 - $(add_kdeapps_dep konqueror)
72 - $(add_plasma_dep kde-cli-tools)
73 -"
74 -
75 -S="${S}/${PN}"
76 -
77 -PATCHES=( "${FILESDIR}/${PN}-ecmmarkastest.patch" )
78 -
79 -src_configure() {
80 - local mycmakeargs=(
81 - $(cmake-utils_use_find_package speech Qt5TextToSpeech)
82 - $(cmake-utils_use_find_package tidy LibTidy)
83 - )
84 - kde5_src_configure
85 -}
86
87 diff --git a/kde-apps/konq-plugins/metadata.xml b/kde-apps/konq-plugins/metadata.xml
88 index 8ad5e62..2fdbf33 100644
89 --- a/kde-apps/konq-plugins/metadata.xml
90 +++ b/kde-apps/konq-plugins/metadata.xml
91 @@ -5,7 +5,4 @@
92 <email>kde@g.o</email>
93 <name>Gentoo KDE Project</name>
94 </maintainer>
95 - <use>
96 - <flag name="speech">Build text-to-speech plugin</flag>
97 - </use>
98 </pkgmetadata>