1 |
commit: 2fb6ab9768812b92412e49f6a2c2c3362ad7fb74 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 17 21:54:10 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 17 23:01:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb6ab97 |
7 |
|
8 |
kde-frameworks/kdoctools: Drop use of deprecated KDEInstallDirs vars |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
...tools-5.61.0-nondeprecated-kdeinstalldirs.patch | 89 ++++++++++++++++++++++ |
14 |
.../kdoctools/kdoctools-5.61.0-r1.ebuild | 49 ++++++++++++ |
15 |
2 files changed, 138 insertions(+) |
16 |
|
17 |
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch b/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..ea250cb305c |
20 |
--- /dev/null |
21 |
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch |
22 |
@@ -0,0 +1,89 @@ |
23 |
+From 2a23bf672f25da3a0b6619969f308133fbd92a7c Mon Sep 17 00:00:00 2001 |
24 |
+From: Andreas Sturmlechner <asturm@g.o> |
25 |
+Date: Sat, 17 Aug 2019 22:42:39 +0200 |
26 |
+Subject: [PATCH] KF5DocToolsMacros.cmake: Use non-deprecated KDEInstallDirs |
27 |
+ variables |
28 |
+ |
29 |
+Summary: |
30 |
+HTML_INSTALL_DIR -> KDE_INSTALL_DOCBUNDLEDIR |
31 |
+MAN_INSTALL_DIR -> KDE_INSTALL_MANDIR |
32 |
+ |
33 |
+BUG: 410998 |
34 |
+ |
35 |
+Test Plan: Install paths are correct by example of marble. |
36 |
+ |
37 |
+Subscribers: kde-frameworks-devel, kde-doc-english |
38 |
+ |
39 |
+Tags: #frameworks, #documentation |
40 |
+ |
41 |
+Differential Revision: https://phabricator.kde.org/D23229 |
42 |
+--- |
43 |
+ KF5DocToolsMacros.cmake | 30 +++++++++++++++++++----------- |
44 |
+ 1 file changed, 19 insertions(+), 11 deletions(-) |
45 |
+ |
46 |
+diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake |
47 |
+index 88a2b3e..91d8736 100644 |
48 |
+--- a/KF5DocToolsMacros.cmake |
49 |
++++ b/KF5DocToolsMacros.cmake |
50 |
+@@ -63,13 +63,13 @@ |
51 |
+ # |
52 |
+ # KDOCTOOLS_INSTALL(po) does the following: |
53 |
+ # - Create man pages from footool.1.docbook and footool.conf.5.docbook, |
54 |
+-# install them in ${MAN_INSTALL_DIR}/fr |
55 |
++# install them in ${KDE_INSTALL_MANDIR}/fr |
56 |
+ # - Create handbooks from index.docbook files, install the one from the |
57 |
+-# fooslave/ directory in ${HTML_INSTALL_DIR}/fr/kioslave5/fooslave |
58 |
+-# and the one from the docs/ directory in $[HTML_INSTALL_DIR}/fr |
59 |
++# fooslave/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr/kioslave5/fooslave |
60 |
++# and the one from the docs/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr |
61 |
+ # |
62 |
+-# If ${HTML_INSTALL_DIR} is not set, share/doc/HTML is used instead. |
63 |
+-# If ${MAN_INSTALL_DIR} is not set, share/man/<lang> is used instead. |
64 |
++# If ${KDE_INSTALL_DOCBUNDLEDIR} is not set, share/doc/HTML is used instead. |
65 |
++# If ${KDE_INSTALL_MANDIR} is not set, share/man/<lang> is used instead. |
66 |
+ # |
67 |
+ # KDOCTOOLS_MEINPROC_EXECUTABLE - the meinproc5 executable |
68 |
+ # |
69 |
+@@ -232,11 +232,19 @@ endfunction() |
70 |
+ |
71 |
+ function(kdoctools_install podir) |
72 |
+ file(GLOB lang_dirs "${podir}/*") |
73 |
+- if (NOT MAN_INSTALL_DIR) |
74 |
+- set(MAN_INSTALL_DIR share/man) |
75 |
++ if (NOT KDE_INSTALL_MANDIR) |
76 |
++ if (MAN_INSTALL_DIR) # TODO KF6: deprecated, remove |
77 |
++ set(KDE_INSTALL_MANDIR ${MAN_INSTALL_DIR}) |
78 |
++ else() |
79 |
++ set(KDE_INSTALL_MANDIR share/man) |
80 |
++ endif() |
81 |
+ endif() |
82 |
+- if (NOT HTML_INSTALL_DIR) |
83 |
+- set(HTML_INSTALL_DIR share/doc/HTML) |
84 |
++ if (NOT KDE_INSTALL_DOCBUNDLEDIR) |
85 |
++ if (HTML_INSTALL_DIR) # TODO KF6: deprecated, remove |
86 |
++ set(KDE_INSTALL_DOCBUNDLEDIR ${HTML_INSTALL_DIR}) |
87 |
++ else() |
88 |
++ set(KDE_INSTALL_DOCBUNDLEDIR share/doc/HTML) |
89 |
++ endif() |
90 |
+ endif() |
91 |
+ foreach(lang_dir ${lang_dirs}) |
92 |
+ get_filename_component(lang ${lang_dir} NAME) |
93 |
+@@ -246,13 +254,13 @@ function(kdoctools_install podir) |
94 |
+ string(REGEX MATCH "\\.([0-9])\\.docbook" match ${docbook}) |
95 |
+ if (match) |
96 |
+ kdoctools_create_manpage(${docbook} ${CMAKE_MATCH_1} |
97 |
+- INSTALL_DESTINATION ${MAN_INSTALL_DIR}/${lang} |
98 |
++ INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}/${lang} |
99 |
+ ) |
100 |
+ else() |
101 |
+ string(REGEX MATCH "${lang_dir}/docs/(.*)/index.docbook" match ${docbook}) |
102 |
+ if (match) |
103 |
+ kdoctools_create_handbook(${docbook} |
104 |
+- INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${lang} |
105 |
++ INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/${lang} |
106 |
+ SUBDIR ${CMAKE_MATCH_1} |
107 |
+ ) |
108 |
+ endif() |
109 |
+-- |
110 |
+2.22.1 |
111 |
+ |
112 |
|
113 |
diff --git a/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild |
114 |
new file mode 100644 |
115 |
index 00000000000..1027f3f8456 |
116 |
--- /dev/null |
117 |
+++ b/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild |
118 |
@@ -0,0 +1,49 @@ |
119 |
+# Copyright 1999-2019 Gentoo Authors |
120 |
+# Distributed under the terms of the GNU General Public License v2 |
121 |
+ |
122 |
+EAPI=7 |
123 |
+ |
124 |
+KDE_QTHELP="false" |
125 |
+inherit kde5 |
126 |
+ |
127 |
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files" |
128 |
+LICENSE="MIT" |
129 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
130 |
+IUSE="nls" |
131 |
+ |
132 |
+BDEPEND=" |
133 |
+ dev-lang/perl |
134 |
+ dev-perl/URI |
135 |
+ nls? ( $(add_frameworks_dep ki18n) ) |
136 |
+" |
137 |
+DEPEND=" |
138 |
+ $(add_frameworks_dep karchive) |
139 |
+ app-text/docbook-xml-dtd:4.5 |
140 |
+ app-text/docbook-xsl-stylesheets |
141 |
+ app-text/sgml-common |
142 |
+ dev-libs/libxml2:2 |
143 |
+ dev-libs/libxslt |
144 |
+" |
145 |
+RDEPEND="${DEPEND}" |
146 |
+ |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" |
149 |
+ "${FILESDIR}/${P}-nondeprecated-kdeinstalldirs.patch" |
150 |
+) |
151 |
+ |
152 |
+src_configure() { |
153 |
+ local mycmakeargs=( |
154 |
+ $(cmake-utils_use_find_package nls KF5I18n) |
155 |
+ ) |
156 |
+ |
157 |
+ kde5_src_configure |
158 |
+} |
159 |
+ |
160 |
+src_test() { |
161 |
+ # bug 665622 |
162 |
+ local myctestargs=( |
163 |
+ -E "(kdoctools_install)" |
164 |
+ ) |
165 |
+ |
166 |
+ kde5_src_test |
167 |
+} |