| 1 |
commit: d547e0758a717b36270b011bff286cea2aa4d7e0 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 21:54:36 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 22:00:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d547e075 |
| 7 |
|
| 8 |
x11-libs/wxGTK: fix USE=doc html installation |
| 9 |
|
| 10 |
Actually adapt to the switch of the doc tarball. Apparently the old |
| 11 |
wxPython docs tarball was just pulled in and never used, as the old |
| 12 |
source paths came from the main wxPython tarball, not the doc one, |
| 13 |
and the doc seemed to just duplicate the docs already present in the |
| 14 |
main tarball for offline reading separate from code. As older versions |
| 15 |
should go away ASAP for security, this remains as-is in older ebuilds. |
| 16 |
|
| 17 |
Closes: https://bugs.gentoo.org/643484 |
| 18 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 19 |
|
| 20 |
x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 5 ++--- |
| 21 |
x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 5 ++--- |
| 22 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 23 |
|
| 24 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 25 |
index 2a61e20e670..24f12cd85a9 100644 |
| 26 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 27 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 28 |
@@ -159,9 +159,8 @@ multilib_src_install_all() { |
| 29 |
newdoc base/readme.txt base_readme.txt |
| 30 |
newdoc gtk/readme.txt gtk_readme.txt |
| 31 |
|
| 32 |
- if use doc; then |
| 33 |
- dodoc -r "${S}"/docs/doxygen/out/html |
| 34 |
- fi |
| 35 |
+ use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. |
| 36 |
+ einstalldocs |
| 37 |
|
| 38 |
# Unversioned links |
| 39 |
rm "${D}"/usr/bin/wx{-config,rc} |
| 40 |
|
| 41 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 42 |
index e49514911b5..2a970c3bafb 100644 |
| 43 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 44 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 45 |
@@ -125,9 +125,8 @@ multilib_src_install_all() { |
| 46 |
newdoc base/readme.txt base_readme.txt |
| 47 |
newdoc gtk/readme.txt gtk_readme.txt |
| 48 |
|
| 49 |
- if use doc; then |
| 50 |
- dodoc -r "${S}"/docs/doxygen/out/html |
| 51 |
- fi |
| 52 |
+ use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/. |
| 53 |
+ einstalldocs |
| 54 |
|
| 55 |
# Stray windows locale file, causes collisions |
| 56 |
local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" |
Archives