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 E00F91388C0 for ; Tue, 23 Feb 2016 14:20:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C2E6E07E2; Tue, 23 Feb 2016 14:20:54 +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 E92FCE07E2 for ; Tue, 23 Feb 2016 14:20:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E960340BD2 for ; Tue, 23 Feb 2016 14:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90B0416C5 for ; Tue, 23 Feb 2016 14:20:45 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1456237236.b2e462d4e891bb2ec966fd414cac684561428644.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kleopatra/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kleopatra/kleopatra-9999.ebuild X-VCS-Directories: kde-apps/kleopatra/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b2e462d4e891bb2ec966fd414cac684561428644 X-VCS-Branch: master Date: Tue, 23 Feb 2016 14:20:45 +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: c50ff8a6-6d59-4929-837b-a77cd20fd1cb X-Archives-Hash: 6c76f7d65ba0ec21c3eeafeab6f74a62 commit: b2e462d4e891bb2ec966fd414cac684561428644 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Feb 20 12:52:36 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Feb 23 14:20:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b2e462d4 kde-apps/kleopatra: Inject KF5DocTools, add kwatchgnupg doc dir Small update to RDEPENDs. Package-Manager: portage-2.2.27 kde-apps/kleopatra/kleopatra-9999.ebuild | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild b/kde-apps/kleopatra/kleopatra-9999.ebuild index e82ff84..804ca59 100644 --- a/kde-apps/kleopatra/kleopatra-9999.ebuild +++ b/kde-apps/kleopatra/kleopatra-9999.ebuild @@ -47,10 +47,10 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext " RDEPEND="${COMMON_DEPEND} - !kde-apps/kleopatra:4 !kde-apps/kdepim[kdepim_features_kleopatra] + !=app-crypt/gnupg-2.1 " if [[ ${KDE_BUILD_TYPE} = live ]] ; then @@ -60,8 +60,18 @@ else fi src_prepare() { - mv "${WORKDIR}/${P}/doc/${PN}" doc || die "Failed to move handbook" + # kleopatra subproject does not contain doc nor searches for DocTools + # at least until properly split upstream echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir" + mkdir doc || die "Failed to create doc dir" + mv ../doc/${PN} doc || die "Failed to move handbook" + mv ../doc/kwatchgnupg doc || die "Failed to move handbook" + cat <<-EOF > doc/CMakeLists.txt +find_package(KF5DocTools) +add_subdirectory(${PN}) +add_subdirectory(kwatchgnupg) +EOF + kde5_src_prepare }