commit: 2bc6934a28bd57f2910fe457bc5e29d34fe1bbdd
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Fri Aug 8 23:56:42 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 9 19:18:10 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2bc6934a
[kde-base/kdelibs] Allow kde-base/khelpcenter:5 (with the compat flag set) to
be used instead of kde-base/khelpcenter:4
Package-Manager: portage-2.2.8-r1
---
kde-base/kdelibs/kdelibs-4.13.97.ebuild | 7 ++++++-
kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdelibs/kdelibs-4.13.97.ebuild
b/kde-base/kdelibs/kdelibs-4.13.97.ebuild
index 0f0aae3..7d3b89b 100644
--- a/kde-base/kdelibs/kdelibs-4.13.97.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.13.97.ebuild
@@ -114,7 +114,12 @@ PDEPEND="
$(add_kdebase_dep kfmclient)
x11-misc/xdg-utils
)
- handbook? ( $(add_kdebase_dep khelpcenter) )
+ handbook? (
+ || (
+ $(add_kdebase_dep khelpcenter)
+ kde-base/khelpcenter:5[compat]
+ )
+ )
nepomuk? (
$(add_kdebase_dep nepomuk-core)
$(add_kdebase_dep nepomuk-widgets)
diff --git a/kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild
b/kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild
index 90479ba..b9bceb7 100644
--- a/kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild
@@ -114,7 +114,12 @@ PDEPEND="
$(add_kdebase_dep kfmclient)
x11-misc/xdg-utils
)
- handbook? ( $(add_kdebase_dep khelpcenter) )
+ handbook? (
+ || (
+ $(add_kdebase_dep khelpcenter)
+ kde-base/khelpcenter:5[compat]
+ )
+ )
nepomuk? (
$(add_kdebase_dep nepomuk-core)
$(add_kdebase_dep nepomuk-widgets)
