summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-09-08 13:54:37 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-09-08 13:54:37 +0000
commit8db98a69165efbfa581289ef26d36fd4bb55514f (patch)
treec9da8b1f2a01f3f3f90fa4611a193efb5bfd3d20 /app-office/akonadi-server
parentAdd patch to fix build with KDE 4.10, wrt bug #484102. (diff)
downloadgentoo-2-8db98a69165efbfa581289ef26d36fd4bb55514f.tar.gz
gentoo-2-8db98a69165efbfa581289ef26d36fd4bb55514f.tar.bz2
gentoo-2-8db98a69165efbfa581289ef26d36fd4bb55514f.zip
Correct dependencies wrt bug #484166.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'app-office/akonadi-server')
-rw-r--r--app-office/akonadi-server/ChangeLog6
-rw-r--r--app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild4
-rw-r--r--app-office/akonadi-server/akonadi-server-1.9.2.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index ccd6bee6bc1f..4504754cf0b6 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.123 2013/08/13 21:35:45 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.124 2013/09/08 13:54:37 kensington Exp $
+
+ 08 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+ akonadi-server-1.10.2-r1.ebuild, akonadi-server-1.9.2.ebuild:
+ Correct dependencies wrt bug #484166.
*akonadi-server-1.10.2-r1 (13 Aug 2013)
diff --git a/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild
index 648dad6ecd1a..50101b4f396b 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild,v 1.1 2013/08/13 21:35:45 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild,v 1.2 2013/09/08 13:54:37 kensington Exp $
EAPI=5
@@ -33,7 +33,7 @@ CDEPEND="
qt4? (
>=dev-qt/qtcore-4.5.0:4
>=dev-qt/qtdbus-4.5.0:4
- >=dev-qt/qtgui-4.5.0:4[dbus(+)]
+ >=dev-qt/qtgui-4.5.0:4
>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
>=dev-qt/qttest-4.5.0:4
)
diff --git a/app-office/akonadi-server/akonadi-server-1.9.2.ebuild b/app-office/akonadi-server/akonadi-server-1.9.2.ebuild
index 09ecfac85c25..730c09138b42 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.2.ebuild,v 1.6 2013/07/10 04:47:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.2.ebuild,v 1.7 2013/09/08 13:54:37 kensington Exp $
EAPI=5
@@ -27,7 +27,8 @@ IUSE="+mysql postgres sqlite test"
CDEPEND="
dev-libs/boost:=
>=dev-libs/soprano-2.6.51
- >=dev-qt/qtgui-4.5.0:4[dbus(+)]
+ >=dev-qt/qtdbus-4.5.0:4
+ >=dev-qt/qtgui-4.5.0:4
>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
>=dev-qt/qttest-4.5.0:4
x11-misc/shared-mime-info