[gentoo-commits] proj/kde:master commit in: kde-apps/kleopatra/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     b2e462d4e891bb2ec966fd414cac684561428644
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 12:52:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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]
+	!<kde-apps/kdepim-15.12.2-r1
 	$(add_kdeapps_dep kdepim-runtime)
-	app-crypt/gnupg
+	>=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
 }