commit: 30b3fa9d29308ecbd09b30a8357adeeb2768ca22 Author: Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org> AuthorDate: Tue Dec 3 01:36:40 2019 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue Dec 3 16:10:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b3fa9d
net-firewall/nftables: Move skel files Currently the ebuild installs the skeleton files directly into the ebuild's doc directory. In 0.9.0-r5 the intention was installing them into a skels folder (although this was not done correctly). Replace the sed rules so that the skeleton files are installed into the skel folder. This will be cleaner if for some reason nftables adds further documentation on the future. It is also easier to perform this change now than once we stabilize. Bug: https://bugs.gentoo.org/671254 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> ...es-0.9.2-r1.ebuild => nftables-0.9.0-r6.ebuild} | 77 +++++----------------- ...es-0.9.1-r1.ebuild => nftables-0.9.1-r2.ebuild} | 4 +- ...es-0.9.2-r1.ebuild => nftables-0.9.2-r2.ebuild} | 4 +- 3 files changed, 22 insertions(+), 63 deletions(-) diff --git a/net-firewall/nftables/nftables-0.9.2-r1.ebuild b/net-firewall/nftables/nftables-0.9.0-r6.ebuild similarity index 61% copy from net-firewall/nftables/nftables-0.9.2-r1.ebuild copy to net-firewall/nftables/nftables-0.9.0-r6.ebuild index 5dd8147c26d..90884e99c1c 100644 --- a/net-firewall/nftables/nftables-0.9.2-r1.ebuild +++ b/net-firewall/nftables/nftables-0.9.0-r6.ebuild @@ -1,54 +1,33 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) - -inherit autotools linux-info python-r1 systemd +inherit autotools linux-info systemd DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" HOMEPAGE="https://netfilter.org/projects/nftables/"; -#SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"; +SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" -IUSE="debug +doc +gmp json +modern-kernel python +readline static-libs xtables" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" +IUSE="debug doc +gmp json +modern-kernel +readline" -RDEPEND=" - >=net-libs/libmnl-1.0.3:0= +RDEPEND=">=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) - python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) - >=net-libs/libnftnl-1.1.4:0= - xtables? ( >=net-firewall/iptables-1.6.1 ) -" - -DEPEND="${RDEPEND}" + >=net-libs/libnftnl-1.1.1:0=" -BDEPEND=" - doc? ( app-text/asciidoc ) +DEPEND="${RDEPEND} >=app-text/docbook2X-0.8.8-r4 + doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex - virtual/pkgconfig -" + virtual/pkgconfig" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -#S="${WORKDIR}/v${PV}" - -python_make() { - emake \ - -C py \ - abs_builddir="${S}" \ - DESTDIR="${D}" \ - PYTHON_BIN="${PYTHON}" \ - ${@} -} +S="${WORKDIR}/v${PV}" pkg_setup() { if kernel_is ge 3 13; then @@ -64,44 +43,26 @@ pkg_setup() { src_prepare() { default - - # fix installation path for doc stuff - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}@' \ - -i files/nftables/Makefile.am || die - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/osf@' \ - -i files/osf/Makefile.am || die - eautoreconf } src_configure() { local myeconfargs=( - # We handle python separately - --disable-python --sbindir="${EPREFIX}"/sbin $(use_enable debug) - $(use_enable doc man-doc) + $(use_enable doc pdf-doc) $(use_with !gmp mini_gmp) $(use_with json) $(use_with readline cli) - $(use_enable static-libs static) - $(use_with xtables) ) econf "${myeconfargs[@]}" } -src_compile() { - default - - if use python ; then - python_foreach_impl python_make - fi -} - src_install() { default - local mksuffix="$(usex modern-kernel '-mk' '')" + local mksuffix="" + use modern-kernel && mksuffix="-mk" exeinto /usr/libexec/${PN} newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh @@ -111,16 +72,14 @@ src_install() { systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service - if use python ; then - python_foreach_impl python_make install - fi - - find "${ED}" -type f -name "*.la" -delete || die + docinto skels + dodoc "${D}"/etc/nftables/* + rm -R "${D}"/etc/nftables } pkg_postinst() { local save_file - save_file="${EROOT}/var/lib/nftables/rules-save" + save_file="${EROOT%/}/var/lib/nftables/rules-save" # In order for the nftables-restore systemd service to start # the save_file must exist. diff --git a/net-firewall/nftables/nftables-0.9.1-r1.ebuild b/net-firewall/nftables/nftables-0.9.1-r2.ebuild similarity index 96% rename from net-firewall/nftables/nftables-0.9.1-r1.ebuild rename to net-firewall/nftables/nftables-0.9.1-r2.ebuild index 8538c51884d..fab18474325 100644 --- a/net-firewall/nftables/nftables-0.9.1-r1.ebuild +++ b/net-firewall/nftables/nftables-0.9.1-r2.ebuild @@ -71,9 +71,9 @@ src_prepare() { default # fix installation path for doc stuff - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}@' \ + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \ -i files/nftables/Makefile.am || die - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/osf@' \ + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \ -i files/osf/Makefile.am || die eautoreconf diff --git a/net-firewall/nftables/nftables-0.9.2-r1.ebuild b/net-firewall/nftables/nftables-0.9.2-r2.ebuild similarity index 96% rename from net-firewall/nftables/nftables-0.9.2-r1.ebuild rename to net-firewall/nftables/nftables-0.9.2-r2.ebuild index 5dd8147c26d..a6478ad1215 100644 --- a/net-firewall/nftables/nftables-0.9.2-r1.ebuild +++ b/net-firewall/nftables/nftables-0.9.2-r2.ebuild @@ -66,9 +66,9 @@ src_prepare() { default # fix installation path for doc stuff - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}@' \ + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \ -i files/nftables/Makefile.am || die - sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/osf@' \ + sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \ -i files/osf/Makefile.am || die eautoreconf
