| 1 |
commit: c6d5e50d05c3d8b20279d5c8f10db25b4a7b7d8e |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Aug 2 18:21:48 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 21:21:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6d5e50d |
| 7 |
|
| 8 |
kde-apps/libkonq: Frameworks merged to master |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-apps/libkonq/libkonq-5.9999.ebuild | 39 ---------------------------------- |
| 15 |
kde-apps/libkonq/libkonq-9999.ebuild | 33 ++++++++++++++++++++++------ |
| 16 |
2 files changed, 26 insertions(+), 46 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/libkonq/libkonq-5.9999.ebuild b/kde-apps/libkonq/libkonq-5.9999.ebuild |
| 19 |
deleted file mode 100644 |
| 20 |
index 3357232..0000000 |
| 21 |
--- a/kde-apps/libkonq/libkonq-5.9999.ebuild |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,39 +0,0 @@ |
| 24 |
-# Copyright 1999-2016 Gentoo Foundation |
| 25 |
-# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Id$ |
| 27 |
- |
| 28 |
-EAPI=6 |
| 29 |
- |
| 30 |
-EGIT_BRANCH="frameworks" |
| 31 |
-KDE_TEST="true" |
| 32 |
-KMNAME="kde-baseapps" |
| 33 |
-VIRTUALX_REQUIRED="test" |
| 34 |
-inherit kde5 |
| 35 |
- |
| 36 |
-DESCRIPTION="The embeddable part of konqueror" |
| 37 |
-KEYWORDS="" |
| 38 |
-IUSE="" |
| 39 |
- |
| 40 |
-DEPEND=" |
| 41 |
- $(add_frameworks_dep kbookmarks) |
| 42 |
- $(add_frameworks_dep kconfig) |
| 43 |
- $(add_frameworks_dep kcoreaddons) |
| 44 |
- $(add_frameworks_dep kdbusaddons) |
| 45 |
- $(add_frameworks_dep ki18n) |
| 46 |
- $(add_frameworks_dep kio) |
| 47 |
- $(add_frameworks_dep kjobwidgets) |
| 48 |
- $(add_frameworks_dep kparts) |
| 49 |
- $(add_frameworks_dep kservice) |
| 50 |
- $(add_frameworks_dep kwidgetsaddons) |
| 51 |
- $(add_frameworks_dep kxmlgui) |
| 52 |
- $(add_qt_dep qtdbus) |
| 53 |
- $(add_qt_dep qtgui) |
| 54 |
- $(add_qt_dep qtwidgets) |
| 55 |
- $(add_qt_dep qtxml) |
| 56 |
- sys-libs/zlib |
| 57 |
-" |
| 58 |
-RDEPEND="${DEPEND}" |
| 59 |
- |
| 60 |
-RESTRICT="test" |
| 61 |
- |
| 62 |
-S=${S}/lib/konq |
| 63 |
|
| 64 |
diff --git a/kde-apps/libkonq/libkonq-9999.ebuild b/kde-apps/libkonq/libkonq-9999.ebuild |
| 65 |
index 27626e6..1aab45a 100644 |
| 66 |
--- a/kde-apps/libkonq/libkonq-9999.ebuild |
| 67 |
+++ b/kde-apps/libkonq/libkonq-9999.ebuild |
| 68 |
@@ -4,16 +4,35 @@ |
| 69 |
|
| 70 |
EAPI=6 |
| 71 |
|
| 72 |
+KDE_TEST="true" |
| 73 |
KMNAME="kde-baseapps" |
| 74 |
-KMMODULE="lib/konq" |
| 75 |
-CPPUNIT_REQUIRED="optional" |
| 76 |
-inherit kde4-meta |
| 77 |
+VIRTUALX_REQUIRED="test" |
| 78 |
+inherit kde5 |
| 79 |
|
| 80 |
DESCRIPTION="The embeddable part of konqueror" |
| 81 |
KEYWORDS="" |
| 82 |
-IUSE="debug" |
| 83 |
-RESTRICT="test" |
| 84 |
+IUSE="" |
| 85 |
+ |
| 86 |
+DEPEND=" |
| 87 |
+ $(add_frameworks_dep kbookmarks) |
| 88 |
+ $(add_frameworks_dep kconfig) |
| 89 |
+ $(add_frameworks_dep kcoreaddons) |
| 90 |
+ $(add_frameworks_dep kdbusaddons) |
| 91 |
+ $(add_frameworks_dep ki18n) |
| 92 |
+ $(add_frameworks_dep kio) |
| 93 |
+ $(add_frameworks_dep kjobwidgets) |
| 94 |
+ $(add_frameworks_dep kparts) |
| 95 |
+ $(add_frameworks_dep kservice) |
| 96 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 97 |
+ $(add_frameworks_dep kxmlgui) |
| 98 |
+ $(add_qt_dep qtdbus) |
| 99 |
+ $(add_qt_dep qtgui) |
| 100 |
+ $(add_qt_dep qtwidgets) |
| 101 |
+ $(add_qt_dep qtxml) |
| 102 |
+ sys-libs/zlib |
| 103 |
+" |
| 104 |
+RDEPEND="${DEPEND}" |
| 105 |
|
| 106 |
-KMSAVELIBS="true" |
| 107 |
+RESTRICT="test" |
| 108 |
|
| 109 |
-PATCHES=( "${FILESDIR}/${PN}-4.9.0-cmake.patch" ) |
| 110 |
+S=${S}/lib/konq |
Archives