gentoo resync : 07.01.2022

10 files changed, 130 insertions, 15 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 45bb220bca6f..9666d1edeefb 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 27b98db7bdb4..a8db02f7dfd7 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -5,6 +5,6 @@ AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d
 AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.5.2-r2.ebuild 5080 BLAKE2B 663bb19848cb44ec344d2782af8eba5903168f54bb539d7c18ef1fd94c95d68f83e0157ba3b75167e51c764d48239001827e50ec7210bb6d910b30b4acd57fcb SHA512 1678862e0284779b1d992ea925c93413cf8066e04b2e9f9a087e249fc1ead141b35b191cfeba51635333f0b66e6de5b8c919392e5c3e1286e5bba8214974746b
-EBUILD openvpn-9999.ebuild 5086 BLAKE2B 03729f6f2dc3ff368b36aedf1d8e576ddcb68e9826a780197c3f15a4485acf67e875b7d18522ddd6798b8f6e2f492950c1a64fd37ce67351a49b587cf1beb003 SHA512 ac4ecbb819eb23e294cb77e71eeccc14dcf516c8ee75cb3a3a4aa69a72ef8fcb0fd727ac78690846d94f615afa73d9123645fbe39ead384ce6f0ccd6f1631f32
+EBUILD openvpn-2.5.2-r2.ebuild 5067 BLAKE2B cdfe2b5ade98314d6227eef1eed058f9f1bf71055a69274e44e6fa8130ca512d706dbc189faa2b6480e62134903a5cd1041e3738f78542d55f47ae8e7c0dc91a SHA512 be89dfae729d8690f308478034ff6b0438537e5a346a331c7c93323927ef936302ce568d76cdce743b37be3cfccae6fd8a4b2cde7cdac1887faee53773be7170
+EBUILD openvpn-9999.ebuild 5073 BLAKE2B 636cc550073d05bb0bdb8348642f0e0fbdd0501e82cdad2caa26f8edf18c00119600416391109a6e6fd0487e75e8c582db9d6bd8addf6dba410c0c01dde345a3 SHA512 76b699fee072205b937c97432ab814c5eae8f10f5eb4a6fabf82089644832727f1dbf8c65fa3f71dc538f8995e53b985fa3b2ca4dcfd7e7e833404b35eb7a17f
 MISC metadata.xml 1084 BLAKE2B 7033412d6507615f6c62a19e23b5519b9b37e9f9e31c364a8fd3fcf366338e586a7b25040f591af60383985efdcfcca9ae1732bb05d25766682406cbe0582050 SHA512 b965606f58fa9a1616210cca127a58867f30049eb8bf6e63d7f0b0943e5c9259d54e3e11763f89d7e1b4f453fc2eee356f4a18ac5354b4bad710dda4f23bed60
diff --git a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
index f3520516410b..005ac8cef337 100644
--- a/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
+++ b/net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 1dfab6f2d9f7..cec8d0d00572 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index ed9e3b7db4bc..d2a553d9d1a9 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,5 +2,5 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815e39b8a88be349ad0a78b531a983d3b3919d5c9f3b97793b0b2569f2c6b151cc3b5d9b145a8bfd663db6f79d8ff3dd6 SHA512 dca30b9be7847e0af59d1526c2e38d440b6729055cb3f0f0637d50d7381df465c7b59e79662efe63870a7a5a44eef696c02231274d2764f9e3c430ce2fd694f6
 DIST strongswan-5.9.4.tar.bz2 4651000 BLAKE2B 071a0a0a144b369a7e4069d92340cecca9eef0c004949d91993c8f1cc0f39f7868749020d6e135fa59d5899d146f39172f87eb32a26ad788cb8a4c160597e328 SHA512 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3
 EBUILD strongswan-5.9.2-r1.ebuild 9476 BLAKE2B 224e5c6d8b9e4bc44efc05088487aa1c967172ff3b8aeb6cc0cbbf945b9ca94456d719f3a04d37310fc8df03dbbba2adb57160327e5917797ed028a1318195e3 SHA512 7d08af11744fbd85e84197b0ccbfcb0eb665293d8326c4600685b781c77d99229943f7ff08b107498c0d617a2bb2249463861285708958df5ee6493fdb3b4c67
