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 25B5E138334 for ; Sat, 4 May 2019 18:49:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57C4FE08EF; Sat, 4 May 2019 18:49:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2C27FE08EF for ; Sat, 4 May 2019 18:49:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2B0CF34356B for ; Sat, 4 May 2019 18:49:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CFC26566 for ; Sat, 4 May 2019 18:49:16 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1556995751.be60ee03d4618b922e226bc867f0371cb3f0c432.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tor/metadata.xml net-vpn/tor/tor-0.4.0.4_rc.ebuild X-VCS-Directories: net-vpn/tor/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: be60ee03d4618b922e226bc867f0371cb3f0c432 X-VCS-Branch: master Date: Sat, 4 May 2019 18:49:16 +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: 28cc03eb-2c08-4517-af99-fe427d15efe7 X-Archives-Hash: b5ed0e16ddac320aa331fea11ef1b57f commit: be60ee03d4618b922e226bc867f0371cb3f0c432 Author: Anthony G. Basile gentoo org> AuthorDate: Sat May 4 18:48:51 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat May 4 18:49:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be60ee03 net-vpn/tor: add USE=doc and man for bug #684986 Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 net-vpn/tor/metadata.xml | 1 + net-vpn/tor/tor-0.4.0.4_rc.ebuild | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml index ed620b01846..121fa511c90 100644 --- a/net-vpn/tor/metadata.xml +++ b/net-vpn/tor/metadata.xml @@ -6,6 +6,7 @@ Anthony G. Basile + Build and install man pages Use app-crypt/libscrypt for the scrypt algorithm Compile tor with hardening on vanilla compilers/linkers diff --git a/net-vpn/tor/tor-0.4.0.4_rc.ebuild b/net-vpn/tor/tor-0.4.0.4_rc.ebuild index 2e27b784b6b..6b60698543f 100644 --- a/net-vpn/tor/tor-0.4.0.4_rc.ebuild +++ b/net-vpn/tor/tor-0.4.0.4_rc.ebuild @@ -16,13 +16,13 @@ S="${WORKDIR}/${MY_PF}" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" -IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd" +IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd" DEPEND=" - app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) + man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) @@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch ) -DOCS=( README ChangeLog ReleaseNotes doc/HACKING ) +DOCS=() pkg_setup() { enewgroup tor @@ -46,11 +46,11 @@ pkg_setup() { } src_configure() { + use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) export ac_cv_lib_cap_cap_init=$(usex caps) econf \ --localstatedir="${EPREFIX}/var" \ --enable-system-torrc \ - --enable-asciidoc \ --disable-android \ --disable-libfuzzer \ --disable-module-dirauth \ @@ -58,6 +58,7 @@ src_configure() { --disable-rust \ --disable-restart-debugging \ --disable-zstd-advanced-apis \ + $(use_enable man asciidoc) \ $(use_enable lzma) \ $(use_enable scrypt libscrypt) \ $(use_enable seccomp) \ @@ -84,4 +85,5 @@ src_install() { insinto /etc/tor/ newins "${FILESDIR}"/torrc-r1 torrc + }