From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 357C21395E3 for ; Sun, 6 Nov 2016 09:32:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89B9BE0851; Sun, 6 Nov 2016 09:32:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F073E084D for ; Sun, 6 Nov 2016 09:32:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4873341661 for ; Sun, 6 Nov 2016 09:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D35C24B5 for ; Sun, 6 Nov 2016 09:32:28 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1478424746.7bd42bc958e40e7761831e3d325dd4bd62bcfc68.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-9999.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 7bd42bc958e40e7761831e3d325dd4bd62bcfc68 X-VCS-Branch: master Date: Sun, 6 Nov 2016 09:32:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2a740c9a-3483-44d8-9dfe-ace83d57372d X-Archives-Hash: 6a64eb65ccbaf2458475eda06d0eebfd commit: 7bd42bc958e40e7761831e3d325dd4bd62bcfc68 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Nov 6 09:31:57 2016 +0000 Commit: Jeroen Roovers gentoo 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