[gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-08-07 20:43 Johannes Huber
  0 siblings, 0 replies; 22+ messages in thread
From: Johannes Huber @ 2015-08-07 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     020e8ff00dfeb1abf8401ab98d45158d3fe36280
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 20:45:02 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 20:45:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=020e8ff0

[kde-apps/kdepim] Version bump 15.08 beta

Package-Manager: portage-2.2.20

 kde-apps/kdepim/kdepim-15.07.90.ebuild | 157 +++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-15.07.90.ebuild b/kde-apps/kdepim/kdepim-15.07.90.ebuild
new file mode 100644
index 0000000..c643829
--- /dev/null
+++ b/kde-apps/kdepim/kdepim-15.07.90.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK=true
+KDE_TEST=true
+inherit kde5
+
+DESCRIPTION="Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+KEYWORDS="~amd64 ~x86"
+
+PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
+IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepimlibs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ktnef)
+	$(add_kdeapps_dep syndication)
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/libxslt
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	designer? ( dev-qt/designer:5 )
+	google? ( net-libs/libkgapi:5 )
+	prison? ( media-libs/prison:5 )
+	kdepim_features_kleopatra? (
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-base/akonadiconsole
+	!kde-base/akregator
+	!kde-base/blogilo
+	!kde-base/calendarjanitor
+	!kde-base/kabcclient
+	!kde-base/kaddressbook
+	!kde-base/kalarm
+	!kde-base/kdepim-common-libs
+	!kde-base/kdepim-icons
+	!kde-base/kdepim-kresources
+	!kde-base/kdepim-l10n
+	!kde-base/kdepim-meta
+	!kde-base/kdepim-runtime
+	!kde-base/kjots
+	!kde-base/kleopatra
+	!kde-base/kmail
+	!kde-base/knode
+	!kde-base/knotes
+	!kde-base/konsolekalendar
+	!kde-base/kontact
+	!kde-base/korganizer
+	!kde-base/ktimetracker
+	!kde-base/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	kdepim_features_kleopatra? ( app-crypt/gnupg )
+"
+# kontact: summary plugin; kalarm: email scheduler
+REQUIRED_USE="
+	kdepim_features_kontact? ( kdepim_features_kmail )
+	kdepim_features_kalarm? ( kdepim_features_kmail )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-find-gpgme.patch"
+	"${FILESDIR}/${PN}-4.81-includes.patch"
+)
+
+src_prepare() {
+	kde5_src_prepare
+
+	cp "${FILESDIR}/FindGpgme.cmake" cmake/modules || die
+
+	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
+		-i CMakeLists.txt || die
+
+	# applications
+	for pim_ft in ${PIM_FTS}; do
+		use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIM_NO_TEXTTOSPEECH=TRUE
+		$(cmake-utils_use_find_package designer Qt5Designer)
+		$(cmake-utils_use_find_package google KF5GAPI)
+		$(cmake-utils_use_find_package prison KF5Prison)
+	)
+
+	kde5_src_configure
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-08-10 20:51 Johannes Huber
  0 siblings, 0 replies; 22+ messages in thread
From: Johannes Huber @ 2015-08-10 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     8f5b9dd9fd142b5c69c0b5c39eabcdee99dd8327
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 10 20:24:25 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 20:54:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f5b9dd9

kde-apps/kdepim: Patches upstreamed

Package-Manager: portage-2.2.20

 kde-apps/kdepim/kdepim-15.08.49.9999.ebuild | 7 -------
 kde-apps/kdepim/kdepim-9999.ebuild          | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
index a795ae2..c1d3dfb 100644
--- a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
@@ -127,16 +127,9 @@ REQUIRED_USE="
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-find-gpgme.patch"
-	"${FILESDIR}/${PN}-4.81-includes.patch"
-)
-
 src_prepare() {
 	kde5_src_prepare
 
-	cp "${FILESDIR}/FindGpgme.cmake" cmake/modules || die
-
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 4908af1..e6c5b98 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -125,13 +125,9 @@ REQUIRED_USE="
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-find-gpgme.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 
-	cp "${FILESDIR}/FindGpgme.cmake" cmake/modules || die
-
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-08-10 20:51 Johannes Huber
  0 siblings, 0 replies; 22+ messages in thread
From: Johannes Huber @ 2015-08-10 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     86abdb4833d6dd625314d8b76adb6960373e789e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 10 18:23:29 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 20:54:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=86abdb48

kde-apps/kdepim: Add missing DEPEND

Package-Manager: portage-2.2.20

 kde-apps/kdepim/kdepim-15.07.90.ebuild      | 1 +
 kde-apps/kdepim/kdepim-15.08.49.9999.ebuild | 1 +
 kde-apps/kdepim/kdepim-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-15.07.90.ebuild b/kde-apps/kdepim/kdepim-15.07.90.ebuild
index eac5951..5591fd8 100644
--- a/kde-apps/kdepim/kdepim-15.07.90.ebuild
+++ b/kde-apps/kdepim/kdepim-15.07.90.ebuild
@@ -70,6 +70,7 @@ DEPEND="
 	$(add_kdeapps_dep syndication)
 	>=app-crypt/gpgme-1.3.2
 	dev-libs/boost:=
+	dev-libs/grantlee:5
 	dev-libs/libxslt
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5

diff --git a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
index db2ffdb..a795ae2 100644
--- a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
@@ -70,6 +70,7 @@ DEPEND="
 	$(add_kdeapps_dep syndication)
 	>=app-crypt/gpgme-1.3.2
 	dev-libs/boost:=
+	dev-libs/grantlee:5
 	dev-libs/libxslt
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 9ba31f7..4908af1 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -70,6 +70,7 @@ DEPEND="
 	$(add_kdeapps_dep syndication)
 	>=app-crypt/gpgme-1.3.2
 	dev-libs/boost:=
+	dev-libs/grantlee:5
 	dev-libs/libxslt
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-10-22 10:13 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2015-10-22 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f984ef4ad7548b6118e2e1a562b9ce955666e864
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 26 23:52:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 10:13:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f984ef4a

kde-apps/kdepim: Build against installed libraries

Package-Manager: portage-2.2.22

 kde-apps/kdepim/kdepim-9999.ebuild | 55 ++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 29e1098..0303fa0 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -55,12 +55,19 @@ DEPEND="
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
 	$(add_kdeapps_dep akonadi-socialutils)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep composereditor)
