gentoo resync : 26.08.2021

8 files changed, 6 insertions, 224 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b9a0ba0fab65..aa236e3ebd9b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 0cf7b8d9c3cd..8d92f048005c 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -2,13 +2,12 @@ AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d34889
 AUX libreswan-3.32-nss-compat.patch 680 BLAKE2B 5eb1f43e95d2f0801e0725ae1186e96ccf529200b0f1e4c8aa8d6d09248114f45a61468ad88a247a85c2f97b019ab0a022c6ce8a6ed263097c8d42c0008cfa43 SHA512 231b3985f333cc4a6f588b6854a217847136dd67305152dd14be96db8c0d7e043b885c47382276387e44939e26d046753d16853f3f0f17b43f966e3c3213c8e1
 AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
 DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f5567914a453ab875185110aeda4d33ecdaacfc83e361f153860a1db66faec70e0ad06af65e310af28ae72ce68fc6a SHA512 bb65512351059e2fac6f1c3ed1e291eabd6835faacf6d9c58649dd71dab1bb4fe6d6074178dea6dea01f24d39f3fbefd84c6060e4d8436b5d057fa55ae4467f3
-DIST libreswan-4.2.tar.gz 3467095 BLAKE2B 0630e9f7cf7ce6182712b4837688fd6b7a1ad1644f167f7ded4e63c7a0aac960a38d903cefbf0189da22b6ddb8c15f217ff3134f220b64020812789c1a196d29 SHA512 290be2e36fb41959c9889597aad8ab5df1edc1999ed7315e8f2e50213de073732c91ad497a2b5634f7bc83bca84089ef9f711420a77309c6cce243f1419a2d0f
 DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
 DIST libreswan-4.4.tar.gz 3503201 BLAKE2B c6c5cb2d7141afe52128e71051fd39b058a06fe4972074c853dbba2937f4c113548392d9c202badac5c1350e4d05f60d4a4d0aed453b1ee91c38a3245b0cf209 SHA512 108b2ac7a36454c48ce448a83ddd81e72d7fbb7cf8b042116d9bd31f195cdab4ccd6311d72af7ab4cc6d054df50d30a6bfc50b56fe7cbfd35d54a68804a6678b
+DIST libreswan-4.5.tar.gz 3529355 BLAKE2B 7485a8c77b997026681b3b99194ee54176f1cd7230af72a2aa231e5caa97946c40b0178f0ffa1dd200085b5919883697d7300bb328561501789707035f045337 SHA512 451a4f71099aa4776624a4c127fdaff492acc38a44228255dcbf955efa0982fd963c989d63522f56279eec6a9ef738febb573dde34aa541724ab11e37a554f9e
 EBUILD libreswan-3.32-r4.ebuild 3191 BLAKE2B 256ae0b37e6efc53174ba4b1e5dce166ec49e719bd3b768f19d40f2a0aa2ecd820ad4f8fa40fc6896e070b70041e50730736be026bf22a439b6d9aa93e44131f SHA512 8f29ae93e948b912dd581b011e9ad03f3069bd1a0dc54ac24341ea75bcf067f61c65d08361145191f25a6b2da9987079514b0bfeb725cb522dce7676290ee60a
