diff options
Diffstat (limited to 'net-firewall/nftables')
| -rw-r--r-- | net-firewall/nftables/Manifest | 4 | ||||
| -rw-r--r-- | net-firewall/nftables/nftables-1.0.1-r1.ebuild (renamed from net-firewall/nftables/nftables-1.0.1.ebuild) | 38 | ||||
| -rw-r--r-- | net-firewall/nftables/nftables-9999.ebuild | 36 |
3 files changed, 45 insertions, 33 deletions
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index 1f3727704f34..c96b8bb76853 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -14,6 +14,6 @@ DIST nftables-1.0.1.tar.bz2 954586 BLAKE2B e406699c96b98495f1b6deeab0233873ce20b EBUILD nftables-0.9.8-r1.ebuild 4285 BLAKE2B 4c03efb0f42ce1619c8aee1a27fa837dab27ab37c1b4db78428fe5391a0f7b7cd1b1f84c9affc52ee656d85e22055a4eacb4b09a69139239a8e480d8c3339c92 SHA512 d66b7e3072b28495cf87dcb3f55488bde050a3cce741a394b2ab9347f5ceaffca53cd258f530098c1ad87c0447d11c6fa6f77b462a00ff9b6d42caf3e0f7122a EBUILD nftables-0.9.9.ebuild 4553 BLAKE2B 54b3de2a5413532de597c7b496dcc83405136e442f1d9dca2e3c3cabe23f0ed8d2e84311d9091b62ec14e284cf768652f924cfd51df537a576d391026d82df2d SHA512 6d17349a2749437becd3d8a75c192e58d6019b49c3e99594d7f0f6989cb84b5a24820b843aed08cf6a43cdf359f63c250b7a00fdf2cb994c93faa31f3ad458b3 EBUILD nftables-1.0.0.ebuild 4558 BLAKE2B 8365c83cd919817f8c0b7868a3a66b1018e9718b338d7902e7a1a836d19980eb56301359630d0c18f104ac89dce85b36291d190defbbe278521eb473b620b466 SHA512 7220d616f94de73f024290bb9c24fd65a17a68855c1754d9b4b74a60bb2a7005b643d2d356f58809ed638358ce5872e387c62b4e37fb8ce108a3529d6db59809 -EBUILD nftables-1.0.1.ebuild 4565 BLAKE2B 042f2ed9f88017d6c4fe1e43891dc44841575bef0b6e9bfeab992f9566478d48b1bc9ca71ed84627f55344fd7f341475e2582ad68f7cda8862e7b142ae603d9a SHA512 8ca62bd11feae45b8dfe28467570f6d42da2d89bf2280f613bf90e9d031de6af82726a18eabecc476a8ba282605f63de291056ea4acc30a62f2bb13414b9959c -EBUILD nftables-9999.ebuild 4565 BLAKE2B 042f2ed9f88017d6c4fe1e43891dc44841575bef0b6e9bfeab992f9566478d48b1bc9ca71ed84627f55344fd7f341475e2582ad68f7cda8862e7b142ae603d9a SHA512 8ca62bd11feae45b8dfe28467570f6d42da2d89bf2280f613bf90e9d031de6af82726a18eabecc476a8ba282605f63de291056ea4acc30a62f2bb13414b9959c +EBUILD nftables-1.0.1-r1.ebuild 4741 BLAKE2B 732080a02f8585a46e3a52d64e888d1210b1e6ae5773ebf6dfa10f7372d7c272aaa727a5815ec997657367e94c9f42e48f112d9539338137614a0987aa9390fb SHA512 626742cd980ea46eedd24aef6c3ffb566d12fcf3ffe9b9c5004031addd2908f91e2aba76b4fd5b3ef03676db2380f59a9565149cbdb07102f891f9b8c3122cd4 +EBUILD nftables-9999.ebuild 4735 BLAKE2B 364499724015c29d6ede31ce9229fc5603a35953c7169e9734279b63d0bb78c94b6852fec33c6c0b420d0abf9db3f281b9ce36eed522e72d55af28e9a07551ad SHA512 1d2045639f63325f2d8a7ace74cd686e9ce5ad74ed68d5016e2e9be6f4b25ecbb437c1c33bdd350349e3d8e819c537ca7fb198d3432dc25cccd5f77fa2cbc3b3 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25 diff --git a/net-firewall/nftables/nftables-1.0.1.ebuild b/net-firewall/nftables/nftables-1.0.1-r1.ebuild index 944c87fea31f..584e495b73d4 100644 --- a/net-firewall/nftables/nftables-1.0.1.ebuild +++ b/net-firewall/nftables/nftables-1.0.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..10} ) - -inherit autotools linux-info python-r1 systemd +DISTUTILS_OPTIONAL=1 +inherit autotools linux-info distutils-r1 systemd DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" HOMEPAGE="https://netfilter.org/projects/nftables/" @@ -20,7 +20,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then " else SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="GPL-2" @@ -56,15 +56,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.8-slibtool.patch" ) -python_make() { - emake \ - -C py \ - abs_builddir="${S}" \ - DESTDIR="${D}" \ - PYTHON_BIN="${PYTHON}" \ - "${@}" -} - pkg_setup() { if kernel_is ge 3 13; then if use modern-kernel && kernel_is lt 3 18; then @@ -87,6 +78,12 @@ src_prepare() { -i files/osf/Makefile.am || die eautoreconf + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi } src_configure() { @@ -104,13 +101,21 @@ src_configure() { $(use_with xtables) ) econf "${myeconfargs[@]}" + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi } src_compile() { default if use python; then - python_foreach_impl python_make + pushd py >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die fi } @@ -134,8 +139,9 @@ src_install() { systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service if use python ; then - python_foreach_impl python_make install - python_foreach_impl python_optimize + pushd py >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die fi find "${ED}" -type f -name "*.la" -delete || die diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild index 944c87fea31f..82923aace969 100644 --- a/net-firewall/nftables/nftables-9999.ebuild +++ b/net-firewall/nftables/nftables-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..10} ) - -inherit autotools linux-info python-r1 systemd +DISTUTILS_OPTIONAL=1 +inherit autotools linux-info distutils-r1 systemd DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" HOMEPAGE="https://netfilter.org/projects/nftables/" @@ -56,15 +56,6 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.8-slibtool.patch" ) -python_make() { - emake \ - -C py \ - abs_builddir="${S}" \ - DESTDIR="${D}" \ - PYTHON_BIN="${PYTHON}" \ - "${@}" -} - pkg_setup() { if kernel_is ge 3 13; then if use modern-kernel && kernel_is lt 3 18; then @@ -87,6 +78,12 @@ src_prepare() { -i files/osf/Makefile.am || die eautoreconf + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi } src_configure() { @@ -104,13 +101,21 @@ src_configure() { $(use_with xtables) ) econf "${myeconfargs[@]}" + + if use python; then + pushd py >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi } src_compile() { default if use python; then - python_foreach_impl python_make + pushd py >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die fi } @@ -134,8 +139,9 @@ src_install() { systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service if use python ; then - python_foreach_impl python_make install - python_foreach_impl python_optimize + pushd py >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die fi find "${ED}" -type f -name "*.la" -delete || die |