From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9592138334 for ; Tue, 29 Jan 2019 17:22:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF68BE0CAB; Tue, 29 Jan 2019 17:22:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0C3CE0CAB for ; Tue, 29 Jan 2019 17:22:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19CFC335DA6 for ; Tue, 29 Jan 2019 17:22:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D4EB4E3 for ; Tue, 29 Jan 2019 17:22:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1548714882.290bbd89e17c723ca268f36ed01d2256c372a015.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 290bbd89e17c723ca268f36ed01d2256c372a015 X-VCS-Branch: master Date: Tue, 29 Jan 2019 17:22:51 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46a78d43-e396-4a11-804e-d94b9af3166f X-Archives-Hash: 2fd8dd16c1b7422bd74ce19463d99d8e commit: 290bbd89e17c723ca268f36ed01d2256c372a015 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 28 19:29:12 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 28 22:34:42 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=290bbd89 kde5.eclass: Relocate KDE_INSTALL_DOCBUNDLEDIR to /usr/share/help These are handbook files installed by hundreds of packages to a central location, to be accessed by KDE Helpcenter application, with compressed index cache files. This leads to the following QA issues on every package w/ USE handbook: * The ebuild is installing to one or more unexpected paths * One or more compressed files were found in docompress-ed directories We'll use the EAPI-7 transition to move the location from previously /usr/share/doc/HTML to /usr/share/help [1]. Transition for khelpcenter will be seemless as kde-frameworks/kdoctools can be easily patched to accept both locations, until eventually /usr/share/doc/HTML is empty. As a side-effect, we will be able to drop the workaround for disabling auto compression of files beneath /usr/share/doc together with EAPI-6. [1] See also: https://www.freedesktop.org/wiki/Specifications/help-system/ It is also the path upstream intends to migrate to in the future. Bug: https://bugs.gentoo.org/667138 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index d6c790fe52..b25679a76c 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -636,6 +636,8 @@ kde5_src_configure() { # install mkspecs in the same directory as qt stuff -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) + # move handbook outside of doc dir for at least two QA warnings, bug 667138 + [[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" ) fi # allow the ebuild to override what we set here @@ -705,11 +707,13 @@ kde5_src_install() { docompress -x /usr/share/doc/qt-${pv} fi - # We don't want /usr/share/doc/HTML to be compressed, - # because then khelpcenter can't find the docs - #todo: clean up trailing slash check when EAPI <7 is removed - if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then - docompress -x /usr/share/doc/HTML + if [[ ${EAPI} = 6 ]]; then + # We don't want /usr/share/doc/HTML to be compressed, + # because then khelpcenter can't find the docs + #todo: clean up trailing slash check when EAPI <7 is removed + if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then + docompress -x /usr/share/doc/HTML + fi fi }