-EBUILD strongswan-5.9.4.ebuild 9511 BLAKE2B 078adf9e494742e4a4cc68e52741d51d9ead858ee748c2e3427789035f27c97f8ad7e3917f6ea996655921ce1312719d3d75f504ac5599d157c8ecd44697a54c SHA512 83686bff8309500544f793d96f244c85e90eeac6ac02fdf660d896e24ca20005411c1975d021b207f8ed30dbd229ae4e10877f79eab53c94cc3ed274eac4f482
-MISC metadata.xml 4511 BLAKE2B 9b93f24481ee180b523eae9f1123e520354299a1ec482e428372297c7d49f1f3894a4c921673a6882620c01b4ec0037d7c5e4fec70e100f4a20ec1e8f8f95366 SHA512 82ee3e9076478a0d307eadeaf646083d901c2f6b03ca5346ff39d921907f468054523b49b38693c897354dded58bc89e837b54f55505e1919b941e71d7387348
+EBUILD strongswan-5.9.4-r1.ebuild 9541 BLAKE2B d92ad450c4d2d0e1f004eb432c14b38b80d53e2662beef0dd02f50e780135425e8f452b741e919d3e79e6889274375bbb6cdd483603abef3fce0b051be9752d8 SHA512 f1fc1e8cc72dd158db388869d1babeca199e891d8de2d27c78888bc0d70facc207a1936d0e60af83c8ff26a606ac52c3881bf96abd1caa50df875a220f9294a9
+MISC metadata.xml 4614 BLAKE2B 36dda05c64629c1eb1a84af07c7e87fc473d887cb72828e8293f6333682ec71092d67ea4e6b29722402ff556111823d295b4c43a5142500ac8a682243ba6a903 SHA512 11bb9cdbd59efce68c5467d3615ddf32b94c497fbeaf69ac3d2aeb16cee733ab0db08d045e6b5f20f11c00139bd027bf3f65defcab31dc8cb12b638aa9b8e941
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index dfd6043700dc..0198dd1c8ac4 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>mail@dennis-eisele.de</email>
+		<email>kernlpanic@dennis-eisele.de</email>
 		<name>Dennis Eisele</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
@@ -52,6 +52,7 @@
 		<flag name="strongswan_plugins_save-keys">Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging)</flag>
 		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
 		<flag name="strongswan_plugins_whitelist">Enable support for the whitelist plugin</flag>
+		<flag name="strongswan_plugins_xauth-noauth">Enable support for the xauth-noauth plugin</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
diff --git a/net-vpn/strongswan/strongswan-5.9.4.ebuild b/net-vpn/strongswan/strongswan-5.9.4-r1.ebuild
index 133424376b55..5d6ceeabdccc 100644
--- a/net-vpn/strongswan/strongswan-5.9.4.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -14,7 +14,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
+STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
+xauth-noauth"
 for mod in $STRONGSWAN_PLUGINS_STD; do
 	IUSE="${IUSE} +strongswan_plugins_${mod}"
 done
