gentoo (valentine's day) resync : 14.02.2021

13 files changed, 147 insertions, 173 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2b6dd4793fc2..45cd5dd97f66 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-libreswan/Manifest b/net-vpn/networkmanager-libreswan/Manifest
index b577af88e1c8..3fcb35f6cae7 100644
--- a/net-vpn/networkmanager-libreswan/Manifest
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -1,3 +1,5 @@
 DIST NetworkManager-libreswan-1.2.12.tar.xz 397132 BLAKE2B 2ffe269e0898954d37c417df9779ff8e4e673e6b27232119b5414ed962e49d23053df1a73183366c4d47cc2da3032a59d7cbd89494f109a7c1a726f8e974304d SHA512 11cc8c2193959ec722e960825e34f246af3a1f93126bc916c122de6fe8d3194910a65b0884483134be1f4416fa072c9c7086f82e2f95b6f0a034ef409f7ca711
+DIST NetworkManager-libreswan-1.2.14.tar.xz 402108 BLAKE2B 6be276c7fdd5dd588f0d35a1f1b1f1c8ffa902fc6b3d586c870afa2b0c44b58f55e38e55d1e12e68fdeb5fc9c16793185216e1efe3fb773ab63f240fdde9892a SHA512 4dec676c906ab67151321e29a050805c1c2b927da4f15fd3555f3f78758d416bbdd05a664a0e063089211b458abbf9904e82f230cd32cdc4fd5123a73fbe5742
 EBUILD networkmanager-libreswan-1.2.12.ebuild 857 BLAKE2B 0702b86e209df2bbad2686bc7fa0e4f075c2007a3f494771b8c01c6b4c9b412910a50756f99e53a4c8500099943ce1df2d08c0591492c5c1c6a679b59a37795c SHA512 feadc141041376082e2a9d7ab588d576b408812f572288149c31d0547d05169b3a22cfe9cee032fb1ddad959bf236c7e0e318bda5523383d11ab07b6d4fa6540
+EBUILD networkmanager-libreswan-1.2.14.ebuild 859 BLAKE2B aead17bb8b2382b99a4f938a7c1478b2310597938a3d53d3965179cfba0eb4240918985bff6c59654fa6d5c17ee3289179cb681e58bde0f19a58d6f82b21368c SHA512 a59ecde12253c02f5334a17e1a29902c0a45b07861b8eb670c5ee9cb7fd1d93313fc1db5b5203af96d60058b033e9bf683c462e77af3b30239df945be6906937
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.14.ebuild b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.14.ebuild
new file mode 100644
index 000000000000..0c60eeca3a24
--- /dev/null
+++ b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-libreswan"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager libreswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-1.2.0:=
+	net-vpn/libreswan
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.2.0
+		>=x11-libs/gtk+-3.4:3
+	)
+	!net-misc/networkmanager-openswan
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		--without-libnm-glib
+		$(use_with gtk gnome)
+	)
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/net-vpn/networkmanager-wireguard/Manifest b/net-vpn/networkmanager-wireguard/Manifest
deleted file mode 100644
index a49ae776fe52..000000000000
--- a/net-vpn/networkmanager-wireguard/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX networkmanager-wireguard-0_pre20191128-change-appdata-path.patch 945 BLAKE2B 2d235958175d6f62cb9032e88b0a7d8c1e3a0c859d6e233c687fa5aff65cd54b7d225008d150a4b1e6ab3115055d33b6cd07473aeb41e14aef6f1050a66d8fdf SHA512 8efa817767eb80752c862be1b4d1a1aa923d293f868dad880fd02a7af50cebbf1a6b3673a2f6598cb92cb0f38e50434414787b6b33644e3c90a6da13581e9d23
-DIST networkmanager-wireguard-0_pre20191128.tar.gz 238536 BLAKE2B e926c08c68df3e452a7ba25c66e7678969594002cb45a03ca26af32c86b021260c7836157fe9244c07223bf2e1c821ee64c3535c392f3636217c6ae67d8b800a SHA512 4ed9566a18be01b1be7d92da4663a292e17804a706045d58f08640e2fe81f9672880f20d1657b70eafc769b2688f72928c6fa601c0011bde91347902a222e670
-EBUILD networkmanager-wireguard-0_pre20191128-r5.ebuild 1171 BLAKE2B fb7d3c9f5471f133a96b8d5fbbf9ce5ac6e3d52bec24a9da0531bfabe3134785f2015a8759ca369ac333cf52ad21460b655a1b6a3a1c0e915cc18306fa5764f0 SHA512 e4579c17da4360c384349e00c0e35cb25e4161b5909253ebb7f3c60eb56f47ae68a6bdc34821f78c70d925c6b9a08bc8acd2335efe8fe539a46f79a4acdf7224
-EBUILD networkmanager-wireguard-9999.ebuild 1019 BLAKE2B 46b228e851771f0673c01212f40b784840d5faf74982fae7c3983fdf9b3d2306aff39c149e363ca48fae6196de08c63bdd75a4517764a55dfd039cb46436a639 SHA512 89123d77464e1064d49bb0c142483c3cb8bd9067a54eb67469906fa238ee176b6880dc6ef938b6ca35df370b3bb95ba998f07bb92258c730ebc96ac34c74a9c8
-MISC metadata.xml 479 BLAKE2B 2d974d5fe2bfd35934e2638959ea93f54e0bb0c574dc0da398a9521573de047ab091728cbc6583530cdc737bd1c00af16eb282b78aae39ae8d21c37a0ad3aabe SHA512 6f8889fee4242fb2ee7e11b9ff5b1c1e012b434d19ae909c719a12dd63ff30830adc71632fb31517ea24872f3450f54381e787b399391744f8a89dfd4de0e3c6
diff --git a/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch b/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch
deleted file mode 100644
index d774613a9176..000000000000
--- a/net-vpn/networkmanager-wireguard/files/networkmanager-wireguard-0_pre20191128-change-appdata-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f02a7863a13ad5da340b35648ae5cefc0789869e Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Mon, 20 Apr 2020 17:00:58 +0200
-Subject: [PATCH] Makefile.am: store appdata to /usr/share/metainfo
-
-The path '/usr/share/appdata' is deprecated and
-should be changed to '/usr/share/metainfo'.
-
-See section: 2.1.2. Filesystem locations
-https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 81c6923..53d6f1b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -266,7 +266,7 @@ uninstall-hook:
- 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-wireguard-service.name
- endif
- 
--appdatadir = $(datadir)/appdata
-+appdatadir = $(datadir)/metainfo
- appdata_files = $(appdata_in_files:.xml.in=.xml)
- if WITH_GNOME
- appdata_DATA = $(appdata_files)
diff --git a/net-vpn/networkmanager-wireguard/metadata.xml b/net-vpn/networkmanager-wireguard/metadata.xml
deleted file mode 100644
index 7c35c1d67d11..000000000000
--- a/net-vpn/networkmanager-wireguard/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<longdescription>
-		This project is a VPN Plugin for NetworkManager that handles client-side WireGuard connections.
-		It is based on the OpenVPN Plugin and was started as a Bachelor's Thesis at SBA Research.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
deleted file mode 100644
index 4d9e66dee6b3..000000000000
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-EGIT_COMMIT="0e1124df9e97129c5e0d9996a2c3876ae18f01c4"
-MY_PN="${PN/network/network-}"
-
-DESCRIPTION="NetworkManager WireGuard plugin"
-HOMEPAGE="https://github.com/max-moser/network-manager-wireguard"
-SRC_URI="https://github.com/max-moser/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk +nls"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.7.0
-	net-vpn/wireguard-tools[wg-quick]
-	>=dev-libs/glib-2.32:2
-	gtk? (
-		>=x11-libs/gtk+-3.4:3
-		>=net-libs/libnma-1.7.0
-		>=app-crypt/libsecret-0.18
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
-
-PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-lto
-		--disable-more-warnings
-		--disable-static
-		$(use_with gtk gnome)
-		--without-libnm-glib
-		$(use_enable nls)
-		--with-dist-version="Gentoo"
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
deleted file mode 100644
index 7f5d26e4d124..000000000000
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3
-
-DESCRIPTION="NetworkManager WireGuard plugin"
-HOMEPAGE="https://github.com/max-moser/network-manager-wireguard"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/max-moser/network-manager-wireguard"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+gtk +nls"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.7.0
-	net-vpn/wireguard-tools[wg-quick]
-	>=dev-libs/glib-2.32:2
-	gtk? (
-		>=x11-libs/gtk+-3.4:3
-		>=net-libs/libnma-1.7.0
-		>=app-crypt/libsecret-0.18
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-PATCHES="${FILESDIR}/${PN}-0_pre20191128-change-appdata-path.patch"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-lto
-		--disable-more-warnings
-		--disable-static
-		$(use_with gtk gnome)
-		--without-libnm-glib
-		$(use_enable nls)
-		--with-dist-version="Gentoo"
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index d98f3e8eaec0..ac890f60a9a7 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,5 +2,5 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.9.0.tar.bz2 4568404 BLAKE2B daf5cce5cbe12253f9ad201d89323ab7d54ba7ff466685b84830737689e4d417fbb97d053d8c9f3de5acb6dee9a192ebae48ec0d4aa07ba3c8969ee6d8f06ab3 SHA512 b982ce7c3e940ad75ab71b02ce3e2813b41c6b098cde5b6f3f3513d095f409fe989ae6e38a31eff51c57423bf452c3610cd5cd8cd7f45ff932581d9859df1821
 DIST strongswan-5.9.1.tar.bz2 4590867 BLAKE2B 1515764352e7473c47f853a5aa68e582d1fd61122ac1e1577bdc7813da77e0213803c69abf41a1667166e32fb9f2a4bfe8c74616d6431e698e31cf51e939ce3e SHA512 222625e77bd86959da6dd7346cfa9f92569fc396a494bb95ddf2c8e0680b7e8041541e8a14320517a0c735d713ae0fdc0d0c4694215e812817814b0b4efc3497
 EBUILD strongswan-5.9.0.ebuild 9527 BLAKE2B 2ef6b0a313b9fccdd5b389f09fc0cb46f1bdbcf72888ee026e194aa7abd595e034591ffd10db3e75109c18a1779cde184e2e51572a3e1aaedcf1ceaa841ea1f0 SHA512 ae80168f8334a9ea110a3e7ea87e083a530f4219f1d687dd0559318ef189d08333872758f0987bdb8f2e2e538a8cd4c434d1bc8ea07aa427bf6de77803daf1ae
-EBUILD strongswan-5.9.1.ebuild 9477 BLAKE2B 019c0fd2fa014b2dc42143abb4a6b2409d97b27811f0fb5772e73f9d51ee77e96de35a66866425e8f0f8b74275d81a75fce179c80fac5edf1f4377fd2450e107 SHA512 40ea090b9e259192c54e6bd2c836de809562af59eb2a6eb8e975088d7b7f1a6bd4772e67f64eb180ccfab6fff34b15146f9208634a23096064e2743d0eb9cdad
+EBUILD strongswan-5.9.1.ebuild 9474 BLAKE2B 8905412c271c26de26b8fd58d7200bb3bffdaf2aead3c2eb063dbc7cc7ec3f12baee7195df54c556bc0c584dbbb83a95e72f70b6180b0d044c07586afc0f507e SHA512 227f50a3d8db69d1a116f93777087a0cc51de1104a05d433a7d0485dfa6e25dff73eabaf71039f1806399475749747adb46e9bf605f6bc66ef9d7ec360ca46be
 MISC metadata.xml 4228 BLAKE2B 113700b03d706f7ca76cfb67c45dbd5a703f6c45aca08784f7665807c30d5539a9f60d42beb96b72618bbf3587238a3fa7f5a21c8c34550e8bd7f30f72e84cbb SHA512 86c2718a8db2da6f00f9c15bb3b0c7f72af5d6f86e977aae46a3f6a4bbd861e4d30dba15459cfa21fbb484a5818fc32183bd935acce29f30accdcca8b7ae31c9
diff --git a/net-vpn/strongswan/strongswan-5.9.1.ebuild b/net-vpn/strongswan/strongswan-5.9.1.ebuild
index 3ec804ee2611..0dbba9da50cd 100644
--- a/net-vpn/strongswan/strongswan-5.9.1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+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"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3b62bc4afead..1a21ad2b56be 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,7 +6,9 @@ AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c5
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.4.6.tar.gz 7806477 BLAKE2B 8eb5f22825193a61be42105ad32bd82e662c1859971fb2248fe05da2f80d1a3a9cbc96ee4f47f4127da56c328f5c60a6f57d5641cfa90b79becc8bf622f56f3f SHA512 84f981bed6d8c89d3de437e35dd2ad2ca3ee5efd7ce6b78e3e00bf40f644f495b960a7a741be5dd7ba096d73d5f941974722a44e9d3ef4fbcd02b20274d565fb
-DIST tor-0.4.5.2-alpha.tar.gz 7909432 BLAKE2B f19054c504dabecddf3ddb1b7195d5a37083ae0109ceb670af174a3876ec6f31d1a2ea0c0e8e5847d21e7ae5366f0e90aab72f91391e3de18a03639349bc46b1 SHA512 ca3f55522b198fd69abc948ef8c9dc14106b7cf6dc38f9308ca7188c713acaa07ac41c532621fc25934bf146721db99d80ca6d0fadf4a5bae7c7931a035341b9
+DIST tor-0.4.4.7.tar.gz 7812645 BLAKE2B 8e35c56c0dc94c01de556ae3a02e2d465776dbe9cb2db35d4513dbe83b5e3b0b3641570ddeee1f43aedc34edba245591d4457debc13fa43111780cd4cff739f2 SHA512 356e9569eb79d81bccba1360d10af7d78f3824d5a4827fc95272a952fc8e5bebdfa9ec99fa82992c025625d6da963c15803acbabd66cd59c587c1e042af16acc
+DIST tor-0.4.5.5-rc.tar.gz 7918239 BLAKE2B 8db4d4edbfa8a3298bd5269dfa6c38797cb217a6e5e1bffbee7a007847f8ea0c2fa87dc9343597af500fb9a51dacc7685d66a309b7bdffaabcdf271018b3bc84 SHA512 e7ca955387a7e985488d9af8a51703251af990e7fe790377caa8e349b48ccc6286e73fdb2f042d74323af2f9a82ecf3766adf3c2dd499bfc46d7ad7f578815a8
 EBUILD tor-0.4.4.6.ebuild 2396 BLAKE2B 222e94672d20bc9b073b668a84ee446c9c2ea3161da990e2599119046d3586c1e781f75f4f8617c2f224072c3f8b50ff8b4fd3a6529535eceff072cbd12d4104 SHA512 d5e477251f5d13f48c4f46adebde4c24ebb89fb80547ee1719f534fa091f65f3444da25d4ebd717e24b37fe63387d5ea3af261949822482f45bb8b2205ac84aa
-EBUILD tor-0.4.5.2_alpha.ebuild 2347 BLAKE2B 87d97ba428f73fc7d8db86339500620824ab5f87d76b5a135931b39f4579061d3238790b34f08479f512ddc124871d777dec2453e348910b5132fe4ce870be7e SHA512 0ad5b1b7bc105b155c48452d974ff6250f27345b948e69b1b145b422413f087aec961c650f43f6706e2b1834092abbf23800d2800a1879715e5f3e1f284a4272
+EBUILD tor-0.4.4.7.ebuild 2402 BLAKE2B 73413ad692d0c74f51000ee1d52805046c116646741effc3cf86ee06347a671647e26142b0a5b0ae54196022e752fc125ab2d1b52b96db31750fdf5bdd82dd30 SHA512 64a6bea16d866f27d3b229463532a4f16864f16f41e7e2f750f6a0079fa24594b0f3d1b0834c6a8a09c85260f26d70a54f45bfc3b0e8d7710a1f60bd66af7ef5
+EBUILD tor-0.4.5.5_rc.ebuild 2347 BLAKE2B 748c868fe10e2ba502f88fb2ed607c19334ce0d7a6b97e0e76ce52a6e51fcf9169bc6ccc3f6a06ba02f4a4011fc64525fe61ae95c0680eb21fddca0b945d7ae8 SHA512 6df906de9f7865ac6498f6d8aae0f6997b4c55310af0c8f47abb8f8ce8076670e14b174a3cb13b652b1b896dd2cde51482789c90e5bbf37f26e88e4b816faf98
 MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/tor-0.4.4.7.ebuild b/net-vpn/tor/tor-0.4.4.7.ebuild
new file mode 100644
index 000000000000..3ef4e3e4dd5e
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.4.7.ebuild
@@ -0,0 +1,93 @@
+# 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
+
+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 +server 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" \
+		--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 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.5.2_alpha.ebuild b/net-vpn/tor/tor-0.4.5.5_rc.ebuild
index 689cf47c9f83..63ea086b109c 100644
--- a/net-vpn/tor/tor-0.4.5.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.5.5_rc.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"