-EBUILD libreswan-3.32-r5.ebuild 3229 BLAKE2B ed6d3a1668d2877997a872111c2450d71be046b9acc96949b23405b7f92b178c56c087d1685494d5464f9b1a654e7719f750deeb1b63b5a52b8064060013f917 SHA512 45c5ddcc8e7509f5aa71b4b4e470fc2066b335d81ee304645e5371a873187812fe9bd250192dcfd8c0d89a0f3fbeb3bf90abd8c457d0ac7b7a2b388aa430b216
-EBUILD libreswan-4.2-r2.ebuild 3299 BLAKE2B 9c658f9901211a1a835e9a75b92af351fa572baa175567db55ce80048276d0a152df3a59682d9867fc69ce888b0025bd26347ad51d22d8f533ef425560ecfe1e SHA512 18bebcb26cd8e2933e574eaa3d267dced985b5d0ff6c4b6de3b7d6940eeca66cbf5f3c562e0123ed1abf8b08e0842f353991bb94ae0c75593d6b496ba15153ff
 EBUILD libreswan-4.3-r2.ebuild 3297 BLAKE2B 0349de254a56a9a375f734981326b46a8798a553842fb0030344f09ea797a4cba421dd29bba2a7af7116cac27c5f0290161a694539989c9148daf46610102262 SHA512 8eb0e3189d38b9432d8a879faa96a98536f034743194ceb27ec282562693bd547e4da8bcf162f6e6d0674c555854fcae355f1f7c4b31d1f4fbdfe675fea02342
 EBUILD libreswan-4.4-r4.ebuild 3298 BLAKE2B d580c97b4da77e574ab25a8b163942c302f19c22823799ba780bf9340f34a0cffe7ed2a6cf800891dafebbe564cda92a7b6399a1a4bf9dcfbdbfd028f8bc61fb SHA512 0c075d4992460e9731e183780e11d99f3dc303fff2410b90c019f08c2b317c8a0b6e2ac444044c5570d6578e91275ee0fca57c5a3793fa31d0d9a95ef110a87b
 EBUILD libreswan-4.4-r5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
+EBUILD libreswan-4.5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.32-r5.ebuild b/net-vpn/libreswan/libreswan-3.32-r5.ebuild
deleted file mode 100644
index fbf53aa5227f..000000000000
--- a/net-vpn/libreswan/libreswan-3.32-r5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process libreswan.conf
-
-	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/libreswan/libreswan-4.2-r2.ebuild b/net-vpn/libreswan/libreswan-4.5.ebuild
index ef6abcc59657..06f4baa533ab 100644
--- a/net-vpn/libreswan/libreswan-4.2-r2.ebuild
+++ b/net-vpn/libreswan/libreswan-4.5.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 	export PREFIX=/usr
 	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
 	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
+	export INITSYSTEM=$(usex systemd systemd openrc)
 	export INITDDIRS=
 	export INITDDIR_DEFAULT=/etc/init.d
 	export USERCOMPILE=${CFLAGS}
