gentoo Easter resync : 12.04.2020

6 files changed, 5 insertions, 277 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 978b08e06994..29a06cbdf2f1 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,14 +4,8 @@ AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e911
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B 34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5 SHA512 f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
-DIST tor-0.4.1.8.tar.gz 7513612 BLAKE2B bd9e126d04111aa1232107b3de3f59a258754454deba8bbbb7f34f7245b915e336f999dce4544f6e211b29702d28898938f2816a6ae9550884348f6628304461 SHA512 0118012ec723379316d5ee684eb4fdd98f64f538abf6db95071015eb5e0079d155a93cc5c4a9dbeaa7a3f56cfbcc8741fcd0c94c5101aa44fb11000ec27715c1
-DIST tor-0.4.2.5.tar.gz 7596836 BLAKE2B 0c7fa5d427f9d0683846c1023a4539ae4042c0d26f1c5afff20037f0681f6ea0dfb735e9c0e9d14bd7dddbfd5a0023064dc6e6cf6e6629402a6a13248129e6c5 SHA512 e63157713caa3590324f652f17c5c5634bab015dcde5c7832eb725351c3a91c1051dd8a95650502703e9c3dd5daefc2867ff3d20530dfec17310bb3dd4bb5b7d
-DIST tor-0.4.2.6.tar.gz 7600081 BLAKE2B c0ae5972a096e7f442b39d9dcfc5d5f13146243690a10cf6bf96ffed698c0b8bc8b4fe39d13ce40714e8aacf98ca30be6c6e8e75dc38d7799642247122a46152 SHA512 0e757cd6f48ca3ed5737978e8f63f1f267d2223479bfc7a431b71a6912040a4a9bc63cc97a73356ff998e03123b0a6a4519486c41359d1ef1f0fe30aa1fa168f
-DIST tor-0.4.3.1-alpha.tar.gz 7716850 BLAKE2B a03d0a1ad172ac9e5fd511ad772b4dbb4f2c75f42bb30636d5928bad819b984ac36bc11894d2aa75f0cca57591385a8cda5186c64c54aad222cd233268bfe8c9 SHA512 fb51b368927fd292de7f257e31bd882168a04bf7ffc108a1fff2bf555118d71732213ef6d2b5adb93f9178b5410307025c4a0494858fb457913655a0b705466b
-EBUILD tor-0.4.1.7.ebuild 2228 BLAKE2B 8fb5b646f254fa5cc654c6c9f7eb7d0210e149575fdbc3bcf15e0d687b04cf7d34c37540192ea83dcd8e7f47e8d0f4f3d1ab9134b6a8c5f5846c409d1046b39c SHA512 25629021a44ac69d65c4d385de128c87aa749d6d8c996420f580e16049c9ee7afaf7b756c7818323b546e581b15ba09106e038e36b858649ca51e02a78f42d21
-EBUILD tor-0.4.1.8.ebuild 2233 BLAKE2B 17d2ab238c4dbe4236e7e15e62c83c9501c77d2fabd257b624082a3489358d6097c9fc51928ac7762dc47a1b01c185ddfe46828b157ae141189075218553dba4 SHA512 50edd4dec8c8ac7fb5469b00b37eda65581dbb8cb3a249142581372321f7dc64b08a003f9bc8b55bfe70d2ab7e6b6cbe81aa70d36a3d3283f36a1b7c4d4bf0f6
-EBUILD tor-0.4.2.5.ebuild 2283 BLAKE2B e2547b9385b612a2a9405ef0e8a8dc02cbedf5de346065d409b6506e38a12fef904d1708c7b7cb10908ba8a2856aa6723c4a2d05113fe22980ebf54f7c63314d SHA512 cb795e34f97314c998e086e200024eef6d3b0daa43f75e26d649ca0a1f6a39e80e08bdcc14094f3965ca6a28c22fe0890a4651bc9eafd4d36bd6b942b4b6b6d7
-EBUILD tor-0.4.2.6.ebuild 2289 BLAKE2B bc21fdc051673426bc0166c00fff0b01280c53b8cd12e3cb704629d884e1b1abb72e8a376b8cfc22817b1e223475108e1be2daf6ee490eb66320d180a207e51e SHA512 7601ee64b664e0b17317bf139d3c6b72a80a51f3f617f68359f1a0719665f85ce8b951940c3c0469fc31862a171b48a16e6837816e2c45eb0babcbb15dc2a5d6
-EBUILD tor-0.4.3.1_alpha.ebuild 2369 BLAKE2B d9a1a3739242f704bb202937f37f6c81e2f4a6354098a60baf07767d50124a09acccf7770c4ae730881f7848fdb7e555671d03cb60ba2fceb1881b2755c1531e SHA512 a57fcf96fec12ebe15c963835eeceea9841d781faa894f06af874c670e397ffd2b9eff52a3ebb53c540fde737af58fad3373add0b57b8b8290ae495e4acb60ec
+DIST tor-0.4.2.7.tar.gz 7604875 BLAKE2B d24f9bd5a3467c909cf95e7e06873817df1a11a86f002450058df7d2aa637b25441128ec57951e22681fdd9b0ef95808306d76b6485e060365f4fbf10e263ac8 SHA512 a23c7eec8f399372227433c62c97278563a63e4cf03e475307915d395fb0b7efc461b4c8a077149e7b6df955ec26d52cd833dfe37fb650d23b3fcb1a4163d64d
+DIST tor-0.4.3.3-alpha.tar.gz 7731305 BLAKE2B da3fb8186a5450b81d8eaa5d991319453d05c8ba829b94abadbd75420b098a77cb173f086bf650751af8e8054f1baa30ebb934ba7a5f8086a4c24cf138ece44a SHA512 77e84397578b6473c3608a6dbf3a76f1f638e7d432c505145bc7c64c9a21a4ab9e8f545133296bb6341a8088cdcd53f031a0ea0cba2c6f30ad248cdf075aaa5b
+EBUILD tor-0.4.2.7.ebuild 2281 BLAKE2B feb38bdd43a223cdad0544ccb9c3b6bfa090070d7653fd01679b2a271237074715bf5da25f2d9304c66d03a69a274c9c9d2273d37e484ffc228a58c66634822a SHA512 f2801fd1f4b739df5ec280925b1a3f83ea2436d3afed1abbdce1e7750f5d6f3dfd647b865fba460524b3b18b1692a47c152b934fa750c60365592420587308ab
+EBUILD tor-0.4.3.3_alpha.ebuild 2369 BLAKE2B d9a1a3739242f704bb202937f37f6c81e2f4a6354098a60baf07767d50124a09acccf7770c4ae730881f7848fdb7e555671d03cb60ba2fceb1881b2755c1531e SHA512 a57fcf96fec12ebe15c963835eeceea9841d781faa894f06af874c670e397ffd2b9eff52a3ebb53c540fde737af58fad3373add0b57b8b8290ae495e4acb60ec
 MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/tor-0.4.1.7.ebuild b/net-vpn/tor/tor-0.4.1.7.ebuild
deleted file mode 100644
index 81e7a01b64f3..000000000000
--- a/net-vpn/tor/tor-0.4.1.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	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 )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-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 \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.1.8.ebuild b/net-vpn/tor/tor-0.4.1.8.ebuild
deleted file mode 100644
index 84c4db15e794..000000000000
--- a/net-vpn/tor/tor-0.4.1.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	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 )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-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 \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.2.6.ebuild b/net-vpn/tor/tor-0.4.2.6.ebuild
deleted file mode 100644
index f03b2707ab6e..000000000000
--- a/net-vpn/tor/tor-0.4.2.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	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 )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-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 \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.2.5.ebuild b/net-vpn/tor/tor-0.4.2.7.ebuild
index 2724b9555171..9002a59e9007 100644
--- a/net-vpn/tor/tor-0.4.2.5.ebuild
+++ b/net-vpn/tor/tor-0.4.2.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit flag-o-matic readme.gentoo-r1 systemd
 
diff --git a/net-vpn/tor/tor-0.4.3.1_alpha.ebuild b/net-vpn/tor/tor-0.4.3.3_alpha.ebuild
index 36757c1c3d73..36757c1c3d73 100644
--- a/net-vpn/tor/tor-0.4.3.1_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.3.3_alpha.ebuild