public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/
Date: Sun, 29 Nov 2015 15:29:34 +0000 (UTC)	[thread overview]
Message-ID: <1448709459.f2d9e0f950182a62125ecf4315e07748c6f47b59.kensington@gentoo> (raw)

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}


             reply	other threads:[~2015-11-29 15:29 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-29 15:29 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-05-25 20:39 [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ 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-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-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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448709459.f2d9e0f950182a62125ecf4315e07748c6f47b59.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox