commit:     11f6d950515a2578fbb3f5c9a3d2dcd795477592
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 18:17:20 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 18:17:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f6d950

net-firewall/nftables-0.9.5: Don't require extra tarball with USE=-doc

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-firewall/nftables/Manifest              | 1 -
 net-firewall/nftables/nftables-0.9.5.ebuild | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 52fef421cf2..f51358d73d7 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,5 +1,4 @@
 DIST nftables-0.9.3.tar.bz2 786759 BLAKE2B 
578276d861fdb2b843223aca1276bbc1dda9627d0058259a966e324e30ee64d8c102d1e2cceb82d29143caa9dcd1a4492df168f1c87b136fc7b3a1a7dc8568a8
 SHA512 
d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43
 DIST nftables-0.9.4-manpages.tar.xz 38580 BLAKE2B 
bb561c7824d032ecfff5c98af10c95af6f5188377f43de8398be7e503adff0441d49fa3e2cefcb646927cc1a4222957f0cc75d5ad4c770ef3a3f8cb8a677c5ce
 SHA512 
1b94ff06ceccf75bbefbf64496d5fa0b492907d7ec5fe41f7808c6e239b2a0a42e88d61e35e22485abee7e4bd382178e962a7c5b113433247ca329cbfa408bca
 DIST nftables-0.9.4.tar.bz2 792788 BLAKE2B 
3f2d8ff3bcfe3ab815ee369c4937adef5e5730edee8ea59b32031732802e608bcb47ddd3e55303ad6c295158aff51b2f2c069d98600db83d732ff78836c7abb5
 SHA512 
cef5b5f26f3a2893a3eb1323f1f0ecfd6e2865e0eb040e9b7da5824e5be2274b888e661abe96e828add9e951f47303e30cb7c9238d267a031c0f99b5f3b6e2c0
-DIST nftables-0.9.5-manpages.tar.xz 38908 BLAKE2B 
ee4977ecd03d5f22657d8898c6758a8de481481df158f540e07fe5fc8dbb5dcbd38c5598c496359f1facbb9e5304bef8a8eefc798736092ed9df494d8cb57ebb
 SHA512 
2f049ad6663ac926f6e6740457f9698afcfe7147fc90a9d20542171ca376beb71fd8bc3f8308c3e46fee517e8470c79ac8b54079bc036ef5471822e55d5cd3c3
 DIST nftables-0.9.5.tar.bz2 855740 BLAKE2B 
82c6962616a1ba5329fe9f39a64e61984415be5087bc79457fc2f6c4e70edba0f2ccc63698eb620f9d9e22950b9de014d34bf499f8457179610ff749a9ad8658
 SHA512 
fc306984e951c3d036ce0d5bc0cd9dc07dd773a129ceb2df13db6636fbeeeb08ddd1586ef7116f3a0c3a08d1366da230ebcbcdb65e5fe29c07e24d612426f352

diff --git a/net-firewall/nftables/nftables-0.9.5.ebuild 
b/net-firewall/nftables/nftables-0.9.5.ebuild
index 78b72cc2610..aad88b61923 100644
--- a/net-firewall/nftables/nftables-0.9.5.ebuild
+++ b/net-firewall/nftables/nftables-0.9.5.ebuild
@@ -10,8 +10,7 @@ inherit autotools linux-info python-r1 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
-       !doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/nftables/${P}-manpages.tar.xz )"
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -103,7 +102,7 @@ src_install() {
        default
 
        if ! use doc; then
-               pushd "${WORKDIR}/${P}-manpages" >/dev/null || die
+               pushd doc >/dev/null || die
                doman *.?
                popd >/dev/null || die
        fi

Reply via email to