+	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep gpgmepp)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbookgrantlee)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-kioslaves)
+	$(add_kdeapps_dep kdgantt2)
 	$(add_kdeapps_dep kholidays)
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kimap)
@@ -72,7 +79,23 @@ DEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep ktnef)
 	$(add_kdeapps_dep libakonadi)
+	$(add_kdeapps_dep libfollowupreminder)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkdepimdbusinterfaces)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libsendlater)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagecomposer)
+	$(add_kdeapps_dep messagecore)
+	$(add_kdeapps_dep messagelist)
+	$(add_kdeapps_dep messageviewer)
+	$(add_kdeapps_dep noteshared)
+	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
+	$(add_kdeapps_dep templateparser)
 	>=app-crypt/gpgme-1.3.2
 	dev-libs/boost:=
 	dev-libs/grantlee:5
@@ -105,11 +128,7 @@ RDEPEND="${DEPEND}
 	!kde-base/kabcclient:4
 	!kde-base/kaddressbook:4
 	!kde-base/kalarm:4
-	!kde-base/kdepim-common-libs:4
 	!kde-base/kdepim-icons:4
-	!kde-base/kdepim-kresources:4
-	!kde-base/kdepim-l10n:4
-	!kde-base/kdepim-meta:4
 	!kde-base/kdepim-runtime:4
 	!kde-base/kjots:4
 	!kde-base/kleopatra:4
