From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- net-vpn/i2pd/Manifest | 6 +-- net-vpn/i2pd/i2pd-2.30.0.ebuild | 103 ---------------------------------------- net-vpn/i2pd/i2pd-2.33.0.ebuild | 93 ++++++++++++++++++++++++++++++++++++ net-vpn/i2pd/metadata.xml | 3 -- 4 files changed, 96 insertions(+), 109 deletions(-) delete mode 100644 net-vpn/i2pd/i2pd-2.30.0.ebuild create mode 100644 net-vpn/i2pd/i2pd-2.33.0.ebuild (limited to 'net-vpn/i2pd') diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest index 07e812c2913d..6a55c3034154 100644 --- a/net-vpn/i2pd/Manifest +++ b/net-vpn/i2pd/Manifest @@ -5,12 +5,12 @@ 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.30.0.tar.gz 1087411 BLAKE2B adfd6d2eebb2bbd0fe931a9a96110d0bf540ceff18231afc88ba4df7b428ec702297871ecafb812cd130e68eb8f6127e3f7a4645631df7ca2a723d0a45d8723c SHA512 d27c5e5b7ae7c78be14ad96ac458c0f3a45e31ee5fbdf59d5c6278d0195909badc5917a258b5de37d6a255c20a8c3cb0c0ddc3291a110444a96f475b662a119b 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 -EBUILD i2pd-2.30.0.ebuild 2647 BLAKE2B ccad7ceaf795f8ef6fd2e6f1b12a849313a3d2b1dd22eaf7500cac5795a72dc46ff743e99c699966e3ff5e3a7e7c7c88202bc1fb2ddfd8311807c2b5e2a53d03 SHA512 9dc942c5aaa75a060e33fb947c451fd7408f39f695e125cc11d8fdb53b1a5c05510714cb19e4226e8150aba7d3e6099ea007e3587700af44d3269ccdbc66b5be +DIST i2pd-2.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910 EBUILD i2pd-2.31.0.ebuild 2437 BLAKE2B 8e7e6c41aee82040a0202e16b272e9a0e73f19837aad7116734b019cddcefd0dcf017eb39770b8cd64bf73e996133c51abaadaa07c263a8a336be6b04b9219e8 SHA512 b6ee8b144168f1fe97010f920a1f64351bba82f733a591a5ccf38dc553d774d07d94d3213d7442ba8e1d88e3e0b7552c311697ae01db2f4307c66dfb2139ccd9 EBUILD i2pd-2.32.0.ebuild 2385 BLAKE2B c7bf3ba9a9253aeab8dd3b73da080cfc97ec9b14d7751dfeae127101a7a8c7aa39344cb911db78a9c20821c7816b12e21bc364f540c3681e8099df68e5143515 SHA512 b216e0088a0deaff9987ac0dc2a05188badc83c82ef87572fbe229c2fff852aed376fe5c6f5ee3895ad904d601036827536afee211a614bd78ffbb467fc70f0a EBUILD i2pd-2.32.1.ebuild 2383 BLAKE2B 712f839637188daa1e78e5c89d7b728c585a905fe5593d80cfcb9fb14a7ea82e6346484f975f854004ca5d2276ebb71dabd553a4cec4609e3a19d8ecfab8d955 SHA512 0c51d8c302e2222ea9d48a31007367a4805b290616c060ebaa968311e0d29ef34810f9eccbb3ed2e8de284f995893874410c8cb6cbb0e54f1f1167575da2dc8c -MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8 +EBUILD i2pd-2.33.0.ebuild 2387 BLAKE2B e196864e0e52c694af51a72573dff6b670ca8babd00fd1bb47ad9ad39be97f7e4f0df16b41b69f3657437bc3074b40f5df76372a8c8aac6cd8b633de32437e4a SHA512 e47b0bb709174825dd6ca3d28e48589a00fc2eeb9a681f9c46aef379996965e2812bca136ffe7ea0e763dd0d6b88e53afa19d7fb2e22890b8e2e0cd35d048f0f +MISC metadata.xml 683 BLAKE2B 85b4a13c13c88a69ecbfbb10e60881bc583b6539a42cf4ac8d061537bb6c0ed55dd2d15ced732f69ce46afe4b0381d7d7233fef9ad8dad4a9eb51e49aa904706 SHA512 5c6c84f95f4264eb3a33cc6c0de0f0890063ba2ca3cb56852303f919e1c4a152d7a3b1c593c0ba066e5485ee9e843ffc2836ea89ed8ee42aa56c1b602d5a2a62 diff --git a/net-vpn/i2pd/i2pd-2.30.0.ebuild b/net-vpn/i2pd/i2pd-2.30.0.ebuild deleted file mode 100644 index b305f25c71f5..000000000000 --- a/net-vpn/i2pd/i2pd-2.30.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd cmake 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=" - acct-user/i2pd - acct-group/i2pd - !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 )" - -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-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_WEBSOCKETS=$(usex websocket 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/i2pd-2.33.0.ebuild b/net-vpn/i2pd/i2pd-2.33.0.ebuild new file mode 100644 index 000000000000..acc70c57b412 --- /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 cf0e4a0905e4..412f0dd2b43a 100644 --- a/net-vpn/i2pd/metadata.xml +++ b/net-vpn/i2pd/metadata.xml @@ -17,9 +17,6 @@ Compile with hardening on vanilla compilers/linkers - - Enable websocket server - PurpleI2P/i2pd -- cgit v1.2.3