net-vpn/i2pd: use eapi7-ver and cosmetic Signed-off-by: Alexey Korepanov <kaikaikai...

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-vpn/i2pd/i2pd-2.21.0.ebuild b/net-vpn/i2pd/i2pd-2.21.0.ebuild
index d794863101220642b8d7dfc6897780ae87b6490c..1fff5a0abb4bb817802d8a51b2024cd0ac45ff1b 100644 (file)
--- a/net-vpn/i2pd/i2pd-2.21.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.21.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils systemd user cmake-utils versionator toolchain-funcs
+inherit systemd user cmake-utils eapi7-ver toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -13,18 +13,24 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~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 )
-                       sys-libs/zlib
-                       upnp? ( net-libs/miniupnpc )
-               )"
+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]
+       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 )
+               libressl? (
+                       dev-libs/libressl:0[static-libs]
+                       >=dev-libs/boost-1.65
+               )
                sys-libs/zlib[static-libs]
                upnp? ( net-libs/miniupnpc[static-libs] )
        )
@@ -40,7 +46,7 @@ DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
 
 pkg_pretend() {
-       if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then
+       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