summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2014-04-05 18:04:35 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2014-04-05 18:04:35 +0000
commite414dd0476a654a3ffc65429972e126d2770edbc (patch)
tree69635928c65aca490d4051ebd150e939e2eacead /kde-base
parentRemove ree18 and ruby18 target. (diff)
downloadgentoo-2-e414dd0476a654a3ffc65429972e126d2770edbc.tar.gz
gentoo-2-e414dd0476a654a3ffc65429972e126d2770edbc.tar.bz2
gentoo-2-e414dd0476a654a3ffc65429972e126d2770edbc.zip
EAPI bump, clean up blockers
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/akonadi/ChangeLog8
-rw-r--r--kde-base/akonadi/akonadi-4.4.11.1.ebuild13
2 files changed, 10 insertions, 11 deletions
diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index e39edf472ae4..7ffc3681cd8e 100644
--- a/kde-base/akonadi/ChangeLog
+++ b/kde-base/akonadi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/akonadi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.98 2013/10/10 05:26:49 creffett Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.99 2014/04/05 18:04:35 dilfridge Exp $
+
+ 05 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ akonadi-4.4.11.1.ebuild:
+ EAPI bump, clean up blockers
*akonadi-4.4.11.1 (10 Oct 2013)
diff --git a/kde-base/akonadi/akonadi-4.4.11.1.ebuild b/kde-base/akonadi/akonadi-4.4.11.1.ebuild
index f812abdf9735..cc08e23a15ad 100644
--- a/kde-base/akonadi/akonadi-4.4.11.1.ebuild
+++ b/kde-base/akonadi/akonadi-4.4.11.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.11.1.ebuild,v 1.12 2013/10/10 05:26:49 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.11.1.ebuild,v 1.13 2014/04/05 18:04:35 dilfridge Exp $
-EAPI=4
+EAPI=5
KMNAME="kdepim"
inherit kde4-meta
@@ -17,6 +17,7 @@ DEPEND="
$(add_kdebase_dep kdelibs 'semantic-desktop(+)' 4.6)
$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 4.6)
$(add_kdebase_dep libkdepim)
+ !kde-base/akonadiconsole
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepim-runtime)
@@ -26,12 +27,6 @@ KMEXTRA="
akonadiconsole/
"
-# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
-add_blocker kdemaildir
-add_blocker kdepim-kresources '<4.2.95'
-# bug #428182
-add_blocker akonadiconsole
-
src_configure() {
mycmakeargs=(
# Set the dbus dirs, otherwise it searches in KDEDIR