Skip to content

Commit

Permalink
x11-libs/wxGTK: fix USE=doc html installation
Browse files Browse the repository at this point in the history
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
  • Loading branch information
leio committed Jan 4, 2018
1 parent b1f8645 commit d547e07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions x11-libs/wxGTK/wxGTK-3.0.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit d547e07

Please sign in to comment.