[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/

[Jeroen Roovers]

commit:     7bd42bc958e40e7761831e3d325dd4bd62bcfc68
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 09:31:57 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 09:32:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd42bc9

net-misc/chrony: USE=html is not optional for the live ebuild, as the ADOC=true hack now fails.

Package-Manager: portage-2.3.2

 net-misc/chrony/chrony-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index b744729..851dbdb 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 KEYWORDS=""
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
 "
@@ -25,7 +25,7 @@ CDEPEND="
 "
 DEPEND="
 	${CDEPEND}
-	html? ( dev-ruby/asciidoctor )
+	dev-ruby/asciidoctor
 "
 RDEPEND="
 	${CDEPEND}
@@ -40,7 +40,7 @@ src_prepare() {
 	sed -i \
 		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
 		-e 's:/var/run:/run:g' \
-		conf.c doc/*.man.in examples/* || die
+		conf.c doc/*.adoc examples/* || die
 
 	default
 }
@@ -90,7 +90,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake all docs $(usex html '' 'ADOC=true')
+	emake all docs
 }
 
 src_install() {
@@ -105,10 +105,8 @@ src_install() {
 	docinto examples
 	dodoc examples/*.example*
 
-	if use html; then
-		docinto html
-		dodoc doc/*.html
-	fi
+	docinto html
+	dodoc doc/*.html
 
 	keepdir /var/{lib,log}/chrony