From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC1CF1396DA for ; Tue, 10 Oct 2017 18:30:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B53D2BC034; Tue, 10 Oct 2017 18:30:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE8CC2BC034 for ; Tue, 10 Oct 2017 18:30:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F31D33BE2E for ; Tue, 10 Oct 2017 18:30:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF37C909C for ; Tue, 10 Oct 2017 18:30:16 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1507660211.6713a76e8524ddb3bb564bec9834de07652920b9.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2pd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/i2pd/i2pd-2.13.0.ebuild net-vpn/i2pd/i2pd-2.14.0.ebuild net-vpn/i2pd/i2pd-2.15.0.ebuild X-VCS-Directories: net-vpn/i2pd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 6713a76e8524ddb3bb564bec9834de07652920b9 X-VCS-Branch: master Date: Tue, 10 Oct 2017 18:30:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b522027e-2182-4154-bdd9-981d55bff609 X-Archives-Hash: d7a724cdbe78f44b9fa173f363797d07 commit: 6713a76e8524ddb3bb564bec9834de07652920b9 Author: Alexey Korepanov yandex ru> AuthorDate: Tue Oct 10 14:38:06 2017 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Oct 10 18:30:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6713a76e net-vpn/i2pd: fix dependencies Signed-off-by: Anthony G. Basile gentoo.org> net-vpn/i2pd/i2pd-2.13.0.ebuild | 14 ++++++++++---- net-vpn/i2pd/i2pd-2.14.0.ebuild | 14 ++++++++++---- net-vpn/i2pd/i2pd-2.15.0.ebuild | 10 +++++++--- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/net-vpn/i2pd/i2pd-2.13.0.ebuild b/net-vpn/i2pd/i2pd-2.13.0.ebuild index aaa4ab6149e..fdde4874845 100644 --- a/net-vpn/i2pd/i2pd-2.13.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.13.0.ebuild @@ -10,19 +10,24 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp" +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 >=dev-libs/boost-1.65 ) + 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[static-libs] >=dev-libs/boost-1.65 ) + 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 ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" @@ -39,9 +44,10 @@ src_configure() { mycmakeargs=( -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) -DWITH_HARDENING=$(usex i2p-hardening ON OFF) - -DWITH_PCH=$(usex pch 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 ) diff --git a/net-vpn/i2pd/i2pd-2.14.0.ebuild b/net-vpn/i2pd/i2pd-2.14.0.ebuild index 8c20134989f..de35d0cc72b 100644 --- a/net-vpn/i2pd/i2pd-2.14.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.14.0.ebuild @@ -10,19 +10,24 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp" +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 >=dev-libs/boost-1.65 ) + 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[static-libs] >=dev-libs/boost-1.65 ) + 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 ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" @@ -39,9 +44,10 @@ src_configure() { mycmakeargs=( -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) -DWITH_HARDENING=$(usex i2p-hardening ON OFF) - -DWITH_PCH=$(usex pch 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 ) diff --git a/net-vpn/i2pd/i2pd-2.15.0.ebuild b/net-vpn/i2pd/i2pd-2.15.0.ebuild index 436a526d78d..de35d0cc72b 100644 --- a/net-vpn/i2pd/i2pd-2.15.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.15.0.ebuild @@ -15,15 +15,19 @@ 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 >=dev-libs/boost-1.65 ) + libressl? ( dev-libs/libressl:0 + >=dev-libs/boost-1.65 ) + sys-libs/zlib upnp? ( net-libs/miniupnpc ) - websocket? ( dev-cpp/websocketpp ) )" DEPEND="${RDEPEND} static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) - libressl? ( dev-libs/libressl[static-libs] >=dev-libs/boost-1.65 ) + 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 ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"