commit: 80a453962d6da3bbda8d0736062a4dfb9b39644b
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 17:40:52 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 17:58:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a45396
net-firewall/nftables: Bump to 0.9.7, update 9999
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-firewall/nftables/Manifest | 1 +
...{nftables-9999.ebuild => nftables-0.9.7.ebuild} | 23 ++++++----------------
net-firewall/nftables/nftables-9999.ebuild | 2 +-
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 39e99bf8e47..bdc20af83d0 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -2,3 +2,4 @@ DIST nftables-0.9.3.tar.bz2 786759 BLAKE2B
578276d861fdb2b843223aca1276bbc1dda96
DIST nftables-0.9.4-manpages.tar.xz 38580 BLAKE2B
bb561c7824d032ecfff5c98af10c95af6f5188377f43de8398be7e503adff0441d49fa3e2cefcb646927cc1a4222957f0cc75d5ad4c770ef3a3f8cb8a677c5ce
SHA512
1b94ff06ceccf75bbefbf64496d5fa0b492907d7ec5fe41f7808c6e239b2a0a42e88d61e35e22485abee7e4bd382178e962a7c5b113433247ca329cbfa408bca
DIST nftables-0.9.4.tar.bz2 792788 BLAKE2B
3f2d8ff3bcfe3ab815ee369c4937adef5e5730edee8ea59b32031732802e608bcb47ddd3e55303ad6c295158aff51b2f2c069d98600db83d732ff78836c7abb5
SHA512
cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0
DIST nftables-0.9.6.tar.bz2 859481 BLAKE2B
0ede36370d9f8b75d0179f8f28077124d47132413417382b737508c7ef81c7d2891e1934e69c1ef5af5450ac13c9a914d37bb62ebf40fb91fa048b4ec3a24c90
SHA512
ca6524ff1cb1e79d636afeb96f54e4699773e1cbda8e9a3ec5728f4d5b764c0df16b195cdcc0e304ae5643c8761b6b5a6685c737965a7415aec07aeb9f3dc5df
+DIST nftables-0.9.7.tar.bz2 872759 BLAKE2B
25218d97bd5a102b626a2c4beb37a59da2f6c1a8ead49b18375154ff88da536dfac7442aef2c10d2f6e20e6b51c5760a692960da35b82ab335a58e48189e3ae8
SHA512
174cf2d788dfd21f6709ccdc59060580aff904c3d906bac57d07c1b813b2cfdba895205d8342d722460b813f3504d598b82ac2d8a93af5964569b378b9598455
diff --git a/net-firewall/nftables/nftables-9999.ebuild
b/net-firewall/nftables/nftables-0.9.7.ebuild
similarity index 91%
copy from net-firewall/nftables/nftables-9999.ebuild
copy to net-firewall/nftables/nftables-0.9.7.ebuild
index 989c4f467e9..c1413422262 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-0.9.7.ebuild
@@ -9,37 +9,26 @@ inherit autotools linux-info python-r1 systemd
DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
HOMEPAGE="https://netfilter.org/projects/nftables/";
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.netfilter.org/${PN}";
-
- BDEPEND="
- sys-devel/bison
- sys-devel/flex
- "
-else
- SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
-fi
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2";
LICENSE="GPL-2"
-SLOT="0/1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
RDEPEND="
>=net-libs/libmnl-1.0.4:0=
+ >=net-libs/libnftnl-1.1.8:0=
gmp? ( dev-libs/gmp:0= )
json? ( dev-libs/jansson )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
- >=net-libs/libnftnl-1.1.8:0=
xtables? ( >=net-firewall/iptables-1.6.1 )
"
DEPEND="${RDEPEND}"
-BDEPEND+="
+BDEPEND="
doc? (
app-text/asciidoc
>=app-text/docbook2X-0.8.8-r4
@@ -111,7 +100,7 @@ src_compile() {
src_install() {
default
- if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+ if ! use doc; then
pushd doc >/dev/null || die
doman *.?
popd >/dev/null || die
diff --git a/net-firewall/nftables/nftables-9999.ebuild
b/net-firewall/nftables/nftables-9999.ebuild
index 989c4f467e9..2230bbd4f98 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -29,11 +29,11 @@ IUSE="debug doc +gmp json +modern-kernel python +readline
static-libs xtables"
RDEPEND="
>=net-libs/libmnl-1.0.4:0=
+ >=net-libs/libnftnl-1.1.8:0=
gmp? ( dev-libs/gmp:0= )
json? ( dev-libs/jansson )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
- >=net-libs/libnftnl-1.1.8:0=
xtables? ( >=net-firewall/iptables-1.6.1 )
"
