[gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/

["Sam James" <sam@gentoo.org>]

commit:     28ffa30b397d97d48e0f98f07e894d64c64f07f2
Author:     Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Sat Aug 29 12:33:15 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 21:52:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ffa30b

net-vpn/i2pd: version bump 2.33.0

Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/i2pd/Manifest           |  1 +
 net-vpn/i2pd/i2pd-2.33.0.ebuild | 93 +++++++++++++++++++++++++++++++++++++++++
 net-vpn/i2pd/metadata.xml       |  3 --
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 84499d2ee7d..4a749f4a848 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -2,3 +2,4 @@ DIST i2pd-2.30.0.tar.gz 1087411 BLAKE2B adfd6d2eebb2bbd0fe931a9a96110d0bf540ceff
 DIST i2pd-2.31.0.tar.gz 1092238 BLAKE2B 61424b8d5796511a1bae4d0274b86fa198e0fb2e590312e7e5039533bca2ded494f9bdd7406951c82a99259772581ee716159f6500921f9fb8b5fd4aa217ce9a SHA512 af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
 DIST i2pd-2.32.0.tar.gz 1098880 BLAKE2B 0b5db302cac78c6993fd7c25362bad512c0597222059c21d0902c1378228425bafc6e39040c1a99122b66dfca106db64ff69783b23e40caf528764f7ec1709c6 SHA512 f76eb2744b55b4099914cb42e7fe6821e3b7b3dbbc93d491a83cfb8cd9fb67e6559f20891874215060a3797b5f66051480e49670032c952fcddf91aa96e0e41e
 DIST i2pd-2.32.1.tar.gz 1099034 BLAKE2B be32443d2d686247459e74396202ff5fc595be27b7a4e207aa756f35c6b65fe05b006491bb9b8a564bc2b3c1144dae1dcba8dcfdff95cedfb032ca137f30d617 SHA512 2c492942526b5d6dd787baaf6ad31b036c593d633a36ba951c02d3289607be5e43562057622deee51db724854eef6f4bd67eaec62699b07aad47ee49fd291783
+DIST i2pd-2.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910

diff --git a/net-vpn/i2pd/i2pd-2.33.0.ebuild b/net-vpn/i2pd/i2pd-2.33.0.ebuild
new file mode 100644
index 00000000000..9b23723bdc1
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.33.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs systemd
+
+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 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
+
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	!static? (
+		dev-libs/boost:=[threads]
+		!libressl? ( dev-libs/openssl:0=[-bindist] )
+		libressl? ( dev-libs/libressl:0= )
+		upnp? ( net-libs/miniupnpc )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		dev-libs/boost:=[static-libs,threads]
+		sys-libs/zlib[static-libs]
+		!libressl? ( dev-libs/openssl:0=[static-libs] )
+		libressl? ( dev-libs/libressl:0=[static-libs] )
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)"
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
+
+PATCHES=( "${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
+
+pkg_pretend() {
+	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_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# working directory
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+
+	# 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_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/metadata.xml b/net-vpn/i2pd/metadata.xml
index cf0e4a0905e..412f0dd2b43 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -17,9 +17,6 @@
 		<flag name="i2p-hardening">
 			Compile with hardening on vanilla compilers/linkers
 		</flag>
-		<flag name="websocket">
-			Enable websocket server
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">PurpleI2P/i2pd</remote-id>