From a2810985afabcc31d3eace5e61d8ea25b852ba17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 May 2019 11:18:59 +0100 Subject: gentoo resync : 07.05.2019 --- net-vpn/Manifest.gz | Bin 5860 -> 5859 bytes net-vpn/tor/Manifest | 4 ++-- net-vpn/tor/metadata.xml | 1 + net-vpn/tor/tor-0.4.0.4_rc.ebuild | 10 ++++++---- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index 843fc2e62e55..5229573206a4 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index d395e54907dc..30ca27bd1076 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -7,5 +7,5 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a DIST tor-0.3.5.8.tar.gz 6994335 BLAKE2B d37006ee48f6ecb9205fe9ad1178f2375aec5a8f8c614a85af398e2114d13e4ef7dcfc501685f2f6d4dbb44cca2ab318be69ac37686a3ef1bb980adcdefcac11 SHA512 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132 DIST tor-0.4.0.4-rc.tar.gz 7193480 BLAKE2B 31b1f95f8c8226a56945c96c10d81c7c93269bd0d377f76281e95fd8014ab0b93c8fb84c9837f977017a66043b1e1da144bf50be2af10c2c47b524acbadf83c3 SHA512 5389e87110824747cab4875414d95d2da3c3740dfd0a74a67d1bcb0b90a6ed76bc16c87dd51a3c93020376d927f07645a50fccba4123c56e83518fedbd508773 EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e -EBUILD tor-0.4.0.4_rc.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412 -MISC metadata.xml 448 BLAKE2B 57805e3f34aa7ae1e07297c16ca1cf9171298d9d128fb0d1e5ea1703fe4b697aa2d13ad51cf9b868cada561a3dd5ead47a4e039ba14226e8811cb5c037aa8a42 SHA512 a791bf3a5ad8b73daba0b708f340521fe156b653aa031b3c53062c98696eb92761b012c78140767126065d319a53394129cc452ba2d42f3cd52c71b807fdcbde +EBUILD tor-0.4.0.4_rc.ebuild 2230 BLAKE2B ec5dfa73675ceac29a469b29bb6bb414175f0e9099adbf4059ea013f7a8be039d4f69d52f2b7d94c4b258b6240fa07347d1ff2975ac61008bb67cff166037211 SHA512 f87cc6e4e70b7cee2f309f7e06d49726a24c4c26ea00c5d51f06cd25677a687d0f9ab1afee6ccf51e460389cb1f07ea90fc419ed1ecde0f365dfe44635533075 +MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000 diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml index ed620b018464..121fa511c906 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 2e27b784b6bc..6b60698543f6 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 + } -- cgit v1.2.3