commit: 6713a76e8524ddb3bb564bec9834de07652920b9 Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru> AuthorDate: Tue Oct 10 14:38:06 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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 <blueness <AT> 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 )"
