| 1 |
commit: 61045949abc0ec1e9691eac416825201bc649d8a |
| 2 |
Author: Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sat Dec 9 17:09:40 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 02:25:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61045949 |
| 7 |
|
| 8 |
net-vpn/i2pd: make compiler version check right |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
net-vpn/i2pd/i2pd-2.15.0.ebuild | 18 +++++++++++++----- |
| 13 |
net-vpn/i2pd/i2pd-2.16.0.ebuild | 18 +++++++++++++----- |
| 14 |
net-vpn/i2pd/i2pd-2.17.0.ebuild | 18 +++++++++++++----- |
| 15 |
3 files changed, 39 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-vpn/i2pd/i2pd-2.15.0.ebuild b/net-vpn/i2pd/i2pd-2.15.0.ebuild |
| 18 |
index a5cedbfaa37..2c29b4139a6 100644 |
| 19 |
--- a/net-vpn/i2pd/i2pd-2.15.0.ebuild |
| 20 |
+++ b/net-vpn/i2pd/i2pd-2.15.0.ebuild |
| 21 |
@@ -2,7 +2,7 @@ |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=6 |
| 25 |
-inherit eutils systemd user cmake-utils |
| 26 |
+inherit eutils systemd user cmake-utils versionator toolchain-funcs |
| 27 |
|
| 28 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
| 29 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
| 30 |
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND} |
| 31 |
libressl? ( dev-libs/libressl:0[static-libs] |
| 32 |
>=dev-libs/boost-1.65 ) |
| 33 |
sys-libs/zlib[static-libs] |
| 34 |
- upnp? ( net-libs/miniupnpc[static-libs] ) ) |
| 35 |
- websocket? ( dev-cpp/websocketpp ) |
| 36 |
- i2p-hardening? ( >=sys-devel/gcc-4.7 ) |
| 37 |
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" |
| 38 |
+ upnp? ( net-libs/miniupnpc[static-libs] ) |
| 39 |
+ ) |
| 40 |
+ websocket? ( dev-cpp/websocketpp )" |
| 41 |
|
| 42 |
I2PD_USER=i2pd |
| 43 |
I2PD_GROUP=i2pd |
| 44 |
@@ -40,6 +39,15 @@ DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) |
| 45 |
|
| 46 |
PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" ) |
| 47 |
|
| 48 |
+pkg_pretend() { |
| 49 |
+ if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then |
| 50 |
+ die "At least gcc 4.7 is required" |
| 51 |
+ fi |
| 52 |
+ if use i2p-hardening && ! tc-is-gcc; then |
| 53 |
+ die "i2p-hardening requires gcc" |
| 54 |
+ fi |
| 55 |
+} |
| 56 |
+ |
| 57 |
src_configure() { |
| 58 |
mycmakeargs=( |
| 59 |
-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) |
| 60 |
|
| 61 |
diff --git a/net-vpn/i2pd/i2pd-2.16.0.ebuild b/net-vpn/i2pd/i2pd-2.16.0.ebuild |
| 62 |
index a5cedbfaa37..2c29b4139a6 100644 |
| 63 |
--- a/net-vpn/i2pd/i2pd-2.16.0.ebuild |
| 64 |
+++ b/net-vpn/i2pd/i2pd-2.16.0.ebuild |
| 65 |
@@ -2,7 +2,7 @@ |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
EAPI=6 |
| 69 |
-inherit eutils systemd user cmake-utils |
| 70 |
+inherit eutils systemd user cmake-utils versionator toolchain-funcs |
| 71 |
|
| 72 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
| 73 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
| 74 |
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND} |
| 75 |
libressl? ( dev-libs/libressl:0[static-libs] |
| 76 |
>=dev-libs/boost-1.65 ) |
| 77 |
sys-libs/zlib[static-libs] |
| 78 |
- upnp? ( net-libs/miniupnpc[static-libs] ) ) |
| 79 |
- websocket? ( dev-cpp/websocketpp ) |
| 80 |
- i2p-hardening? ( >=sys-devel/gcc-4.7 ) |
| 81 |
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" |
| 82 |
+ upnp? ( net-libs/miniupnpc[static-libs] ) |
| 83 |
+ ) |
| 84 |
+ websocket? ( dev-cpp/websocketpp )" |
| 85 |
|
| 86 |
I2PD_USER=i2pd |
| 87 |
I2PD_GROUP=i2pd |
| 88 |
@@ -40,6 +39,15 @@ DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) |
| 89 |
|
| 90 |
PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" ) |
| 91 |
|
| 92 |
+pkg_pretend() { |
| 93 |
+ if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then |
| 94 |
+ die "At least gcc 4.7 is required" |
| 95 |
+ fi |
| 96 |
+ if use i2p-hardening && ! tc-is-gcc; then |
| 97 |
+ die "i2p-hardening requires gcc" |
| 98 |
+ fi |
| 99 |
+} |
| 100 |
+ |
| 101 |
src_configure() { |
| 102 |
mycmakeargs=( |
| 103 |
-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) |
| 104 |
|
| 105 |
diff --git a/net-vpn/i2pd/i2pd-2.17.0.ebuild b/net-vpn/i2pd/i2pd-2.17.0.ebuild |
| 106 |
index a5cedbfaa37..2c29b4139a6 100644 |
| 107 |
--- a/net-vpn/i2pd/i2pd-2.17.0.ebuild |
| 108 |
+++ b/net-vpn/i2pd/i2pd-2.17.0.ebuild |
| 109 |
@@ -2,7 +2,7 @@ |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
|
| 112 |
EAPI=6 |
| 113 |
-inherit eutils systemd user cmake-utils |
| 114 |
+inherit eutils systemd user cmake-utils versionator toolchain-funcs |
| 115 |
|
| 116 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
| 117 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
| 118 |
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND} |
| 119 |
libressl? ( dev-libs/libressl:0[static-libs] |
| 120 |
>=dev-libs/boost-1.65 ) |
| 121 |
sys-libs/zlib[static-libs] |
| 122 |
- upnp? ( net-libs/miniupnpc[static-libs] ) ) |
| 123 |
- websocket? ( dev-cpp/websocketpp ) |
| 124 |
- i2p-hardening? ( >=sys-devel/gcc-4.7 ) |
| 125 |
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )" |
| 126 |
+ upnp? ( net-libs/miniupnpc[static-libs] ) |
| 127 |
+ ) |
| 128 |
+ websocket? ( dev-cpp/websocketpp )" |
| 129 |
|
| 130 |
I2PD_USER=i2pd |
| 131 |
I2PD_GROUP=i2pd |
| 132 |
@@ -40,6 +39,15 @@ DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf ) |
| 133 |
|
| 134 |
PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" ) |
| 135 |
|
| 136 |
+pkg_pretend() { |
| 137 |
+ if tc-is-gcc && ! version_is_at_least "4.7" "$(gcc-version)"; then |
| 138 |
+ die "At least gcc 4.7 is required" |
| 139 |
+ fi |
| 140 |
+ if use i2p-hardening && ! tc-is-gcc; then |
| 141 |
+ die "i2p-hardening requires gcc" |
| 142 |
+ fi |
| 143 |
+} |
| 144 |
+ |
| 145 |
src_configure() { |
| 146 |
mycmakeargs=( |
| 147 |
-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF) |
Archives