Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/keditbookmarks/
Date: Wed, 04 Jan 2017 09:52:06
Message-Id: 1483479620.14c53a6693461af31c41af8937ea34ea825444fe.asturm@gentoo
1 commit: 14c53a6693461af31c41af8937ea34ea825444fe
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 3 21:40:20 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 3 21:40:20 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14c53a66
7
8 kde-apps/keditbookmarks: Add USE=man, add blocker
9
10 kde-apps/konqueror:4 file collision:
11 /usr/share/man/man1/kbookmarkmerger.1.bz2
12
13 Package-Manager: portage-2.3.0
14
15 .../keditbookmarks/keditbookmarks-16.12.49.9999.ebuild | 14 ++++++++++++--
16 kde-apps/keditbookmarks/keditbookmarks-9999.ebuild | 14 ++++++++++++--
17 kde-apps/keditbookmarks/metadata.xml | 3 +++
18 3 files changed, 27 insertions(+), 4 deletions(-)
19
20 diff --git a/kde-apps/keditbookmarks/keditbookmarks-16.12.49.9999.ebuild b/kde-apps/keditbookmarks/keditbookmarks-16.12.49.9999.ebuild
21 index d953530..014869a 100644
22 --- a/kde-apps/keditbookmarks/keditbookmarks-16.12.49.9999.ebuild
23 +++ b/kde-apps/keditbookmarks/keditbookmarks-16.12.49.9999.ebuild
24 @@ -11,7 +11,7 @@ inherit kde5
25
26 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
27 KEYWORDS=""
28 -IUSE=""
29 +IUSE="+man"
30
31 DEPEND="
32 $(add_frameworks_dep kbookmarks)
33 @@ -32,4 +32,14 @@ DEPEND="
34 $(add_qt_dep qtwidgets)
35 $(add_qt_dep qtxml)
36 "
37 -RDEPEND="${DEPEND}"
38 +RDEPEND="${DEPEND}
39 + man? ( !kde-apps/konqueror:4 )
40 +"
41 +
42 +src_prepare(){
43 + kde5_src_prepare
44 +
45 + if ! use man ; then
46 + sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
47 + fi
48 +}
49
50 diff --git a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild b/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
51 index d953530..014869a 100644
52 --- a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
53 +++ b/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
54 @@ -11,7 +11,7 @@ inherit kde5
55
56 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
57 KEYWORDS=""
58 -IUSE=""
59 +IUSE="+man"
60
61 DEPEND="
62 $(add_frameworks_dep kbookmarks)
63 @@ -32,4 +32,14 @@ DEPEND="
64 $(add_qt_dep qtwidgets)
65 $(add_qt_dep qtxml)
66 "
67 -RDEPEND="${DEPEND}"
68 +RDEPEND="${DEPEND}
69 + man? ( !kde-apps/konqueror:4 )
70 +"
71 +
72 +src_prepare(){
73 + kde5_src_prepare
74 +
75 + if ! use man ; then
76 + sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
77 + fi
78 +}
79
80 diff --git a/kde-apps/keditbookmarks/metadata.xml b/kde-apps/keditbookmarks/metadata.xml
81 index 2fdbf33..ac7f14a 100644
82 --- a/kde-apps/keditbookmarks/metadata.xml
83 +++ b/kde-apps/keditbookmarks/metadata.xml
84 @@ -5,4 +5,7 @@
85 <email>kde@g.o</email>
86 <name>Gentoo KDE Project</name>
87 </maintainer>
88 + <use>
89 + <flag name="man">Build and install man pages</flag>
90 + </use>
91 </pkgmetadata>