Bug 533410 – net-misc/ntp-4.2.8-r1 installs duplicate HTML documentation outside of /usr/share/doc/$PF

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Chris Mayo 2014-12-23 20:06:52 UTC]

Created attachment 392292 [details, diff]
Makefile.am patch

/usr/share/doc/ntp-4.2.8-r1/html/access.html
/usr/share/doc/ntp-4.2.8-r1/html/accopt.html
...
/usr/share/doc/ntp4/html/access.html
/usr/share/doc/ntp4/html/accopt.html
...
/usr/share/doc/ntp4/html/sntp.html
...
/usr/share/doc/sntp/sntp.html


Makefile now installs HTML files in $docdir, in addition to dohtml in ebuild.

Suggest adding to econf: --docdir=/usr/share/doc/${PF}/html

This on its own creates /usr/share/doc/ntp-4.2.8-r1/html/html, therefore attached patch to install NTP "Document Collection" in html/collection.

Reported upstream:
https://bugs.ntp.org/show_bug.cgi?id=2705


--- ntp-4.2.8-r1.ebuild.orig
+++ ntp-4.2.8-r1.ebuild
@@ -42,4 +42,5 @@
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-html-collection.patch
 	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
 	epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238
@@ -56,4 +57,5 @@
 	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
 	econf \
+		--docdir=/usr/share/doc/${PF}/html \
 		--with-lineeditlibs=readline,edit,editline \
 		--with-yielding-select \
@@ -76,5 +78,4 @@
 	dodoc INSTALL WHERE-TO-START
 	doman "${WORKDIR}"/man/*.[58]
-	dohtml -r html/*
 
 	insinto /etc

[Comment 1 Mike Gilbert 2014-12-23 20:52:14 UTC]

(In reply to Chris Mayo from comment #0)
> Suggest adding to econf: --docdir=/usr/share/doc/${PF}/html
> 
> This on its own creates /usr/share/doc/ntp-4.2.8-r1/html/html, therefore
> attached patch to install NTP "Document Collection" in html/collection.

It would make more sense to just pass --htmldir=/usr/share/doc/${PF}/html instead of --docdir.

[Comment 2 Mike Gilbert 2014-12-23 21:11:38 UTC]

I'm not sure about that patch, so I leave that to the maintainers.

+*ntp-4.2.8-r2 (23 Dec 2014)
+
+  23 Dec 2014; Mike Gilbert <[e-mail]> +ntp-4.2.8-r2.ebuild:
+  Pass --docdir and --htmldir to configure and drop dohtml, bug 533410.

[Comment 3 SpanKY 2015-04-04 08:01:50 UTC]

i'd rather let upstream sort through that patch