aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-08-02 20:21:48 +0200
committerJohannes Huber <johu@gentoo.org>2016-08-02 23:21:52 +0200
commitc6d5e50d05c3d8b20279d5c8f10db25b4a7b7d8e (patch)
tree6f7f9f5bfeed87a42a7154d6ce07128c86e14cf5
parentmedia-sound/kaudiocreator: Add kf5 version (diff)
downloadkde-c6d5e50d.tar.gz
kde-c6d5e50d.tar.bz2
kde-c6d5e50d.zip
kde-apps/libkonq: Frameworks merged to master
Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber <johu@gentoo.org>
-rw-r--r--kde-apps/libkonq/libkonq-5.9999.ebuild39
-rw-r--r--kde-apps/libkonq/libkonq-9999.ebuild33
2 files changed, 26 insertions, 46 deletions
diff --git a/kde-apps/libkonq/libkonq-5.9999.ebuild b/kde-apps/libkonq/libkonq-5.9999.ebuild
deleted file mode 100644
index 3357232b31..0000000000
--- a/kde-apps/libkonq/libkonq-5.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-KDE_TEST="true"
-KMNAME="kde-baseapps"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S=${S}/lib/konq
diff --git a/kde-apps/libkonq/libkonq-9999.ebuild b/kde-apps/libkonq/libkonq-9999.ebuild
index 27626e648a..1aab45a81f 100644
--- a/kde-apps/libkonq/libkonq-9999.ebuild
+++ b/kde-apps/libkonq/libkonq-9999.ebuild
@@ -4,16 +4,35 @@
EAPI=6
+KDE_TEST="true"
KMNAME="kde-baseapps"
-KMMODULE="lib/konq"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
+VIRTUALX_REQUIRED="test"
+inherit kde5
DESCRIPTION="The embeddable part of konqueror"
KEYWORDS=""
-IUSE="debug"
-RESTRICT="test"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
-KMSAVELIBS="true"
+RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" )
+S=${S}/lib/konq