kde-apps: Add necessary blockers against incompatible kdepimlibs

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/app-office/kmymoney/kmymoney-4.7.2.ebuild b/app-office/kmymoney/kmymoney-4.7.2.ebuild
index e263def1ff4b48d02c7fa30a98b53e9f3873094c..72bbb4e7b0e3026d04ba96205a98427557191fdb 100644 (file)
--- a/app-office/kmymoney/kmymoney-4.7.2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.7.2.ebuild
@@ -36,6 +36,8 @@ COMMON_DEPEND="
        ofx? ( >=dev-libs/libofx-0.9.4 )
 "
 RDEPEND="${COMMON_DEPEND}
+       !=kde-apps/kdepimlibs-4.14.10_p2016*
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        quotes? ( dev-perl/Finance-Quote )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/app-office/kmymoney/kmymoney-4.8.0.ebuild b/app-office/kmymoney/kmymoney-4.8.0.ebuild
index e4f42442d898e85dfde0b628c8454161810d3179..25350ab457907c7ae6768729929a2af5b51761fc 100644 (file)
--- a/app-office/kmymoney/kmymoney-4.8.0.ebuild
+++ b/app-office/kmymoney/kmymoney-4.8.0.ebuild
@@ -38,6 +38,10 @@ COMMON_DEPEND="
        weboob? ( www-client/weboob )
 "
 RDEPEND="${COMMON_DEPEND}
+       pim? (
+               !=kde-apps/kdepimlibs-4.14.10_p2016*
+               !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
+       )
        quotes? ( dev-perl/Finance-Quote )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild
index 4cb164137b84ae459ff3deadc0213a060d99f9aa..6c56b30617e3d65b0944fe4f042fd67e71d24c66 100644 (file)
--- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,9 @@ DEPEND="
        dev-libs/grantlee:0
        !kde-base/contactthemeeditor
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
+"
 
 KMEXTRA="
        grantleeeditor/contactthemeeditor

diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
index 3e6a10cbc27c06800c384682981c2b61c6b59fcd..29f2f7efb47d76257758868517cc07378b2b26ef 100644 (file)
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,9 @@ DEPEND="
        $(add_kdeapps_dep libkleo '' 4.4.2015)
        kde-frameworks/kdelibs:4
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
+"
 
 KMEXTRA="
        plugins/kaddressbook/

diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild
index 4807976090fbf1da650db6d04c663c2f56e591d4..0fcd4f30030a42cb38d5c1073a85ab17941e7ed3 100644 (file)
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}
        !kde-apps/libkpgp:4
        !<kde-apps/kaddressbook-4.11.50:4
        !kde-apps/kdepim-wizards:4
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        !<kde-apps/kmail-4.14.5:4
        !<kde-apps/korganizer-4.5.67:4
        $(add_kdeapps_dep kdepim-runtime)

diff --git a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild b/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild
index fde2351f971a51e068a0a7f3e39d94927c631ca3..042b859650807aac931ca1d09d9ea39d35b70a20 100644 (file)
--- a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild
+++ b/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,9 @@ DEPEND="
        $(add_kdeapps_dep kdepim-kresources '' 4.4.2015)
        $(add_kdeapps_dep libkdepim '' 4.4.2015)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
+"
 
 KMEXTRACTONLY="
        kmail/

diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
index 30bdeb26d9cf167d086058acfc26c2ba9388ea70..540a0a71de7bafb1edd0934dd19551afac0a2c1b 100644 (file)
--- a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild
@@ -25,6 +25,7 @@ DEPEND="
        dev-libs/libgpg-error
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        app-crypt/gnupg
 "
 

diff --git a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild
index 8ddab33b78f27ffb7a2127c17c93876c09d7b1c6..b4a6cffedc140a8f6f02af1e073bf13dbf165afc 100644 (file)
--- a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
        dev-libs/libgpg-error
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
        app-crypt/gnupg
 "
 

diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
index 33c095132de3b8801c698297811bc4e6e8b02f12..4595c5ab522eb3abc152505518fceccd88944baa 100644 (file)
--- a/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild
@@ -23,9 +23,9 @@ DEPEND="
        $(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160211-r1)
        $(add_kdeapps_dep korganizer)
 "
-RDEPEND="
-       ${DEPEND}
+RDEPEND="${DEPEND}
        !=kde-apps/kdepim-common-libs-4.12.1-r1
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
 "
 
 RESTRICT="test"

diff --git a/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild b/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild
index 832b06456c513d4fbab7bf80cea214758cdfacc4..05893fc561acdf22d2603181ee25ed84dd438f3e 100644 (file)
--- a/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild
+++ b/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild
@@ -21,7 +21,7 @@ DEPEND="
        kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}
-       !>=kde-apps/kdepimlibs-4.14.11_pre20160211
+       !>kde-apps/kdepimlibs-4.14.10-r3
 "
 
 KMEXTRACTONLY="

diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild
index 60ccc462639dce920a1c3a4810f6862e4c5c6193..43b604c957bf3b5892088c0eb1fab1d2be310d47 100644 (file)
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,9 @@ DEPEND="
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
        $(add_kdeapps_dep kdepim-common-libs)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
