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 C28761382C5 for ; Tue, 30 Jun 2020 14:25:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 097D2E09F1; Tue, 30 Jun 2020 14:25:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5FCCE09F1 for ; Tue, 30 Jun 2020 14:25:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C956C34EBD8 for ; Tue, 30 Jun 2020 14:25:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CDEC274 for ; Tue, 30 Jun 2020 14:25:08 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1593527105.bbfca4304f2a9750f3a0ff0cdd0d1e2da388318a.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/bind-tools/bind-tools-9.16.4.ebuild X-VCS-Directories: net-dns/bind-tools/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: bbfca4304f2a9750f3a0ff0cdd0d1e2da388318a X-VCS-Branch: master Date: Tue, 30 Jun 2020 14:25:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ca39c09d-d79c-4d82-bf1e-14034014a464 X-Archives-Hash: 8e79976c22d47e8e430c51459d1bdb93 commit: bbfca4304f2a9750f3a0ff0cdd0d1e2da388318a Author: Mikle Kolyada gentoo org> AuthorDate: Tue Jun 30 14:23:43 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Tue Jun 30 14:25:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfca430 net-dns/bind-tools: fix doc building Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> net-dns/bind-tools/bind-tools-9.16.4.ebuild | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/net-dns/bind-tools/bind-tools-9.16.4.ebuild b/net-dns/bind-tools/bind-tools-9.16.4.ebuild index ce5dd685f2f..e5e7e2b6a22 100644 --- a/net-dns/bind-tools/bind-tools-9.16.4.ebuild +++ b/net-dns/bind-tools/bind-tools-9.16.4.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit autotools flag-o-matic toolchain-funcs +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools flag-o-matic python-any-r1 toolchain-funcs MY_PN=${PN//-tools} MY_PV=${PV/_p/-P} @@ -36,13 +38,22 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" -BDEPEND="virtual/pkgconfig" +# sphinx required for man-page and html creation +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ') + virtual/pkgconfig" S="${WORKDIR}/${MY_P}" # bug 479092, requires networking RESTRICT="test" +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + src_prepare() { default @@ -106,35 +117,39 @@ src_compile() { emake AR="${AR}" -C bin/dig/ emake AR="${AR}" -C bin/nsupdate/ emake AR="${AR}" -C bin/dnssec/ + emake -C doc/man/ man $(usev doc) } src_install() { + local man_dir="${S}/doc/man" + local html_dir="${man_dir}/_build/html" + dodoc README CHANGES cd "${S}"/bin/delv || die dobin delv - doman delv.1 + doman ${man_dir}/delv.1 cd "${S}"/bin/dig || die dobin dig host nslookup - doman {dig,host,nslookup}.1 + doman ${man_dir}/{dig,host,nslookup}.1 cd "${S}"/bin/nsupdate || die dobin nsupdate - doman nsupdate.1 + doman ${man_dir}/nsupdate.1 if use doc; then docinto html - dodoc nsupdate.html + dodoc ${html_dir}/nsupdate.html fi cd "${S}"/bin/dnssec || die for tool in dsfromkey importkey keyfromlabel keygen \ revoke settime signzone verify; do dobin dnssec-"${tool}" - doman dnssec-"${tool}".8 + doman ${man_dir}/dnssec-"${tool}".8 if use doc; then docinto html - dodoc dnssec-"${tool}".html + dodoc ${html_dir}/dnssec-"${tool}".html fi done }