gentoo resync : 28.04.2019

39 files changed, 214 insertions, 677 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 347faca2e627..9230027aae0b 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/aiccu/Manifest b/net-vpn/aiccu/Manifest
deleted file mode 100644
index 57884478b1ba..000000000000
--- a/net-vpn/aiccu/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX aiccu-2007.01.15-Makefile.patch 2128 BLAKE2B cf0da51f23b8e7d126dff3eca409f1de92b2fdb50565eb33f876d6d0db548557eb885a665df24a3415228679df63273aea949a4496189b8a1a4ec6cc19997d54 SHA512 bafc7d397edcfc24138fc32137dc0ee6eb2afedd5e14656e3b769ff50790619a421b5dc3860c316e4c2150890154ded1149eaa5e23734dd0e2471464ff032544
-AUX aiccu-2007.01.15-gnutls-3.4.patch 927 BLAKE2B ef3a4225d71ba4bd004dec7ad01e6238f62bdd68c9d57048589b32d3754acfa018f5b4aec499afb837dc2cf4336d1fa8d5d90423e115c2fc76c8a2f6a2b66c9e SHA512 43d875eab0d4d4a6133b1a37a76098f58c4601c0235614806c5a9bfae88c6f3a52a32815ea83b1ec1d55c8ae3e18c5348ff16f73567aaed6bee081944783636c
-AUX aiccu-2007.01.15-r2-init.gentoo.patch 677 BLAKE2B e4e3825ff8089e4050712a7969a3daea0ce7e021af32f0b088061aef03050871ca3edaea63f34277dbefdaeb7b152e3e09b068403bc8eea4006d1eeaf2ccd1d3 SHA512 06ca8ca7d860fddf3c1f30eecbfcb7fb8b2e62b66ea3fbdba25af16b03fd91d47c26c54f9b5589c1e91b3a2dc7efeeb457b98db7dde85484402f6c24db0e2570
-AUX aiccu-2007.01.15-setupscript.patch 414 BLAKE2B a607014e0d0b6ceaf6ed308fe97f47e74162bb3445bf4a29e44d324a5f38175bce75cb5ae6f0b8749eb6403959fbd02ad6ef2a6ac9e7aa590a901529867853d3 SHA512 6170c9c52516d58ea68f2acd61c78379f21a1810a9c19867c57249547aa07ca35b1281ae4dea905ac4600d2b2643b3a1c7050e3adbad963efb3554688dc4ac0a
-AUX aiccu-2007.01.15-systemd.patch 1365 BLAKE2B 840e135e703498f26908cd72a31a12e83cff3c0e79d1a97c2a8fa1f8e590dbf1d2a5b9b238db3fdbe96a4f92d37a0ec33932d6250112fdbe73e85bd1d5a62925 SHA512 3caf0282aa6e8731b0c0ad7cbb6e2975a7588a6e7df9d0346d0e602e8777d9eddeefc481ae0b9e236b780c6fdd7f434a679bd45303ea0aaa6754f2891e0d7bff
-AUX aiccu-2007.01.15-uclibc.patch 790 BLAKE2B b51a5cd7f14df2f1d6dc349ac06c00b6edd4adbfbab3ddad5642dae583f6d4ee52979095877d3a0b1288d44d149c8477850c77feb879c032db5a1fd958548cdb SHA512 fe2382db103f1cda397dfdd02b97e44e1b54b256d87a81fc04e46b999ed5692a077f15a974414f7cbddf6e22c5ba975da0d0fa96e5de516c3741d9121deafca6
-DIST aiccu_20070115.tar.gz 70056 BLAKE2B 6eac12e3f26f5a2765f195805d23909dd4b9f506e0307855fdb4008b9a9d452ad819415b932f3461fb8aa695cf60bbda4bc642607992d9dc3a69b569693d97d3 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78
-EBUILD aiccu-2007.01.15-r5.ebuild 1285 BLAKE2B fc3df872851eb51210352e9fddcad3f4e5a484628e9f4eca441c648482703b4d824b7d2da1c589ab0fd75b4e695a2701d92a16eb5744b589faaf8d30dc30424d SHA512 8f1fb3e0eb1b21aeff4092493fadaf64ff9a54a22736e5b5a116650bc074a25b2921d940a39eec13903a92ffe74054fefa303da5a2399a74f81c3e5f9a33d73e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/aiccu/aiccu-2007.01.15-r5.ebuild b/net-vpn/aiccu/aiccu-2007.01.15-r5.ebuild
deleted file mode 100644
index 2887d7a02020..000000000000
--- a/net-vpn/aiccu/aiccu-2007.01.15-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
-HOMEPAGE="https://www.sixxs.net/tools/aiccu"
-SRC_URI="https://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_${PV//\./}.tar.gz"
-
-LICENSE="SixXS"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc sparc x86"
-IUSE="systemd"
-
-RDEPEND="
-	net-libs/gnutls
-	sys-apps/iproute2
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}
-
-CONFIG_CHECK="~TUN"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-r2-init.gentoo.patch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-setupscript.patch \
-		"${FILESDIR}"/${P}-uclibc.patch \
-		"${FILESDIR}"/${P}-systemd.patch \
-		"${FILESDIR}"/${P}-gnutls-3.4.patch
-}
-
-src_compile() {
-	# Don't use main Makefile since it requires additional
-	# dependencies which are useless for us.
-	emake CC=$(tc-getCC) STRIP= -C unix-console \
-		HAVE_SYSTEMD=$(usex systemd 1 0)
-}
-
-src_install() {
-	dosbin unix-console/${PN}
-
-	insopts -m 600
-	insinto /etc
-	doins doc/${PN}.conf
-	newinitd doc/${PN}.init.gentoo ${PN}
-
-	use systemd && systemd_dounit doc/${PN}.service
-
-	dodoc doc/{HOWTO,README,changelog}
-}
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-Makefile.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-Makefile.patch
deleted file mode 100644
index c0eabbefd906..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-Makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- unix-console/Makefile.old	2010-06-28 21:56:32.287782600 +0200
-+++ unix-console/Makefile	2010-06-28 22:15:56.232637681 +0200
-@@ -25,14 +25,11 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar
- # CWARNS += -Wpacked
- 
- #CFLAGS	+= $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0
--CFLAGS	+= $(CWARNS) -D_GNU_SOURCE
-+CFLAGS ?= $(CWARNS) -O3
-+CFLAGS	+= -D_GNU_SOURCE
- CC      = @gcc
- RM      = rm
--
--# Add -O3 when nothing is specified yet
--ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0)
--CFLAGS	+= -O3
--endif
-+STRIP   = strip
- 
- # This is a console client
- CFLAGS	+= -D AICCU_CONSOLE
-@@ -42,7 +39,7 @@ CFLAGS	+= -D AICCU_CONSOLE
- # Currently defaultly builds only on Linux, but other platforms might easily also support it
- ifeq ($(shell uname | grep -c "Linux"),1)
- CFLAGS	+= -D AICCU_GNUTLS
--LDFLAGS += -lgnutls
-+LIBS += -lgnutls
- endif
- 
- # Linux
-@@ -50,7 +47,7 @@ ifeq ($(shell uname | grep -c "Linux"),1
- CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
- SRCS	+= ../common/aiccu_linux.c
- OBJS	+= ../common/aiccu_linux.o
--LDFLAGS	+= -lpthread -lresolv
-+LIBS	+= -lpthread -lresolv
- endif
- 
- # FreeBSD
-@@ -118,7 +115,7 @@ ifeq ($(shell uname | grep -c "Darwin"),
- CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
- SRCS	+= ../common/aiccu_darwin.c
- OBJS	+= ../common/aiccu_darwin.o
--LDFLAGS	+= -lresolv
-+LIBS	+= -lresolv
- endif
- 
- # SunOS / Solaris
-@@ -126,7 +123,7 @@ ifeq ($(shell uname | grep -c "SunOS"),1
- CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
- SRCS	+= ../common/aiccu_sunos.c
- OBJS	+= ../common/aiccu_sunos.o
--LDFLAGS	+= -lsocket -lnsl -lresolv
-+LIBS	+= -lsocket -lnsl -lresolv
- endif
- 
- # AIX
-@@ -137,17 +134,19 @@ CFLAGS	+= -D AICCU_CONSOLE
- CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
- SRCS	+= ../common/aiccu_aix.c
- OBJS	+= ../common/aiccu_aix.o
--LDFLAGS	+= -lpthread
-+LIBS	+= -lpthread
- endif
- 
- 
- all: aiccu
- 
- aiccu:	$(OBJS) ${SRCS} ${INCS}
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
--	strip $@
-+ifdef STRIP
-+	$(STRIP) $@
-+endif
- endif
- endif
- 
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
deleted file mode 100644
index ee637a761029..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-gnutls-3.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-from http://git.alpinelinux.org/cgit/aports/tree/main/aiccu
-
---- aiccu/common/common.c	2015-04-17 23:08:32.543680010 +0200
-+++ aiccu/common/common.c.new	2015-04-17 23:14:02.152457972 +0200
-@@ -272,7 +272,6 @@
- {
- #ifdef AICCU_GNUTLS
- 	/* Allow connections to servers that have OpenPGP keys as well */
--	const int	cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
- 	int		ret;
- #endif /* AICCU_GNUTLS*/
- 
-@@ -300,8 +299,7 @@
- 	gnutls_set_default_priority(sock->session);
- 	/* XXX: Return value is not documented in GNUTLS documentation! */
- 
--	gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
--	/* XXX: Return value is not documented in GNUTLS documentation! */
-+	gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
- 
- 	/* Configure the x509 credentials for the current session */
- 	gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
deleted file mode 100644
index 35ca2b8a6719..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- aiccu/doc/aiccu.init.gentoo
-+++ aiccu/doc/aiccu.init.gentoo
-@@ -2,7 +2,7 @@
- 
- depend() {
- 	need net
--	after ntp-client
-+	after ntp-client ntpd
- }
- 
- checkconfig() {
-@@ -23,14 +23,19 @@
- start() {
- 	checkconfig || return 1
- 	ebegin "Starting aiccu"
--	start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start
-+	start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start
- 	eend $?
- }
- 
- 
- stop() {
- 	ebegin "Stopping aiccu"
--	start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop
-+	start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop
- 	eend $?
- }
- 
-+restart() {
-+	stop
-+	sleep 3
-+	start
-+}
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-setupscript.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-setupscript.patch
deleted file mode 100644
index 8981530435f3..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-setupscript.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- aiccu/unix-console/main.c
-+++ aiccu/unix-console/main.c
-@@ -471,6 +471,14 @@
- 	 */
- 	if (aiccu_setup(hTunnel, true))
- 	{
-+
-+		/* Running setup script */
-+		if (g_aiccu->setupscript)
-+		{
-+			aiccu_exec("%s", g_aiccu->setupscript);
-+		}
-+
-+
- 		/* We need to stay running when doing Heartbeat or AYIYA */
- 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
- 			strcasecmp(hTunnel->sType, "ayiya") == 0)
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-systemd.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-systemd.patch
deleted file mode 100644
index e8616d04b3fc..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-systemd.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- /dev/null
-+++ aiccu-2007.01.15/doc/aiccu.service
-@@ -0,0 +1,13 @@
-+[Unit]
-+Description=Automatic IPv6 Connectivity Client Utility
-+After=time-sync.target network.target
-+ConditionPathExists=/etc/aiccu.conf
-+
-+
-+[Service]
-+Type=notify
-+ExecStart=/usr/sbin/aiccu start
-+ExecStop=/usr/sbin/aiccu stop
-+
-+[Install]
-+WantedBy=multi-user.target
---- aiccu-2007.01.15/unix-console/Makefile
-+++ aiccu-2007.01.15/unix-console/Makefile
-@@ -48,6 +48,10 @@ ifeq ($(shell uname | grep -c "Linux"),1)
- SRCS	+= ../common/aiccu_linux.c
- OBJS	+= ../common/aiccu_linux.o
- LIBS	+= -lpthread -lresolv
-+ifeq (1,$(HAVE_SYSTEMD))
-+LIBS	+= $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon)
-+CFLAGS += -DHAVE_SYSTEMD
-+endif
- endif
- 
- # FreeBSD
---- aiccu-2007.01.15/unix-console/main.c
-+++ aiccu-2007.01.15/unix-console/main.c
-@@ -12,6 +12,9 @@
- 
- #include "../common/aiccu.h"
- #include "../common/tun.h"
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif
- 
- #ifndef _WIN32
- /* Enable/Disable heartbeating */
-@@ -478,6 +481,10 @@ int main(int argc, char *argv[])
- 			aiccu_exec("%s", g_aiccu->setupscript);
- 		}
- 
-+#ifdef HAVE_SYSTEMD
-+		/* Tell systemd we are operational. */
-+		sd_notify(0, "READY=1");
-+#endif
- 
- 		/* We need to stay running when doing Heartbeat or AYIYA */
- 		if (	strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 ||
diff --git a/net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch b/net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch
deleted file mode 100644
index 56341dea72f4..000000000000
--- a/net-vpn/aiccu/files/aiccu-2007.01.15-uclibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -26,7 +26,7 @@
- 
- int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
- {
--#ifdef _LINUX
-+#if defined(_LINUX) && ! defined(__UCLIBC__)
- 	struct __res_state	res;
- #endif
- 	unsigned char		answer[8192];
-@@ -38,7 +38,7 @@
- 	uint16_t		type = 0, class = 0;
- 	uint32_t		ttl = 0;
- 
--#ifdef _LINUX
-+#if defined(_LINUX) && ! defined(__UCLIBC__)
- 	memset(&res, 0, sizeof(res));
- 	res.options = RES_DEBUG;
- 	res_ninit(&res);
-@@ -47,7 +47,7 @@
- #endif
- 
- 	memset(answer, 0, sizeof(answer));
--#ifdef _LINUX
-+#if defined(_LINUX) && ! defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index cc285abbeb4b..9b3babf2c8e8 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,11 +1,8 @@
-AUX 0.9.37-add-cp-to-tests 1880 BLAKE2B bd5da44d351acbea0583a7e26ead5c898739c87fc33b949772b8fdb9415c3277913cf0e97fadf6c379e8b4cfb4d723ea7e121b6c36ed72d4cec96b8d4bbd1fbd SHA512 3afcb97ad455777d9ad1f158d9a6f0de42694dd92841dc588a4308f666a6a4810cfa3be5a1f00a730e7f15f8573e9f7a5107885561f4e7a847da017904ee37a1
 AUX 0.9.38-add-cp-to-tests 2908 BLAKE2B ab78902afe450bd4f6c5741900cf4e88c5760726b95cae4b74092104a84a05073e227d382080db6af09a96a1034d8e20ec1b4a9c9a6fa6894e7df37e9d887399 SHA512 f2725aea99a37820048cbd8af4f17fd7b3702eba5c2d2d9816bb20a531c9c643e94dd8c88a8b4cd40240ba0fbf20dd85dcb30a7f84f7bcd97dfea5420e8724ac
 AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
-DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
 DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
-EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf
-EBUILD i2p-0.9.37.ebuild 5212 BLAKE2B d7851583229df8021448749324ffe3927ca843ac59fc97ced69adeafed513a9c75be89346ff8f8353c0df02f963e06788e2653e2a3853aebea7604653ed33b08 SHA512 e6aaa547eb6039804b8af5c17fa35e532f303d54bfbcd5d3c25ba17b53cc390b1f7e87e257ea55e2311d2bc4cc2985a77401db44a7a4a3ea47cd6e64386c0341
+DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
 EBUILD i2p-0.9.38.ebuild 4618 BLAKE2B 35befafb709b7d61ea4e0c9ec69ef5412703ac659e298ac2568a6995109f1a0741695deafa34ec828f1fb2ccc90c27dbb9ae4e3e85b10a2ae44c00a7c4398fbd SHA512 2c7fe6101d65197b72ff1516802431731ccf0c83169e93de85e5458bfd668ff6353080c6ab2cb18945198ebca358769a1856cf4489e0e72bff70a21f2a59cdd2
-MISC metadata.xml 904 BLAKE2B cc55ce0d1f0cd042997b30a12405ad9e4f0e7e63926c8bc5409dae47d2f0aa37fd141ce8dd436abeb0b417b04484b7bc0155b075899c8127d424301b1af2913b SHA512 195b17fe2bedf530b32ef031b92044d9adf7c1e43d7ba067301bb02d716c9a9836c105663083aad79353afc9938cca1359dc57409adae809e12c8e2f260240c2
+EBUILD i2p-0.9.39.ebuild 4568 BLAKE2B d79911a88386dbcc02791fbae143be8353f3774f5a2aa5a058a8dc24d451c33e64621bfa27b76528d0c228496c099cc1ae414872e50775ad2b0b8ab0ba1798c1 SHA512 3d1142911ff90037b0b9f8f9a8d9c4d70c9f57bbb709f05eae7b5e99390ca5bd37b43b53165d3eb1128f8e881be37ce24307ed005585e3be57a1a390de02f146
+MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
deleted file mode 100644
index b8e967dd31d2..000000000000
--- a/net-vpn/i2p/files/0.9.37-add-cp-to-tests
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
---- a/apps/ministreaming/java/build.xml	2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/ministreaming/java/build.xml	2018-10-12 08:15:16.481532093 +0200
-@@ -194,6 +194,7 @@
-             includeAntRuntime="false"
-             destdir="./build/obj" >
-             <classpath>
-+                <pathelement path="${javac.classpath}" />
-                 <pathelement location="../../../core/java/build/i2p.jar" />
-                 <pathelement location="${junit.home}/junit4.jar" />
-                 <pathelement location="${hamcrest.home}/hamcrest.jar" />
-diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
---- a/apps/streaming/java/build.xml	2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/streaming/java/build.xml	2018-10-12 11:17:22.814404049 +0200
-@@ -62,6 +62,7 @@
-             includeAntRuntime="false"
-             destdir="./build/obj" >
-             <classpath>
-+                <pathelement path="${javac.classpath}" />
-                 <pathelement location="../../../core/java/build/i2p.jar" />
-                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
-                 <pathelement location="${junit.home}/junit4.jar" />
-diff -Naur a/router/java/build.xml b/router/java/build.xml
---- a/router/java/build.xml	2018-10-04 12:05:14.000000000 +0200
-+++ b/router/java/build.xml	2018-10-12 08:14:52.921530213 +0200
-@@ -162,6 +162,7 @@
-             includeAntRuntime="true"
-             destdir="./build/obj">
-             <classpath>
-+                <pathelement path="${javac.classpath}" />
-                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
-                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
-                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/net-vpn/i2p/i2p-0.9.36.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
deleted file mode 100644
index 5bedf3debbfa..000000000000
--- a/net-vpn/i2p/i2p-0.9.36.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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 multilib 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:*
-	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 )
-	net-libs/nativebiginteger:0
-"
-
-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|" \
-		-e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
-		-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,jbigi.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/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.39.ebuild
index b12699fa6694..f9b032fe1103 100644
--- a/net-vpn/i2p/i2p-0.9.37.ebuild
+++ b/net-vpn/i2p/i2p-0.9.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 
 # Until the deps reach other arches
 KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls test"
+IUSE='nls test'
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
 CP_DEPEND='dev-java/bcprov:1.50
@@ -41,15 +41,7 @@ DEPEND="${CP_DEPEND}
 "
 
 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.8 )
+	virtual/jre:1.8
 	net-libs/nativebiginteger:0
 "
 
@@ -58,10 +50,6 @@ EANT_BUILD_TARGET="pkg"
 EANT_TEST_TARGET='junit.test'
 JAVA_ANT_ENCODING="UTF-8"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-add-cp-to-tests"
-)
-
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
@@ -166,14 +154,4 @@ src_install() {
 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/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 71d052d100fd..47d301c7bc15 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -15,7 +15,6 @@
 </maintainer>
 <longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
 <use>
-	<flag name="ecdsa">Enables additional checks to make sure a setup is available that is capable of using I2Ps ECDSA provisions. I2P will work without it, but you will likely see warnings.</flag>
 	<flag name="nls">Adds Native Language Support using GNU gettext.</flag>
 </use>
 </pkgmetadata>
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 4dc870ca8358..0c73e1d09e7f 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -10,10 +10,12 @@ DIST i2pd-2.21.0.tar.gz 1993520 BLAKE2B 616f4938d547e6a5d27292bec1741fa28131c37a
 DIST i2pd-2.21.1.tar.gz 1993853 BLAKE2B 8686acf12464f892cb116ba6c14b67fc56af45315feec25b4c165c7b38238f48b7e1ca227f8b2b53dabcb4d9f46555e1528f4f11e675fbfc63aa3fad062280b6 SHA512 e73c0c1f624b468a4a30996de77b27f5a2166d16b57724ec58647e5630f9e988052b11962fa47f318403ccd4c675a8d7c8b0ddcaa79666cea9743a6437fc4fd2
 DIST i2pd-2.22.0.tar.gz 2263033 BLAKE2B b8b7fa0a1fc4e333824eed8c6bd5fbfe40b83b7a0dbf5db8001144ca1b672c6e33996ad5218ef53cca15e56738fd8447f1c10a90c109d86a2364ef7646cc1377 SHA512 da8187a5d68bf09962419da91eeeb12534eaa2b519139784afb5faf6f1c40e7b344181f987461614d0f7b6563d0a872c8180ecc8a122ed08688130de3d13b0e8
 DIST i2pd-2.23.0.tar.gz 1008677 BLAKE2B c216785d8642e1c8d7cdbcddd23e6dd0b8a1fe8d732ef8b8d19e3c7c55ad91285dfa85bcfab0934a0acc4c180750ff8e3f5730f948dafff7c283ed084afa3374 SHA512 b547fa5b4ab3fbdf51cded846966b702304cc3dcbafbf3b4fc0e93e1907e45a649dd19eabc851309dfb7d3aa8ef84eefcb2cf1a3cda8549f90200da54df06923
+DIST i2pd-2.24.0.tar.gz 1063751 BLAKE2B 22e0dd09926735d0d512fefde21da7cd6c923225f8e22f8e511a4d170781420670cc297584a01eb1200c45e1bba11f0c7e03153d3a412cf57bb2cebc0307b551 SHA512 89364943ab4d7344c3e7e79759b051710ca7ebb9021220904c112ebd6adac84fac37627c191ed06de5c4aba799a3157f680382b227499d26976ae1a742151514
 EBUILD i2pd-2.19.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
 EBUILD i2pd-2.20.0.ebuild 3166 BLAKE2B 5a62ee83bd80beca39b265a8a6806c733d047066d204afe101ded329795b4f053af6dd13e93914bb22ab307729eda6ed72073a6cd0bd5699ed6f350b4ae136cf SHA512 24098b0bf0e114bbcda5eaa821906f7b7c4387b4202220526bf177c109979f6a0b65d0449a7e13bcc2d134a90cf9e8ca0fc2cd7db04620e1ad5a3115de36a017
 EBUILD i2pd-2.21.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 EBUILD i2pd-2.21.1.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 EBUILD i2pd-2.22.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3
 EBUILD i2pd-2.23.0.ebuild 3154 BLAKE2B ff277675b1d37d58d674eceaac7a1639b0956946e2f8bb6849acf50f6a20165780f0ddecc138e402968c20d4514f0ad4e44122cd8fb2ff5cea764290905cf86c SHA512 b0b8b97067ce62ad1837621456a0b1136541ba7187f4513ca6ca50b61f25b5693361e9341729abe2486da554032ecbb4cf01c55d07a794d82991ae76b483f314
+EBUILD i2pd-2.24.0.ebuild 3154 BLAKE2B ff277675b1d37d58d674eceaac7a1639b0956946e2f8bb6849acf50f6a20165780f0ddecc138e402968c20d4514f0ad4e44122cd8fb2ff5cea764290905cf86c SHA512 b0b8b97067ce62ad1837621456a0b1136541ba7187f4513ca6ca50b61f25b5693361e9341729abe2486da554032ecbb4cf01c55d07a794d82991ae76b483f314
 MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553
diff --git a/net-vpn/i2pd/i2pd-2.24.0.ebuild b/net-vpn/i2pd/i2pd-2.24.0.ebuild
new file mode 100644
index 000000000000..719f88b1a2ce
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.24.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user cmake-utils eapi7-ver toolchain-funcs
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
+
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="
+	!static? (
+		dev-libs/boost:=[threads]
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? (
+			dev-libs/libressl:0=
+			>=dev-libs/boost-1.65:=
+		)
+		upnp? ( net-libs/miniupnpc )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		dev-libs/boost:=[static-libs,threads]
+		!libressl? ( dev-libs/openssl:0=[static-libs] )
+		libressl? (
+			dev-libs/libressl:0=[static-libs]
+			>=dev-libs/boost-1.65:=
+		)
+		sys-libs/zlib:=[static-libs]
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
+
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
+
+PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
+
+pkg_pretend() {
+	if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then
+		die "At least gcc 4.7 is required"
+	fi
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_PCH=OFF
+		-DWITH_STATIC=$(usex static ON OFF)
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# grant i2pd group read and write access to config files
+	fowners "root:${I2PD_GROUP}" \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+	fperms 660 \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf
+
+	# working directory
+	keepdir /var/lib/i2pd
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+}
+
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT%/}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
new file mode 100644
index 000000000000..1efcb3c956b2
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -0,0 +1,3 @@
+DIST NetworkManager-l2tp-1.2.12.tar.xz 397496 BLAKE2B 7ff57356dcb27d37af52d2f1778875632f65705ee2bff6a047415fef2c1d34fcc11abae08053283ba63ffe92726efc32027d703f50c82a1527f500b81305794f SHA512 b3e6ab72e81df568b77afabd91cef40b35d2b9227087495b0b44f966ef937b6c78ccc94b019102c13fc76ba443f850fffe1ad7445f5967a1737532036e632422
+EBUILD networkmanager-l2tp-1.2.12.ebuild 972 BLAKE2B c1fe49aba715e0b0cb88491569bb5d8a4e24cc0be4640644618fc1b26bd0c5447fb97a6ef4730840d95ea27684258f572865fb88ce8d24d4349a47c0781cd58e SHA512 a980692d97236675f262084e30fa86f4cc7f3098cc90e48379792d4d5ed2c92f43aedeb0dedab170ac5c347c87bbefb3e87386c98624d7a33eb58c3d5bcdc791
+MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/net-vpn/aiccu/metadata.xml b/net-vpn/networkmanager-l2tp/metadata.xml
index 6f49eba8f496..086586c08a88 100644
--- a/net-vpn/aiccu/metadata.xml
+++ b/net-vpn/networkmanager-l2tp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.2.12.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.2.12.ebuild
new file mode 100644
index 000000000000..a1b6b45566a7
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.2.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="NetworkManager-l2tp"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils gnome.org autotools
+
+DESCRIPTION="NetworkManager L2TP plugin"
+HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp"
+SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome static-libs"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2[ppp]
+	dev-libs/dbus-glib
+	net-dialup/ppp[eap-tls]
+	net-dialup/xl2tpd
+	>=dev-libs/glib-2.32
+	net-vpn/libreswan
+	gnome? (
+		x11-libs/gtk+:3
+		gnome-base/libgnome-keyring
+	)"
+
+BDEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		$(use_with gnome)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-vpn/networkmanager-libreswan/Manifest b/net-vpn/networkmanager-libreswan/Manifest
index 5421d8906257..a17ab7c5afa8 100644
--- a/net-vpn/networkmanager-libreswan/Manifest
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -1,5 +1,5 @@
 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.10.ebuild 857 BLAKE2B 0702b86e209df2bbad2686bc7fa0e4f075c2007a3f494771b8c01c6b4c9b412910a50756f99e53a4c8500099943ce1df2d08c0591492c5c1c6a679b59a37795c SHA512 feadc141041376082e2a9d7ab588d576b408812f572288149c31d0547d05169b3a22cfe9cee032fb1ddad959bf236c7e0e318bda5523383d11ab07b6d4fa6540
 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
index afd895a544aa..225505b7b92b 100644
--- a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.10.ebuild
+++ b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 0fc7a5db730d..a3d09f15ecc7 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
 DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
-EBUILD networkmanager-openvpn-1.8.10.ebuild 1258 BLAKE2B 334b88266da2b346eebfd686aa7424b4053af457cc8df1fba239b9dcaad9c6cb90e8c3f0f43903623483ab1f57fb2a4cba0639f3ac4a87ad68e883c6877b14bf SHA512 c5197fde17bf0c7b0ae8800b572924a6af6953413e17497337b076a6d9ea00b733c38ede20751231dd0657139962df4ef6e66f38060f9aeea74d5ce7245c004d
+EBUILD networkmanager-openvpn-1.8.10.ebuild 1256 BLAKE2B 54e4eaaa338447364b6dc56a85d4e37894329f5e401580d3292663626c00a828aa2214d2228ab41dbafd5a3f49159a52871164a2e4ecb7998b5c66985eaa74c3 SHA512 d02142ca90283dcac35f7a88c4a894d9952343953d194b434aaab699b8c16b69116f7ac3eebe4b781cf042f0b2c66a5647ab4d3606ad2f9d1be2456f06156fdd
 EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
index be8cb945aed3..541515a4836b 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 2aa58754ae99..df6db4d679e6 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155
-EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 938 BLAKE2B 7d8115c26a8da345f61674c36aa51edba2884d3330325402ab8618e7d8142047b7c27adfb89347ef2dc5dd5c62f5203a1b9dc8ed09900d330caa7364ade52a11 SHA512 3645d9fc3505f0cd0790893b53eaa47fe39b4a4967260483dcdec36bef1d8bfd347dc68cac56e02eb3d5816676e7be3f3c621a1afce47636c44b3340f2249540
+EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 937 BLAKE2B 33513300bdd65cb15781efe51c1a4f2cd15e8102112af14d94ef1341742be99f1a237f84ef53e1062d2f47342e2a79cf35a8fa1388561f614e4712b25c7d5493 SHA512 5d0ffc3d027cc723d1ecce7e70d85939ce2bc31a145acff4f36c6d1abdccf7ba4a52eb5a496e836ccc3e7ffb19bab77ac289149c7168b685315c3eed3e87b3c2
 MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
index de93d1d51007..2038508b9dbd 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+glib"
 
 RDEPEND="
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 7e17ef6bab53..a11e701ebacf 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -9,8 +9,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
 DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
-EBUILD openvpn-2.4.6-r1.ebuild 4586 BLAKE2B db7c3da2659728384d6bb78beb8ffa632c66dba467403d87250bdbaa4bdc008b6d4e73dda30c1bf747517927256e144ab0e49e2f419525937d293cc14f38082e SHA512 ba63e3d5cade6cae6ae13126aa974798caba94a2806d0f1da2610c891072b349af73f874f6374817d3d509e1e633cf2b1fd2afbf873c9fb5790059758dc6987d
-EBUILD openvpn-2.4.6.ebuild 4577 BLAKE2B e8828ba11b3d6026ebddd2f7c64aa351881b99f9bdc2ad480347db796eaf1fa139e1d3478135e53287439a97bd6904e6911b0ff361110b9d6e32e454ff76c6e6 SHA512 b906ae2d8281893d36ed87bf4b6a58c9d8dfd11dedc2f78bdbaf00f246a32a987b50347dd6142c9224e4744bb34146b154e31c9f68b9d938dc21c1bc12a4bf92
-EBUILD openvpn-2.4.7-r1.ebuild 4631 BLAKE2B 911f155893cedef53848906375d7ff6281496c797335852f64b0d9561b722c3293aeb45ae7d61bac5990791815624fef8b5f112b9321d29c8094435d6c27c065 SHA512 5568835996f6260ac3a2cc03c163b87178775c36c1fa2d53ba09f99f4a1be6c936adab153e7442757709bf28a6de4ac1bb92d2a3ac6183769dbbc542c7cb1702
-EBUILD openvpn-9999.ebuild 4291 BLAKE2B 0bd80862bf886f0ab5a859ac1894c8c786d8a861c3c87cbf70ce8000f1c842a9025c61382aca5e2c4361f626b460ab73cea5f265b7280e023d6d31d4d88860db SHA512 dbd5e8f80532d625c4403e461ed56ba87b1f36ad24c69d13e9c120298a08aa32a3993ee4283a7d436f890b9c284f0dd1c6c313c1ff334f4661d6c2017b7b3a14
+EBUILD openvpn-2.4.6-r1.ebuild 4570 BLAKE2B 553cf285d9b56c9980288a76086cc4c1e6c2966cd0faa9fef748d8d52ebd9d5cc753744af2b91040c9b13842a143018d982221bc38d0ddffd94670cdc19e19ae SHA512 0dbfab153334ac315aa2de9aee667ed0febcc48a0d5cc432e3ec404dc564fdbb35b52626141132ca12ac6638987e98484693bb5e4181de4627228ec9aaf68ce1
+EBUILD openvpn-2.4.6.ebuild 4562 BLAKE2B e6e9d019a5acb456fc52dff3e811045a846fbe1d26548dd2f9b6c4ef5ace5072d7921f095085f2dbbc5c7f6602f2aa2f18d18e20146b5c0842ce9f18fde95515 SHA512 66a74cdff4521b8e0b63b648cf6931e9e47c0d19aa831d00bacaaf5682598d582aa953cc7b6a7447e93606aa3b0db2ade5f80beee337c15e375f684243088736
+EBUILD openvpn-2.4.7-r1.ebuild 4615 BLAKE2B 31fe988c02831d6a8bc96e1cec0b7f3046ec7b78d72c8694c1f3f45b34c20d21656646aba643e552dc199d69df288ddd49c5f8f396c969cd421b105da0e8c56d SHA512 e973cc64e828761ea9a5439d39722d2e240118931d029eb868c86bb05ca4679941bff20ba98d3d71bc15c8ffc8148b4af69ffaac55afb084323d208e677410fd
+EBUILD openvpn-9999.ebuild 4303 BLAKE2B 0f3cbf8a1a16b74e86c95ff0b8b2890ff2c3170ba1f5e274e616a5dfd68310abcdb249075c3dd6b1490e6b161ec64e1aed6a1c3b476179bad8868cf1a4c9b727 SHA512 d0ab575c0144753c57c63bdef58b7ba0a8cb8c62c72b762153b607470a73c87388271c9c079010c2dee157c906fe45fe67a911ac0fbe75d90f934bf925906822
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
index 81d3d655a383..d90a72c8b4e0 100644
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -72,9 +71,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 09a11b23f047..41badc7b0794 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -31,8 +30,8 @@ CDEPEND="
 	pam? ( virtual/pam )
 	ssl? (
 		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-0.9.8:* )
-			libressl? ( dev-libs/libressl )
+			!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+			libressl? ( dev-libs/libressl:0= )
 		)
 		mbedtls? ( net-libs/mbedtls )
 	)
@@ -72,9 +71,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 0ae13d41d8c6..47ecc313e5d0 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
-	mbedtls? ( ssl !libressl )
 	pkcs11? ( ssl )
 	!plugins? ( !pam !down-root )
 	inotify? ( plugins )"
@@ -73,9 +72,9 @@ src_configure() {
 	IFCONFIG=/bin/ifconfig \
 	ROUTE=/bin/route \
 	econf \
-		$(usex mbedtls '--with-crypto-library=mbedtls' '') \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 8ad3d42ffc35..8cf7c4dc8093 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -64,10 +64,10 @@ src_configure() {
 	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
 	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
 	econf \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \
+		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/$PN" \
 		$(use_enable inotify async-push) \
 		$(use_enable ssl crypto) \
+		$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \
 		$(use_enable lz4) \
 		$(use_enable lzo) \
 		$(use_enable pkcs11) \
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 7c6ca8c1173c..5ab8df2b0499 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -5,13 +5,10 @@ AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
 AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a328fa8ff759ed2f5f42d82a0d3555302cb87d4dfc5521e1850a41b9c5332e9210284f1cb0091 SHA512 f8d9354af5ebc07420ced98059262751bffef434b61c6333964338f327e2ac01ae676e375954efa794a1bccf8b939c78387b9fb7261f675f1237b0d946b529c9
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
-DIST tinc-1.0.35-upstream-patches-0.tar.xz 2884 BLAKE2B a01ee1a372cc366402c005a48adccd7e31bd3182c1fc6df2dc27aecd622266be06f2c25aa169794b2970fe1f8218b7fa813365f8852e165ed2356ed885c5fde3 SHA512 c95add88e05dc7dc8d09618dd07870e400e1fe28c8f864acbf131d9616d75337fd1d2d7b44ee80c3f31e1b713f258bb9d575956114e73fea781488d2b477a5f5
+DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b SHA512 8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f88881aa2d21e70f9154570feede6a9771a0eaec83ab
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
-DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
-EBUILD tinc-1.0.35-r1.ebuild 1349 BLAKE2B b6d0cb417a850682c16857f6f341137e4da9935a7fffb44d5afc4adb91bc37459f0a8f488dc55af1735ca5e1a6cb370484fb9b92ae03d2dd71b83092400a0cd9 SHA512 eb05c0ca37005fd0126b6fd611bd62dfcdba09140324e2cce9b6181796051280edf029088d98fa18b5636d026d92e3704f97ddd05ab65b56275f2449a2c52177
-EBUILD tinc-1.0.35.ebuild 1068 BLAKE2B 61e0222d74e8f01930905649be368cc6da9cc37d047f0d78259deca6badc296ff2e8738144e9eecb8b13848f4b34795cba39b623eb50af677d203169c1429f2c SHA512 86835b3684728c69084d59bb94f7d996a1c74a7a215ba11902c4dba3041a0569b88e90748f53412f395482c879f8fb96dee16905e8c605fc08ce3b4607114b38
-EBUILD tinc-1.1_pre16-r1.ebuild 2410 BLAKE2B 45ca4aa369b5d8fb66cd8af6c25b0f124059a86fece6ad89d72f83a5e76e7a4d92b8ed84cecf256737547f596ce32c3479cd68776bd47276d74e60943048374a SHA512 e95f032539e58a0387740f34ff82c51315454b117288a21d45cc620c763a76e3c17edd32b278ef606edf3119d8edd149be117ab95ac277ed01d6819e4ff9811c
+EBUILD tinc-1.0.35-r2.ebuild 1349 BLAKE2B a082f910398173e5956af8fa52782557a263ca1877a7ea710afe0f11f1b82830e851efbf735d92e2e67b267d3bbe85ffb64c28337a59685f41b4355b955f842b SHA512 f765a2da03b5526bdef70fdb50c7efddc0b27d978b97526cb3e0048f1570c9a69ec8376768f462b8d79769eb1185b13b6b42881796471ccafbec246fae2ba41e
 EBUILD tinc-1.1_pre17.ebuild 2417 BLAKE2B fcbfdddaf5c5e80b9af691bc62e0dd59b297fdcedabe8258edc524306f34e1a1a317bb2e2ef13b6e28f053a5c87f683e99eaa74a7439feb653474ceb80abbff5 SHA512 47f0247a1f47c4cd14f6d9d014b33470276f67a0dcee0d7e81d3fec8d0fe48c2db6c8f6a633a87c108c7e399887fba5d2a6d1afc9304796bc6bd63302c4bb71b
 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
diff --git a/net-vpn/tinc/tinc-1.0.35-r1.ebuild b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
index 1f2d089df011..7f3390de4c16 100644
--- a/net-vpn/tinc/tinc-1.0.35-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -7,7 +7,7 @@ inherit systemd
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
 
-UPSTREAM_VER=0
+UPSTREAM_VER=1
 
 [[ -n ${UPSTREAM_VER} ]] && \
 	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
diff --git a/net-vpn/tinc/tinc-1.0.35.ebuild b/net-vpn/tinc/tinc-1.0.35.ebuild
deleted file mode 100644
index 8d387dbc59c8..000000000000
--- a/net-vpn/tinc/tinc-1.0.35.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	lzo? ( dev-libs/lzo:2 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-tunemu  \
-		$(use_enable lzo) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	newinitd "${FILESDIR}"/tincd-r1 tincd
-	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
diff --git a/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
deleted file mode 100644
index f252a1217c30..000000000000
--- a/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-
-# UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	lzo? ( dev-libs/lzo:2 )
-	ncurses? ( sys-libs/ncurses:= )
-	readline? ( sys-libs/readline:= )
-	upnp? ( net-libs/miniupnpc )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	vde? ( net-misc/vde )"
-S="${WORKDIR}/${MY_P}"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
-	PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-PATCHES+=(
-	"${FILESDIR}"/${PF}-fix-paths.patch #560528
-	"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Fix the static (failing UNKNOWN) version in the autoconf
-	# NOTE: When updating the ebuild, make sure to check that this
-	# line number hasn't changed in the upstream sources.
-	sed -i "6d" configure.ac
-	sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
-}
-
-src_configure() {
-	econf \
-		--enable-jumbograms \
-		--disable-silent-rules \
-		--enable-legacy-protocol \
-		--disable-tunemu  \
-		--with-systemd="$(systemd_get_systemunitdir)" \
-		$(use_enable lzo) \
-		$(use_enable ncurses curses) \
-		$(use_enable readline) \
-		$(use_enable uml) \
-		$(use_enable vde) \
-		$(use_enable zlib) \
-		$(use_enable upnp miniupnpc) \
-		$(use_with ssl openssl)
-		#--without-libgcrypt \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodir /etc/tinc
-	dodoc AUTHORS NEWS README THANKS
-	doconfd "${FILESDIR}"/tinc.networks
-	newconfd "${FILESDIR}"/tincd.conf tincd
-	newinitd "${FILESDIR}"/tincd-r2 tincd
-}
-
-pkg_postinst() {
-	elog "This package requires the tun/tap kernel device."
-	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 2edab1af9a23..d395e54907dc 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,7 +5,7 @@ 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.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.4-rc.tar.gz 7193480 BLAKE2B 31b1f95f8c8226a56945c96c10d81c7c93269bd0d377f76281e95fd8014ab0b93c8fb84c9837f977017a66043b1e1da144bf50be2af10c2c47b524acbadf83c3 SHA512 5389e87110824747cab4875414d95d2da3c3740dfd0a74a67d1bcb0b90a6ed76bc16c87dd51a3c93020376d927f07645a50fccba4123c56e83518fedbd508773
 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.4_rc.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
+MISC metadata.xml 448 BLAKE2B 57805e3f34aa7ae1e07297c16ca1cf9171298d9d128fb0d1e5ea1703fe4b697aa2d13ad51cf9b868cada561a3dd5ead47a4e039ba14226e8811cb5c037aa8a42 SHA512 a791bf3a5ad8b73daba0b708f340521fe156b653aa031b3c53062c98696eb92761b012c78140767126065d319a53394129cc452ba2d42f3cd52c71b807fdcbde
diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml
index 0d755825187d..ed620b018464 100644
--- a/net-vpn/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<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>
 	</use>
 </pkgmetadata>
diff --git a/net-vpn/tor/tor-0.4.0.3_alpha.ebuild b/net-vpn/tor/tor-0.4.0.4_rc.ebuild
index 2e27b784b6bc..2e27b784b6bc 100644
--- a/net-vpn/tor/tor-0.4.0.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.0.4_rc.ebuild
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index f0c7f18886c6..a62f2b83992c 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190227.tar.xz 323788 BLAKE2B ec302b0ded5aa1afe477134a5d9ffc4354bfe70e10594a786d1fc74e75375fafa75be5efb300f0d18aa7d14c8bf07432c54bf66b30c83d19fcdbba0c23519798 SHA512 0c27353f27d7ae758cab84a02f63863681baa5eab2b64aa494be30c411b4dccc3af030b410dbfb72342fb5ea34be04f2d3b36ad0bb6a418d9f389ac34384eca3
-EBUILD wireguard-0.0.20190227.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20190406.tar.xz 324112 BLAKE2B 11a67eae986b0adac11dc88c899d68e3c5510bd7fa438bbd378eaa5b3c184b3dd726f625950e6800e0f53662cd1c23d5a78c954edd9a3387f278700bffeab607 SHA512 e3035030299f5a6ae3ac0c2e35dc2d54745cda8f31185b21c6590f1ddcc9c7a83bf7b71cc71f6d48ed6dc8f2b31f3c704f8fa85685d4113f4c560f7eba7b7d5e
+EBUILD wireguard-0.0.20190406.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20190227.ebuild b/net-vpn/wireguard/wireguard-0.0.20190406.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190227.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20190406.ebuild