| 1 |
commit: 7f1c27e10b3c76cfd04c5ba9616caae99f664ecc |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Oct 7 22:44:08 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 13:07:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f1c27e1 |
| 7 |
|
| 8 |
kde-apps/kdepimlibs: Add USE=tools, fix KDE_DOC_DIR, add KDE_DOXYGEN |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.22 |
| 11 |
|
| 12 |
kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild | 11 +++++++++-- |
| 13 |
kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 11 +++++++++-- |
| 14 |
kde-apps/kdepimlibs/metadata.xml | 1 + |
| 15 |
3 files changed, 19 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild |
| 18 |
index 8f05846..9751207 100644 |
| 19 |
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild |
| 20 |
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild |
| 21 |
@@ -4,6 +4,9 @@ |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
+KDE_DOC_DIR="kioslave/docs" |
| 26 |
+KDE_DOX_DIR="akonadi" |
| 27 |
+KDE_DOXYGEN=true |
| 28 |
KDE_HANDBOOK=true |
| 29 |
KDE_TEST=true |
| 30 |
inherit kde5 |
| 31 |
@@ -11,7 +14,7 @@ inherit kde5 |
| 32 |
DESCRIPTION="Common library for KDE PIM apps" |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
LICENSE="LGPL-2.1" |
| 35 |
-IUSE="designer prison ssl" |
| 36 |
+IUSE="designer prison ssl tools" |
| 37 |
|
| 38 |
# some akonadi tests time out, that probably needs more work as it's ~700 tests |
| 39 |
RESTRICT="test" |
| 40 |
@@ -43,7 +46,6 @@ COMMON_DEPEND=" |
| 41 |
$(add_kdeapps_dep kldap) |
| 42 |
$(add_kdeapps_dep kmbox) |
| 43 |
$(add_kdeapps_dep kmime) |
| 44 |
- dev-libs/libxml2 |
| 45 |
dev-libs/libxslt |
| 46 |
dev-qt/qtdbus:5 |
| 47 |
dev-qt/qtgui:5 |
| 48 |
@@ -56,6 +58,7 @@ COMMON_DEPEND=" |
| 49 |
designer? ( dev-qt/designer:5 ) |
| 50 |
prison? ( media-libs/prison:5 ) |
| 51 |
ssl? ( dev-libs/cyrus-sasl ) |
| 52 |
+ tools? ( dev-libs/libxml2 ) |
| 53 |
" |
| 54 |
DEPEND="${COMMON_DEPEND} |
| 55 |
dev-libs/boost |
| 56 |
@@ -73,6 +76,10 @@ src_prepare() { |
| 57 |
sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ |
| 58 |
-e '/^add_subdirectory(docs)/ s/^/#/' \ |
| 59 |
-i kioslave/CMakeLists.txt || die |
| 60 |
+ |
| 61 |
+ use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \ |
| 62 |
+ -i akonadi/src/CMakeLists.txt |
| 63 |
+ |
| 64 |
# kdepimlibs contains many projects for which we have to run our kde5_src_prepare |
| 65 |
for d in $(find "${S}" -maxdepth 1 -type d); do |
| 66 |
pushd "$d" |
| 67 |
|
| 68 |
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild |
| 69 |
index 1aeb6f1..5237534 100644 |
| 70 |
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild |
| 71 |
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild |
| 72 |
@@ -4,6 +4,9 @@ |
| 73 |
|
| 74 |
EAPI=5 |
| 75 |
|
| 76 |
+KDE_DOC_DIR="kioslave/docs" |
| 77 |
+KDE_DOX_DIR="akonadi" |
| 78 |
+KDE_DOXYGEN=true |
| 79 |
KDE_HANDBOOK=true |
| 80 |
KDE_TEST=true |
| 81 |
inherit kde5 |
| 82 |
@@ -11,7 +14,7 @@ inherit kde5 |
| 83 |
DESCRIPTION="Common library for KDE PIM apps" |
| 84 |
KEYWORDS="" |
| 85 |
LICENSE="LGPL-2.1" |
| 86 |
-IUSE="designer prison ssl" |
| 87 |
+IUSE="designer prison ssl tools" |
| 88 |
|
| 89 |
# some akonadi tests time out, that probably needs more work as it's ~700 tests |
| 90 |
RESTRICT="test" |
| 91 |
@@ -43,7 +46,6 @@ COMMON_DEPEND=" |
| 92 |
$(add_kdeapps_dep kldap) |
| 93 |
$(add_kdeapps_dep kmbox) |
| 94 |
$(add_kdeapps_dep kmime) |
| 95 |
- dev-libs/libxml2 |
| 96 |
dev-libs/libxslt |
| 97 |
dev-qt/qtdbus:5 |
| 98 |
dev-qt/qtgui:5 |
| 99 |
@@ -56,6 +58,7 @@ COMMON_DEPEND=" |
| 100 |
designer? ( dev-qt/designer:5 ) |
| 101 |
prison? ( media-libs/prison:5 ) |
| 102 |
ssl? ( dev-libs/cyrus-sasl ) |
| 103 |
+ tools? ( dev-libs/libxml2 ) |
| 104 |
" |
| 105 |
DEPEND="${COMMON_DEPEND} |
| 106 |
dev-libs/boost |
| 107 |
@@ -69,6 +72,10 @@ src_prepare() { |
| 108 |
sed -e '/^find_package.*KF5DocTools/ s/^/#/' \ |
| 109 |
-e '/^add_subdirectory(docs)/ s/^/#/' \ |
| 110 |
-i kioslave/CMakeLists.txt || die |
| 111 |
+ |
| 112 |
+ use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \ |
| 113 |
+ -i akonadi/src/CMakeLists.txt |
| 114 |
+ |
| 115 |
# kdepimlibs contains many projects for which we have to run our kde5_src_prepare |
| 116 |
for d in $(find "${S}" -maxdepth 1 -type d); do |
| 117 |
pushd "$d" |
| 118 |
|
| 119 |
diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml |
| 120 |
index 34055f7..24190e4 100644 |
| 121 |
--- a/kde-apps/kdepimlibs/metadata.xml |
| 122 |
+++ b/kde-apps/kdepimlibs/metadata.xml |
| 123 |
@@ -5,5 +5,6 @@ |
| 124 |
<use> |
| 125 |
<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag> |
| 126 |
<flag name="prison">Enable support for QRcodes in contacts</flag> |
| 127 |
+ <flag name="tools">Install tools for developers and testing</flag> |
| 128 |
</use> |
| 129 |
</pkgmetadata> |
Archives