dev-tcltk/tklib: EAPI 6, fix generating docs

Closes: https://bugs.gentoo.org/625804
Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/dev-tcltk/tklib/files/tklib-0.6-doc.patch b/dev-tcltk/tklib/files/tklib-0.6-doc.patch
new file mode 100644 (file)
index 0000000..7fea599
--- /dev/null
+++ b/dev-tcltk/tklib/files/tklib-0.6-doc.patch
@@ -0,0 +1,14 @@
+--- a/Makefile.in      2018-09-25 09:12:56.269163896 +0200
++++ b/Makefile.in      2018-09-25 09:14:27.437130443 +0200
+@@ -101,9 +101,9 @@
+ 
+ 
+ html-doc:
+-      $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` html
++      $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc html
+ nroff-doc:
+-      $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` nroff
++      $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` doc nroff
+ tmml-doc:
+       $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/sak.tcl` tmml
+ wiki-doc:

diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
index 9231c58cf5e7e2c736bd96497daf7f99d90b2575..b8b7f41408e1c0f317606931792724fca2eefc5d 100644 (file)
--- a/dev-tcltk/tklib/tklib-0.6-r2.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit multilib
 
@@ -21,13 +21,20 @@ RDEPEND="
        dev-tcltk/tcllib"
 DEPEND="${RDEPEND}"
 
-src_install() {
+PATCHES=( "${FILESDIR}"/${P}-doc.patch )
+
+src_compile() {
        default
+       use doc && emake doc
+}
+
+src_install() {
+       HTML_DOCS=
        if use doc; then
-               emake DESTDIR="${D}" doc
-               dohtml doc/html/*
+               HTML_DOCS=doc/html/*
        fi
-       dodoc DESCRIPTION.txt README*
+       default
+       dodoc DESCRIPTION.txt
        dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
 
        mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die