gentoo resync : 18.05.2019

10 files changed, 16 insertions, 495 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 5229573206a4..604ec91a1629 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 0c73e1d09e7f..68cf4eff08fd 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,18 +4,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.19.0.tar.gz 1982459 BLAKE2B b05f7a3018091e9c0008ca7037e44b6f5a4416be57054df5f9af72bd664b7d4fc7673e5d3eb1b8bb1ddfb61e81145eb0a847b301a580ef971d181ed00a4c960a SHA512 4c3d2408962f3e55e1a22491b0844ce44cacc7aa631541a86e94554da88e42234576fe221e1398c88e7e68d267bbf9e73cbea9cd74981c354e46ba82d62bb32f
-DIST i2pd-2.20.0.tar.gz 1991174 BLAKE2B 37b85dc37299cd6d2f64050eb096ecc11d75ccdcdba845f34c908e6467cbcb9fa7cea9243415bafd7c9167f5e8ea06c8729bcb885e78f45e37680f8001b69237 SHA512 affade889d32fdf20fc0bc4c7bb809fb511794421a80a93334707e26c72eecc83715d756d79ce7924d43ef44dc9f655925de860b5b392b6c4fe815eb873c1864
-DIST i2pd-2.21.0.tar.gz 1993520 BLAKE2B 616f4938d547e6a5d27292bec1741fa28131c37ad12b0f7c564e24ff0fd3b0a01974989ac6f337cd58cc1a618980fd171692c0164d22c3e97080540318e5df89 SHA512 a9c2f4bb1ec6459e7f8f48b74a48dd192af0962876fc6dcf998febe342918f98a21ae421cf48402d5e0c4570641eb3112d85522230dad34cabe6c4f367d6d8ab
-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
+DIST i2pd-2.25.0.tar.gz 1068786 BLAKE2B 80e5e6de2ffaad86c0c3ad4a89cfa12cf3ac8cf61ae856f4647af4e06b56594f39e9d75d798d5429b372fba718f4e92ea4ea94b802929ab22d8850ba46b2827e SHA512 e45318236b7a4e23c8dc83423f4cbc62e622a6f6346a67d56af09b805a82f1d1bf4174c9785078292ad07fc7e5e75f15d3fcc801e44fddcbd8c30d6c7bd6975e
 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
+EBUILD i2pd-2.25.0.ebuild 3154 BLAKE2B ff277675b1d37d58d674eceaac7a1639b0956946e2f8bb6849acf50f6a20165780f0ddecc138e402968c20d4514f0ad4e44122cd8fb2ff5cea764290905cf86c SHA512 b0b8b97067ce62ad1837621456a0b1136541ba7187f4513ca6ca50b61f25b5693361e9341729abe2486da554032ecbb4cf01c55d07a794d82991ae76b483f314
+MISC metadata.xml 629 BLAKE2B 53fdd29677e15ec3a5692b80ff83e43a6463aa3282478b10cfa577493f6cb87249a0f9643d5f2e8ba51fdd9d753546c9ed5dbb5f167fee5f6abf4e3240e2ff5c SHA512 631467e96539599a194a0c63665c902cda90be2c08405fb619d88bc17ada0e107c8e7d70345f6a488fd46ca580a48904c02125ffaec84dc1a86fdcc10a9d0cec
diff --git a/net-vpn/i2pd/i2pd-2.19.0.ebuild b/net-vpn/i2pd/i2pd-2.19.0.ebuild
deleted file mode 100644
index 454dd172bd22..000000000000
--- a/net-vpn/i2pd/i2pd-2.19.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd user cmake-utils versionator 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 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_aes 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 )
-			sys-libs/zlib
-			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 && ! version_is_at_least "4.7" "$(gcc-version)"; 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_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/i2pd/i2pd-2.20.0.ebuild b/net-vpn/i2pd/i2pd-2.20.0.ebuild
deleted file mode 100644
index aa8dd040979b..000000000000
--- a/net-vpn/i2pd/i2pd-2.20.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd user cmake-utils versionator 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 )
-			sys-libs/zlib
-			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 && ! version_is_at_least "4.7" "$(gcc-version)"; 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/i2pd/i2pd-2.21.0.ebuild b/net-vpn/i2pd/i2pd-2.21.0.ebuild
deleted file mode 100644
index 9b28206e7582..000000000000
--- a/net-vpn/i2pd/i2pd-2.21.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 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/i2pd/i2pd-2.21.1.ebuild b/net-vpn/i2pd/i2pd-2.21.1.ebuild
deleted file mode 100644
index 9b28206e7582..000000000000
--- a/net-vpn/i2pd/i2pd-2.21.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 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/i2pd/i2pd-2.22.0.ebuild b/net-vpn/i2pd/i2pd-2.25.0.ebuild
index 9b28206e7582..719f88b1a2ce 100644
--- a/net-vpn/i2pd/i2pd-2.22.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.25.0.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
@@ -15,23 +15,23 @@ IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp we
 # if using libressl, require >=boost-1.65, see #597798
 RDEPEND="
 	!static? (
-		dev-libs/boost[threads]
-		!libressl? ( dev-libs/openssl:0[-bindist] )
+		dev-libs/boost:=[threads]
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
 		libressl? (
-			dev-libs/libressl:0
-			>=dev-libs/boost-1.65
+			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] )
+		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
+			dev-libs/libressl:0=[static-libs]
+			>=dev-libs/boost-1.65:=
 		)
