public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/calendarjanitor/, kde-apps/blogilo/, ...
@ 2017-05-01  8:03 Andreas Sturmlechner
  0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2017-05-01  8:03 UTC (permalink / raw
  To: gentoo-commits

commit:     1aa05448c16f239e49f86f6efff02f12a5ab3f05
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 09:21:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  1 07:48:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa05448

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 <AT> Apache.Org>
Gentoo-bug: 611818
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../akonadiconsole-4.14.11_pre20160611.ebuild      |  4 +-
 .../akregator/akregator-4.14.11_pre20160611.ebuild |  2 +-
 .../blogilo/blogilo-4.14.11_pre20160611.ebuild     |  2 +-
 .../calendarjanitor-4.14.11_pre20160611.ebuild     |  2 +-
 .../gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild     |  2 +-
 .../kabcclient-4.14.11_pre20160611.ebuild          |  4 +-
 .../kaddressbook-4.14.11_pre20160611.ebuild        |  4 +-
 kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild  |  2 +-
 .../kdepim-common-libs-4.14.11_pre20160611.ebuild  |  4 +-
 .../kdepim-kresources-4.14.11_pre20160611.ebuild   |  4 +-
 .../kdepim-meta-4.14.11_pre20160611.ebuild         | 44 +++++++++++-----------
 kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild    |  4 +-
 .../kleopatra/kleopatra-4.14.11_pre20160611.ebuild |  2 +-
 kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild    |  2 +-
 kde-apps/knode/knode-4.14.11_pre20160611.ebuild    |  4 +-
 kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild  |  2 +-
 .../konsolekalendar-4.14.11_pre20160611.ebuild     |  6 +--
 .../kontact/kontact-4.14.11_pre20160611.ebuild     |  4 +-
 .../korganizer-4.14.11_pre20160611.ebuild          | 10 +----
 .../ktimetracker-4.14.11_pre20160611.ebuild        |  4 +-
 kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild    |  4 +-
 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 306a3d67aa2..e9c1c7f5bf7 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 30ec168e8b6..9cf5c3f8cc0 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 b106a30682b..c7452e869a9 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 e13f0aef9f0..bd24b24f9d2 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 941901b064a..feaeb863306 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 f4cb59d6153..b2030ea6411 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 9c4b399f2f7..5663f2173f3 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 7bf9565c13f..8fc03794aeb 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 9276f282771..6ca79c475da 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 a0ba4c71188..23ca6ab0a0a 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 1af6dd820bf..3266432974e 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 2c9f013d4e5..973a1dc9b5b 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 50928baee17..9c26cd60a7f 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 33d45ed8919..ba8eeffb932 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 0b846e42f5f..f1df5772ec4 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 cec191efd03..faa3ea8bbd4 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 0f0538ee5f5..0891c77a442 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 2ff704b88d8..3833a1a69d7 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 a35b25535fd..e3c34df5cb7 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 798d58586c3..52172df2d4b 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 384f3b6d393..0f180c764a3 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}"


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-05-01  8:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-01  8:03 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/calendarjanitor/, kde-apps/blogilo/, Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox