[gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/, kde-apps/konq-plugins/files/
commit: b0cf9cfe74499a35256863f1c6a1cb19072da981
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Sep 18 21:01:55 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Sep 21 14:36:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0cf9cfe
kde-apps/konq-plugins: Package merged into konqueror
Package-Manager: portage-2.3.0
.../files/konq-plugins-ecmmarkastest.patch | 9 -
kde-apps/konq-plugins/konq-plugins-.ebuild | 47 --
kde-apps/konq-plugins/metadata.xml | 3 --
3 files changed, 59 deletions(-)
diff --git a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
b/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
deleted file mode 100644
index 27f0ab8..000
--- a/kde-apps/konq-plugins/files/konq-plugins-ecmmarkastest.patch
+++ /dev/null
@@ -1,9 +0,0 @@
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-.ebuild
b/kde-apps/konq-plugins/konq-plugins-.ebuild
deleted file mode 100644
index e6483ea..000
--- a/kde-apps/konq-plugins/konq-plugins-.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Various plugins for konqueror"
-KEYWORDS=""
-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)
- $(add_qt_dep qtwidgets)
- speech? ( $(add_qt_dep qtspeech) )
- tidy? (
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kwidgetsaddons)
- app-text/htmltidy
- )
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep konqueror)
- $(add_plasma_dep kde-cli-tools)
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-ecmmarkastest.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package speech Qt5TextToSpeech)
- $(cmake-utils_use_find_package tidy LibTidy)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/konq-plugins/metadata.xml
b/kde-apps/konq-plugins/metadata.xml
index 8ad5e62..2fdbf33 100644
--- a/kde-apps/konq-plugins/metadata.xml
+++ b/kde-apps/konq-plugins/metadata.xml
@@ -5,7 +5,4 @@
k...@gentoo.org
Gentoo KDE Project
-
- Build text-to-speech plugin
-
[gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/files/, kde-apps/konq-plugins/
commit: 19e4afa42355a322a57e3b4345db00eaea75f003
Author: Andreas Sturmlechner gmail com>
AuthorDate: Tue Feb 10 23:58:19 2015 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Aug 2 21:21:52 2016 +
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-.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 000..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-.ebuild
b/kde-apps/konq-plugins/konq-plugins-.ebuild
index 0f1611f..e6483ea 100644
--- a/kde-apps/konq-plugins/konq-plugins-.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-.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 @@
k...@gentoo.org
Gentoo KDE Project
+
+ Build text-to-speech plugin
+
[gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/, kde-apps/kfind/, kde-apps/konqueror/, ...
commit: 43fef0b46f87d6259c9fa62b8f8b3aaf63270316
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Apr 7 10:22:32 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Apr 7 10:22:32 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=43fef0b4
kde-apps: kde-baseapps 15.12.3 moveed to main tree
kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild| 21
kde-apps/kdialog/kdialog-15.12.3.ebuild| 12 -
.../keditbookmarks/keditbookmarks-15.12.3.ebuild | 22
kde-apps/kfind/kfind-15.12.3.ebuild| 19 ---
kde-apps/kfmclient/kfmclient-15.12.3.ebuild| 34
kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild | 32
kde-apps/konqueror/konqueror-15.12.3.ebuild| 61 --
kde-apps/libkonq/libkonq-15.12.3.ebuild| 19 ---
kde-apps/nsplugins/nsplugins-15.12.3.ebuild| 30 ---
kde-apps/plasma-apps/plasma-apps-15.12.3.ebuild| 18 ---
10 files changed, 268 deletions(-)
diff --git a/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
b/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
deleted file mode 100644
index e87..000
--- a/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- $(add_kdeapps_dep libkonq)
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdesu)
- sys-apps/accountsservice
-"
diff --git a/kde-apps/kdialog/kdialog-15.12.3.ebuild
b/kde-apps/kdialog/kdialog-15.12.3.ebuild
deleted file mode 100644
index 588c3b4..000
--- a/kde-apps/kdialog/kdialog-15.12.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug"
diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
b/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
deleted file mode 100644
index 76f775d..000
--- a/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-VIRTUALX_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- $(add_kdeapps_dep libkonq)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- lib/konq/
-"
diff --git a/kde-apps/kfind/kfind-15.12.3.ebuild
b/kde-apps/kfind/kfind-15.12.3.ebuild
deleted file mode 100644
index 6e708ca..000
--- a/kde-apps/kfind/kfind-15.12.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="KDE file finder utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kfind/;
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- $(add_kdeapps_dep libkonq)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
b/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
deleted file mode 100644
index f86007a..000
--- a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="kde-baseapps"
-KMMODULE="konqueror/client"
-inherit kde4-meta
-
-DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="debug"
-
-KMEXTRACTONLY="
- konqueror/kfmclient.desktop
- konqueror/kfmclient_dir.desktop
- konqueror/kfmclient_html.desktop
- konqueror/kfmclient_war.desktop
- konqueror/src/org.kde.Konqueror.Main.xml
- konqueror/src/org.kde.Konqueror.MainWindow.xml
-"
-
-src_prepare() {
- kde4-meta_src_prepare
-
- # Do not install non-kfmclient *.desktop files
- sed -e "/konqbrowser\.desktop/d" \
- -e "/konqueror\.desktop/s/^/#DONOTWANT/" \
- -e "/install(FILES profile/s/^/#DONOTWANT/" \
- -e "/install(FILES konqueror.appdata.xml/s/^/#DONOTWANT/" \
- -i konqueror/CMakeLists.txt \
- || die "Failed to omit .desktop files"
-}
diff --git a/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
b/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
deleted file mode 100644
index 6697752..000
--- a/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
+++ /dev/null
@@ -1,32
[gentoo-commits] proj/kde:master commit in: kde-apps/konq-plugins/
commit: 8c52c6020ed3d493b9f2f3c1c35e4df9af6d6026
Author: Johannes Huber gentoo org>
AuthorDate: Mon Apr 4 22:38:47 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Apr 4 22:38:47 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c52c602
kde-apps/konq-plugins: EAPI 6
Package-Manager: portage-2.2.28
kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild | 4 ++--
kde-apps/konq-plugins/konq-plugins-16.04.49..ebuild | 4 ++--
kde-apps/konq-plugins/konq-plugins-.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
b/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
index 0d1f773..6697752 100644
--- a/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KMNAME="kde-baseapps"
inherit kde4-meta
@@ -25,7 +25,7 @@ src_configure() {
local mycmakeargs=(
-DKdeWebKit=OFF
-DWebKitPart=OFF
- $(cmake-utils_use_with tidy LibTidy)
+ -DWITH_LibTidy=$(usex tidy)
)
kde4-meta_src_configure
diff --git a/kde-apps/konq-plugins/konq-plugins-16.04.49..ebuild
b/kde-apps/konq-plugins/konq-plugins-16.04.49..ebuild
index a683264..0f1611f 100644
--- a/kde-apps/konq-plugins/konq-plugins-16.04.49..ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-16.04.49..ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KMNAME="kde-baseapps"
inherit kde4-meta
@@ -25,7 +25,7 @@ src_configure() {
local mycmakeargs=(
-DKdeWebKit=OFF
-DWebKitPart=OFF
- $(cmake-utils_use_with tidy LibTidy)
+ -DWITH_LibTidy=$(usex tidy)
)
kde4-meta_src_configure
diff --git a/kde-apps/konq-plugins/konq-plugins-.ebuild
b/kde-apps/konq-plugins/konq-plugins-.ebuild
index a683264..0f1611f 100644
--- a/kde-apps/konq-plugins/konq-plugins-.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KMNAME="kde-baseapps"
inherit kde4-meta
@@ -25,7 +25,7 @@ src_configure() {
local mycmakeargs=(
-DKdeWebKit=OFF
-DWebKitPart=OFF
- $(cmake-utils_use_with tidy LibTidy)
+ -DWITH_LibTidy=$(usex tidy)
)
kde4-meta_src_configure
