amd64 stable, bug #323573, thank Agostino Sarubbo for testing. Drop old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 7 insertions, 71 deletions

diff --git a/net-firewall/arptables/ChangeLog b/net-firewall/arptables/ChangeLog
index 9f54fd14e0bc..e0a4d50abffe 100644
--- a/net-firewall/arptables/ChangeLog
+++ b/net-firewall/arptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/arptables
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.18 2010/12/20 20:14:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.19 2010/12/21 08:52:51 pva Exp $
+
+  21 Dec 2010; Peter Volkov <pva@gentoo.org> -arptables-0.0.3.4.ebuild,
+  -arptables-0.0.3.4-r1.ebuild, arptables-0.0.3.4-r2.ebuild:
+  amd64 stable, bug #323573, thank Agostino Sarubbo for testing. Drop old.
 
   20 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   arptables-0.0.3.4-r2.ebuild:
diff --git a/net-firewall/arptables/arptables-0.0.3.4-r1.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r1.ebuild
deleted file mode 100644
index bf0cf3584d8d..000000000000
--- a/net-firewall/arptables/arptables-0.0.3.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.4-r1.ebuild,v 1.1 2010/09/15 13:51:39 pva Exp $
-
-EAPI="2"
-inherit versionator eutils
-
-MY_P=${PN}-v$(replace_version_separator 3 - )
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
-	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin arptables arptables-restore arptables-save || die
-	doman arptables.8 || die
-}
diff --git a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
index da77de880f3e..6fddc556a537 100644
--- a/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
+++ b/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild,v 1.2 2010/12/20 20:14:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.4-r2.ebuild,v 1.3 2010/12/21 08:52:51 pva Exp $
 
 EAPI="2"
 inherit versionator eutils
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-firewall/arptables/arptables-0.0.3.4.ebuild b/net-firewall/arptables/arptables-0.0.3.4.ebuild
deleted file mode 100644
index 9dc1a4dfa779..000000000000
--- a/net-firewall/arptables/arptables-0.0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.4.ebuild,v 1.1 2010/03/16 07:57:29 pva Exp $
-
-EAPI="2"
-inherit versionator eutils
-
-MY_P=${PN}-v$(replace_version_separator 3 - )
-
-DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
-HOMEPAGE="http://ebtables.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ebtables/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# -O0 does not work and at least -O2 is required, bug #240752
-	emake CC="$(tc-getCC)" COPT_FLAGS="-O2 ${CFLAGS//-O0/-O2}" || die "make failed"
-	sed -ie 's:__EXEC_PATH__:/sbin:g' arptables-save arptables-restore \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin arptables arptables-restore arptables-save || die
-	doman arptables.8 || die
-}