From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1180691-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 3288313835A
	for <garchives@archives.gentoo.org>; Fri, 19 Jun 2020 06:51:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5F09CE090E;
	Fri, 19 Jun 2020 06:51:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 34152E090E
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2020 06:51:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7185E34F3C7
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2020 06:51:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F3B262A8
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2020 06:51:07 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1592549461.342b22ecf68b5520e297e79758905f0a10d3057e.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ebtables/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild net-firewall/ebtables/ebtables-2.0.11.ebuild
X-VCS-Directories: net-firewall/ebtables/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 342b22ecf68b5520e297e79758905f0a10d3057e
X-VCS-Branch: master
Date: Fri, 19 Jun 2020 06:51:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 906040d8-04f0-4acc-ac40-fe315a454483
X-Archives-Hash: 0af102520d22de18fd30443c685e70e0

commit:     342b22ecf68b5520e297e79758905f0a10d3057e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 06:50:49 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 06:51:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342b22ec

net-firewall/ebtables: Removed old

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild | 72 ------------------
 net-firewall/ebtables/ebtables-2.0.11.ebuild      | 92 -----------------------
 2 files changed, 164 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
deleted file mode 100644
index c506fa3d0bf..00000000000
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator eutils toolchain-funcs multilib flag-o-matic
-
-MY_PV=$(replace_version_separator 3 '-' )
-MY_P=${PN}-v${MY_PV}
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+perl static"
-
-# The ebtables-save script is written in perl.
-RDEPEND="perl? ( dev-lang/perl )
-	!<net-firewall/iptables-1.6.2-r2[nftables(-)]
-	!net-misc/ethertypes
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use static; then
-		ewarn "You've chosen static build which is useful for embedded devices."
-		ewarn "It has no init script. Make sure that's really what you want."
-	fi
-}
-
-src_prepare() {
-	# Enhance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
-
-	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
-		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
-		-e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \
-		-e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \
-		-e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile
-}
-
-src_compile() {
-	# This package uses _init functions to initialise extensions. With
-	# --as-needed this will not work.
-	append-ldflags $(no-as-needed)
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		$(use static && echo static)
-}
-
-src_install() {
-	if ! use static; then
-		emake DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-		if ! use perl; then
-			rm "${ED}"/sbin/ebtables-save || die
-		fi
-	else
-		into /
-		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
-	fi
-	dodoc ChangeLog THANKS
-}

diff --git a/net-firewall/ebtables/ebtables-2.0.11.ebuild b/net-firewall/ebtables/ebtables-2.0.11.ebuild
deleted file mode 100644
index c9be4be12cc..00000000000
--- a/net-firewall/ebtables/ebtables-2.0.11.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-MY_PV="$(ver_rs 3 '-' )"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Controls Ethernet frame filtering on a Linux bridge, MAC NAT and brouting"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+perl static"
-
-# The ebtables-save script is written in perl.
-RDEPEND="perl? ( dev-lang/perl )
-	net-misc/ethertypes"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.11-makefile.patch"
-
-	# Enhance ebtables-save to take table names as parameters bug #189315
-	"${FILESDIR}/${PN}-2.0.11-ebt-save.patch"
-
-	# from upstream git
-	"${FILESDIR}/ebtables-2.0.11-remove-stray-atsign.patch"
-)
-
-pkg_setup() {
-	if use static; then
-		ewarn "You've chosen static build which is useful for embedded devices."
-		ewarn "It has no init script. Make sure that's really what you want."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# don't install perl scripts if USE=perl is disabled
-	if ! use perl; then
-		sed -e '/sbin_SCRIPTS/ d' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--bindir="/bin" \
-		--sbindir="/sbin" \
-		--libdir=/$(get_libdir)/${PN} \
-		--sysconfdir="/usr/share/doc/${PF}" \
-		$(use_enable static)
-}
-
-src_compile() {
-	emake $(usex static 'static ebtables-legacy.8' '')
-}
-
-src_install() {
-	local -a DOCS=( ChangeLog THANKS )
-
-	if ! use static; then
-		emake DESTDIR="${D}" install
-		keepdir /var/lib/ebtables/
-		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
-		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
-
-		# symlink -legacy binaries to original names
-		local ext
-		for ext in '' -{save,restore}; do
-			local prog="${PN}-legacy${ext}"
-			[[ -f ${ED}/sbin/${prog} ]] && dosym ${prog} /sbin/${PN}${ext}
-		done
-
-		find "${D}" -name '*.la' -type f -delete || die
-	else
-		into /
-		newsbin static ebtables
-		insinto /etc
-		doins ethertypes
-	fi
-
-	newman ebtables-legacy.8 ebtables.8
-	einstalldocs
-}