commit: 7f1c27e10b3c76cfd04c5ba9616caae99f664ecc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 7 22:44:08 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 13:07:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f1c27e1
kde-apps/kdepimlibs: Add USE=tools, fix KDE_DOC_DIR, add KDE_DOXYGEN
Package-Manager: portage-2.2.22
kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild | 11 +++++++++--
kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 11 +++++++++--
kde-apps/kdepimlibs/metadata.xml | 1 +
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
index 8f05846..9751207 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
@@ -4,6 +4,9 @@
EAPI=5
+KDE_DOC_DIR="kioslave/docs"
+KDE_DOX_DIR="akonadi"
+KDE_DOXYGEN=true
KDE_HANDBOOK=true
KDE_TEST=true
inherit kde5
@@ -11,7 +14,7 @@ inherit kde5
DESCRIPTION="Common library for KDE PIM apps"
KEYWORDS="~amd64 ~x86"
LICENSE="LGPL-2.1"
-IUSE="designer prison ssl"
+IUSE="designer prison ssl tools"
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
@@ -43,7 +46,6 @@ COMMON_DEPEND="
$(add_kdeapps_dep kldap)
$(add_kdeapps_dep kmbox)
$(add_kdeapps_dep kmime)
- dev-libs/libxml2
dev-libs/libxslt
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -56,6 +58,7 @@ COMMON_DEPEND="
designer? ( dev-qt/designer:5 )
prison? ( media-libs/prison:5 )
ssl? ( dev-libs/cyrus-sasl )
+ tools? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -73,6 +76,10 @@ src_prepare() {
sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-e '/^add_subdirectory(docs)/ s/^/#/' \
-i kioslave/CMakeLists.txt || die
+
+ use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
+ -i akonadi/src/CMakeLists.txt
+
# kdepimlibs contains many projects for which we have to run our
kde5_src_prepare
for d in $(find "${S}" -maxdepth 1 -type d); do
pushd "$d"
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
index 1aeb6f1..5237534 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
@@ -4,6 +4,9 @@
EAPI=5
+KDE_DOC_DIR="kioslave/docs"
+KDE_DOX_DIR="akonadi"
+KDE_DOXYGEN=true
KDE_HANDBOOK=true
KDE_TEST=true
inherit kde5
@@ -11,7 +14,7 @@ inherit kde5
DESCRIPTION="Common library for KDE PIM apps"
KEYWORDS=""
LICENSE="LGPL-2.1"
-IUSE="designer prison ssl"
+IUSE="designer prison ssl tools"
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
@@ -43,7 +46,6 @@ COMMON_DEPEND="
$(add_kdeapps_dep kldap)
$(add_kdeapps_dep kmbox)
$(add_kdeapps_dep kmime)
- dev-libs/libxml2
dev-libs/libxslt
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -56,6 +58,7 @@ COMMON_DEPEND="
designer? ( dev-qt/designer:5 )
prison? ( media-libs/prison:5 )
ssl? ( dev-libs/cyrus-sasl )
+ tools? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -69,6 +72,10 @@ src_prepare() {
sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-e '/^add_subdirectory(docs)/ s/^/#/' \
-i kioslave/CMakeLists.txt || die
+
+ use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
+ -i akonadi/src/CMakeLists.txt
+
# kdepimlibs contains many projects for which we have to run our
kde5_src_prepare
for d in $(find "${S}" -maxdepth 1 -type d); do
pushd "$d"
diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
index 34055f7..24190e4 100644
--- a/kde-apps/kdepimlibs/metadata.xml
+++ b/kde-apps/kdepimlibs/metadata.xml
@@ -5,5 +5,6 @@
<use>
<flag name="designer">Install plugin for
<pkg>dev-qt/designer</pkg></flag>
<flag name="prison">Enable support for QRcodes in
contacts</flag>
+ <flag name="tools">Install tools for developers and
testing</flag>
</use>
</pkgmetadata>