@@ -79,7 +79,7 @@ src_configure() {
 	export USE_SECCOMP=$(usetf seccomp)
 	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
 	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
+	export USE_AUTHPAM=$(usetf pam)
 	export DEBUG_CFLAGS=
 	export OPTIMIZE_CFLAGS=
 	export WERROR_CFLAGS=
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 89f00dfabbe4..f74a8845c05f 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openconnect-1.2.6.tar.xz 713464 BLAKE2B 7837d2e825b8e962a960bfd00d3e9a9ed247d20d3628d8242c86cb145f8aa3fa8e748126785f067f348a661867436fa5f6e529e4dfefdcb07eec273a807206b0 SHA512 8e6f0af6bcc275d5afff6388b75700c35a5b65773118876203a30ad42a5758cef5d27af8954e8c47bdc46c2b5dfd70262d894aca3d3a62bcab6d240c03eb6fb2
-EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 948 BLAKE2B de63d4917e5c832cb4ceb67adc8e54c78a676de017c8c4e411a73eda2f25722fc79bc04a02b9b57bc12974ac3b81e34e73dc90e42398745ac913052a98e9b604 SHA512 d3e6092eaa041501d4848fdf1dd9e99eb4eabe766652c405ff578af17a22325c6be76378bb590c3f8ecd3a7ed2c4557c69e0a41719bb07c15ded8508e86c3aa8
+EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 955 BLAKE2B 82f2db460538780d49cb2c2b74952e57d5e8278f826bc1d68f97ecff8c4ce2e7d1178e00349ffb52bf3f8d8060ffe0a590e04353256b2872edd59a5672b0f20c SHA512 eaec4389ac3b33bef9ff0fce60a3a122ff26bf8b454ae8b4a4e87e22a0d1b7b2881e9113dec7c53f045f7f62cdebf0c78cb4ca8f86d57cb4a1f0a51cc3af8450
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
index b03a1ae535e8..8aed1039aeed 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index a2eeaa1e2cca..160044d5af1d 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,11 +7,8 @@ AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.5.10.tar.gz 7870323 BLAKE2B cb0b1ee9c997a8837837b5a21e3a18e3efc52f8c056dea65625059b694f5ba76660462510311b1abd30d2659e6c5c5d3f999d42e269d7d7d464676b3f8f8d4d0 SHA512 a6970623696bdd0b3138e51ad3c6eaba13533d537560e1615deb90e41ca508d71282ad526ae6206604889c5a795097a71133bd0e0a9b490f544bff78d9dfa7f0
 DIST tor-0.4.5.10.tar.gz.asc 833 BLAKE2B 8b42bf8e2276ad9f83acf344ddba7db73c8dd3446074980bac339b9021112161944364b5f3d05eae81231ec92846a22fab081bb881133f259a715e242878d64f SHA512 87a60a51c29b8a3ae43b47f0f16e966911e1712ab276cd3da0f8e3194839c6b5c074bd43290a00ff401efd376a7d3100031f8d8e683d9ffa2a35ad709bcaf4b8
-DIST tor-0.4.5.9.tar.gz 7840294 BLAKE2B 75babcbf7929fa34034ad706df1189ca7988e8c5db30f7051a5a006d8bb61afa7ebf7d0f7441e3ef1df1bc777cd80dc165c1d481d65a695c315b8820f8be392a SHA512 b3c3b5cce30c881fb1e705ec6183513f625ddb9d076671b9cd6299e81a410bc12f59a30677636371c336e397211432f0831bdcb2105c9aed8dcb608eae54e2b2
-DIST tor-0.4.5.9.tar.gz.asc 833 BLAKE2B fca3769b683e8bb90540026dda6d2f302d499262c806f7c7215e7a30908cd46b807717fd130380d114660380166852f6a0cbb702966c6930004d04098718d582 SHA512 df538981aa19a2fa730a1e357f277f22b3cae769a1d13fa1d920a5e949d5b3770a8de9883eeaf2522c8b24327f73505569ac0f6ecf77139ddb5ef1e2418924b6
 DIST tor-0.4.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f4374a7dde1e1cb78b4b43944fd6156d84bd98c8be734a7cf81b99cb36187544028c3e4800d38d11d7286d19e12 SHA512 e5f9e235fc4b96f5e63e0bfa4ca412d0d11299a31cb77cae1c199b276d0dfbf3656657ddf910b22625dd49eb726d487666e80e8889db78c9edebbab0d80d9e03
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3
 EBUILD tor-0.4.5.10.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
-EBUILD tor-0.4.5.9-r1.ebuild 2544 BLAKE2B 840d53158ed06452c125ac933253d01f79996b73a24293890dcd25011c969da7dd6e6a8b87bd94f7c0e9426a180e74515a29cade4702dcd14e946a6be2134cc6 SHA512 76f2944e47441bc85be06bdf05c943f5032f344d6aaa28710c79c26ff4f293879e40d463764cb03e44319d6ca7faa743456084d51f8ae3476e912b4daca00266
 EBUILD tor-0.4.6.7.ebuild 2742 BLAKE2B f76a7e441ced00d2c5f8e935468b27c79eac0c15689c84cd6dd3946ab604d481f808b110d5854d7e4a6e6496e656595169b79c7e348a19999fa619a3bb747091 SHA512 1c2aed487ca4c116216ece04af1a71806f51c4858737b2aead93d3be2d40daeb56eeee5c15b5e68e127f6224646a77f8a2eb8b856f8d4aded89df4bddd45a4fb
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.5.9-r1.ebuild b/net-vpn/tor/tor-0.4.5.9-r1.ebuild
deleted file mode 100644
index 7ffede47e2de..000000000000
--- a/net-vpn/tor/tor-0.4.5.9-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd verify-sig
-
-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
-	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
-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? ( app-crypt/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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.4.5.5_rc1-LDFLAGS-typo.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" \
-		--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
-}