gentoo resync : 08.06.2019

5 files changed, 166 insertions, 1 deletions

diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 68cf4eff08fd..0165a06592af 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,5 +1,7 @@
 AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f
 AUX i2pd-2.14.0-fix_installed_components.patch 1033 BLAKE2B dc6a64bc143583184e7b6af1104d5c68dbd96e7a873c6ad335f3b7feba31fb70e155e1117a7f59c1571e8d368048a2a12d664fa170c5378ab553736e47c96d75 SHA512 b4d91487657d1d0b89b8a43eb962e7f87dfb56fdb40fd7e10f4818d1d87cd814833f72c823e808756545c580517b7ce8bf1e11e55d15addd84abc343587f9d66
+AUX i2pd-2.25.0-lib-path.patch 725 BLAKE2B ad87fbfae2cb78945d0e0f62ea9d0ab45e1676908ebb11d6c4844a6160e0eb2714fa1221e886d158454a7ba3c19af7d1bb672035195993fb4633162a761e3bcb SHA512 1e1942c8c424ecefb0b62ee96973b2b238553a887a42cb5d9206cbea31e3136b7b3ad0b8ff1f290cbb507f1cc404e8a6e3c1a52551ac0aa719fbadbcf5ccc43b
+AUX i2pd-2.25.0-link.patch 676 BLAKE2B c663a745b57399e4b1fb26e235c684c03ed61a1c448546ed9e6296ecf7c6cf82e02f896d35a03d8ba998b327344d663b7035ad11668644677a7a7eb049a39f33 SHA512 368662f0221edc193071464fcd0eb1235522956fdb5811f89e5246cb7f9a9796be227164b3e04a506638e0d7a3e9445f4dfba83d3da2ec0f0dc470c961f9551f
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
@@ -9,5 +11,6 @@ DIST i2pd-2.24.0.tar.gz 1063751 BLAKE2B 22e0dd09926735d0d512fefde21da7cd6c923225
 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
+EBUILD i2pd-2.25.0-r1.ebuild 3225 BLAKE2B 5056da1dddef8151fb6117b173c7e97f91ea5ce5ed8a026926542abe863d13002b1282b819dbf87a724074a44edf8e260dff4fc2dbfe89f27a97cdeda72f4b03 SHA512 91b3e132cd61c4f06ac4c6fea8621e1ea7ac91a191908e9a5edc8e1a08fabb9cd26235736c76b65de424738f454ddd6c662ed449a22a2efcf9bfea0eebe33510
 EBUILD i2pd-2.25.0.ebuild 3154 BLAKE2B ff277675b1d37d58d674eceaac7a1639b0956946e2f8bb6849acf50f6a20165780f0ddecc138e402968c20d4514f0ad4e44122cd8fb2ff5cea764290905cf86c SHA512 b0b8b97067ce62ad1837621456a0b1136541ba7187f4513ca6ca50b61f25b5693361e9341729abe2486da554032ecbb4cf01c55d07a794d82991ae76b483f314
-MISC metadata.xml 629 BLAKE2B 53fdd29677e15ec3a5692b80ff83e43a6463aa3282478b10cfa577493f6cb87249a0f9643d5f2e8ba51fdd9d753546c9ed5dbb5f167fee5f6abf4e3240e2ff5c SHA512 631467e96539599a194a0c63665c902cda90be2c08405fb619d88bc17ada0e107c8e7d70345f6a488fd46ca580a48904c02125ffaec84dc1a86fdcc10a9d0cec
+MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch
new file mode 100644
index 000000000000..af0590be32f7
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.25.0-lib-path.patch
@@ -0,0 +1,22 @@
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index 949f6a46..a6d29990 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -103,8 +103,6 @@ set_target_properties(libi2pd PROPERTIES PREFIX "")
+ if (WITH_LIBRARY)
+   install(TARGETS libi2pd
+     EXPORT libi2pd
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+     COMPONENT Libraries)
+ # TODO Make libi2pd available to 3rd party projects via CMake as imported target
+ # FIXME This pulls stdafx
+@@ -135,8 +133,6 @@ set_target_properties(libi2pdclient PROPERTIES PREFIX "")
+ if (WITH_LIBRARY)
+   install(TARGETS libi2pdclient
+     EXPORT libi2pdclient
+-    ARCHIVE DESTINATION lib
+-    LIBRARY DESTINATION lib
+     COMPONENT Libraries)
+ endif()
+ 
diff --git a/net-vpn/i2pd/files/i2pd-2.25.0-link.patch b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch
new file mode 100644
index 000000000000..52c5dc745273
--- /dev/null
+++ b/net-vpn/i2pd/files/i2pd-2.25.0-link.patch
@@ -0,0 +1,13 @@
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index e50bbc865..949f6a46e 100644
+https://github.com/PurpleI2P/i2pd/issues/1353
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -470,6 +470,7 @@ if (WITH_BINARY)
+   if (WITH_STATIC)
+     set(DL_LIB ${CMAKE_DL_LIBS})
+   endif()
++  target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY})
+   target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
+ 
+   install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
diff --git a/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild
new file mode 100644
index 000000000000..43a6b4401bdf
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.25.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user cmake-utils 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"
+	"${FILESDIR}/i2pd-2.25.0-link.patch"
+	"${FILESDIR}/i2pd-2.25.0-lib-path.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/metadata.xml b/net-vpn/i2pd/metadata.xml
index 64ef73af4652..cf0e4a0905e4 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>kaikaikai@yandex.ru</email>
 		<name>Alexey Korepanov</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>klondike@gentoo.org</email>
 		<name>Francisco Blas Izquierdo Riera</name>