kde-apps: KDE PIM 4.14.11_pre20160611 version bump

Fix configure w/ >=kde-apps/kdepimlibs-4.14.11_pre20160611,
updating gpgme++ and qgpgme references.
kdepim-meta: Pin dependencies to slot 4

Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Gentoo-bug: 611818
Package-Manager: Portage-2.3.3, Repoman-2.3.1

21 files changed, 55 insertions, 61 deletions

diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
index 306a3d67aa29..e9c1c7f5bf7c 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.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
@@ -12,8 +12,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 	kde-apps/akonadi:4
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
index 30ec168e8b6b..9cf5c3f8cc02 100644
--- a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
+++ b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
index b106a30682b0..c7452e869a97 100644
--- a/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
+++ b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
@@ -15,7 +15,7 @@ IUSE="debug"
 
 DEPEND="
 	$(add_kdeapps_dep kdepim-common-libs)
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+	$(add_kdeapps_dep kdepimlibs)
 	$(add_kdeapps_dep libkgapi '' 2.2.0)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
index e13f0aef9f02..bd24b24f9d2f 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
@@ -16,7 +16,7 @@ IUSE="debug"
 
 DEPEND="
 	$(add_kdeapps_dep kdepim-common-libs)
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
index 941901b064af..feaeb8633063 100644
--- a/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepimlibs:4
 "
 
-S=${WORKDIR}/${KMNAME}
+S=${WORKDIR}/${KMNAME}-${PV}
 
 src_prepare() {
 	cmake_comment_add_subdirectory kmime
diff --git a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
index f4cb59d61539..b2030ea64118 100644
--- a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.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
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
index 9c4b399f2f72..5663f2173f3a 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 	dev-libs/grantlee:0
 "
 RDEPEND="${DEPEND}
diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
index 7bf9565c13f9..8fc03794aeb1 100644
--- a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 	$(add_kdeapps_dep ktimezoned)
 	media-libs/phonon[qt4]
 	x11-libs/libX11
diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
index 9276f2827715..6ca79c475dac 100644
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug google"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 	app-crypt/gpgme
 	dev-libs/grantlee:0
 	kde-apps/akonadi:4
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-wizards:4
 	!<kde-apps/kmail-4.14.5:4
 	!<kde-apps/korganizer-4.5.67:4
-	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kdepim-runtime '' 4.14.11_pre20160211)
 	app-crypt/gnupg
 "
 
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
index a0ba4c711887..23ca6ab0a0ae 100644
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.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
@@ -13,8 +13,8 @@ IUSE="debug"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
index 1af6dd820bff..3266432974e9 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.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
@@ -13,28 +13,28 @@ IUSE="nls"
 SLOT="4"
 
 RDEPEND="
+	>=kde-apps/akonadiconsole-4.14.11_pre20160611:4
+	>=kde-apps/akregator-4.14.11_pre20160611:4
+	>=kde-apps/blogilo-4.14.11_pre20160611:4
+	>=kde-apps/calendarjanitor-4.14.11_pre20160611:4
+	>=kde-apps/kabcclient-4.14.11_pre20160611:4
+	>=kde-apps/kaddressbook-4.14.11_pre20160611:4
+	>=kde-apps/kalarm-4.14.11_pre20160611:4
+	>=kde-apps/kdepim-kresources-4.14.11_pre20160611:4
+	>=kde-apps/kdepim-runtime-4.14.11_pre20160211:4
+	>=kde-apps/kjots-4.14.11_pre20160611:4
+	>=kde-apps/kleopatra-4.14.11_pre20160611:4
+	>=kde-apps/kmail-4.14.11_pre20160611:4
+	>=kde-apps/knode-4.14.11_pre20160611:4
+	>=kde-apps/knotes-4.14.11_pre20160611:4
+	>=kde-apps/konsolekalendar-4.14.11_pre20160611:4
+	>=kde-apps/kontact-4.14.11_pre20160611:4
+	>=kde-apps/korganizer-4.14.11_pre20160611:4
+	>=kde-apps/ktimetracker-4.14.11_pre20160611:4
+	>=kde-apps/ktnef-4.14.11_pre20160611:4
 	kde-frameworks/oxygen-icons:5
