diff options
| author |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2019-12-27 23:55:53 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2019-12-27 23:56:19 +0100 |
| commit | ac4359208d9a3fe508d7668d59c0406c4080bc28 (patch) | |
| tree | 200165ca5616f886badc231b270a73698388341b | |
| parent | games-strategy/ufoai: EAPI 7 (diff) | |
| download | gentoo-ac4359208d9a3fe508d7668d59c0406c4080bc28.tar.gz gentoo-ac4359208d9a3fe508d7668d59c0406c4080bc28.tar.bz2 gentoo-ac4359208d9a3fe508d7668d59c0406c4080bc28.zip | |
net-vpn/wireguard-tools: update to eapi 7 and use smarter kernel deps
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
| -rw-r--r-- | net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild | 25 | ||||
| -rw-r--r-- | net-vpn/wireguard-tools/wireguard-tools-9999.ebuild | 25 |
2 files changed, 40 insertions, 10 deletions
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild index 2275a3d51c3e..945b8b6e5056 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info bash-completion-r1 @@ -20,6 +20,7 @@ fi LICENSE="GPL-2" SLOT="0" +BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} || ( net-firewall/nftables net-firewall/iptables ) @@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { pkg_setup() { wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES - wg_quick_optional_config_nob NETFILTER_XT_MARK - wg_quick_optional_config_nob NETFILTER_XT_CONNMARK - wg_quick_optional_config_nob IP6_NF_RAW - wg_quick_optional_config_nob IP_NF_RAW + if has_version net-firewall/nftables; then + wg_quick_optional_config_nob NF_TABLES + wg_quick_optional_config_nob NF_TABLES_IPV4 + wg_quick_optional_config_nob NF_TABLES_IPV6 + wg_quick_optional_config_nob NFT_CT + wg_quick_optional_config_nob NFT_FIB + wg_quick_optional_config_nob NFT_FIB_IPV4 + wg_quick_optional_config_nob NFT_FIB_IPV6 + elif has_version net-firewall/iptables; then + wg_quick_optional_config_nob NETFILTER_XTABLES + wg_quick_optional_config_nob NETFILTER_XT_MARK + wg_quick_optional_config_nob NETFILTER_XT_CONNMARK + wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT + wg_quick_optional_config_nob IP6_NF_RAW + wg_quick_optional_config_nob IP_NF_RAW + wg_quick_optional_config_nob IP6_NF_FILTER + wg_quick_optional_config_nob IP_NF_FILTER + fi linux-info_pkg_setup } diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild index 2275a3d51c3e..945b8b6e5056 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info bash-completion-r1 @@ -20,6 +20,7 @@ fi LICENSE="GPL-2" SLOT="0" +BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} || ( net-firewall/nftables net-firewall/iptables ) @@ -34,10 +35,24 @@ wg_quick_optional_config_nob() { pkg_setup() { wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES - wg_quick_optional_config_nob NETFILTER_XT_MARK - wg_quick_optional_config_nob NETFILTER_XT_CONNMARK - wg_quick_optional_config_nob IP6_NF_RAW - wg_quick_optional_config_nob IP_NF_RAW + if has_version net-firewall/nftables; then + wg_quick_optional_config_nob NF_TABLES + wg_quick_optional_config_nob NF_TABLES_IPV4 + wg_quick_optional_config_nob NF_TABLES_IPV6 + wg_quick_optional_config_nob NFT_CT + wg_quick_optional_config_nob NFT_FIB + wg_quick_optional_config_nob NFT_FIB_IPV4 + wg_quick_optional_config_nob NFT_FIB_IPV6 + elif has_version net-firewall/iptables; then + wg_quick_optional_config_nob NETFILTER_XTABLES + wg_quick_optional_config_nob NETFILTER_XT_MARK + wg_quick_optional_config_nob NETFILTER_XT_CONNMARK + wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT + wg_quick_optional_config_nob IP6_NF_RAW + wg_quick_optional_config_nob IP_NF_RAW + wg_quick_optional_config_nob IP6_NF_FILTER + wg_quick_optional_config_nob IP_NF_FILTER + fi linux-info_pkg_setup } |