diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2019-08-28 17:27:59 -0500 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2019-08-28 17:27:59 -0500 |
| commit | 2dbc84da7af261484768ab90fe47b1a677359382 (patch) | |
| tree | d6b7fdf3089edf9ef6d41dcffdb14794bbf596fe | |
| parent | eclass/toolchain.eclass: drop eclass from overlay as (diff) | |
| download | musl-2dbc84da.tar.gz musl-2dbc84da.tar.bz2 musl-2dbc84da.zip | |
net-firewall/ebtables: Sync with latest changes from portage
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
| -rw-r--r-- | net-firewall/ebtables/Manifest | 2 | ||||
| -rw-r--r-- | net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild (renamed from net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild) | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest index 68edfb13..73219a00 100644 --- a/net-firewall/ebtables/Manifest +++ b/net-firewall/ebtables/Manifest @@ -1 +1 @@ -DIST ebtables-v2.0.10-4.tar.gz 103764 SHA256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d SHA512 a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a WHIRLPOOL 5a1e0703e3fd5c79e149824e789646d042660081fb8a9f301fa4cc2716e84fbf842216d5b6b4c8c33de3b6949bfbfcaa2eb7293fe7afa71a2305de8f70abd57d +DIST ebtables-v2.0.10-4.tar.gz 103764 BLAKE2B 01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6 SHA512 a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild index bdcbd7a6..78a3c20d 100644 --- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="6" -inherit versionator eutils toolchain-funcs multilib flag-o-matic +inherit versionator toolchain-funcs flag-o-matic MY_PV=$(replace_version_separator 3 '-' ) MY_P=${PN}-v${MY_PV} @@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="+perl static" # The ebtables-save script is written in perl. -RDEPEND="perl? ( dev-lang/perl )" +RDEPEND="perl? ( dev-lang/perl ) + net-misc/ethertypes" S=${WORKDIR}/${MY_P} @@ -31,7 +32,9 @@ pkg_setup() { src_prepare() { # Enhance ebtables-save to take table names as parameters bug #189315 - epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" + local PATCHES=( "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" ) + + default # Musl fixes epatch "${FILESDIR}/musl-fixes.patch" @@ -64,11 +67,11 @@ src_install() { if ! use perl; then rm "${ED}"/sbin/ebtables-save || die fi + # Bug 647458 + rm "${ED%/}"/etc/ethertypes || die else into / newsbin static ebtables - insinto /etc - doins ethertypes fi dodoc ChangeLog THANKS } |