commit: ca9ad0c216ce9301b176b362168aac8926922452 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Mar 7 17:43:52 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Mar 7 19:26:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9ad0c2
net-firewall/ebtables: drop /etc/ethertypes Bug: https://bugs.gentoo.org/647458 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 5 ++++- ...les-2.0.10.4-r1.ebuild => ebtables-2.0.10.4-r2.ebuild} | 15 +++++++++------ net-firewall/ebtables/ebtables-2.0.10.4.ebuild | 5 +++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild index 83e49e5a63c..c506fa3d0bf 100644 --- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild @@ -18,7 +18,10 @@ 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-firewall/iptables-1.6.2-r2[nftables(-)] + !net-misc/ethertypes +" S=${WORKDIR}/${MY_P} diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild similarity index 87% copy from net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild copy to net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild index 83e49e5a63c..4fe72ef2909 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-2018 Gentoo Foundation # 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 sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \ -e "s,^BINDIR:=.*,BINDIR:=/sbin," \ @@ -59,11 +62,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 } diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild index d4f1785a01f..10bbd3d6985 100644 --- a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild +++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild @@ -17,6 +17,11 @@ IUSE="static" LICENSE="GPL-2" SLOT="0" +RDEPEND=" + !<net-firewall/iptables-1.6.2-r2[nftables(-)] + !net-misc/ethertypes +" + S=${WORKDIR}/${MY_P} pkg_setup() {
