gentoo resync : 29.12.2022

3 files changed, 84 insertions, 3 deletions

diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 5db9d588e7ca..86fb22416046 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,5 +4,7 @@ AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d64
 AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3cec686f3ecb6e3b7b04a13c1de57ba081da7dee4c35b72bc65f2a1ac3c4dccf3a57c22b24eba248664f SHA512 58f28b38a39e3e7a1bf378e17dad1c0879c641d6c479db887f33e2689dde29f4f2fa1b9d3dc9a6ab03eb35d2e834b5691de2bc7d9c97c9a8523ebea1e9cd637e
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 DIST i2pd-2.41.0.tar.gz 594453 BLAKE2B 36298133f057152445d3f7c83c9983d1e16476066f0139019faf0168142cb8dbed150eccee1e006c0a9f1b67670855fdb38513e8d7992e05122b581890b036a5 SHA512 10ba77d714e4b02f9640c64b16b597550f71bfacf02242bd17cfdc7fc416e0e9bc62a2f1da486161baea397dae3d260fa88359325062b1c587f509058d418d85
-EBUILD i2pd-2.41.0.ebuild 1998 BLAKE2B 5872dec5207242412116c1d2d5087ce56affd22bb530e7ca9f99c3ae7ab34779e36648704046358b523d25880b969a1595e949820670bbe99f32edc4c91006ba SHA512 fa3da8f4e735cf33c2e4eae99b9a8a369032d9bb6de3d6b7c93e611a88ba46d14bfe3b9972c654b35ffc201f72a7631e62d55b793c2e8dca48045c346b9a662f
+DIST i2pd-2.42.1.tar.gz 615872 BLAKE2B b3e2e070e616d6908f8024dd83ca2fe77aa76ba233a62575ac0b36767448a4741fb227c3b326179355ff9c11acf887600e70697226baef6ade2d945c5e4c34bb SHA512 85df4d8d0a18bf7f3095191a5181a1fa864bfad7b84d2fc18a089b964d80166727f010dcd55a0c8fb1c4e385e1b35b3a1d975f0c0c2efa70999f3c19aba08d97
+EBUILD i2pd-2.41.0.ebuild 1981 BLAKE2B ad97683d22fdf588ef0d7d99fc68442dcb85137fbf645c67cca50d25c44bce832ee47b3e8fdf1acd40236527f34f312bc9b593d0d045a215978a12557398d0f2 SHA512 67d40285777d45e1396991c855ee2862dc2330f3479f00ee9249bea286e6797e8c25007762626ab2b86c4c92041ad13061ddae5df65c1dcc78e6d96491eeb06a
+EBUILD i2pd-2.42.1.ebuild 1981 BLAKE2B ad97683d22fdf588ef0d7d99fc68442dcb85137fbf645c67cca50d25c44bce832ee47b3e8fdf1acd40236527f34f312bc9b593d0d045a215978a12557398d0f2 SHA512 67d40285777d45e1396991c855ee2862dc2330f3479f00ee9249bea286e6797e8c25007762626ab2b86c4c92041ad13061ddae5df65c1dcc78e6d96491eeb06a
 MISC metadata.xml 728 BLAKE2B 37fbc9a6966478aa61c9c67e20835bd759dc46ec88e4a575974acb872e3f73d093ec354399441b64b283d16ebbd9b6d23bdbd40e38c483a184f0700d01e1f179 SHA512 927d1fb8cafb87bf199e7e67bbc6edffd08eb7e7b50c8b7a7bf16cf5cbe3dfef32fca387b5c861c8e4aa3336687022a6978a7084e730d1dc6308c3db6152d309
diff --git a/net-vpn/i2pd/i2pd-2.41.0.ebuild b/net-vpn/i2pd/i2pd-2.41.0.ebuild
index 106e5d800df4..5306c078013b 100644
--- a/net-vpn/i2pd/i2pd-2.41.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
 		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=OFF
 		-DWITH_STATIC=OFF
 		-DWITH_UPNP=$(usex upnp ON OFF)
 		-DWITH_LIBRARY=ON
diff --git a/net-vpn/i2pd/i2pd-2.42.1.ebuild b/net-vpn/i2pd/i2pd-2.42.1.ebuild
new file mode 100644
index 000000000000..5306c078013b
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.42.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 +upnp"
+
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	dev-libs/boost:=[threads(+)]
+	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
+	upnp? ( net-libs/miniupnpc:= )"
+DEPEND="${RDEPEND}"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/build"
+
+DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
+
+pkg_pretend() {
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_STATIC=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.39.0.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.38.0-r1.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
+}