@@ -133,6 +152,32 @@ REQUIRED_USE="
 src_prepare() {
 	kde5_src_prepare
 
+	rm -r calendarsupport		\
+		composereditor-ng	\
+		eventviews		\
+		grantleetheme		\
+		incidenceeditor-ng	\
+		kaddressbookgrantlee	\
+		kdgantt2		\
+		libfollowupreminder	\
+		libgravatar		\
+		libkdepimdbusinterfaces	\
+		libkleo			\
+		libksieve		\
+		libsendlater		\
+		mailcommon		\
+		mailimporter		\
+		messagecomposer		\
+		messagecore		\
+		messagelist		\
+		messageviewer		\
+		noteshared		\
+		pimcommon		\
+		templateparser		\
+		|| die "Failed to remove split libraries"
+
+	#TODO: Remove libkdepim as well when org.kde.mailtransport.service.xml fixed
+
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 
@@ -144,7 +189,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DKDEPIM_NO_TEXTTOSPEECH=TRUE
+		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
 		$(cmake-utils_use_find_package designer Qt5Designer)
 		$(cmake-utils_use_find_package google KF5GAPI)
 		$(cmake-utils_use_find_package prison KF5Prison)


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-11-19 12:36 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2015-11-19 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     37c1b1019a909272d5066e05312990145d6060c0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 23:59:36 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 12:32:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=37c1b101

kde-apps/kdepim: libkdepim was properly split

Package-Manager: portage-2.2.20.1

 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 3 +--
 kde-apps/kdepim/kdepim-9999.ebuild          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 0303fa0..2d05612 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -161,6 +161,7 @@ src_prepare() {
 		kdgantt2		\
 		libfollowupreminder	\
 		libgravatar		\
+		libkdepim		\
 		libkdepimdbusinterfaces	\
 		libkleo			\
 		libksieve		\
@@ -176,8 +177,6 @@ src_prepare() {
 		templateparser		\
 		|| die "Failed to remove split libraries"
 
-	#TODO: Remove libkdepim as well when org.kde.mailtransport.service.xml fixed
-
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 0303fa0..2d05612 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -161,6 +161,7 @@ src_prepare() {
 		kdgantt2		\
 		libfollowupreminder	\
 		libgravatar		\
+		libkdepim		\
 		libkdepimdbusinterfaces	\
 		libkleo			\
 		libksieve		\
@@ -176,8 +177,6 @@ src_prepare() {
 		templateparser		\
 		|| die "Failed to remove split libraries"
 
-	#TODO: Remove libkdepim as well when org.kde.mailtransport.service.xml fixed
-
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-11-29 15:29 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2015-11-29 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     f2d9e0f950182a62125ecf4315e07748c6f47b59
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 26 19:25:58 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 11:17:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2d9e0f9

kde-apps/kdepim: kde-apps/noteshared only required by knotes

Package-Manager: portage-2.2.26

 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 2d05612..85a84aa 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -92,7 +92,6 @@ DEPEND="
 	$(add_kdeapps_dep messagecore)
 	$(add_kdeapps_dep messagelist)
 	$(add_kdeapps_dep messageviewer)
-	$(add_kdeapps_dep noteshared)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
 	$(add_kdeapps_dep templateparser)
@@ -119,6 +118,9 @@ DEPEND="
 		dev-libs/libassuan
 		dev-libs/libgpg-error
 	)
+	kdepim_features_knotes? (
+		$(add_kdeapps_dep noteshared)
+	)
 "
 RDEPEND="${DEPEND}
 	!kde-base/akonadiconsole:4
@@ -180,6 +182,15 @@ src_prepare() {
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 
+	if ! use kdepim_features_knotes ; then
+		sed -i \
+			-e '/find_package(KF5NoteShared/ s/^/#DONT/' \
+			CMakeLists.txt || die
+		sed -i \
+			-e '/add_subdirectory(notesagent)/ s/^/#DONT/' \
+			agents/CMakeLists.txt || die
+	fi
+
 	# applications
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-11-29 15:29 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2015-11-29 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ad76d4dc23630f5c047445d5831a6399819cf9b8
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 28 17:12:57 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 17:13:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad76d4dc

kde-apps/kdepim: Add missing test dependencies, VIRTUALX_REQUIRED="test"

TODO:
61 - ispdbtest (Failed)
62 - autoconfigkolabmailtest (Failed)
63 - autoconfigkolabldaptest (Failed)
64 - autoconfigkolabfreebusytest (Failed)

Package-Manager: portage-2.2.26

 kde-apps/kdepim/kdepim-15.08.3.ebuild       |  1 +
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 13 +++++++++++--
 kde-apps/kdepim/kdepim-9999.ebuild          | 13 +++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.08.3.ebuild b/kde-apps/kdepim/kdepim-15.08.3.ebuild
index e5de96e..7a36ed2 100644
--- a/kde-apps/kdepim/kdepim-15.08.3.ebuild
+++ b/kde-apps/kdepim/kdepim-15.08.3.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK=true
 KDE_TEST=true
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Personal Information Management Suite"

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 85a84aa..baa5510 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK=true
 KDE_TEST=true
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Personal Information Management Suite"
@@ -15,7 +16,7 @@ KEYWORDS=""
 PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
 IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
@@ -122,7 +123,15 @@ DEPEND="
 		$(add_kdeapps_dep noteshared)
 	)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi sqlite)
+		$(add_kdeapps_dep libakonadi tools)
+		dev-qt/qtsql:5[sqlite]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-base/akonadiconsole:4
 	!kde-base/akregator:4
 	!kde-base/blogilo:4

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 5031738..b0adc90 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK=true
 KDE_TEST=true
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Personal Information Management Suite"
@@ -15,7 +16,7 @@ KEYWORDS=""
 PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
 IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
@@ -119,7 +120,15 @@ DEPEND="
 		dev-libs/libgpg-error
 	)
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	test? (
+		$(add_kdeapps_dep akonadi sqlite)
+		$(add_kdeapps_dep libakonadi tools)
+		dev-qt/qtsql:5[sqlite]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/noteshared
 	!kde-base/akonadiconsole:4
 	!kde-base/akregator:4


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2015-12-10  6:41 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2015-12-10  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6f3dc0ddc2553917495685b2e8842f1463cc9367
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 21:55:46 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 22:09:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f3dc0dd

kde-apps/kdepim: Use of split libs is default now

Package-Manager: portage-2.2.24

 kde-apps/kdepim/kdepim-9999.ebuild | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index f96c867..52d6a83 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -153,22 +153,6 @@ REQUIRED_USE="
 src_prepare() {
 	kde5_src_prepare
 
-	rm -r calendarsupport		\
-		eventviews		\
-		grantleetheme		\
-		incidenceeditor		\
-		kdepim-apps-lib		\
-		kdgantt2		\
-		libgravatar		\
-		libkdepim		\
-		libkleo			\
-		libksieve		\
-		mailcommon		\
-		mailimporter		\
-		messagelib		\
-		pimcommon		\
-		|| die "Failed to remove split libraries"
-
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 
@@ -180,7 +164,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
 		$(cmake-utils_use_find_package designer Qt5Designer)
 		$(cmake-utils_use_find_package google KF5GAPI)
 		$(cmake-utils_use_find_package prison KF5Prison)


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-09 10:53 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-09 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     94de5139e4106cf5ee6ec18f65da57680f1ffb59
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb  4 01:57:59 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 10:53:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=94de5139

kde-apps/kdepim: Add blocker against kdepim-common-libs:4

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-15.12.1.ebuild       | 1 +
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 1 +
 kde-apps/kdepim/kdepim-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-15.12.1.ebuild b/kde-apps/kdepim/kdepim-15.12.1.ebuild
index 967eaec..a7a0bdc 100644
--- a/kde-apps/kdepim/kdepim-15.12.1.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.1.ebuild
@@ -139,6 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
+	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index e44db90..e8ed99c 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -139,6 +139,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
+	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 3b64089..b3b0bb8 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -127,6 +127,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
+	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-09 10:55 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-09 10:55 UTC (permalink / raw
  To: gentoo-commits

commit:     672b717433bdc954ce415bf3279e993deaab840a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 00:09:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 10:55:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=672b7174

kde-apps/kdepim: Drop kleopatra from build

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-9999.ebuild | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index b3b0bb8..dcf477b 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK=true
-KDE_TEST=true
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -13,7 +14,7 @@ DESCRIPTION="Personal Information Management Suite"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=""
 
-PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
+PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kmail knotes kontact korganizer ktnef"
 IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
@@ -87,10 +88,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep messagelib)
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
-	>=app-crypt/gpgme-1.3.2
-	dev-libs/boost:=
-	dev-libs/grantlee:5
-	dev-libs/libxslt
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
@@ -102,14 +99,13 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/grantlee:5
+	dev-libs/libxslt
 	media-libs/phonon[qt5]
 	designer? ( $(add_qt_dep designer) )
 	google? ( net-libs/libkgapi:5 )
 	prison? ( media-libs/prison:5 )
-	kdepim_features_kleopatra? (
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -131,7 +127,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4
-	!kde-apps/kleopatra:4
 	!kde-apps/kmail:4
 	!kde-apps/knode:4
 	!kde-apps/knotes:4
@@ -141,7 +136,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/ktimetracker:4
 	!kde-apps/ktnef:4
 	$(add_kdeapps_dep kdepim-runtime)
-	kdepim_features_kleopatra? ( app-crypt/gnupg )
 "
 # kontact: summary plugin; kalarm: email scheduler
 REQUIRED_USE="
@@ -152,12 +146,15 @@ REQUIRED_USE="
 src_prepare() {
 	kde5_src_prepare
 
+	rm -r kleopatra || die "Failed to remove kleopatra subdirectory"
+	cmake_comment_add_subdirectory kleopatra
+
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 
 	# applications
 	for pim_ft in ${PIM_FTS}; do
-		use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}
+		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
 	done
 }
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-14 15:28 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-14 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     67e6f29cf44b13abfee0a7fed8c3fabf0862aa36
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 13 22:41:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 01:38:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=67e6f29c

kde-apps/kdepim: Split out kdepim-icons

Package-Manager: portage-2.2.27

 ...depim-15.12.1.ebuild => kdepim-15.12.1-r1.ebuild} |  4 +++-
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild          | 20 +++++++++++---------
 kde-apps/kdepim/kdepim-9999.ebuild                   |  1 -
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.1.ebuild b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
similarity index 99%
rename from kde-apps/kdepim/kdepim-15.12.1.ebuild
rename to kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
index a7a0bdc..23a0f8d 100644
--- a/kde-apps/kdepim/kdepim-15.12.1.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
@@ -140,7 +140,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4
 	!kde-apps/kleopatra:4
@@ -168,6 +167,7 @@ src_prepare() {
 		composereditor-ng	\
 		eventviews		\
 		grantleetheme		\
+		icons			\
 		incidenceeditor-ng	\
 		kaddressbookgrantlee	\
 		kdgantt2		\
@@ -189,6 +189,8 @@ src_prepare() {
 		templateparser		\
 		|| die "Failed to remove split libraries"
 
+	comment_add_subdirectory icons
+
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index e8ed99c..c6a75ab 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK=true
-KDE_TEST=true
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -96,10 +96,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep pimcommon)
 	$(add_kdeapps_dep syndication)
 	$(add_kdeapps_dep templateparser)
-	>=app-crypt/gpgme-1.3.2
-	dev-libs/boost:=
-	dev-libs/grantlee:5
-	dev-libs/libxslt
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
@@ -111,6 +107,10 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.3.2
+	dev-libs/boost:=
+	dev-libs/grantlee:5
+	dev-libs/libxslt
 	media-libs/phonon[qt5]
 	designer? ( $(add_qt_dep designer) )
 	google? ( net-libs/libkgapi:5 )
@@ -140,7 +140,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4
 	!kde-apps/kleopatra:4
@@ -168,6 +167,7 @@ src_prepare() {
 		composereditor-ng	\
 		eventviews		\
 		grantleetheme		\
+		icons			\
 		incidenceeditor-ng	\
 		kaddressbookgrantlee	\
 		kdgantt2		\
@@ -189,6 +189,8 @@ src_prepare() {
 		templateparser		\
 		|| die "Failed to remove split libraries"
 
+	cmake_comment_add_subdirectory icons
+
 	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 		-i CMakeLists.txt || die
 
@@ -203,7 +205,7 @@ src_prepare() {
 
 	# applications
 	for pim_ft in ${PIM_FTS}; do
-		use kdepim_features_${pim_ft} || comment_add_subdirectory ${pim_ft}
+		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
 	done
 }
 

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index dcf477b..f79b3ab 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -124,7 +124,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-icons:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4
 	!kde-apps/kmail:4


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-14 15:28 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-14 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d619f03c7796857a713e5c9e7bb81b17e71f7341
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 01:26:55 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 11:52:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d619f03c

kde-apps/kdepim: Drop USE=designer

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-15.12.1-r1.ebuild    | 4 +---
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 5 ++---
 kde-apps/kdepim/kdepim-9999.ebuild          | 5 ++---
 kde-apps/kdepim/metadata.xml                | 1 -
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
index 23a0f8d..31c42fd 100644
--- a/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=" ~amd64 ~x86"
 
 PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
-IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -112,7 +112,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
-	designer? ( $(add_qt_dep designer) )
 	google? ( net-libs/libkgapi:5 )
 	prison? ( media-libs/prison:5 )
 	kdepim_features_kleopatra? (
@@ -212,7 +211,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
-		$(cmake-utils_use_find_package designer Qt5Designer)
 		$(cmake-utils_use_find_package google KF5GAPI)
 		$(cmake-utils_use_find_package prison KF5Prison)
 	)

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index c6a75ab..c0f103f 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=""
 
 PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
-IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -112,7 +112,6 @@ COMMON_DEPEND="
 	dev-libs/grantlee:5
 	dev-libs/libxslt
 	media-libs/phonon[qt5]
-	designer? ( $(add_qt_dep designer) )
 	google? ( net-libs/libkgapi:5 )
 	prison? ( media-libs/prison:5 )
 	kdepim_features_kleopatra? (
@@ -212,7 +211,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
-		$(cmake-utils_use_find_package designer Qt5Designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
 		$(cmake-utils_use_find_package google KF5GAPI)
 		$(cmake-utils_use_find_package prison KF5Prison)
 	)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index f79b3ab..60a099f 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=""
 
 PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kmail knotes kontact korganizer ktnef"
-IUSE="designer google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -103,7 +103,6 @@ COMMON_DEPEND="
 	dev-libs/grantlee:5
 	dev-libs/libxslt
 	media-libs/phonon[qt5]
-	designer? ( $(add_qt_dep designer) )
 	google? ( net-libs/libkgapi:5 )
 	prison? ( media-libs/prison:5 )
 "
@@ -159,7 +158,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
 		$(cmake-utils_use_find_package google KF5GAPI)
 		$(cmake-utils_use_find_package prison KF5Prison)
 	)

diff --git a/kde-apps/kdepim/metadata.xml b/kde-apps/kdepim/metadata.xml
index 3f72dd5..5000cec 100644
--- a/kde-apps/kdepim/metadata.xml
+++ b/kde-apps/kdepim/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="designer">Build the Qt Designer plugins</flag>
 		<flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag>
 		<flag name="prison">Enable support for QRcodes in contacts</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-18 14:44 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-18 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c798f38f62ace521936fd58108931ce26dcf0b9d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 20:08:11 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 14:23:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c798f38f

kde-apps/kdepim: Drop split out KDEPIM_FEATURES

Namely:
akonadiconsole, akregator, blogilo, console, kaddressbook, knotes, ktnef

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 82 ++++++++---------------------
 kde-apps/kdepim/kdepim-9999.ebuild          | 40 ++++++--------
 2 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index c0f103f..16b4f32 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -4,7 +4,12 @@
 
 EAPI=6
 
+PIM_FTS="kalarm kleopatra kmail kontact korganizer"
+
 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
@@ -13,8 +18,7 @@ DESCRIPTION="Personal Information Management Suite"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=""
 
-PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kleopatra kmail knotes kontact korganizer ktnef"
-IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -59,12 +63,10 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep composereditor)
 	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
 	$(add_kdeapps_dep kaddressbookgrantlee)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-kioslaves)
@@ -78,13 +80,11 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ktnef)
 	$(add_kdeapps_dep libakonadi)
 	$(add_kdeapps_dep libfollowupreminder)
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep libkdepimdbusinterfaces)
-	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
 	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep mailcommon)
@@ -107,20 +107,17 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.3.2
 	dev-libs/boost:=
 	dev-libs/grantlee:5
 	dev-libs/libxslt
 	media-libs/phonon[qt5]
-	google? ( net-libs/libkgapi:5 )
-	prison? ( media-libs/prison:5 )
 	kdepim_features_kleopatra? (
+		$(add_kdeapps_dep gpgmepp)
+		$(add_kdeapps_dep libkleo)
+		>=app-crypt/gpgme-1.3.2
 		dev-libs/libassuan
 		dev-libs/libgpg-error
 	)
-	kdepim_features_knotes? (
-		$(add_kdeapps_dep noteshared)
-	)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -131,12 +128,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/akonadiconsole:4
-	!kde-apps/akregator:4
-	!kde-apps/blogilo:4
-	!kde-apps/calendarjanitor:4
 	!kde-apps/kabcclient:4
-	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4
@@ -144,12 +136,9 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kleopatra:4
 	!kde-apps/kmail:4
 	!kde-apps/knode:4
-	!kde-apps/knotes:4
-	!kde-apps/konsolekalendar:4
 	!kde-apps/kontact:4
 	!kde-apps/korganizer:4
 	!kde-apps/ktimetracker:4
-	!kde-apps/ktnef:4
 	$(add_kdeapps_dep kdepim-runtime)
 	kdepim_features_kleopatra? ( app-crypt/gnupg )
 "
@@ -162,45 +151,18 @@ REQUIRED_USE="
 src_prepare() {
 	kde5_src_prepare
 
-	rm -r calendarsupport		\
-		composereditor-ng	\
-		eventviews		\
-		grantleetheme		\
-		icons			\
-		incidenceeditor-ng	\
-		kaddressbookgrantlee	\
-		kdgantt2		\
-		libfollowupreminder	\
-		libgravatar		\
-		libkdepim		\
-		libkdepimdbusinterfaces	\
-		libkleo			\
-		libksieve		\
-		libsendlater		\
-		mailcommon		\
-		mailimporter		\
-		messagecomposer		\
-		messagecore		\
-		messagelist		\
-		messageviewer		\
-		noteshared		\
-		pimcommon		\
-		templateparser		\
-		|| die "Failed to remove split libraries"
-
-	cmake_comment_add_subdirectory icons
-
-	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-		-i CMakeLists.txt || die
+	rm -r agents/notesagent || die "Failed to remove split notesagent"
+	sed -e '/add_subdirectory(notesagent)/ s/^/#DONT/' \
+		-i agents/CMakeLists.txt || die
 
-	if ! use kdepim_features_knotes ; then
-		sed -i \
-			-e '/find_package(KF5NoteShared/ s/^/#DONT/' \
-			CMakeLists.txt || die
-		sed -i \
-			-e '/add_subdirectory(notesagent)/ s/^/#DONT/' \
-			agents/CMakeLists.txt || die
-	fi
+	sed -i \
+		-e "/akregator/ s/^/#DONT/" \
+		-e "/blogilo/ s/^/#DONT/" \
+		-e "/kleopatra/ s/^/#DONT/" \
+		-e "/knotes/ s/^/#DONT/" \
+		-e "/konsolekalendar/ s/^/#DONT/" \
+		-e "/ktnef/ s/^/#DONT/" \
+		doc/CMakeLists.txt || die "Failed to disable split docs"
 
 	# applications
 	for pim_ft in ${PIM_FTS}; do
@@ -211,9 +173,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
-		$(cmake-utils_use_find_package google KF5GAPI)
-		$(cmake-utils_use_find_package prison KF5Prison)
 	)
 
 	kde5_src_configure

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 60a099f..b511cb0 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -4,8 +4,13 @@
 
 EAPI=6
 
+PIM_FTS="kalarm kmail kontact korganizer"
+
 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
@@ -14,8 +19,7 @@ DESCRIPTION="Personal Information Management Suite"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 KEYWORDS=""
 
-PIM_FTS="akonadiconsole akregator blogilo console kaddressbook kalarm kmail knotes kontact korganizer ktnef"
-IUSE="google prison $(printf 'kdepim_features_%s ' ${PIM_FTS})"
+IUSE="$(printf 'kdepim_features_%s ' ${PIM_FTS})"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -59,11 +63,9 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-socialutils)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep gpgmepp)
 	$(add_kdeapps_dep grantleetheme)
 	$(add_kdeapps_dep incidenceeditor)
 	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kblog)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
