1 |
These are handbook files installed by hundreds of packages to a |
2 |
central location, to be accessed by KDE Helpcenter application, |
3 |
with compressed index cache files. |
4 |
|
5 |
This leads to the following QA issues on every package w/ USE handbook: |
6 |
* The ebuild is installing to one or more unexpected paths |
7 |
* One or more compressed files were found in docompress-ed directories |
8 |
|
9 |
We'll use the EAPI-7 transition to move the location from previously |
10 |
/usr/share/doc/HTML to /usr/share/kde-doc, similar to gtk-doc. To minimise |
11 |
interruption for users of khelpcenter, the stabilisation of EAPI-7 ebuilds |
12 |
will be done in bulk for all kde-*/ packages. |
13 |
|
14 |
As a side-effect, we will be able to drop the workaround for disabling |
15 |
auto compression of files beneath /usr/share/doc together with EAPI-6. |
16 |
|
17 |
Bug: https://bugs.gentoo.org/667138 |
18 |
Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
19 |
--- |
20 |
eclass/kde5.eclass | 14 +++++++++----- |
21 |
1 file changed, 9 insertions(+), 5 deletions(-) |
22 |
|
23 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
24 |
index d6c790fe52..a0cedc1f35 100644 |
25 |
--- a/eclass/kde5.eclass |
26 |
+++ b/eclass/kde5.eclass |
27 |
@@ -636,6 +636,8 @@ kde5_src_configure() { |
28 |
# install mkspecs in the same directory as qt stuff |
29 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
30 |
) |
31 |
+ # move handbook outside of doc dir for at least two QA warnings, bug 667138 |
32 |
+ [[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/kde-doc" ) |
33 |
fi |
34 |
|
35 |
# allow the ebuild to override what we set here |
36 |
@@ -705,11 +707,13 @@ kde5_src_install() { |
37 |
docompress -x /usr/share/doc/qt-${pv} |
38 |
fi |
39 |
|
40 |
- # We don't want /usr/share/doc/HTML to be compressed, |
41 |
- # because then khelpcenter can't find the docs |
42 |
- #todo: clean up trailing slash check when EAPI <7 is removed |
43 |
- if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then |
44 |
- docompress -x /usr/share/doc/HTML |
45 |
+ if [[ ${EAPI} = 6 ]]; then |
46 |
+ # We don't want /usr/share/doc/HTML to be compressed, |
47 |
+ # because then khelpcenter can't find the docs |
48 |
+ #todo: clean up trailing slash check when EAPI <7 is removed |
49 |
+ if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then |
50 |
+ docompress -x /usr/share/doc/HTML |
51 |
+ fi |
52 |
fi |
53 |
} |
54 |
|
55 |
-- |
56 |
2.20.1 |