-	$(add_kdeapps_dep akonadiconsole '' 4.14.10)
-	$(add_kdeapps_dep akregator '' 4.14.10)
-	$(add_kdeapps_dep blogilo '' 4.14.10)
-	$(add_kdeapps_dep calendarjanitor '' 4.14.10)
-	$(add_kdeapps_dep kabcclient '' 4.14.10)
-	$(add_kdeapps_dep kaddressbook '' 4.14.10)
-	$(add_kdeapps_dep kalarm '' 4.14.10)
-	$(add_kdeapps_dep kdepim-kresources '' 4.14.10)
-	$(add_kdeapps_dep kdepim-runtime '' 4.14.10)
-	$(add_kdeapps_dep kjots '' 4.14.10)
-	$(add_kdeapps_dep kleopatra '' 4.14.10)
-	$(add_kdeapps_dep kmail '' 4.14.10)
-	$(add_kdeapps_dep knode '' 4.14.10)
-	$(add_kdeapps_dep knotes '' 4.14.10)
-	$(add_kdeapps_dep konsolekalendar '' 4.14.10)
-	$(add_kdeapps_dep kontact '' 4.14.10)
-	$(add_kdeapps_dep korganizer '' 4.14.10)
-	$(add_kdeapps_dep ktimetracker '' 4.14.10)
-	$(add_kdeapps_dep ktnef '' 4.14.10)
 	nls? (
-		$(add_kdeapps_dep kde4-l10n '' 4.14.3-r1)
-		$(add_kdeapps_dep kdepim-l10n '' 4.14.3-r1)
+		>=kde-apps/kde4-l10n-4.14.3-r1:4
+		>=kde-apps/kdepim-l10n-4.14.3-r1:4
 	)
 "
diff --git a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild b/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
index 2c9f013d4e5e..973a1dc9b5bc 100644
--- a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kjots/kjots-4.14.11_pre20160611.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
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 	dev-libs/grantlee:0
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
index 50928baee175..9c26cd60a7f2 100644
--- a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
 	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 	app-crypt/gpgme
 	dev-libs/boost:=
 	dev-libs/libassuan
diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
index 33d45ed89198..ba8eeffb932c 100644
--- a/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
 	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 	$(add_kdeapps_dep korganizer)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/knode/knode-4.14.11_pre20160611.ebuild b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
index 0b846e42f5fe..f1df5772ec42 100644
--- a/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
+++ b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
@@ -17,8 +17,8 @@ IUSE="debug"
 RESTRICT=test
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-	$(add_kdeapps_dep kdepim-common-libs '' 4.12.1-r1)
+	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
index cec191efd036..faa3ea8bbd4f 100644
--- a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
+++ b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
index 0f0538ee5f51..0891c77a4428 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.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
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
index 2ff704b88d89..3833a1a69d72 100644
--- a/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
-	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
index a35b25535fd7..e3c34df5cb77 100644
--- a/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
+++ b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)' 4.14.11_pre20160611)
-	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+	$(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}
@@ -66,12 +66,6 @@ src_unpack() {
 	kde4-meta_src_unpack
 }
 
-src_prepare() {
-	use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
-
-	kde4-meta_src_prepare
-}
-
 src_install() {
 	kde4-meta_src_install
 	# colliding with kdepim-common-libs
diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
index 798d58586c32..52172df2d4b2 100644
--- a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
+++ b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep kdepim-kresources)
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
 	$(add_kdeapps_dep kdepim-common-libs)
+	$(add_kdeapps_dep kdepim-kresources)
+	$(add_kdeapps_dep kdepimlibs)
 	x11-libs/libXScrnSaver
 "
 DEPEND="${RDEPEND}
diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
index 384f3b6d3934..0f180c764a3e 100644
--- a/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.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
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+	$(add_kdeapps_dep kdepimlibs)
 	kde-apps/akonadi:4
 "
 RDEPEND="${DEPEND}"