diff --git a/srcpkgs/nftables/patches/destdir.patch b/srcpkgs/nftables/patches/destdir.patch deleted file mode 100644 index 852ba96518d..00000000000 --- a/srcpkgs/nftables/patches/destdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Else setuptools installs an .egg directory, this way it installs -nftables/ and nftables-*-egg.info/ - ---- a/py/Makefile.am -+++ b/py/Makefile.am -@@ -7,7 +7,7 @@ - install-exec-local: - cd $(srcdir) && \ - $(PYTHON_BIN) setup.py build --build-base $(abs_builddir) \ -- install --prefix $(DESTDIR)$(prefix) -+ install --prefix $(prefix) --root $(DESTDIR) - - uninstall-local: - rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/nftables diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template index c9a9893fb9f..34d8f883435 100644 --- a/srcpkgs/nftables/template +++ b/srcpkgs/nftables/template @@ -1,25 +1,36 @@ # Template file for 'nftables' pkgname=nftables -version=1.0.8 -revision=2 +version=1.0.9 +revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3 --with-cli=readline" hostmakedepends="asciidoc automake docbook2x flex libtool pkg-config - python3 python3-setuptools" + python3 python3-build python3-installer python3-wheel" makedepends="gmp-devel jansson-devel libmnl-devel libnftnl-devel readline-devel" short_desc="Netfilter nftables userspace tools" maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="http://netfilter.org/projects/nftables/" distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.xz" -checksum=9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50 +checksum=a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd post_extract() { autoreconf -fi } +post_build() { + ( + cd py + python -m build --no-isolation --wheel + ) +} + post_install() { + ( + cd py + python -m installer --destdir ${DESTDIR} --no-compile-bytecode dist/*.whl + ) vsv nftables }