gentoo resync : 19.04.2018

12 files changed, 212 insertions, 180 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1ea804ae50b7..32e3462493fd 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index a8e1b750fb3f..45faeabefba0 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -2,9 +2,11 @@ AUX i2p-0.9.31-add_libs.patch 1129 BLAKE2B 3de0a26134a9d3cec0a15bda0348adde8c1b4
 AUX i2p-0.9.31.initd 1107 BLAKE2B fdfda220dd31fd2f49c1b92e9d1cd64ff3787a9f94031fe1dc54fcbceaedf42a863911b66ae97a70c90ba14ef2fc92029ef88e7f28ddb8e263986d2e174b684d SHA512 78d68722d274f59b79423b2e7ca9f541c18ee0f23a9e4c8e15bec6f84fcad5fb4af3fb3b0708b38d5e0accb304e2302793bbbc667f6bfd84d5488dade560d55f
 AUX i2p-0.9.31.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
-AUX i2p.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
+AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
 DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
 DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
+DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
 EBUILD i2p-0.9.31.ebuild 4295 BLAKE2B cfc6c721d8fe72621cb680694249632137ff8785f6554c049ed9fe662b480632ce4adfbf0673dfafc289b61dac161c7b90dad58bd6ae5203c15f65c42d5da931 SHA512 ed0a65a028e644884a52cb6928365795cd43f00e8a5bcbc8efd8ecf913717d649895f30153527b8c5a6038b379ae8a08846f2de049dbefa3e9b6fcdb90fbc39e
 EBUILD i2p-0.9.33.ebuild 4227 BLAKE2B 8a0270c41a8c3ca6d727cf01eb1daf58aba144b384039bb131d70d18f18f79c9baabed9d2f21bf0a10bc0a4843ff074f94a0ba33c903540717e13d5fe4f59460 SHA512 a3143b919829a2e67ff8429965b90a6dbd3fa8f81562cbf0512fdc7123c89b028bd24878d93a7abb5d40e4ae2f547b740d37b809569fefd93418cbb7c6eee025
+EBUILD i2p-0.9.34.ebuild 4049 BLAKE2B a0104622fd5e19989304d3c0572715ea87cb9684aa6c8f0ef264f5fc17f592a1865e14211c932a4a0a8cb89e05f2f914a20867c141d2009764a60c361a2e0e3d SHA512 66fd700c6493bc79b5580b3c811eb0a7043d69b2b1033d4b1f0d95a5c0071a7af33a358a11c308ff9afc16a4b9027168d5cee13a2db7f55ac3ed3cfdbf13c314
 MISC metadata.xml 894 BLAKE2B 7f1415ae58ff6b83e05824111e0de818bce0f6b00fda294124eb838d3d24bab43e03f9224cdb3eb5e9b0625cb4a930fce107aa508275e398362ae4d3be502a73 SHA512 dbb318ce927a56d1f0d84cec63b1265969dd4d77021d36ee93e253c4cf02238265aa02a292353d6f520c223b433ce7dcafe605ce2bf97fa253e97f286be34cdb
diff --git a/net-vpn/i2p/files/i2p.service b/net-vpn/i2p/files/i2p.service
index ccbadbd4d167..87c218075a1c 100644
--- a/net-vpn/i2p/files/i2p.service
+++ b/net-vpn/i2p/files/i2p.service
@@ -4,10 +4,7 @@ After=network.target
 
 [Service]
 User=i2p