+"
 
 KMCOMPILEONLY="
        calendarsupport/

diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild
index 06e311d0d67bfeb78e3a75f2a7fb751f52aaef1f..c79a5ff985efbd2b969f18a31df99ef3d9a2b090 100644 (file)
--- a/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,4 +16,6 @@ IUSE="debug"
 DEPEND="
        $(add_kdeapps_dep kdepimlibs '' 4.6)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
+"

diff --git a/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild b/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild
index 9456b4ad39ca4c41766b2ec61b31414c0299d7d1..12a513b1ed8eb8427abba38f49e6d31c6d055fc4 100644 (file)
--- a/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,9 @@ DEPEND="
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
        $(add_kdeapps_dep kdepim-common-libs)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
+"
 
 KMLOADLIBS="kdepim-common-libs"
 KMSAVELIBS="true"

diff --git a/kde-apps/kontact/kontact-4.4.2016.01.ebuild b/kde-apps/kontact/kontact-4.4.2016.01.ebuild
index fa93b8d2164f67a7f934f894dddc246f7d71ea67..ac015c5a2575fc8ade54d9c318e238771ffb05e6 100644 (file)
--- a/kde-apps/kontact/kontact-4.4.2016.01.ebuild
+++ b/kde-apps/kontact/kontact-4.4.2016.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,9 @@ DEPEND="
        $(add_kdeapps_dep kdepimlibs '' 4.6)
        $(add_kdeapps_dep libkdepim '' 4.4.2015)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
+"
 
 KMLOADLIBS="libkdepim"
 KMSAVELIBS="true"

diff --git a/kde-apps/kopete/kopete-16.12.3-r1.ebuild b/kde-apps/kopete/kopete-16.12.3-r1.ebuild
index aca4d3f14f6961bff618b26e8cfaa667b84ae6f6..19a4da24d21d7ad82bac272689d91fcf41fca61a 100644 (file)
--- a/kde-apps/kopete/kopete-16.12.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-16.12.3-r1.ebuild
@@ -106,6 +106,8 @@ COMMONDEPEND="
        yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+       !=kde-apps/kdepimlibs-4.14.10_p2016*
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        jingle? ( media-libs/speex )
        latex? (
                virtual/imagemagick-tools

diff --git a/kde-apps/kopete/kopete-17.04.0.ebuild b/kde-apps/kopete/kopete-17.04.0.ebuild
index be9563fab702225f0d3b52b7cab9d86112722034..f1ef35a230670069ae8fa314bda3a32f308e42ab 100644 (file)
--- a/kde-apps/kopete/kopete-17.04.0.ebuild
+++ b/kde-apps/kopete/kopete-17.04.0.ebuild
@@ -106,6 +106,8 @@ COMMONDEPEND="
        yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
+       !=kde-apps/kdepimlibs-4.14.10_p2016*
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        jingle? ( media-libs/speex )
        latex? (
                virtual/imagemagick-tools

diff --git a/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild b/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild
index ba99e9015ad9b406c95f155c9079f54db580c388..acb3a53132f7b821f961205c4be9f304d57ab348 100644 (file)
--- a/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild
+++ b/kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
        sys-libs/zlib
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
        $(add_kdeapps_dep ktimezoned '' 4.14.3)
 "
 

diff --git a/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild b/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild
index 09daa0e621f34baf93785b0260f28aba4d624bcd..4c67cb5afd34640b9a7b91ad4eb9b5116eb88eac 100644 (file)
--- a/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild
+++ b/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild
@@ -18,6 +18,7 @@ DEPEND="
        sys-libs/zlib
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
        $(add_kdeapps_dep ktimezoned '' 4.14.3)
 "
 

diff --git a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
index 45b1f9a79596c4918508790012ed6601a137d3c0..c13106334c3c4f0566248ee789e358ecf2fba879 100644 (file)
--- a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
+++ b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,10 @@ DEPEND="
                || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) )
        )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !=kde-apps/kdepimlibs-4.14.10_p2016*
+       !>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
+"
 
 RESTRICT="test"
 # testpamopen crashes with a buffer overflow (__fortify_fail)

diff --git a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild b/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
index fc418a8c0af592f0f4016ae8a284066821343306..ab775e7a2c6a57af6d03455d37857eb0cd73e3d2 100644 (file)
--- a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
+++ b/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
@@ -16,6 +16,7 @@ DEPEND="
        $(add_kdeapps_dep kdepimlibs '' 4.6)
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
        app-crypt/gnupg
 "
 

diff --git a/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild b/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild
index 87fcfd44757da94e5f0dcde033122f4dac6ac447..ae2e4704ba3a1c6c7b641eaaf85329ef8e61ae03 100644 (file)
--- a/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild
+++ b/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ DEPEND="
        $(add_kdeapps_dep kdepimlibs '' 4.6)
 "
 RDEPEND="${DEPEND}
+       !>kde-apps/kdepimlibs-4.14.10-r3
        app-crypt/gnupg
 "