commit: a0152b9752228314727fb6e1e757c1305a08b4ec Author: Kerin Millar <kfm <AT> plushkava <DOT> net> AuthorDate: Wed Mar 22 03:29:49 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 22 04:05:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0152b97
net-firewall/nftables: Always require sys-devel/flex for building It is always necessary for flex to be available, whereas bison is only necessary where building from git. Update the BDEPEND declarations to reflect this. Also, bump the revision number for the formal releases because --changed-deps isn't a commonly used option and nftables isn't a particularly large package. Signed-off-by: Kerin Millar <kfm <AT> plushkava.net> Closes: https://bugs.gentoo.org/876730 Signed-off-by: Sam James <sam <AT> gentoo.org> .../nftables/{nftables-1.0.5.ebuild => nftables-1.0.5-r1.ebuild} | 9 +++------ .../nftables/{nftables-1.0.6.ebuild => nftables-1.0.6-r1.ebuild} | 9 +++------ .../nftables/{nftables-1.0.7.ebuild => nftables-1.0.7-r1.ebuild} | 9 +++------ net-firewall/nftables/nftables-9999.ebuild | 9 +++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild b/net-firewall/nftables/nftables-1.0.5-r1.ebuild similarity index 98% rename from net-firewall/nftables/nftables-1.0.5.ebuild rename to net-firewall/nftables/nftables-1.0.5-r1.ebuild index 5226ca74577d..232290e36198 100644 --- a/net-firewall/nftables/nftables-1.0.5.ebuild +++ b/net-firewall/nftables/nftables-1.0.5-r1.ebuild @@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/"; if [[ ${PV} =~ ^[9]{4,}$ ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}"; - - BDEPEND=" - sys-devel/bison - sys-devel/flex - " + BDEPEND="sys-devel/bison" else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2 verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )" KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" @@ -44,6 +40,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND+=" + sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild b/net-firewall/nftables/nftables-1.0.6-r1.ebuild similarity index 98% rename from net-firewall/nftables/nftables-1.0.6.ebuild rename to net-firewall/nftables/nftables-1.0.6-r1.ebuild index e5de7f69c0a1..80c434c2fc43 100644 --- a/net-firewall/nftables/nftables-1.0.6.ebuild +++ b/net-firewall/nftables/nftables-1.0.6-r1.ebuild @@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/"; if [[ ${PV} =~ ^[9]{4,}$ ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}"; - - BDEPEND=" - sys-devel/bison - sys-devel/flex - " + BDEPEND="sys-devel/bison" else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )" KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi LICENSE="GPL-2" @@ -44,6 +40,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND+=" + sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc diff --git a/net-firewall/nftables/nftables-1.0.7.ebuild b/net-firewall/nftables/nftables-1.0.7-r1.ebuild similarity index 98% rename from net-firewall/nftables/nftables-1.0.7.ebuild rename to net-firewall/nftables/nftables-1.0.7-r1.ebuild index 13ecec61248b..bee5c7fd77bd 100644 --- a/net-firewall/nftables/nftables-1.0.7.ebuild +++ b/net-firewall/nftables/nftables-1.0.7-r1.ebuild @@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/"; if [[ ${PV} =~ ^[9]{4,}$ ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}"; - - BDEPEND=" - sys-devel/bison - sys-devel/flex - " + BDEPEND="sys-devel/bison" else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi # See COPYING: new code is GPL-2+, existing code is GPL-2 @@ -45,6 +41,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND+=" + sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild index 13ecec61248b..bee5c7fd77bd 100644 --- a/net-firewall/nftables/nftables-9999.ebuild +++ b/net-firewall/nftables/nftables-9999.ebuild @@ -14,16 +14,12 @@ HOMEPAGE="https://netfilter.org/projects/nftables/"; if [[ ${PV} =~ ^[9]{4,}$ ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://git.netfilter.org/${PN}"; - - BDEPEND=" - sys-devel/bison - sys-devel/flex - " + BDEPEND="sys-devel/bison" else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )" fi # See COPYING: new code is GPL-2+, existing code is GPL-2 @@ -45,6 +41,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND+=" + sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc
