| 1 |
commit: 4a7590590647791319d3fb5285f095afdc876476 |
| 2 |
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Thu Oct 11 13:03:40 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 12 12:01:02 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a759059 |
| 7 |
|
| 8 |
net-vpn/i2pd: use eapi7-ver and cosmetic Signed-off-by: Alexey Korepanov <kaikaikai <AT> yandex.ru> |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
net-vpn/i2pd/i2pd-2.21.0.ebuild | 30 ++++++++++++++++++------------ |
| 13 |
1 file changed, 18 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-vpn/i2pd/i2pd-2.21.0.ebuild b/net-vpn/i2pd/i2pd-2.21.0.ebuild |
| 16 |
index d7948631012..1fff5a0abb4 100644 |
| 17 |
--- a/net-vpn/i2pd/i2pd-2.21.0.ebuild |
| 18 |
+++ b/net-vpn/i2pd/i2pd-2.21.0.ebuild |
| 19 |
@@ -2,7 +2,7 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
|
| 22 |
EAPI=6 |
| 23 |
-inherit eutils systemd user cmake-utils versionator toolchain-funcs |
| 24 |
+inherit systemd user cmake-utils eapi7-ver toolchain-funcs |
| 25 |
|
| 26 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
| 27 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
| 28 |
@@ -13,18 +13,24 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86" |
| 29 |
IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket" |
| 30 |
|
| 31 |
# if using libressl, require >=boost-1.65, see #597798 |
| 32 |
-RDEPEND="!static? ( dev-libs/boost[threads] |
| 33 |
- !libressl? ( dev-libs/openssl:0[-bindist] ) |
| 34 |
- libressl? ( dev-libs/libressl:0 |
| 35 |
- >=dev-libs/boost-1.65 ) |
| 36 |
- sys-libs/zlib |
| 37 |
- upnp? ( net-libs/miniupnpc ) |
| 38 |
- )" |
| 39 |
+RDEPEND=" |
| 40 |
+ !static? ( |
| 41 |
+ dev-libs/boost[threads] |
| 42 |
+ !libressl? ( dev-libs/openssl:0[-bindist] ) |
| 43 |
+ libressl? ( |
| 44 |
+ dev-libs/libressl:0 |
| 45 |
+ >=dev-libs/boost-1.65 |
| 46 |
+ ) |
| 47 |
+ upnp? ( net-libs/miniupnpc ) |
| 48 |
+ )" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
- static? ( dev-libs/boost[static-libs,threads] |
| 51 |
+ static? ( |
| 52 |
+ dev-libs/boost[static-libs,threads] |
| 53 |
!libressl? ( dev-libs/openssl:0[static-libs] ) |
| 54 |
- libressl? ( dev-libs/libressl:0[static-libs] |
| 55 |
- >=dev-libs/boost-1.65 ) |
| 56 |
+ libressl? ( |
| 57 |
+ dev-libs/libressl:0[static-libs] |
| 58 |
+ >=dev-libs/boost-1.65 |
| 59 |
+ ) |
| 60 |
sys-libs/zlib[static-libs] |
| 61 |
upnp? ( net-libs/miniupnpc[static-libs] ) |
| 62 |
) |
| 63 |
@@ -40,7 +46,7 @@ DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) |
| 64 |
PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" ) |
| 65 |
|
| 66 |
pkg_pretend() { |
| 67 |
- if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then |
| 68 |
+ if tc-is-gcc && ! ver_test "$(gcc-version)" -ge "4.7"; then |
| 69 |
die "At least gcc 4.7 is required" |
| 70 |
fi |
| 71 |
if use i2p-hardening && ! tc-is-gcc; then |
Archives