net-vpn/i2pd: make compiler version check right

Signed-off-by: Anthony G. Basile <[email protected]>
johu · Dec 10, 2017 · 6104594 · 6104594
1 parent be87fbb
commit 6104594
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/net-vpn/i2pd/i2pd-2.15.0.ebuild b/net-vpn/i2pd/i2pd-2.15.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
+inherit eutils systemd user cmake-utils versionator toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND}
 		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 )"
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
 
 I2PD_USER=i2pd
 I2PD_GROUP=i2pd
@@ -40,6 +39,15 @@ 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
+		die "At least gcc 4.7 is required"
+	fi
+	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)

diff --git a/net-vpn/i2pd/i2pd-2.16.0.ebuild b/net-vpn/i2pd/i2pd-2.16.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
+inherit eutils systemd user cmake-utils versionator toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND}
 		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 )"
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
 
 I2PD_USER=i2pd
 I2PD_GROUP=i2pd
@@ -40,6 +39,15 @@ 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
+		die "At least gcc 4.7 is required"
+	fi
+	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)

diff --git a/net-vpn/i2pd/i2pd-2.17.0.ebuild b/net-vpn/i2pd/i2pd-2.17.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
+inherit eutils systemd user cmake-utils versionator toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND}
 		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 )"
+		upnp? ( net-libs/miniupnpc[static-libs] )
+	)
+	websocket? ( dev-cpp/websocketpp )"
 
 I2PD_USER=i2pd
 I2PD_GROUP=i2pd
@@ -40,6 +39,15 @@ 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
+		die "At least gcc 4.7 is required"
+	fi
+	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)