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

[Michael Palimaka]

commit:     f66fd822d05eebd2bbfc1f0870b89047d5e81c11
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 23:42:50 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=f66fd822

kde5.eclass: Split KDE PIM: Do more forcefully remove deps

 eclass/kde5.eclass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index b065315..2ccbf6e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -532,20 +532,25 @@ kde5_src_prepare() {
                        -i CMakeLists.txt || die "Failed to make dependencies 
optional"
                # FIXME: try to push these down into subdirs @upstream
                # AkonadiSearch:        kaddressbook, knotes, kdepim (kmail, 
korganizer)
-               # Boost:                        kleopatra, kdepim (kmail, 
agents)
-               # Gpgme:                        kleopatra
+               # Gpgme:                        kleopatra (removed in >= 
16.03.80)
                # Grantlee:                     akregator, kaddressbook, 
knotes, kdepim (grantleeeditor, kmail, kontact)
-               # MailTransportDBusService: kdepim (kmail)
-               # Phonon4Qt5:           kdepim (kalarm, korgac)
                sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ 
OPTIONAL/" \
-                       -e "/set_package_properties(Boost/ s/ REQUIRED/ 
OPTIONAL/" \
                        -e "/set_package_properties(Xsltproc/ s/ REQUIRED/ 
OPTIONAL/" \
                        -e "/find_package(Gpgme/ s/ REQUIRED//" \
                        -e "/find_package(Grantlee5/ s/ REQUIRED//" \
-                       -e "/find_package(MailTransportDBusService/ s/ 
REQUIRED//" \
-                       -e "/find_package(Phonon4Qt5/ s/ REQUIRED//" \
                        -i CMakeLists.txt || die "Failed to make dependencies 
optional"
 
+               # Boost: kdepim (kmail, mailfilteragent)
+               # MailTransportDBusService: kdepim (kmail)
+               # Phonon4Qt5: kdepim (kalarm, korgac)
+               if [[ ${PN} != "kdepim" ]] ; then
+                       sed -e "/find_package(Boost/ s/^/#DONT/" \
+                               -e "/set_package_properties(Boost/ s/^/#DONT/" \
+                               -e "/find_package(MailTransportDBusService/ 
s/^/#DONT/" \
+                               -e "/find_package(Phonon4Qt5/ s/^/#DONT/" \
+                               -i CMakeLists.txt || die "Failed to disable 
dependencies"
+               fi
+
                # remove anything else not listed here
                local _pim_keep_subdir="${PN} ${KDE_PIM_KEEP_SUBDIR}"
                einfo "Building: ${_pim_keep_subdir}"