diff options
21 files changed, 55 insertions, 21 deletions
diff --git a/app-office/kmymoney/kmymoney-4.7.2.ebuild b/app-office/kmymoney/kmymoney-4.7.2.ebuild index e263def1ff4b..72bbb4e7b0e3 100644 --- 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 e4f42442d898..25350ab45790 100644 --- 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 4cb164137b84..6c56b30617e3 100644 --- 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 3e6a10cbc27c..29f2f7efb47d 100644 --- 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 4807976090fb..0fcd4f30030a 100644 --- 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 fde2351f971a..042b85965080 100644 --- 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 30bdeb26d9cf..540a0a71de7b 100644 --- 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 8ddab33b78f2..b4a6cffedc14 100644 --- 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 33c095132de3..4595c5ab522e 100644 --- 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 832b06456c51..05893fc561ac 100644 --- 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 60ccc462639d..43b604c957bf 100644 --- 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 06e311d0d67b..c79a5ff985ef 100644 --- 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 9456b4ad39ca..12a513b1ed8e 100644 --- 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 fa93b8d2164f..ac015c5a2575 100644 --- 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 aca4d3f14f69..19a4da24d21d 100644 --- 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 be9563fab702..f1ef35a23067 100644 --- 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 ba99e9015ad9..acb3a53132f7 100644 --- 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 09daa0e621f3..4c67cb5afd34 100644 --- 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 45b1f9a79596..c13106334c3c 100644 --- 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 fc418a8c0af5..ab775e7a2c6a 100644 --- 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 87fcfd44757d..ae2e4704ba3a 100644 --- 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 " |