Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

8 files changed, 182 insertions, 49 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 347faca2e627..d8f8f4fe8f0e 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 5421d8906257..e808bf81fbc9 100644
--- a/net-vpn/networkmanager-libreswan/Manifest
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-libreswan-1.2.10.tar.xz 388552 BLAKE2B c7172ab8e9f967eb69a20b329d7d9f6d8beca8e809f5d6b74a3bbdace553ce47ed99dc09f7655c61a399a01a52073bdedf86d4405227049870530fff68991870 SHA512 90eef90e0ecbe8b8e7b927b49e996b042231ea25495f46b2413dd11a597f170f23668d0a3900f82c84e377dacc15f7589a48b5f28c7d6ee3580b7bbd8f61060d
 DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 BLAKE2B e27180b94807db3bab7d41502674fb9e950fc8eb79447a901f2c69f9fdbbf99032e007cb1e631ef5f8eec5dbed40e74f1e0eadecef7fdfc3b618500447a3a9a8 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
-EBUILD networkmanager-libreswan-1.2.10.ebuild 859 BLAKE2B c382b8614670a92710fe315bf81d12b9eae3a04d8bec6cc2afbcd3a920ac48d42e7ebd0d9c718467a47d38e60ddfe62e0eebec59bca96ea5c8ddacd6e9336597 SHA512 fb03b01a77f0894fc7b711c75528709767970836e5bec4fbe15770f568d0fb9d2e9aa75108d645921760bfa66899aed94d22008ce831b2c0bdd57abff2fdf01f
 EBUILD networkmanager-libreswan-1.2.6.ebuild 837 BLAKE2B d6683af55cc293b35cd492e6862b8958243b106b9e0d8742be124134b9e83251448dd9b74afc486cef1bc88df3026e4569e3c6fa089653586f0c4be6da7c4269 SHA512 5c046e22b2c49e4dac512de88f8dab8c578145865763bd6f5f3cb31c94d68ea28ddadffb5307624b2b193b9e0b36d33a191b5f057944706197dc9cd9f63784d0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.10.ebuild b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.10.ebuild
deleted file mode 100644
index afd895a544aa..000000000000
--- a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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/tor/Manifest b/net-vpn/tor/Manifest
index 2edab1af9a23..182f5412ff1a 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,8 +4,12 @@ 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-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
+DIST tor-0.3.4.9.tar.gz 6695931 BLAKE2B ebfe0f49ae923e63b0bd8a7cafc453d7b0775cbfd167463b364490faf9bbf61decd28906d8f5bb08bfa9a5a10b371d9188a5019314c0de5ace15cc379347f88e SHA512 cc254a2cc2f21b4511e9cb215ba5f05fefc4dceffcf46a402efa2d3540872a4ed8e0095245df0802ea12c1367451bc16ca60c0aea6a77e2139580f3c5ba8c02f
+DIST tor-0.3.5.7.tar.gz 6934521 BLAKE2B 3af9a1a14fa5ea7ce0a5be08db3e2cbe4188d569bda92c7a24a66f94d79869acfd1ba9e1c51bfb0ac3f6399d79b907888d1546ba7898af9563d65f5288c09577 SHA512 e3a7be620c228c3bc73ea9350a19abecb0ac6dae2b309d6233151ab2377c754110a9854d8d221f380f80cffa2f723d266bd09b3432ae33c319c0fe9a7e538bc9
 DIST tor-0.3.5.8.tar.gz 6994335 BLAKE2B d37006ee48f6ecb9205fe9ad1178f2375aec5a8f8c614a85af398e2114d13e4ef7dcfc501685f2f6d4dbb44cca2ab318be69ac37686a3ef1bb980adcdefcac11 SHA512 47a21cdd6d4563dd9bfb43c26f054f00747d069611dc9b16eb11b9653fab5c0133fb8bd30e162fa27d90d6bc4f88c0e2bf49eb4fe54529017d5eb87c3bb86132
-DIST tor-0.4.0.3-alpha.tar.gz 7173481 BLAKE2B cc3710d3530364a29cc1b461643c847ca449c711d9abdc6b39bb366e7d7b0edea2f146429d5fbcef85a9d4515d260cf689576414bf37db9b12424a20637994f0 SHA512 88a7380b6c674dc06ee5c7aaa9b4d444c8f771220e47c83fe27612659432c6cb8ac8dd79998e6c27b7815b77113478d475fa8c6ab9733d26bb261b143456f8ad
+DIST tor-0.4.0.2-alpha.tar.gz 7156129 BLAKE2B 7262558ae96382b6b40e4f7122b2d73f9d9e5cf4695662d9a0289c0b3218dc835afaf18b326d2f074df7eb9496f7db0bf63fc60a0e5a89fb2b4d7d9f2620b593 SHA512 a69301e1f337c466e6fc064ff8d581d5328c84532fe902720252f3b055079b5dfb203489d1684b2e9055c737b17ad8ebdfaf96e4d0f7fdd83514ffbce22745f0
+EBUILD tor-0.3.4.9.ebuild 2198 BLAKE2B 6c350a8532cee3ffb1be3cbd33d1d98fc39b75c79772f8cff00b9a9db1bcc40003f47ac5f429ee4e616075c7138b46be29227970abbcc0ad1be77c464dc14597 SHA512 9d5600ebc92dd36acd25beb0eac0c709557b3709897afeb738461a21a82ab5dd82ac46e78d6cc0a32f8954b800584db42b3bc23fc79df80ee702d2a4b654bf40
+EBUILD tor-0.3.5.7.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
 EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e
-EBUILD tor-0.4.0.3_alpha.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
-MISC metadata.xml 520 BLAKE2B d6dd514af55383b79212c3173a3f6bcdba6566409a39ee69f53b44b9c852816cd3e21b1b1eff487453be748e309e829b29b053d01845d730b1bbe46171f99d60 SHA512 bee0e15e89680b2334cdeb2ce9c25e7ffeea0b375850936d627528955980c4b486e9290c7ffcb45437cc9b020236f15c8e6f92c55ad74fb15e009e0f5a6ba83a
+EBUILD tor-0.4.0.2_alpha.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
+MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml
index 0d755825187d..00b3de70ab61 100644
--- a/net-vpn/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
 		<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag>
 		<flag name="zstd">Use <pkg>app-arch/zstd</pkg> for compression</flag>
+		<flag name="web">Build a tor2web service instead of a tor client</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-vpn/tor/tor-0.3.4.9.ebuild b/net-vpn/tor/tor-0.3.4.9.ebuild
new file mode 100644
index 000000000000..75831fe871e6
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.4.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd user
+
+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 ~mips ppc ppc64 x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	!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() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(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.4.0.3_alpha.ebuild b/net-vpn/tor/tor-0.3.5.7.ebuild
index 2e27b784b6bc..2e27b784b6bc 100644
--- a/net-vpn/tor/tor-0.4.0.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.5.7.ebuild
diff --git a/net-vpn/tor/tor-0.4.0.2_alpha.ebuild b/net-vpn/tor/tor-0.4.0.2_alpha.ebuild
new file mode 100644
index 000000000000..2e27b784b6bc
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.0.2_alpha.ebuild
@@ -0,0 +1,87 @@
+# 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 user
+
+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 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	!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() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(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-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
+}