1 |
commit: f3797887ac87c56c9c78abee9f0c34b61dc512f3 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 25 09:08:27 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 25 09:08:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3797887 |
7 |
|
8 |
dev-tcltk/tklib: EAPI 6, fix generating docs |
9 |
|
10 |
Closes: https://bugs.gentoo.org/625804 |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
12 |
|
13 |
dev-tcltk/tklib/files/tklib-0.6-doc.patch | 14 ++++++++++++++ |
14 |
dev-tcltk/tklib/tklib-0.6-r2.ebuild | 19 +++++++++++++------ |
15 |
2 files changed, 27 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/dev-tcltk/tklib/files/tklib-0.6-doc.patch b/dev-tcltk/tklib/files/tklib-0.6-doc.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..7fea599df52 |
20 |
--- /dev/null |
21 |
+++ b/dev-tcltk/tklib/files/tklib-0.6-doc.patch |
22 |
@@ -0,0 +1,14 @@ |
23 |
+--- a/Makefile.in 2018-09-25 09:12:56.269163896 +0200 |
24 |
++++ b/Makefile.in 2018-09-25 09:14:27.437130443 +0200 |
25 |
+@@ -101,9 +101,9 @@ |
26 |
+ |
27 |
+ |
28 |
+ html-doc: |
29 |
+- $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` html |
30 |
++ $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc html |
31 |
+ nroff-doc: |
32 |
+- $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` nroff |
33 |
++ $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc nroff |
34 |
+ tmml-doc: |
35 |
+ $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` tmml |
36 |
+ wiki-doc: |
37 |
|
38 |
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild |
39 |
index 9231c58cf5e..b8b7f41408e 100644 |
40 |
--- a/dev-tcltk/tklib/tklib-0.6-r2.ebuild |
41 |
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild |
42 |
@@ -1,7 +1,7 @@ |
43 |
-# Copyright 1999-2015 Gentoo Foundation |
44 |
+# Copyright 1999-2018 Gentoo Foundation |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
-EAPI=5 |
48 |
+EAPI=6 |
49 |
|
50 |
inherit multilib |
51 |
|
52 |
@@ -21,13 +21,20 @@ RDEPEND=" |
53 |
dev-tcltk/tcllib" |
54 |
DEPEND="${RDEPEND}" |
55 |
|
56 |
-src_install() { |
57 |
+PATCHES=( "${FILESDIR}"/${P}-doc.patch ) |
58 |
+ |
59 |
+src_compile() { |
60 |
default |
61 |
+ use doc && emake doc |
62 |
+} |
63 |
+ |
64 |
+src_install() { |
65 |
+ HTML_DOCS= |
66 |
if use doc; then |
67 |
- emake DESTDIR="${D}" doc |
68 |
- dohtml doc/html/* |
69 |
+ HTML_DOCS=doc/html/* |
70 |
fi |
71 |
- dodoc DESCRIPTION.txt README* |
72 |
+ default |
73 |
+ dodoc DESCRIPTION.txt |
74 |
dosym ${PN}${PV} /usr/$(get_libdir)/${PN} |
75 |
|
76 |
mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die |