@@ -138,6 +140,7 @@ src_configure() {
 		--enable-ikev2 \
 		--enable-swanctl \
 		--enable-socket-dynamic \
+		--enable-cmd \
 		$(use_enable curl) \
 		$(use_enable constraints) \
 		$(use_enable ldap) \
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index cc6a78fa72fc..a325d8705363 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,9 +8,12 @@ DIST tor-0.4.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f43
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3
 DIST tor-0.4.6.8.tar.gz 7796485 BLAKE2B 3475597c9f46c83c736bf5f3db2a4f44a38c4f4c4998903d1fe89fc75a7090f4eaa8faafbbd44d728d5e8915f195eb3e284141925b16fca9bf6001844f52863d SHA512 ff008ddf10c2a4c9e0d0da28558c7a97a6d42615c8bcad25a74567e3aafaba49df1699e379fd674f93305d222748d16b2f21d0da9a8fd3444b659747e1f1d07b
 DIST tor-0.4.6.8.tar.gz.asc 833 BLAKE2B 6f1825e3f5e2d70c5078d27990633137c7551fa80f5d202e56cfcb2a88d6b5b653ec6c349c7dc152f6c7313e6330182ce22a42be3f7aa63aced0586ee673addf SHA512 5000c111688d76d357c371532f7edbb01280273e5dc9bc18fa524517fcb1efda1403071536f06d61b8b8a73e26505d6e74cd84bd611f63f2a56e4b944f76b2e9
-DIST tor-0.4.7.2-alpha.tar.gz 7821412 BLAKE2B 04c4b8ed6378580a10d30738e8b85765e3daa7942c2bea0de9fe0103df47989477a41cb98e548a2a5392aefeab3667164a834b41d4d6025b3fcac0e03739bdf1 SHA512 b2f94f267f2fdab37211dbd1e00427532909bf9859d64abcebf45b28ed39cb781468445c48fc774f9028eb8551ca083d80ee407d9132f645765a9b4337215335
-DIST tor-0.4.7.2-alpha.tar.gz.asc 833 BLAKE2B cabd93d394e98a9013dbc2af983214effe89dd4dd7702dd17f1065c75d7da84bad6d493141e2c00576f8d9d119bbc4bb96ae6038139d72c3818e4ba79fe80f5a SHA512 00a32d0e8ee580d769a09a660f3c80674b6f70366bf426329a1c17a807a7dcd09b5f00aef1643f54d6a203bc928bd36d88793f2684665ac22841285d13c8bee5
+DIST tor-0.4.6.9.tar.gz 7797677 BLAKE2B 7d6add30867a3b18471bece559acbf6782b516229b8ab2c764f4a581fcbe3c2fa748f2708c60bf0f8a1165bc1fdd930fe00adaf7c1f546e6a7e98bdc0f1abb21 SHA512 67b3c0c0515d4150dd91db6dd4efe19b15a2e8ddac2a34069d61dfaf79d90585f3ca4071483362619719a7cbc6198d67d1ff73acdefa8cc8462bc1e2a7ba264f
+DIST tor-0.4.6.9.tar.gz.asc 833 BLAKE2B 1028464261cd02502408fff7354b92c68f51ce4ec27a16c190f4d16ec4164fb2f81d8018a6c400b22691dda8a29aa5af41b7e8fc9c72f551c8a1e85976ab1223 SHA512 1a34ae6f3b2d58a1a3d71b7a953cb1f8b0ef30430f016d67978a9323f7da42132a7cc2540245e115311951d524bbb67287d1af5c456a72564a4b49971962116f
+DIST tor-0.4.7.3-alpha.tar.gz 7818590 BLAKE2B 3570d52774fa9a14a96e4d7e3a8d0e9e9d2364a9325589d4f23ab0e08ea0933e8cdd6ca1af93b7fabe7745bcd48fad6fbceac34eff6f64253581f9b6dce39bea SHA512 400c8b2c0937734fe9cc934cff9f396bdb4a5073bddfcd91f74bbe8a7d52214467aaeac4200ee6c9a234bf0552929ab9b0fc9727d425c27b6fbdfd81ea8fcc18
+DIST tor-0.4.7.3-alpha.tar.gz.asc 833 BLAKE2B 5c12e159882c4845f48e86708a30f524c62486ba675080ad7799fbf8b15558cadc4133d271d751e39c44274072defcedf653ba8159a495e090fcd393d75a01a7 SHA512 b98f4fb0b0ff92d9d3a427505e28be34f04e18e78fa6c3f8ce408f2d64904321ef289175c7dad57e761ce711a9e686f3cb96f532304f9d46cd77ce1c57951687
 EBUILD tor-0.4.6.7.ebuild 2741 BLAKE2B 8eb904dcb68d1e65d025f5a212c98ecd94f0cc9ddcd73b2efc80bf70aa44a967c600fd17c7ad909e5818263226fc0d82635b2fb4a1add8b0745dfa642140c479 SHA512 38a62d9b70588301762806663fa680c6fb5bddbe50504ed1aba0dc54b64c2d124780cccdc254d9140626e646eb10200741c85e7f6b6caa03c3c722b507c0532c
 EBUILD tor-0.4.6.8.ebuild 2747 BLAKE2B a7aca64064eadc60687b1595eb61e3a4fe7472eb74bb206d795bc7996742455302f5f1b3be3fae7aa2e229cda1ccbfd90abe903fcae4b44e1058c4aed5aa8784 SHA512 78dc27be6f1c05a53605e1e95c46cd96d9dd5c550878157ba48a7b50b7381c7c41d710b3e3d787f85e3e2f891dc80bdf054eec6d2c36df303a7cdcc663e38de0
-EBUILD tor-0.4.7.2_alpha.ebuild 2728 BLAKE2B 064fb06b75cc6c6f9457e207f3d3daf056f16927566c2f8f0e816db315c0f726ceb73ebc644e5b5258bdefb5eae527a765813a2ed23f186071e639434d05ab42 SHA512 d7ab11a79ff0b8213d53d88f3bead21af3f3c3310118a5741583d236c21c8cc76bbcfc16e5b048369d72049b78dcd1d154f1ff8b780fdff3adca746e88a1dc74
+EBUILD tor-0.4.6.9.ebuild 2747 BLAKE2B bbc1ad0aa3f3ea611601359886bb4e05c5faa96c669e00e2221113937b05714b297df32d5102d1c0646e91f4cebcdc5560ab6ce0bdabee198b173ad75fc8e04e SHA512 2a09174c05b81b470d5fe2df4a99b7c9cc22255175d94eaaf0ccb426b16912485aba01ddf85b98f139022d2d05c7e7be2d52551b0e12afb08a1e05bfe91a9cab
+EBUILD tor-0.4.7.3_alpha.ebuild 2728 BLAKE2B 552a75f3db275b28802577445f9231c42f6a7fc42e72995c59ec922db098732af6fbab9d2a2107ec5e5d806731dfe617a0ec592466b973a9bfeba41dbb56ed97 SHA512 fbbbec160b99ae9cc9a3b9893ff7bde923dbd62b7a63f66684825a6a4e848664daf8647a798dca36f9fe8373bd1e6ebd90e3dd2b0625334805d57a4bd82655a8
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.6.9.ebuild b/net-vpn/tor/tor-0.4.6.9.ebuild
new file mode 100644
index 000000000000..d102418e073e
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.6.9.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://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
+	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	dev-libs/openssl:0=[-bindist(-)]
+	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 )"
+
+# bug #764260
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=()
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use test && python-any-r1_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" \
+		--disable-all-bugs-are-fatal \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--enable-missing-doc-warnings \
+		--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 server module-relay) \
+		$(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 "${FILESDIR}"/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.7.2_alpha.ebuild b/net-vpn/tor/tor-0.4.7.3_alpha.ebuild
index 44410e9bac9e..dd28011f8b1e 100644
--- a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.7.3_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"