@@ -78,10 +80,8 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kmime)
 	$(add_kdeapps_dep kontactinterface)
 	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ktnef)
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
@@ -103,8 +103,6 @@ COMMON_DEPEND="
 	dev-libs/grantlee:5
 	dev-libs/libxslt
 	media-libs/phonon[qt5]
-	google? ( net-libs/libkgapi:5 )
-	prison? ( media-libs/prison:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -114,25 +112,16 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/noteshared
-	!kde-apps/akonadiconsole:4
-	!kde-apps/akregator:4
-	!kde-apps/blogilo:4
-	!kde-apps/calendarjanitor:4
 	!kde-apps/kabcclient:4
-	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4
 	!kde-apps/kjots:4
 	!kde-apps/kmail:4
 	!kde-apps/knode:4
-	!kde-apps/knotes:4
-	!kde-apps/konsolekalendar:4
 	!kde-apps/kontact:4
 	!kde-apps/korganizer:4
 	!kde-apps/ktimetracker:4
-	!kde-apps/ktnef:4
 	$(add_kdeapps_dep kdepim-runtime)
 "
 # kontact: summary plugin; kalarm: email scheduler
@@ -144,11 +133,14 @@ REQUIRED_USE="
 src_prepare() {
 	kde5_src_prepare
 
-	rm -r kleopatra || die "Failed to remove kleopatra subdirectory"
-	cmake_comment_add_subdirectory kleopatra
-
-	use handbook || sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-		-i CMakeLists.txt || die
+	sed -i \
+		-e "/akregator/ s/^/#DONT/" \
+		-e "/blogilo/ s/^/#DONT/" \
+		-e "/kleopatra/ s/^/#DONT/" \
+		-e "/knotes/ s/^/#DONT/" \
+		-e "/konsolekalendar/ s/^/#DONT/" \
+		-e "/ktnef/ s/^/#DONT/" \
+		doc/CMakeLists.txt || die "Failed to disable split docs"
 
 	# applications
 	for pim_ft in ${PIM_FTS}; do
@@ -158,9 +150,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON
-		$(cmake-utils_use_find_package google KF5GAPI)
-		$(cmake-utils_use_find_package prison KF5Prison)
 	)
 
 	kde5_src_configure


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-02-23 14:20 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-02-23 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ae78e6a0f92cf78bf94df2348c34df5ed6435c6b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 13:00:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 14:20:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae78e6a0

kde-apps/kdepim: Add back (R)DEPENDs

gpgmepp: plugins/kaddressbook/editorpages
libkleo: plugins/messageviewer/bodypartformatter/calendar
libktnef: plugins/messageviewer/bodypartformatter/ms-tnef

Improve kleopatra handbook removal.

Package-Manager: portage-2.2.27

 .../{kdepim-15.12.2.ebuild => kdepim-15.12.2-r1.ebuild}      | 12 ++++++++++--
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild                  | 12 ++++++++++--
 kde-apps/kdepim/kdepim-9999.ebuild                           |  2 ++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-15.12.2.ebuild b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
similarity index 94%
rename from kde-apps/kdepim/kdepim-15.12.2.ebuild
rename to kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
index 73e4131..5d6f8a4 100644
--- a/kde-apps/kdepim/kdepim-15.12.2.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
@@ -85,7 +85,9 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep libkdepimdbusinterfaces)
+	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
 	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
