commit: 269ef5357b7faf75145b073997908e74e9c18ea5 Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 00:39:53 2019 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 16:10:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=269ef535
net-firewall/nftables: rename modern_kernel use flag When the new scripts supporting atomic updates on modern kernels where introduced, usage of the new scripts was controlled by the modern_kernel USE flag. QA has requested that we avoid using underscores on USE flags as they are a reserved character. Rename the modern_kernel USE flag to modern-kernel to address this issue. Closes: https://bugs.gentoo.org/694838 Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org> Package-Manager: Portage-2.3.76, Repoman-2.3.11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> net-firewall/nftables/metadata.xml | 2 +- net-firewall/nftables/nftables-0.9.0-r5.ebuild | 8 ++++---- net-firewall/nftables/nftables-0.9.1-r1.ebuild | 8 ++++---- net-firewall/nftables/nftables-0.9.2-r1.ebuild | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml index 0984d13e0f0..0380331d510 100644 --- a/net-firewall/nftables/metadata.xml +++ b/net-firewall/nftables/metadata.xml @@ -16,7 +16,7 @@ <use> <flag name="doc">Create man pages for the package (requires <pkg>app-text/asciidoc</pkg>)</flag> <flag name="json">Enable JSON support via <pkg>dev-libs/jansson</pkg></flag> - <flag name="modern_kernel">Install init scripts for 3.18 or higher kernels with atomic rule updates</flag> + <flag name="modern-kernel">Install init scripts for 3.18 or higher kernels with atomic rule updates</flag> <flag name="xtables">Add libxtables support to try to automatically translate rules added by iptables-compat</flag> </use> </pkgmetadata> diff --git a/net-firewall/nftables/nftables-0.9.0-r5.ebuild b/net-firewall/nftables/nftables-0.9.0-r5.ebuild index 2ad8c89d4c7..dc29d33b649 100644 --- a/net-firewall/nftables/nftables-0.9.0-r5.ebuild +++ b/net-firewall/nftables/nftables-0.9.0-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ~arm64 ia64 x86" -IUSE="debug doc +gmp json +modern_kernel +readline" +IUSE="debug doc +gmp json +modern-kernel +readline" RDEPEND=">=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) @@ -31,8 +31,8 @@ S="${WORKDIR}/v${PV}" pkg_setup() { if kernel_is ge 3 13; then - if use modern_kernel && kernel_is lt 3 18; then - eerror "The modern_kernel USE flag requires kernel version 3.18 or newer to work properly." + if use modern-kernel && kernel_is lt 3 18; then + eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly." fi CONFIG_CHECK="~NF_TABLES" linux-info_pkg_setup @@ -62,7 +62,7 @@ src_install() { default local mksuffix="" - use modern_kernel && mksuffix="-mk" + use modern-kernel && mksuffix="-mk" exeinto /usr/libexec/${PN} newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh diff --git a/net-firewall/nftables/nftables-0.9.1-r1.ebuild b/net-firewall/nftables/nftables-0.9.1-r1.ebuild index ef662d78f71..8538c51884d 100644 --- a/net-firewall/nftables/nftables-0.9.1-r1.ebuild +++ b/net-firewall/nftables/nftables-0.9.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" -IUSE="debug +doc +gmp json +modern_kernel python +readline static-libs xtables" +IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables" RDEPEND=" >=net-libs/libmnl-1.0.3:0= @@ -57,8 +57,8 @@ python_make() { pkg_setup() { if kernel_is ge 3 13; then - if use modern_kernel && kernel_is lt 3 18; then - eerror "The modern_kernel USE flag requires kernel version 3.18 or newer to work properly." + if use modern-kernel && kernel_is lt 3 18; then + eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly." fi CONFIG_CHECK="~NF_TABLES" linux-info_pkg_setup @@ -106,7 +106,7 @@ src_compile() { src_install() { default - local mksuffix="$(usex modern_kernel '-mk' '')" + local mksuffix="$(usex modern-kernel '-mk' '')" exeinto /usr/libexec/${PN} newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh diff --git a/net-firewall/nftables/nftables-0.9.2-r1.ebuild b/net-firewall/nftables/nftables-0.9.2-r1.ebuild index f8649c46afa..5dd8147c26d 100644 --- a/net-firewall/nftables/nftables-0.9.2-r1.ebuild +++ b/net-firewall/nftables/nftables-0.9.2-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" -IUSE="debug +doc +gmp json +modern_kernel python +readline static-libs xtables" +IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables" RDEPEND=" >=net-libs/libmnl-1.0.3:0= @@ -52,8 +52,8 @@ python_make() { pkg_setup() { if kernel_is ge 3 13; then - if use modern_kernel && kernel_is lt 3 18; then - eerror "The modern_kernel USE flag requires kernel version 3.18 or newer to work properly." + if use modern-kernel && kernel_is lt 3 18; then + eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly." fi CONFIG_CHECK="~NF_TABLES" linux-info_pkg_setup @@ -101,7 +101,7 @@ src_compile() { src_install() { default - local mksuffix="$(usex modern_kernel '-mk' '')" + local mksuffix="$(usex modern-kernel '-mk' '')" exeinto /usr/libexec/${PN} newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
