Please update it to current version and make the following changes: 1. Installation directory has to be obtained from qmake (adds support for beta and rc releases, apart from sanity): local dest=$($(qt5_get_bindir)/qmake -query QT_INSTALL_DOCS) 2. Install only qch files or make html optional to decrease package size (makes it almost half smaller).
Created attachment 532668 [details, diff] Proposed changes
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97eca49854422fa568ba75968a196ce38e5ffba3 commit 97eca49854422fa568ba75968a196ce38e5ffba3 Author: Davide Pesavento <pesa@gentoo.org> AuthorDate: 2018-07-05 04:50:47 +0000 Commit: Davide Pesavento <pesa@gentoo.org> CommitDate: 2018-07-05 04:51:16 +0000 dev-qt/qt-docs: version bump 5.11.1_p201806180847 Bug: https://bugs.gentoo.org/656336 Package-Manager: Portage-2.3.41, Repoman-2.3.9 dev-qt/qt-docs/Manifest | 8 +++ dev-qt/qt-docs/qt-docs-5.11.1_p201806180847.ebuild | 61 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1fa0b3a844eabc1ac1430aa4713595d61aad51 commit de1fa0b3a844eabc1ac1430aa4713595d61aad51 Author: Davide Pesavento <pesa@gentoo.org> AuthorDate: 2018-07-05 04:37:43 +0000 Commit: Davide Pesavento <pesa@gentoo.org> CommitDate: 2018-07-05 04:51:14 +0000 dev-qt/qt-docs: version bump 5.9.6_p201806072055 Bug: https://bugs.gentoo.org/656336 Package-Manager: Portage-2.3.41, Repoman-2.3.9 dev-qt/qt-docs/Manifest | 9 ++++ dev-qt/qt-docs/metadata.xml | 10 ++++ dev-qt/qt-docs/qt-docs-5.9.6_p201806072055.ebuild | 62 +++++++++++++++++++++++ 3 files changed, 81 insertions(+)
(In reply to Eugene Shalygin from comment #0) > Please update it to current version and make the following changes: > > 1. Installation directory has to be obtained from qmake (adds support for > beta and rc releases, apart from sanity): > local dest=$($(qt5_get_bindir)/qmake -query QT_INSTALL_DOCS) This introduces a dependency on qtcore, and doesn't bring any concrete benefits IMO. (not sure what you mean by "support for beta and rc" but I'm pretty sure it can be added without the additional dep, and it's a moot point anyway because I don't think we'll ever bump qt-docs to beta or rc releases) > 2. Install only qch files or make html optional to decrease package size > (makes it almost half smaller). I've added USE="html qch" to control the installation of docs in the two formats independently. Also introduced several more module-specific USE flags for the largest non-base modules.
(In reply to Davide Pesavento from comment #3) > > 1. Installation directory has to be obtained from qmake (adds support for > > beta and rc releases, apart from sanity): > > local dest=$($(qt5_get_bindir)/qmake -query QT_INSTALL_DOCS) > This introduces a dependency on qtcore, and doesn't bring any concrete > benefits IMO. (not sure what you mean by "support for beta and rc" but I'm > pretty sure it can be added without the additional dep, and it's a moot > point anyway because I don't think we'll ever bump qt-docs to beta or rc > releases). Unfortunately you don't, but the docs for these releases are of special interest, because people try a new version of Qt and probably want to refer to documentation to learn what changed or why their programs changed their behaviour. It is not a big deal to bump the package locally for that case, and there one discovers that the package installs files into a wrong location. From the other hand, I can't see a harm from a dep on qtcore, when the assistant is installed almost for sure.
(In reply to Eugene Shalygin from comment #4) > the docs for these releases are of special interest Where are they? I don't see beta/rc doc packages at the usual place on the official Qt mirrors... > and there one discovers that the package installs files into a wrong > location. Please elaborate.
> Where are they? I don't see beta/rc doc packages at the usual place on the > official Qt mirrors... They are removed after the final release (and, maybe, with each beta/rc release previous versions are removed too), so there is a little sense to add those releases to the tree. > > > and there one discovers that the package installs files into a wrong > > location. > Please elaborate. If you have assistant installed, it displays qch files from the QT_INSTALL_DOCS dir, which is x.x.0_[(beta)(rc)], but the package installs files into x.x.x dir. As a result, after updating to a beta/rc Qt release the helps ceases to work. Should the package use qmake, reinstalling will fix that. Local bumping for a beta release would be as simple as going to the URI from the ebuild and renaming the ebuild file with accordance to the new suffix.
(In reply to Eugene Shalygin from comment #6) > If you have assistant installed, it displays qch files from the > QT_INSTALL_DOCS dir, which is x.x.0_[(beta)(rc)], but the package installs > files into x.x.x dir. And what prevents you from adding _betaN or _rcN to the qt-docs ebuild version when locally bumping to a pre-release? That plus some PV mangling inside the ebuild should do the trick.