@@ -113,13 +115,13 @@ COMMON_DEPEND="
 	media-libs/phonon[qt5]
 	kdepim_features_kleopatra? (
 		$(add_kdeapps_dep gpgmepp)
-		$(add_kdeapps_dep libkleo)
 		>=app-crypt/gpgme-1.3.2
 		dev-libs/libassuan
 		dev-libs/libgpg-error
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep gpgmepp)
 	sys-devel/gettext
 	test? (
 		$(add_kdeapps_dep akonadi sqlite)
@@ -158,12 +160,18 @@ src_prepare() {
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
 		-e "/blogilo/ s/^/#DONT/" \
-		-e "/kleopatra/ s/^/#DONT/" \
 		-e "/knotes/ s/^/#DONT/" \
 		-e "/konsolekalendar/ s/^/#DONT/" \
 		-e "/ktnef/ s/^/#DONT/" \
 		doc/CMakeLists.txt || die "Failed to disable split docs"
 
+	if ! use kdepim_features_kleopatra ; then
+		sed -i \
+			-e "/kleopatra/ s/^/#DONT/" \
+			-e "/kwatchgnupg/ s/^/#DONT/" \
+			doc/CMakeLists.txt || die "Failed to disable kleopatra docs"
+	fi
+
 	# applications
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 16b4f32..1c6d3f3 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -85,7 +85,9 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
 	$(add_kdeapps_dep libkdepimdbusinterfaces)
+	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
 	$(add_kdeapps_dep libsendlater)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
@@ -113,13 +115,13 @@ COMMON_DEPEND="
 	media-libs/phonon[qt5]
 	kdepim_features_kleopatra? (
 		$(add_kdeapps_dep gpgmepp)
-		$(add_kdeapps_dep libkleo)
 		>=app-crypt/gpgme-1.3.2
 		dev-libs/libassuan
 		dev-libs/libgpg-error
 	)
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep gpgmepp)
 	sys-devel/gettext
 	test? (
 		$(add_kdeapps_dep akonadi sqlite)
@@ -158,12 +160,18 @@ src_prepare() {
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
 		-e "/blogilo/ s/^/#DONT/" \
-		-e "/kleopatra/ s/^/#DONT/" \
 		-e "/knotes/ s/^/#DONT/" \
 		-e "/konsolekalendar/ s/^/#DONT/" \
 		-e "/ktnef/ s/^/#DONT/" \
 		doc/CMakeLists.txt || die "Failed to disable split docs"
 
+	if ! use kdepim_features_kleopatra ; then
+		sed -i \
+			-e "/kleopatra/ s/^/#DONT/" \
+			-e "/kwatchgnupg/ s/^/#DONT/" \
+			doc/CMakeLists.txt || die "Failed to disable kleopatra docs"
+	fi
+
 	# applications
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index b511cb0..e0f4e45 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -82,6 +82,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	$(add_kdeapps_dep libgravatar)
 	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
 	$(add_kdeapps_dep libksieve)
 	$(add_kdeapps_dep mailcommon)
 	$(add_kdeapps_dep mailimporter)
@@ -140,6 +141,7 @@ src_prepare() {
 		-e "/knotes/ s/^/#DONT/" \
 		-e "/konsolekalendar/ s/^/#DONT/" \
 		-e "/ktnef/ s/^/#DONT/" \
+		-e "/kwatchgnupg/ s/^/#DONT/" \
 		doc/CMakeLists.txt || die "Failed to disable split docs"
 
 	# applications


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-03-07 15:13 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-03-07 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     851d8cfe8d783691984016ba2ae9a3c0368fa3e9
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar  6 11:17:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 15:13:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=851d8cfe

kde-apps/kdepim: Re-add kaddressbook:4 blocker

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-15.12.2-r1.ebuild    | 1 +
 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
index 5d6f8a4..2445c40 100644
--- a/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
@@ -131,6 +131,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
+	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4

diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 1c6d3f3..69a9ac8 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -131,6 +131,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
+	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-03-07 15:13 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-03-07 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     0f2afb66ad8dd4979fa5969efd8a7255b007fe6c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar  6 18:21:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 15:13:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f2afb66

kde-apps/kdepim: kleopatra was split out

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index e0f4e45..8b524f7 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -137,11 +137,9 @@ src_prepare() {
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
 		-e "/blogilo/ s/^/#DONT/" \
-		-e "/kleopatra/ s/^/#DONT/" \
 		-e "/knotes/ s/^/#DONT/" \
 		-e "/konsolekalendar/ s/^/#DONT/" \
 		-e "/ktnef/ s/^/#DONT/" \
-		-e "/kwatchgnupg/ s/^/#DONT/" \
 		doc/CMakeLists.txt || die "Failed to disable split docs"
 
 	# applications


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-04-06 12:39 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-04-06 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     63814f11d4f93bca31c9da61a4951d9103c0b0ae
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 12:39:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 12:39:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=63814f11

kde-apps/kdepim: drop dependency on removed packages

Package-Manager: portage-2.2.28

 kde-apps/kdepim/kdepim-9999.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 8b524f7..b812fdd 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -60,7 +60,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep akonadi-notes)
 	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akonadi-socialutils)
 	$(add_kdeapps_dep calendarsupport)
 	$(add_kdeapps_dep eventviews)
 	$(add_kdeapps_dep grantleetheme)
@@ -69,7 +68,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-kioslaves)
 	$(add_kdeapps_dep kdgantt2)
 	$(add_kdeapps_dep kholidays)
 	$(add_kdeapps_dep kidentitymanagement)


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-04-08 15:45 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-04-08 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     d4a6a8fde5516c0840166f47b12e648291c5af11
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Apr  8 15:31:15 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 15:31:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4a6a8fd

kde-apps/kdepim: Add pkg_postinst info about kdepim-addons and kleopatra

Package-Manager: portage-2.2.27

 kde-apps/kdepim/kdepim-16.03.90.ebuild      | 16 ++++++++++++++++
 kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 16 ++++++++++++++++
 kde-apps/kdepim/kdepim-9999.ebuild          | 16 ++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-16.03.90.ebuild b/kde-apps/kdepim/kdepim-16.03.90.ebuild
index efce9f2..93bf42b 100644
--- a/kde-apps/kdepim/kdepim-16.03.90.ebuild
+++ b/kde-apps/kdepim/kdepim-16.03.90.ebuild
@@ -157,3 +157,19 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
+		echo
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
+		echo
+	fi
+}

diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
index 8b524f7..bb97118 100644
--- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -157,3 +157,19 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
+		echo
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
+		echo
+	fi
+}

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index b812fdd..9d050c1 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -155,3 +155,19 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
+		echo
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
+		echo
+	fi
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-04-20 19:09 Johannes Huber
  0 siblings, 0 replies; 22+ messages in thread
