From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55C13138334 for ; Tue, 3 Dec 2019 16:10:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A01FE07F9; Tue, 3 Dec 2019 16:10:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B12EE07F9 for ; Tue, 3 Dec 2019 16:10:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF38334D739 for ; Tue, 3 Dec 2019 16:10:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76AE28C9 for ; Tue, 3 Dec 2019 16:10:30 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1575389420.269ef5357b7faf75145b073997908e74e9c18ea5.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/nftables/metadata.xml net-firewall/nftables/nftables-0.9.0-r5.ebuild net-firewall/nftables/nftables-0.9.1-r1.ebuild net-firewall/nftables/nftables-0.9.2-r1.ebuild X-VCS-Directories: net-firewall/nftables/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 269ef5357b7faf75145b073997908e74e9c18ea5 X-VCS-Branch: master Date: Tue, 3 Dec 2019 16:10:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: faadca54-c43c-49e5-9482-f5892342c2b6 X-Archives-Hash: cc197cbe61ad47c4df8eee2b21ad3c91 commit: 269ef5357b7faf75145b073997908e74e9c18ea5 Author: Francisco Blas (klondike) Izquierdo Riera gentoo org> AuthorDate: Tue Dec 3 00:39:53 2019 +0000 Commit: Matthew Thode gentoo 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) gentoo.org> Package-Manager: Portage-2.3.76, Repoman-2.3.11 Signed-off-by: Matthew Thode 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 @@ Create man pages for the package (requires app-text/asciidoc) Enable JSON support via dev-libs/jansson - Install init scripts for 3.18 or higher kernels with atomic rule updates + Install init scripts for 3.18 or higher kernels with atomic rule updates Add libxtables support to try to automatically translate rules added by iptables-compat 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