commit: 5158884909b83ad1db5a748db88f46194cea4a69
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 22:43:08 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 1 07:48:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51588849
kde-apps: Add necessary blockers against incompatible kdepimlibs
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/kmymoney/kmymoney-4.7.2.ebuild | 2 ++
app-office/kmymoney/kmymoney-4.8.0.ebuild | 4 ++++
kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160211.ebuild | 6 ++++--
kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild | 6 ++++--
.../kdepim-common-libs-4.14.11_pre20160211-r1.ebuild | 1 +
kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild | 6 ++++--
kde-apps/kleopatra/kleopatra-4.14.11_pre20160211-r1.ebuild | 1 +
kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild | 1 +
kde-apps/kmail/kmail-4.14.11_pre20160211-r1.ebuild | 4 ++--
kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild | 2 +-
.../konsolekalendar/konsolekalendar-4.14.11_pre20160211.ebuild | 6 ++++--
kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild | 6 ++++--
kde-apps/kontact/kontact-4.14.11_pre20160211.ebuild | 6 ++++--
kde-apps/kontact/kontact-4.4.2016.01.ebuild | 6 ++++--
kde-apps/kopete/kopete-16.12.3-r1.ebuild | 2 ++
kde-apps/kopete/kopete-17.04.0.ebuild | 2 ++
kde-apps/korganizer/korganizer-4.14.11_pre20160211.ebuild | 3 ++-
kde-apps/korganizer/korganizer-4.4.2016.01.ebuild | 1 +
kde-apps/kwalletd/kwalletd-16.04.3.ebuild | 7 +++++--
kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild | 1 +
kde-apps/libkleo/libkleo-4.4.2016.01.ebuild | 3 ++-
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 e263def1ff4..72bbb4e7b0e 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 e4f42442d89..25350ab4579 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 4cb164137b8..6c56b30617e 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 3e6a10cbc27..29f2f7efb47 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 4807976090f..0fcd4f30030 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 fde2351f971..042b8596508 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 30bdeb26d9c..540a0a71de7 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 8ddab33b78f..b4a6cffedc1 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 33c095132de..4595c5ab522 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 832b06456c5..05893fc561a 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 60ccc462639..43b604c957b 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 06e311d0d67..c79a5ff985e 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 9456b4ad39c..12a513b1ed8 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 fa93b8d2164..ac015c5a257 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 aca4d3f14f6..19a4da24d21 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 be9563fab70..f1ef35a2306 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 ba99e9015ad..acb3a53132f 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 09daa0e621f..4c67cb5afd3 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 45b1f9a7959..c13106334c3 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 fc418a8c0af..ab775e7a2c6 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 87fcfd44757..ae2e4704ba3 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
"
