commit: 6ab0dd2c7929439bbc93f4243aa56a13c75cbd34
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat May 7 11:11:26 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 8 20:37:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ab0dd2c
kde-apps: Drop KDE_PIM_KONTACTPLUGIN
Most packages require kontactinterface nevertheless, which is a negligible
dependency.
eclass/kde5.eclass | 18 +++++++++---------
kde-apps/akregator/akregator-16.04.49.9999.ebuild | 2 +-
kde-apps/akregator/akregator-9999.ebuild | 2 +-
.../kaddressbook/kaddressbook-16.04.49.9999.ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-9999.ebuild | 2 +-
kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 3 +--
kde-apps/kmail/kmail-9999.ebuild | 1 -
kde-apps/knotes/knotes-16.04.49.9999.ebuild | 16 +++++++---------
kde-apps/knotes/knotes-9999.ebuild | 18 ++++++++----------
kde-apps/korganizer/korganizer-9999.ebuild | 2 +-
10 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d755887..fed2b26 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -592,16 +592,16 @@ kde5_src_prepare() {
fi
done
popd > /dev/null || die
- fi
- # disable build of kontactplugin in split kdepim packages
- if ! use_if_iuse kontact ; then
- for x in $(find ./ -name CMakeLists.txt -exec grep -l
"add_subdirectory.*kontactplugin" "{}" ";"); do
- einfo "Disabling kontactplugin in: ${x}"
- pushd $(dirname "${x}") > /dev/null || die
- cmake_comment_add_subdirectory kontactplugin
- popd > /dev/null || die
- done
+ # disable build of kontactplugin in split kdepim packages
+ if ! use_if_iuse kontact ; then
+ for x in $(find ./ -name CMakeLists.txt -exec grep -l
"add_subdirectory.*kontactplugin" "{}" ";"); do
+ einfo "Disabling kontactplugin in: ${x}"
+ pushd $(dirname "${x}") > /dev/null || die
+ cmake_comment_add_subdirectory kontactplugin
+ popd > /dev/null || die
+ done
+ fi
fi
}
diff --git a/kde-apps/akregator/akregator-16.04.49.9999.ebuild
b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
index 3181265..f21d962 100644
--- a/kde-apps/akregator/akregator-16.04.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-16.04.49.9999.ebuild
@@ -6,7 +6,6 @@ EAPI=6
FRAMEWORKS_MINIMAL="5.19.0"
KDE_HANDBOOK="false"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="false"
KMNAME="kdepim"
inherit kde5
@@ -38,6 +37,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep messagelib)
diff --git a/kde-apps/akregator/akregator-9999.ebuild
b/kde-apps/akregator/akregator-9999.ebuild
index 4217f7c..f45404f 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="forceoptional"
KMNAME="kdepim"
QT_MINIMAL="5.6.0"
@@ -38,6 +37,7 @@ DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep messagelib)
diff --git a/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
index 60b9a99..c6fc256 100644
--- a/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-16.04.49.9999.ebuild
@@ -6,7 +6,6 @@ EAPI=6
FRAMEWORKS_MINIMAL="5.19.0"
KDE_HANDBOOK="false"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="true"
KMNAME="kdepim"
VIRTUALX_REQUIRED="test"
@@ -41,6 +40,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep grantleetheme)
$(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep pimcommon)
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 4138a50..e6789f6 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="forceoptional"
KMNAME="kdepim"
QT_MINIMAL="5.6.0"
@@ -41,6 +40,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep gpgmepp)
$(add_kdeapps_dep grantleetheme)
$(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep pimcommon)
diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
index 31bd21b..2d690fe 100644
--- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -10,7 +10,6 @@ FRAMEWORKS_MINIMAL="5.19.0"
KDE_HANDBOOK="true"
KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor
importwizard korgac
mboximporter pimsettingexporter plugins sieveeditor storageservicemanager"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -19,7 +18,7 @@ DESCRIPTION="Personal Information Management Suite"
HOMEPAGE="https://www.kde.org/applications/office/kontact/";
KEYWORDS=""
-IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="+kontact $(printf 'kdepim_features_%s ' ${PIM_FTS})"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 0e8faa6..d5734fc 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="forceoptional"
KMNAME="kdepim"
QT_MINIMAL="5.6.0"
diff --git a/kde-apps/knotes/knotes-16.04.49.9999.ebuild
b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
index c978008..9d95213 100644
--- a/kde-apps/knotes/knotes-16.04.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-16.04.49.9999.ebuild
@@ -6,7 +6,6 @@ EAPI=6
KDE_HANDBOOK="true"
KDE_PIM_KEEP_SUBDIR="noteshared"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_PUNT_BOGUS_DEPS="true"
KMNAME="kdepim"
inherit kde5
@@ -29,8 +28,10 @@ DEPEND="
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
@@ -38,7 +39,12 @@ DEPEND="
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kontactinterface)
+ $(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep pimcommon)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
@@ -49,14 +55,6 @@ DEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
x11-libs/libX11
- kontact? (
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kparts)
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcalutils)
- $(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep libkdepim)
- )
"
RDEPEND="${DEPEND}
!<kde-apps/kdepim-15.12.2:5
diff --git a/kde-apps/knotes/knotes-9999.ebuild
b/kde-apps/knotes/knotes-9999.ebuild
index 20fa8af..530165b 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="forceoptional"
KMNAME="kdepim"
QT_MINIMAL="5.6.0"
@@ -30,8 +29,10 @@ DEPEND="
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
@@ -39,7 +40,12 @@ DEPEND="
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kontactinterface)
+ $(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep pimcommon)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
@@ -50,17 +56,9 @@ DEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
x11-libs/libX11
- kontact? (
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kparts)
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcalutils)
- $(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep libkdepim)
- )
"
RDEPEND="${DEPEND}
- !<kde-apps/kdepim-15.12.2:5
+ !kde-apps/kdepim:5
!kde-apps/noteshared:5
"
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild
b/kde-apps/korganizer/korganizer-9999.ebuild
index eef683d..aa72cdc 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-KDE_PIM_KONTACTPLUGIN="true"
KDE_TEST="forceoptional"
KMNAME="kdepim"
QT_MINIMAL="5.6.0"
@@ -59,6 +58,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep kldap)
$(add_kdeapps_dep kmailtransport)
$(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kontactinterface)
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep mailcommon)
