diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2018-01-04 23:54:36 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2018-01-05 00:00:57 +0200 |
| commit | d547e0758a717b36270b011bff286cea2aa4d7e0 (patch) | |
| tree | 2b67aedb7078c53ba831d2b5e2feffafabc0fc28 | |
| parent | dev-libs/gjs: Drop old (diff) | |
| download | gentoo-d547e0758a717b36270b011bff286cea2aa4d7e0.tar.gz gentoo-d547e0758a717b36270b011bff286cea2aa4d7e0.tar.bz2 gentoo-d547e0758a717b36270b011bff286cea2aa4d7e0.zip | |
x11-libs/wxGTK: fix USE=doc html installation
Actually adapt to the switch of the doc tarball. Apparently the old
wxPython docs tarball was just pulled in and never used, as the old
source paths came from the main wxPython tarball, not the doc one,
and the doc seemed to just duplicate the docs already present in the
main tarball for offline reading separate from code. As older versions
should go away ASAP for security, this remains as-is in older ebuilds.
Closes: https://bugs.gentoo.org/643484
Package-Manager: Portage-2.3.19, Repoman-2.3.6
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild index 2a61e20e6702..24f12cd85a90 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild @@ -159,9 +159,8 @@ multilib_src_install_all() { newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt - if use doc; then - dodoc -r "${S}"/docs/doxygen/out/html - fi + use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. + einstalldocs # Unversioned links rm "${D}"/usr/bin/wx{-config,rc} diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild index e49514911b55..2a970c3bafbc 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild @@ -125,9 +125,8 @@ multilib_src_install_all() { newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt - if use doc; then - dodoc -r "${S}"/docs/doxygen/out/html - fi + use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. + einstalldocs # Stray windows locale file, causes collisions local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" |