commit:     fae162e6eec54dbf959ef6c706da382aebd7d47f
Author:     Matthew Dawson <matthew <AT> mjdsystems <DOT> ca>
AuthorDate: Sat Aug  9 00:35:49 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug  9 19:21:02 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fae162e6

[kde-base/kdebase-runtime-meta] 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/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild    | 5 ++++-
 .../kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild 
b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
index 7ed9506..37d6226 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.13.97.ebuild
@@ -43,6 +43,9 @@ RDEPEND="
        $(add_kdebase_dep renamedlg-plugins)
        $(add_kdebase_dep solid-runtime)
        crash-reporter? ( $(add_kdebase_dep drkonqi ) )
-       handbook? ( $(add_kdebase_dep khelpcenter) )
+       handbook? ( || (
+               $(add_kdebase_dep khelpcenter)
+               kde-base/khelpcenter:5[compat]
+       ) )
        nepomuk? ( $(add_kdebase_dep nepomuk) )
 "

diff --git 
a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild 
b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
index 9bb6d84..c655e3e 100644
--- a/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
+++ b/kde-base/kdebase-runtime-meta/kdebase-runtime-meta-4.14.49.9999.ebuild
@@ -43,6 +43,9 @@ RDEPEND="
        $(add_kdebase_dep renamedlg-plugins)
        $(add_kdebase_dep solid-runtime)
        crash-reporter? ( $(add_kdebase_dep drkonqi ) )
-       handbook? ( $(add_kdebase_dep khelpcenter) )
+       handbook? ( || (
+               $(add_kdebase_dep khelpcenter)
+               kde-base/khelpcenter:5[compat]
+       ) )
        nepomuk? ( $(add_kdebase_dep nepomuk) )
 "

Reply via email to