From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4E1061393DD for ; Sat, 9 Aug 2014 19:57:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80B1AE0990; Sat, 9 Aug 2014 19:57:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EECA2E0960 for ; Sat, 9 Aug 2014 19:57:30 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC40B340256 for ; Sat, 9 Aug 2014 19:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id ABB751881B for ; Sat, 9 Aug 2014 19:57:28 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1407611890.2bc6934a28bd57f2910fe457bc5e29d34fe1bbdd.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.13.97.ebuild kde-base/kdelibs/kdelibs-4.14.49.9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 2bc6934a28bd57f2910fe457bc5e29d34fe1bbdd X-VCS-Branch: master Date: Sat, 9 Aug 2014 19:57:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 50d5b024-1c38-4c3d-b465-78efdc090e30 X-Archives-Hash: 4cf102a606242b6c6e05cd300f2ad9e3 commit: 2bc6934a28bd57f2910fe457bc5e29d34fe1bbdd Author: Matthew Dawson mjdsystems ca> AuthorDate: Fri Aug 8 23:56:42 2014 +0000 Commit: Johannes Huber gentoo 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)