diff options
-rw-r--r-- | net-vpn/tor/tor-scm.ebuild | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/net-vpn/tor/tor-scm.ebuild b/net-vpn/tor/tor-scm.ebuild index 587ce0f..c5e5ba4 100644 --- a/net-vpn/tor/tor-scm.ebuild +++ b/net-vpn/tor/tor-scm.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" -inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user git-r3 +inherit eutils flag-o-matic readme.gentoo-r1 systemd toolchain-funcs versionator user git-r3 EGIT_REPO_URI="https://git.torproject.org/tor.git" @@ -15,7 +15,7 @@ SRC_URI="" LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="" -IUSE="libressl scrypt seccomp selinux systemd tor-hardening test web" +IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd" DEPEND=" app-text/asciidoc @@ -23,12 +23,15 @@ DEPEND=" sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) + lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) - systemd? ( sys-apps/systemd )" + systemd? ( sys-apps/systemd ) + zstd? ( app-arch/zstd )" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-tor )" +DOCS=( README ChangeLog ReleaseNotes doc/HACKING ) pkg_setup() { enewgroup tor enewuser tor -1 -1 /var/lib/tor tor @@ -49,7 +52,8 @@ src_configure() { --localstatedir="${EPREFIX}/var" \ --enable-system-torrc \ --enable-asciidoc \ - --disable-unittests \ + --disable-libfuzzer \ + --disable-rust \ $(use_enable scrypt libscrypt) \ $(use_enable seccomp) \ $(use_enable systemd) \ @@ -65,16 +69,11 @@ src_install() { readme.gentoo_create_doc newconfd "${FILESDIR}"/tor.confd tor - newinitd "${FILESDIR}"/tor.initd-r7 tor - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" - - emake DESTDIR="${D}" install + newinitd "${FILESDIR}"/tor.initd-r8 tor + systemd_dounit contrib/dist/tor.service keepdir /var/lib/tor - dodoc README ChangeLog ReleaseNotes - fperms 750 /var/lib/tor fowners tor:tor /var/lib/tor |