summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2014-04-05 18:04:36 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2014-04-05 18:04:36 +0000
commit438cd12b9d0d67e4d8df02a26f1557cbe1dcccd1 (patch)
tree6bd875b4df2687166eae770878c6c36b5d93df1a /kde-base
parentRemove ree18 and ruby18 target. (diff)
downloadhistorical-438cd12b9d0d67e4d8df02a26f1557cbe1dcccd1.tar.gz
historical-438cd12b9d0d67e4d8df02a26f1557cbe1dcccd1.tar.bz2
historical-438cd12b9d0d67e4d8df02a26f1557cbe1dcccd1.zip
EAPI bump, clean up blockers
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/akonadi/ChangeLog8
-rw-r--r--kde-base/akonadi/Manifest32
-rw-r--r--kde-base/akonadi/akonadi-4.4.11.1.ebuild13
3 files changed, 27 insertions, 26 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/Manifest b/kde-base/akonadi/Manifest
index 5c4b8f229aef..7349d8881f2d 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -2,23 +2,25 @@
Hash: SHA256
DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
-EBUILD akonadi-4.4.11.1.ebuild 1194 SHA256 f6d76099d7e41a43f455419b7339f4d4c927f96c9360ee02a8fd5c8e87479bd0 SHA512 2d2774402447ad53d96863767ec31e3b8081ae4cf10beae2474b702f613a201a30bee6c216fd49e7477700330dfbed58c5da3226f819be2537cfa4c3b9660c1d WHIRLPOOL 7a2ed944e4e6e40802750642a7c2b24bb2bb76018ab2fed5e54e3b139f0ea6bd987bb3c8f0519c76fc27105547e022511d1ccf6215fbc9bb50d6fb6d52d0457a
-MISC ChangeLog 12253 SHA256 e2785751178d586af60866eda2ed546b509240cf15e4574e0bdee4d96d31c4d2 SHA512 db774d9d24234c0543adaab8b85cfb424426ca185b39c4d15cec88de1ebafb3e961b2aec3f536ad0bb7ef7d795dcf9124ba40174cd5901e0a51ee0ab8194cde3 WHIRLPOOL 216d9c401a3e4828d52cb92bdc566dc4e6eb7e731a50708ffe8a97ef6b94d5ebe893949398d8c911c25c8e9b04f04dda94f9916af130d33bf8fcc0c3b1e4ac91
+EBUILD akonadi-4.4.11.1.ebuild 1040 SHA256 f4c3ef2970c4b73729e172230da29079c757a03377c08514f0f308674533f77f SHA512 810ffc07718e564bae3ac706db2c9c4ce767ba1756a934b3ee21af4a457ad66228bde1d77c0c0cd363c4d57bad4d5451a8863db2059cfb2da03720277263b532 WHIRLPOOL 9ebc1b44131be0475b5cb60109912074f730cd8d03e4dcecc89d5af352c5a0253b9f78a9e0dbc5c49fa726ba3aa8f7dc3a339e6a13a030fe00d8acc948115cd3
+MISC ChangeLog 12370 SHA256 cb34202a7b14b7ca8a8db71f89418b4a8db23be40bc04037f09a41873526e5d8 SHA512 a578e2842ceb59cc6f000e6546176bfa201c3da43b35e9598d1dde3e955062674b21ec3d123eed3f22ef9f3cdfc4b6be41917f1684c6c650b8762628c2884a01 WHIRLPOOL cbc8972580f287c34ab6d482ea0f54afedaba5f3ea6bcc058c67a29f109ef5e42911b533a3aff9e9babe23ea230ea15cb11a408f2696413e6a5e288f3fd1359d
MISC metadata.xml 264 SHA256 32efc15c63fd9700059a66f445311cb07b7f1bd882c5d9e81f9a8861d6445f54 SHA512 977e88d3d19c3e2bcf0ab8918acda9f0b413042a6f97d9dc9cc0a3033d41402f50964b6b1ece53997d7d6976c26c9afb582f5ea1e3d48fff0ebe6a9d8fd392e8 WHIRLPOOL 881e6c1a5cca813b154e3efb65e3bbca2977b663fddcef40ac323da86aad381fa3cc712c5645fbff2a946bb3d235673e5929fce64dec20e996660d38561def80
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSVl5zAAoJEPiazRVxLXTF50gP/jbz6wQzv7QXp1AZQORg3oxR
-7pVVoXspAJPLz5NTc3vBppaQiC1bnnz5Hj64q+TZXYNNbn/DTVReVY0rIPR4/yTE
-uBUGMFdPd6+OlVoFplVp4p509nBY5CTz6Gbn6P4+nA6QuijqKGs8l7mGQ7YLWBvQ
-VHwfhDQRaTvAP4k4GPp6QZH2rk+ArYw+qzi8PosXkRlV6rjwzmIogZK/4KT9hv+T
-EOCgsbrt41kMJlVejzA7hmZV9ELVGxac6QxmA6p99ADWtVHzB2zxWFGRYYoGpCm8
-65AAD7ZqHRkfW/eTLEat3JVYedn6+8Mlp5OrV+PMI9WvGZgsrCVZyYfzPCJCmoy5
-/v/hBbslV8iSUoe+FZakjGNiqMdVDtlswyfiUffixxfkpEQRKNORzHaWnTO8DwrT
-fj3p9r3bEyT6WgGzncJVa+kssKKNHea0nVLtWnS/IETZTGEcQA1+LOWyxZA6GpbT
-O2t6qi6Aelm+gwtgge6kZwbeq2uxBLqqofCJE22YeO1iAeh6azckLFZU2Kis3Kxp
-6dPvsqK8MsgIkQIOgHmSIGpQoD3xcW/QqRe6v6mpC0OGLYDoAZhkYRxbPfEm6gea
-V+RpDnn+Ogbqbtrx50bbGMv4QRnzqm2gF0jXTDmxvlMFcNd8oqpOP6UVFbfgJefo
-FyfSHHhH2OlZONwVOTbA
-=H8Cm
+iQJ8BAEBCABmBQJTQEW0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcyVEQALdLLa9FH6Bfn6YPgFWPIqa1
+F7qp14ZwoBKpTN4l9Fou0CvIf7KxCxmb0E787wCUSxSs6ZCCVML5yV3c3SYhxRI6
+nd0zaiNLnRKW7seuI+GLFKW+XIN1u+6BifcoV2xxWwR+9RPagF2biVOXauaYtOdq
+g1bfeBRwSK3ry23o2OuXZLx4HcC2W84jYCQTotL1/Epgf7tSVx2DRmVud0DKK7Ak
+H0i8e3z/zATSDx9abBu/WTsSYvJT0aNwMbDyp9ZHq8nOor4+vibw2GxiDALrw5rY
+tHsOJ/7UDfhti0ocZOOw40JrEVcAvWZkS/uaY7VUm8/XITwOwEsaWXbFx0UdRvlD
+crm0aeIJfef5Wa769rOqbSFYvE2mbYFTQ4EqAGoovsoHvJEnhDf9lMzo8LzM/Ib7
+QLFz7gn+CU/vEYusU0EkJRp99M0cfKprJd8tfprxLmo0BIcy7YpeDhxgzobqxQRj
+E/jzgY3+t1qjfh+slGLz2kxbfrDWwjGnIQ8B963vl3tEyjzpvs08h9YfI0Y3X9VA
+1TXn72dy/Qp2mcHlmItiDn9rvN7SeExyZ8AYgZUPStZOBvPVQwfNdZBQ+W/ybqoo
+/XO0ymEuXVXGus1Zk/gzyR96Osi//Qo1ivLXWkBlE7WWL9xRiK440HKtO+WXZ/d6
+3xoeYkea0I5svCmTxT7i
+=EfJm
-----END PGP SIGNATURE-----
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