From: Johannes Huber @ 2016-04-20 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     4d3c84cdf22a099a8f3eeaab7ac4e649ceb6aa2f
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Apr 19 07:53:33 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 19:09:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d3c84cd

kde-apps/kdepim: Remove ambiguity IUSE vs. KDEPIM_FEATURES wrt kontact

Package-Manager: portage-2.2.27

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 kde-apps/kdepim/kdepim-16.04.0.ebuild       | 12 +++++++++---
 kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 12 +++++++++---
 kde-apps/kdepim/kdepim-9999.ebuild          | 12 +++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-16.04.0.ebuild b/kde-apps/kdepim/kdepim-16.04.0.ebuild
index 0fd9a88..e999920 100644
--- a/kde-apps/kdepim/kdepim-16.04.0.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PIM_FTS="kalarm kmail kontact korganizer"
+PIM_FTS="kalarm kmail korganizer"
 
 FRAMEWORKS_MINIMAL="5.19.0"
 KDE_HANDBOOK="true"
@@ -127,12 +127,16 @@ RDEPEND="${COMMON_DEPEND}
 "
 # kontact: summary plugin; kalarm: email scheduler
 REQUIRED_USE="
-	kdepim_features_kontact? ( kdepim_features_kmail )
+	kontact? ( kdepim_features_kmail )
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
 src_prepare() {
-	kde5_src_prepare
+	if use kontact ; then
+		KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact"
+	else
+		cmake_comment_add_subdirectory kontact
+	fi
 
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
@@ -146,6 +150,8 @@ src_prepare() {
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
 	done
+
+	kde5_src_prepare
 }
 
 src_configure() {

diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
index bb97118..31bd21b 100644
--- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PIM_FTS="kalarm kmail kontact korganizer"
+PIM_FTS="kalarm kmail korganizer"
 
 FRAMEWORKS_MINIMAL="5.19.0"
 KDE_HANDBOOK="true"
@@ -127,12 +127,16 @@ RDEPEND="${COMMON_DEPEND}
 "
 # kontact: summary plugin; kalarm: email scheduler
 REQUIRED_USE="
-	kdepim_features_kontact? ( kdepim_features_kmail )
+	kontact? ( kdepim_features_kmail )
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
 src_prepare() {
-	kde5_src_prepare
+	if use kontact ; then
+		KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact"
+	else
+		cmake_comment_add_subdirectory kontact
+	fi
 
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
@@ -146,6 +150,8 @@ src_prepare() {
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
 	done
+
+	kde5_src_prepare
 }
 
 src_configure() {

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index 9d050c1..1766c5e 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PIM_FTS="kalarm kmail kontact korganizer"
+PIM_FTS="kalarm kmail korganizer"
 
 FRAMEWORKS_MINIMAL="5.19.0"
 KDE_HANDBOOK="true"
@@ -125,12 +125,16 @@ RDEPEND="${COMMON_DEPEND}
 "
 # kontact: summary plugin; kalarm: email scheduler
 REQUIRED_USE="
-	kdepim_features_kontact? ( kdepim_features_kmail )
+	kontact? ( kdepim_features_kmail )
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
 src_prepare() {
-	kde5_src_prepare
+	if use kontact ; then
+		KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact"
+	else
+		cmake_comment_add_subdirectory kontact
+	fi
 
 	sed -i \
 		-e "/akregator/ s/^/#DONT/" \
@@ -144,6 +148,8 @@ src_prepare() {
 	for pim_ft in ${PIM_FTS}; do
 		use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft}
 	done
+
+	kde5_src_prepare
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-04-23 17:51 Johannes Huber
  0 siblings, 0 replies; 22+ messages in thread
From: Johannes Huber @ 2016-04-23 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0e2dcc28780db7116384dcdaf058fb81eb6b30dc
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 09:34:29 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 17:50:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e2dcc28

kde-apps/kdepim: agents, korgac and plugins are gone

agents moved into kmail
korgac moved into korganizer
plugins moved into kdepim-addons and korganizer

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 kde-apps/kdepim/kdepim-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
index b3ffa19..d9f25dc 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -7,8 +7,8 @@ EAPI=6
 PIM_FTS="kalarm kmail korganizer"
 
 KDE_HANDBOOK="true"
-KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard agents grantleeeditor importwizard korgac
-mboximporter pimsettingexporter plugins sieveeditor storageservicemanager"
+KDE_PIM_KEEP_SUBDIR="${PIM_FTS} accountwizard grantleeeditor importwizard
+mboximporter pimsettingexporter sieveeditor storageservicemanager"
 KDE_PIM_KONTACTPLUGIN="true"
 KDE_TEST="true"
 QT_MINIMAL="5.6.0"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-05-23 15:05 Andreas Hüttel
  0 siblings, 0 replies; 22+ messages in thread
From: Andreas Hüttel @ 2016-05-23 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     859a7e6de76f5a1837522ed4f20b6098f5a45bc1
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 15:03:42 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon May 23 15:03:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=859a7e6d

kde-apps/kdepim: Add blocker due to file collisions

Package-Manager: portage-2.3.0_rc1

 kde-apps/kdepim/kdepim-16.04.1.ebuild       | 1 +
 kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-16.04.1.ebuild b/kde-apps/kdepim/kdepim-16.04.1.ebuild
index 3299a52..e636e12 100644
--- a/kde-apps/kdepim/kdepim-16.04.1.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.1.ebuild
@@ -111,6 +111,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
+	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4

diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
index 2ea10ce..99b411c 100644
--- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -111,6 +111,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kabcclient:4
+	!kde-apps/kaddressbook:4
 	!kde-apps/kalarm:4
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-runtime:4


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
@ 2016-05-25 20:39 Michael Palimaka
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Palimaka @ 2016-05-25 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     756aa19cdd97a0877745f3251e1ebbc82b8f09f9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 20:38:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 25 20:38:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=756aa19c

kde-apps/kdepim: restrict hanging tests

Gentoo-bug: 580742

Package-Manager: portage-2.3.0_rc1

 kde-apps/kdepim/kdepim-16.04.1.ebuild       | 2 ++
 kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/kde-apps/kdepim/kdepim-16.04.1.ebuild b/kde-apps/kdepim/kdepim-16.04.1.ebuild
index e636e12..3e83dcf 100644
--- a/kde-apps/kdepim/kdepim-16.04.1.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.1.ebuild
@@ -129,6 +129,8 @@ REQUIRED_USE="
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
+RESTRICT="test"
+
 src_prepare() {
 	if use kontact ; then
 		KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact"

diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
index 99b411c..a8ef25a 100644
--- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild
@@ -129,6 +129,8 @@ REQUIRED_USE="
 	kdepim_features_kalarm? ( kdepim_features_kmail )
 "
 
+RESTRICT="test"
+
 src_prepare() {
 	if use kontact ; then
 		KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2016-05-25 20:39 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-14 15:28 [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2016-05-25 20:39 Michael Palimaka
2016-05-23 15:05 Andreas Hüttel
2016-04-23 17:51 Johannes Huber
2016-04-20 19:09 Johannes Huber
2016-04-08 15:45 Michael Palimaka
2016-04-06 12:39 Michael Palimaka
2016-03-07 15:13 Michael Palimaka
2016-03-07 15:13 Michael Palimaka
2016-02-23 14:20 Michael Palimaka
2016-02-18 14:44 Michael Palimaka
2016-02-14 15:28 Michael Palimaka
2016-02-09 10:55 Michael Palimaka
2016-02-09 10:53 Michael Palimaka
2015-12-10  6:41 Michael Palimaka
2015-11-29 15:29 Michael Palimaka
2015-11-29 15:29 Michael Palimaka
2015-11-19 12:36 Michael Palimaka
2015-10-22 10:13 Michael Palimaka
2015-08-10 20:51 Johannes Huber
2015-08-10 20:51 Johannes Huber
2015-08-07 20:43 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox