kde-apps: KDE PIM 4.14.11_pre20160611 version bump
authorAndreas Sturmlechner <asturm@gentoo.org>
Sun, 30 Apr 2017 09:21:33 +0000 (11:21 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Mon, 1 May 2017 07:48:59 +0000 (09:48 +0200)
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:
kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
kde-apps/gpgmepp/gpgmepp-4.14.11_pre20160611.ebuild
kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
kde-apps/knode/knode-4.14.11_pre20160611.ebuild
kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild

index 306a3d67aa2975f1e3636cb6edf189051b4baea6..e9c1c7f5bf7c82298e1f8729f9da9c166a014059 100644 (file)
@@ -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}"
index 30ec168e8b6b70b8520e4a22b6beaa8988fde0e6..9cf5c3f8cc0243137e593c46f43b2c1280670982 100644 (file)
@@ -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}"
 
index b106a30682b012e55d20131022ec6b8ab9f80687..c7452e869a979868350c8856efa1a07355979913 100644 (file)
@@ -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}"
index e13f0aef9f02eb26eda8d06951ccc4a360183709..bd24b24f9d2f56ed72554cac8d82018509e5a9aa 100644 (file)
@@ -16,7 +16,7 @@ IUSE="debug"
 
 DEPEND="
        $(add_kdeapps_dep kdepim-common-libs)
-       $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+       $(add_kdeapps_dep kdepimlibs)
 "
 RDEPEND="${DEPEND}"
 
index 941901b064af8e18c446bbfa71c12065c19fa216..feaeb8633063ee01478e39ac91c08191778a3b60 100644 (file)
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
        !kde-apps/kdepimlibs:4
 "
 
-S=${WORKDIR}/${KMNAME}
+S=${WORKDIR}/${KMNAME}-${PV}
 
 src_prepare() {
        cmake_comment_add_subdirectory kmime
index f4cb59d61539f76e3cf6295eb06bc12f9d672580..b2030ea64118552b5e1092a8d581e4118661406e 100644 (file)
@@ -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}"
 
index 9c4b399f2f729e39711cc4ea5957acbdbe41c075..5663f2173f3adb31568a2758005db5540ea5e4b4 100644 (file)
@@ -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}
index 7bf9565c13f98690b7d2bd3a9fcd97ebedd8fa14..8fc03794aeb138d5e35aad4269659d2e00eb1af9 100644 (file)
@@ -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
index 9276f2827715c35cf4ab5cf216da04f1a404b9c1..6ca79c475dacc20f3cddab0b3b6147209de15538 100644 (file)
@@ -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
 "
 
index a0ba4c71188755ce34ff1427ebefa0f19206326f..23ca6ab0a0ae54d9dc391935e078b4b252c6bb4c 100644 (file)
@@ -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}"
 
index 1af6dd820bff2c0aaac31b43240226023b4fdf9c..3266432974e9c7c8a5e65363e6ca6ab26c23bc25 100644 (file)
@@ -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
        )
 "
index 2c9f013d4e5ef011647f8cdf993ac56427a17e1a..973a1dc9b5bc805dac771b83f66d9af02c14641b 100644 (file)
@@ -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}"
index 50928baee175a8a9089c78f6421aa8a0886bbc29..9c26cd60a7f2d5bb8133a96e5cb47c0d31625b5e 100644 (file)
@@ -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
index 33d45ed891980d5411f33a2a13337f7752c78193..ba8eeffb932ca993962a1d11614a1b9c43b08503 100644 (file)
@@ -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}"
index 0b846e42f5fe4c6bebb65e536d479be956530027..f1df5772ec420eb3d714b77c49146e7c03f784c9 100644 (file)
@@ -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}"
 
index cec191efd0365637a8966167a6f85c10dd9e09b8..faa3ea8bbd4faa2d6d35073fa3490a161eed8420 100644 (file)
@@ -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}"
 
index 0f0538ee5f51729ad43a44e1f4229b066a1bb03a..0891c77a4428fda020603ace0bf58d242a655fd6 100644 (file)
@@ -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}"
 
index 2ff704b88d897d701b30686df362c317bf687fd4..3833a1a69d7296c97817caa7fafa5fa960aaf68d 100644 (file)
@@ -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}"
 
index a35b25535fd73b01d21a0a468a9785390e6c501a..e3c34df5cb771c912081c631f4e80b0475ea3386 100644 (file)
@@ -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
index 798d58586c32d6b61659053d2ab2b9fe7cf64508..52172df2d4b26ccc2eb20ab74396cf5cd9a00db2 100644 (file)
@@ -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}
index 384f3b6d39343af5f756a398eb68e7671e08d801..0f180c764a3e9e15dce4d39ef861561a15ab8f03 100644 (file)
@@ -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}"