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 85164138335 for ; Thu, 28 Feb 2019 14:19:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AA78E08D0; Thu, 28 Feb 2019 14:19:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3F7E6E08CD for ; Thu, 28 Feb 2019 14:19:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ABA8C335D01 for ; Thu, 28 Feb 2019 14:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2497C551 for ; Thu, 28 Feb 2019 14:19:53 +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: <1551363393.f4614e567024e4179e1a16c879653d2e22c5d836.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f4614e567024e4179e1a16c879653d2e22c5d836 X-VCS-Branch: master Date: Thu, 28 Feb 2019 14:19:53 +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: c1f9d652-6e3d-43aa-aa11-256fdff3486a X-Archives-Hash: 0b4a03737b09edf74387bb348912079c commit: f4614e567024e4179e1a16c879653d2e22c5d836 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 31 19:47:20 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 28 14:16:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4614e56 qt5-build.eclass: Relocate QT5_DOCDIR to /usr/share/qt5-doc Acked-by: Michael Palimaka gentoo.org> Bug: https://bugs.gentoo.org/667280 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 2f1e6e68..613af912 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -256,7 +256,9 @@ qt5-build_src_install() { popd >/dev/null || die - docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then + docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + fi # install an empty Gentoo/gentoo-qconfig.h in ${D} # so that it's placed under package manager control @@ -414,7 +416,11 @@ qt5_prepare_env() { QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports QT5_QMLDIR=${QT5_ARCHDATADIR}/qml QT5_DATADIR=${QT5_PREFIX}/share/qt5 - QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then + QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + else + QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc + fi QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations QT5_EXAMPLESDIR=${QT5_DATADIR}/examples QT5_TESTSDIR=${QT5_DATADIR}/tests