| 1 |
commit: be60ee03d4618b922e226bc867f0371cb3f0c432 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 4 18:48:51 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 4 18:49:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be60ee03 |
| 7 |
|
| 8 |
net-vpn/tor: add USE=doc and man for bug #684986 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-vpn/tor/metadata.xml | 1 + |
| 14 |
net-vpn/tor/tor-0.4.0.4_rc.ebuild | 10 ++++++---- |
| 15 |
2 files changed, 7 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml |
| 18 |
index ed620b01846..121fa511c90 100644 |
| 19 |
--- a/net-vpn/tor/metadata.xml |
| 20 |
+++ b/net-vpn/tor/metadata.xml |
| 21 |
@@ -6,6 +6,7 @@ |
| 22 |
<name>Anthony G. Basile</name> |
| 23 |
</maintainer> |
| 24 |
<use> |
| 25 |
+ <flag name="man">Build and install man pages</flag> |
| 26 |
<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag> |
| 27 |
<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag> |
| 28 |
</use> |
| 29 |
|
| 30 |
diff --git a/net-vpn/tor/tor-0.4.0.4_rc.ebuild b/net-vpn/tor/tor-0.4.0.4_rc.ebuild |
| 31 |
index 2e27b784b6b..6b60698543f 100644 |
| 32 |
--- a/net-vpn/tor/tor-0.4.0.4_rc.ebuild |
| 33 |
+++ b/net-vpn/tor/tor-0.4.0.4_rc.ebuild |
| 34 |
@@ -16,13 +16,13 @@ S="${WORKDIR}/${MY_PF}" |
| 35 |
LICENSE="BSD GPL-2" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos" |
| 38 |
-IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd" |
| 39 |
+IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd" |
| 40 |
|
| 41 |
DEPEND=" |
| 42 |
- app-text/asciidoc |
| 43 |
dev-libs/libevent[ssl] |
| 44 |
sys-libs/zlib |
| 45 |
caps? ( sys-libs/libcap ) |
| 46 |
+ man? ( app-text/asciidoc ) |
| 47 |
!libressl? ( dev-libs/openssl:0=[-bindist] ) |
| 48 |
libressl? ( dev-libs/libressl:0= ) |
| 49 |
lzma? ( app-arch/xz-utils ) |
| 50 |
@@ -38,7 +38,7 @@ PATCHES=( |
| 51 |
"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch |
| 52 |
) |
| 53 |
|
| 54 |
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING ) |
| 55 |
+DOCS=() |
| 56 |
|
| 57 |
pkg_setup() { |
| 58 |
enewgroup tor |
| 59 |
@@ -46,11 +46,11 @@ pkg_setup() { |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
+ use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) |
| 64 |
export ac_cv_lib_cap_cap_init=$(usex caps) |
| 65 |
econf \ |
| 66 |
--localstatedir="${EPREFIX}/var" \ |
| 67 |
--enable-system-torrc \ |
| 68 |
- --enable-asciidoc \ |
| 69 |
--disable-android \ |
| 70 |
--disable-libfuzzer \ |
| 71 |
--disable-module-dirauth \ |
| 72 |
@@ -58,6 +58,7 @@ src_configure() { |
| 73 |
--disable-rust \ |
| 74 |
--disable-restart-debugging \ |
| 75 |
--disable-zstd-advanced-apis \ |
| 76 |
+ $(use_enable man asciidoc) \ |
| 77 |
$(use_enable lzma) \ |
| 78 |
$(use_enable scrypt libscrypt) \ |
| 79 |
$(use_enable seccomp) \ |
| 80 |
@@ -84,4 +85,5 @@ src_install() { |
| 81 |
|
| 82 |
insinto /etc/tor/ |
| 83 |
newins "${FILESDIR}"/torrc-r1 torrc |
| 84 |
+ |
| 85 |
} |
Archives