-Type=forking
-ExecReload=/usr/bin/i2prouter restart
-ExecStart=/usr/bin/i2prouter start
-ExecStop=/usr/bin/i2prouter stop
+ExecStart=/usr/bin/wrapper /usr/share/i2p/wrapper.config wrapper.syslog.ident=i2p wrapper.logfile=/var/lib/i2p/.i2p/wrapper.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-vpn/i2p/i2p-0.9.34.ebuild b/net-vpn/i2p/i2p-0.9.34.ebuild
new file mode 100644
index 000000000000..ea2983ad0cdc
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.34.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="+ecdsa nls"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CP_DEPEND="dev-java/bcprov:1.50
+	dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CP_DEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:0
+	nls? ( >=sys-devel/gettext-0.19 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CP_DEPEND}
+	ecdsa? (
+		|| (
+			dev-java/icedtea:8[-sunec]
+			dev-java/icedtea-bin:8
+			dev-java/oracle-jre-bin
+			dev-java/oracle-jdk-bin
+		)
+	)
+	!ecdsa? ( >=virtual/jre-1.7 )"
+
+EANT_BUILD_TARGET="pkg"
+JAVA_ANT_ENCODING="UTF-8"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	enewgroup i2p
+	enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
+}
+
+src_prepare() {
+	# as early as possible to allow generic patches to be applied
+	default
+
+	java-ant_rewrite-classpath
+
+	java-pkg-2_src_prepare
+
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties || die
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties || die
+	fi
+
+	# avoid auto starting browser
+	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
+		'installer/resources/clients.config' || die
+
+	# generate wrapper classpath, keeping the default to be replaced later
+	i2p_cp='' # global forced by java-pkg_gen-cp
+	java-pkg_gen-cp i2p_cp
+	local lib cp i=2
+	for lib in ${i2p_cp//,/ }
+	do
+		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+	done
+
+	# add generated cp and hardcode system VM
+	sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
+		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+		-i 'installer/resources/wrapper.config' || die
+
+	# replace paths as the installer would
+	sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
+		-e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
+		-e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
+		-i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
+}
+
+src_install() {
+	# cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# we remove system installed jar and install the others
+	rm lib/{jrobin.jar,wrapper.jar} || \
+		die 'unable to remove locally built jar already found in system'
+	java-pkg_dojar lib/*.jar
+
+	# create own launcher
+	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+	# Install main files and basic documentation
+	insinto '/usr/share/i2p'
+	doins blocklist.txt hosts.txt *.config
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup user
+	keepdir '/var/lib/i2p/.i2p'
+	fowners i2p:i2p '/var/lib/i2p/.i2p'
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
+	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
+
+	if use !ecdsa
+	then
+		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
+		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
+		ewarn
+		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
+		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
+		ewarn 'as the one you built with.'
+	fi
+}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 453bb53a73f4..d51142acedb9 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -1,12 +1,13 @@
 AUX down.sh 943 BLAKE2B 9853748aebd819c46cec0229971375d28922abe91ff6442a572090f300cd901ccd80c04fc3df30a1251492a55e593a4783f7f5a4b380053f27bb387f5417444b SHA512 5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997
 AUX openvpn-2.1.conf 892 BLAKE2B d0ce49ecc6275c9677e56de5d13afcc69169666441cb6d8eb958642786f0ee7ff6acb1830af0001fd1945b666daf5af1d9be211032817fc345e33242e1d86885 SHA512 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37
 AUX openvpn-2.1.init 4187 BLAKE2B 9ab133bda1db2d94afbf1e35840515452029319c38bb796af90b117dcfcd8552da2ea236399c2708a4862de753a8f92cdff80a69cfdcc5d53e206f9f3ffc48d8 SHA512 2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611
+AUX openvpn-2.4.5-libressl-macro-fix.patch 2096 BLAKE2B d3d277c8bd800827ceabc01431c2ff22e78a89921ff2460460e9acdfbfb7466188456557031de2b0bf2c00703a573c05ba1fcbff96da4b5def596c82717ac81a SHA512 77026186911e852e8434b19662026fa5503a389ecc1a7a8fb3a395beeb2397bc75426ca310e7728ac24ec540b59e00fd623324e262276007c772f9a1cda16863
 AUX openvpn-external-cmocka.patch 2083 BLAKE2B 4e9f0a2ca509a4c37d2efe061ed7a027ba7e069041d193a237d214c493b839fc36e87898aad160eb8198845306b7910f4d9da0e87671b9310425786fbe676bf4 SHA512 6c34518f626992031735f6433861fafd44e3cf35e95668cf5945aee7b341a049e3b6a73dd9937a0f287e4a750a2415532ae49aac11011767e0c7a3355f8ff6ca
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.4.tar.gz 1390194 BLAKE2B 52aa5b9d301b4b5a14acf685f4d4c520d5ec1aa06755262a8504a4c3bb5ee1b8435f68eb4278f25b900f9ae182f31688ef36e4e839ec7a211ad6aba0f76a897a SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76
 DIST openvpn-2.4.5.tar.gz 1430930 BLAKE2B 3ff1324b18fdc24109085a4958401e6d5636b5dc47d30e21392c17410625215bb20473409410ed74995a1b4bb2650ed62217b64b9184805a15ac1ff64a7a8a73 SHA512 a2e3e23bb5374e26d5af393f75686af1962980838c46aee062bc65cc9ffb6f1d20c2c261d1f9abae56ff84a5d22da4a5edb21e39943b33f4a205f809190383c6
 EBUILD openvpn-2.4.4.ebuild 4669 BLAKE2B a76f11fb5271cee7dedeb624dd47d74cb53b52b4867738a9bb0d304001c84017c7c0f1cd119b4cb1eb8b870195267605bf4a5a8db66ac97d9b886bae3bd9f474 SHA512 d3a7b1362d77855d111eea2ca5922b3f43b3d6a0e2b169e4d8c518e6bb047b9329125766dc485d9967e7a5c72fc37888de69a0f37675085aed43e22f56f7df09
-EBUILD openvpn-2.4.5.ebuild 4677 BLAKE2B 5d18623acfc7c4076371ddbcf72e1ed83a17239bbc05593c1b6b02f013ded3bdb2429a39791de5927f00541b6fd55a18f652b004df73ead18687f37aa4bef948 SHA512 fbd405bfb0fae6785e4af11f3b0132d29975f1abd5cdcf94bc97a231cd27996b9392db2193940c84f0abcadc2f4ab65b5cf665209bcce08565ef625b2f3fa061
+EBUILD openvpn-2.4.5.ebuild 4722 BLAKE2B 0208bbd968a1337d41e030356af4f2794ddad6c99d9be6ee21c2b06aa69e3661b5aa441bb9cfbc7f043b01da826790e1cab7dab25a89917d4905eda88df59426 SHA512 055145e05b51204de47213c7fb51da0f1e7f575695a6d5bb2a0332eb99d398ff251ff55e0f427cd04794e84c7898d1cd4d157427628b2f2074df7eade520a35b
 EBUILD openvpn-9999.ebuild 4473 BLAKE2B f26cdcc07aee889c11213b91e7e35d34933195b4ec9523ca20ed9f711f3f939785f769e5c8ea94ac6bc58e6ec6b894ec2037f3153a8fd9cc906fc176d6ad6b8e SHA512 700392c91522915cb00d9282eb7f53f237b40d78c3d5702dfccd6255e86b7b1a86355fdc45902fcba572cbcbf5ee87239b0b4197557934413884b633b7fdc4fa
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch b/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch
new file mode 100644
index 000000000000..13b976009524
--- /dev/null
+++ b/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch
@@ -0,0 +1,63 @@
+diff --git a/configure.ac b/configure.ac
+index 626b4dd..2a8e87f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -948,6 +948,18 @@ if test "${with_crypto_library}" = "openssl"; then
+ 			EC_GROUP_order_bits
+ 		]
+ 	)
++	AC_CHECK_DECLS(
++		[
++			SSL_CTX_get_min_proto_version,
++			SSL_CTX_get_max_proto_version,
++			SSL_CTX_set_min_proto_version,
++			SSL_CTX_set_max_proto_version,
++		],
++		,
++		,
++		[[#include <openssl/ssl.h>]]
++
++	)
+ 
+ 	CFLAGS="${saved_CFLAGS}"
+ 	LIBS="${saved_LIBS}"
+diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
+index d375fab..340d452 100644
+--- a/src/openvpn/openssl_compat.h
++++ b/src/openvpn/openssl_compat.h
+@@ -661,7 +661,7 @@ EC_GROUP_order_bits(const EC_GROUP *group)
+ #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT       RSA_F_RSA_EAY_PRIVATE_ENCRYPT
+ #endif
+ 
+-#ifndef SSL_CTX_get_min_proto_version
++#if !HAVE_DECL_SSL_CTX_GET_MIN_PROTO_VERSION
+ /** Return the min SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 is found, return 0. */
+ static inline int
+@@ -684,7 +684,7 @@ SSL_CTX_get_min_proto_version(SSL_CTX *ctx)
+ }
+ #endif /* SSL_CTX_get_min_proto_version */
+ 
+-#ifndef SSL_CTX_get_max_proto_version
++#if !HAVE_DECL_SSL_CTX_GET_MAX_PROTO_VERSION
+ /** Return the max SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 is found, return 0. */
+ static inline int
+@@ -707,7 +707,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx)
+ }
+ #endif /* SSL_CTX_get_max_proto_version */
+ 
+-#ifndef SSL_CTX_set_min_proto_version
++#if !HAVE_DECL_SSL_CTX_SET_MIN_PROTO_VERSION
+ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min)
+@@ -736,7 +736,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min)
+ }
+ #endif /* SSL_CTX_set_min_proto_version */
+ 
+-#ifndef SSL_CTX_set_max_proto_version
++#if !HAVE_DECL_SSL_CTX_SET_MAX_PROTO_VERSION
+ /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max)
diff --git a/net-vpn/openvpn/openvpn-2.4.5.ebuild b/net-vpn/openvpn/openvpn-2.4.5.ebuild
index 7143fb14c098..d93cd5da7e51 100644
--- a/net-vpn/openvpn/openvpn-2.4.5.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.5.ebuild
@@ -49,6 +49,7 @@ CONFIG_CHECK="~TUN"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-external-cmocka.patch"
+	"${FILESDIR}/${P}-libressl-macro-fix.patch"
 )
 
 pkg_setup()  {
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index c47c97382fd4..f5dd2ce2d25f 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,13 +5,9 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
-DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
 DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
-DIST tor-0.3.3.3-alpha.tar.gz 6486946 BLAKE2B 1cd281ffd960e2d161da390bf0e8f25ffa998458f9cb7c08d5d843b6748feab7e80a963b785433d66f97e46c5c5cb8d00e57240ed2f53866e423cff3e7bbe7b0 SHA512 03c819099b5d7b1657da2df387aa6d354ac0a450ddc19eccd81cc96be96b7741ea034e999d09092dcdfd78c93246a341149da7640a1d693eccbe3ed137370fd0
-DIST tor-0.3.3.4-alpha.tar.gz 6379590 BLAKE2B 3d54d8a95702b007b617e4b15f25f4f1207e53f8c00cb576ebc3b53e06c461b7bdd2ae1cca3ac09624790e46b7747c232755f32523e858913dfd342c6959757a SHA512 e9053de4adac117b938b24eeb82183ffe61638e64f2209dfed1b8333b0acc478c212df150720eda59b6d31505d6e0b301cc1f4edc38564d6f0593a82f326b015
-EBUILD tor-0.3.1.10.ebuild 2019 BLAKE2B e251df1cb10358715ae8de9dcfd33dccfa5801857c2ea69a50881a77859254a2ae2d108be2565ed811a1e543e066154e5b4e13fca7679c9d60b80fcb941eb309 SHA512 9d204642593d26303c5addffee36fdb1dad2570a38a42d9a2d601323291ad14edf4269da645f49427ce3a783740cc06a5a38329e3bc84c151037bc7da2d514b7
-EBUILD tor-0.3.1.9-r1.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
+DIST tor-0.3.3.5-rc.tar.gz 6511634 BLAKE2B 5eb4a4ac31b55340967e99243cd9af2b631e76932c1a5d3bcb2374c6a24d7288f635c1f5bfb6f9c31467bb46e659e0a039f80a08ddc6eb934f3d4c3604dbb5fd SHA512 d2e1a12bf5a4d2f99b94978d952215df54347e91e46c05adcfa749df489f030048ba67ddcda96258bc36815977ed4677235588909023552dfe986227bc004ef6
+EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
-EBUILD tor-0.3.3.3_alpha.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
-EBUILD tor-0.3.3.4_alpha.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
+EBUILD tor-0.3.3.5_rc.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.1.10.ebuild b/net-vpn/tor/tor-0.3.1.10.ebuild
index d8d66291356c..eda70f132ce5 100644
--- a/net-vpn/tor/tor-0.3.1.10.ebuild
+++ b/net-vpn/tor/tor-0.3.1.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 # We need to keyword app-arch/zstd
-KEYWORDS="amd64 arm ~mips ~ppc ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.1.9-r1.ebuild b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
deleted file mode 100644
index eda70f132ce5..000000000000
--- a/net-vpn/tor/tor-0.3.1.9-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 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"
-# We need to keyword app-arch/zstd
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
-	app-text/asciidoc
-	dev-libs/libevent[ssl]
-	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 )
-	zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-libfuzzer \
-		--disable-rust \
-		$(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 web tor2web-mode) \
-		$(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-r8 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-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.3.4_alpha.ebuild b/net-vpn/tor/tor-0.3.3.4_alpha.ebuild
deleted file mode 100644
index 655250741364..000000000000
--- a/net-vpn/tor/tor-0.3.3.4_alpha.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 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"
-# 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"
-
-DEPEND="
-	app-text/asciidoc
-	dev-libs/libevent[ssl]
-	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 )
-	zstd? ( app-arch/zstd )"
-RDEPEND="${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=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-rust \
-		--disable-restart-debugging \
-		$(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 web tor2web-mode) \
-		$(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-r8 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-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.3.3_alpha.ebuild b/net-vpn/tor/tor-0.3.3.5_rc.ebuild
index 655250741364..655250741364 100644
--- a/net-vpn/tor/tor-0.3.3.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.3.5_rc.ebuild