diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-09-10 04:49:48 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-09-10 04:49:48 +1000 |
| commit | c0d5a579feecea4542fa756a9e78f672528a2f47 (patch) | |
| tree | 37afd086098ebcee8f78b9e383937dc0f3eb4dae | |
| parent | 5e32ecedd44e304df7771763743096cb5ebf2926 (diff) | |
| parent | e3c9bbaeb78a3af32bd7658c6dfb1dee61c1cfc1 (diff) | |
| download | kde-c0d5a579feecea4542fa756a9e78f672528a2f47.tar.gz kde-c0d5a579feecea4542fa756a9e78f672528a2f47.tar.bz2 kde-c0d5a579feecea4542fa756a9e78f672528a2f47.zip | |
Merge branch 'master' into frameworks
| -rw-r--r-- | app-office/akonadi-server/akonadi-server-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.11.49.9999.ebuild | 3 | ||||
| -rw-r--r-- | kde-base/marble/marble-9999.ebuild | 3 | ||||
| -rw-r--r-- | net-libs/libkgapi/libkgapi-9999.ebuild | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild index bcdc6537a25..e94b0f8e2e1 100644 --- a/app-office/akonadi-server/akonadi-server-9999.ebuild +++ b/app-office/akonadi-server/akonadi-server-9999.ebuild @@ -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/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild index dc2df636c3f..1aefbb8d7db 100644 --- a/kde-base/marble/marble-4.11.49.9999.ebuild +++ b/kde-base/marble/marble-4.11.49.9999.ebuild @@ -20,8 +20,9 @@ RESTRICT="test" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 - dev-qt/qtgui:4[dbus(+)] + dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild index dc2df636c3f..1aefbb8d7db 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -20,8 +20,9 @@ RESTRICT="test" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 - dev-qt/qtgui:4[dbus(+)] + dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 diff --git a/net-libs/libkgapi/libkgapi-9999.ebuild b/net-libs/libkgapi/libkgapi-9999.ebuild index b36c371b39a..f740ab9f324 100644 --- a/net-libs/libkgapi/libkgapi-9999.ebuild +++ b/net-libs/libkgapi/libkgapi-9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +KDE_MINIMAL="4.10" + inherit kde4-base DESCRIPTION="Library for accessing Google calendar and contact resources" |