-		sys-libs/zlib[static-libs]
+		sys-libs/zlib:=[static-libs]
 		upnp? ( net-libs/miniupnpc[static-libs] )
 	)
 	websocket? ( dev-cpp/websocketpp )"
diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index e99300273d5e..64ef73af4652 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -9,10 +9,6 @@
 		<email>klondike@gentoo.org</email>
 		<name>Francisco Blas Izquierdo Riera</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
 	<use>
 		<flag name="i2p-hardening">
 			Compile with hardening on vanilla compilers/linkers
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 30ca27bd1076..7fa31d5b4587 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.4-rc.tar.gz 7193480 BLAKE2B 31b1f95f8c8226a56945c96c10d81c7c93269bd0d377f76281e95fd8014ab0b93c8fb84c9837f977017a66043b1e1da144bf50be2af10c2c47b524acbadf83c3 SHA512 5389e87110824747cab4875414d95d2da3c3740dfd0a74a67d1bcb0b90a6ed76bc16c87dd51a3c93020376d927f07645a50fccba4123c56e83518fedbd508773
+DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
 EBUILD tor-0.3.5.8.ebuild 2176 BLAKE2B dada372351cc5c34b3929c3a18ee9287728cd3b3c7285366213c056737ed2dfdfdc9887ec9b1cd9c8e352f4d953c927301ab1c2a86a648499ba9932006f7bae8 SHA512 a64cd8723241a6a8af8955b84db614ef6f7b868ee445289cdfc3962ad5daab59925768875cf2a25441455eaee1b3469aabbb9ab5916c5c7b700d867384f7960e
-EBUILD tor-0.4.0.4_rc.ebuild 2230 BLAKE2B ec5dfa73675ceac29a469b29bb6bb414175f0e9099adbf4059ea013f7a8be039d4f69d52f2b7d94c4b258b6240fa07347d1ff2975ac61008bb67cff166037211 SHA512 f87cc6e4e70b7cee2f309f7e06d49726a24c4c26ea00c5d51f06cd25677a687d0f9ab1afee6ccf51e460389cb1f07ea90fc419ed1ecde0f365dfe44635533075
+EBUILD tor-0.4.0.5.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.0.4_rc.ebuild b/net-vpn/tor/tor-0.4.0.5.ebuild
index 6b60698543f6..5260bac68c8c 100644
--- a/net-vpn/tor/tor-0.4.0.4_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.0.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="