net-vpn/tor: migrate fix for bug #653226 to RC branch

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/net-vpn/tor/tor-0.3.4.5_rc.ebuild b/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
similarity index 93%
rename from net-vpn/tor/tor-0.3.4.5_rc.ebuild
rename to net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
index 542a15cd4b99e6b292c1f0521d2e4b481041b365..03ddb1da891749f301487402442829e3c785a03f 100644 (file)
--- a/net-vpn/tor/tor-0.3.4.5_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
@@ -18,12 +18,13 @@ SLOT="0"
 # We need to keyword app-arch/zstd
 #KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
        app-text/asciidoc
        dev-libs/libevent[ssl]
        sys-libs/zlib
+       caps? ( sys-libs/libcap )
        !libressl? ( dev-libs/openssl:0=[-bindist] )
        libressl? ( dev-libs/libressl:0= )
        lzma? ( app-arch/xz-utils )
@@ -49,6 +50,7 @@ pkg_setup() {
 src_configure() {
        # We have to enable unit tests since they break the build.
        # See: https://trac.torproject.org/projects/tor/ticket/26792
+       export ac_cv_lib_cap_cap_init=$(usex caps)
        econf \
                --localstatedir="${EPREFIX}/var" \
                --enable-system-torrc \