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 303C4138239 for ; Mon, 28 Jan 2019 19:59:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD354E0985; Mon, 28 Jan 2019 19:59:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 79DEFE0978 for ; Mon, 28 Jan 2019 19:59:54 +0000 (UTC) Received: from tuxbrain.localnet (178-191-225-152.adsl.highway.telekom.at [178.191.225.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: asturm) by smtp.gentoo.org (Postfix) with ESMTPSA id DDC53335D42 for ; Mon, 28 Jan 2019 19:59:52 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] kde5.eclass: Relocate KDE_INSTALL_DOCBUNDLEDIR to /usr/share/kde-doc Date: Mon, 28 Jan 2019 20:59:32 +0100 Message-ID: <3404430.aZ3QZWaWyv@tuxbrain> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Archives-Salt: 2e09a83f-f191-4a51-b76d-ece0a8f0b494 X-Archives-Hash: 78c65f22bc04eed110776ef79ee631bd 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/kde-doc, similar to gtk-doc. To minimise interruption for users of khelpcenter, the stabilisation of EAPI-7 ebuilds will be done in bulk for all kde-*/ packages. 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. Bug: https://bugs.gentoo.org/667138 Signed-off-by: Andreas Sturmlechner --- eclass/kde5.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index d6c790fe52..a0cedc1f35 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/kde-doc" ) 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 } -- 2.20.1