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

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

5 files changed, 9 insertions, 75 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/Manifest b/net-firewall/arptables/Manifest
index 2bf0e19692bc..402530db799d 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -5,8 +5,6 @@ AUX arptables-0.0.3.4-type.patch 935 RMD160 54ed4336d012a3dbc250b5e5220527785382
 DIST arptables-v0.0.3-3.tar.gz 43903 RMD160 227712bd8b6aa7baa6059b4bd7aa11692f101dec SHA1 ebcd8cc84671fddc73d23b59f767f37af7f437ac SHA256 5fe63803a843f8c3d0c7047d8a7d78cb66fed278832090c0f2a42b97de33940f
 DIST arptables-v0.0.3-4.tar.gz 44335 RMD160 655e70ce24280dc426a7458cf462dc6e9c79a2a9 SHA1 df60f2cc701238855e5443167bf40a8c8b96a39a SHA256 e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928
 EBUILD arptables-0.0.3.3-r1.ebuild 932 RMD160 099cb2db51020ba9e0fd3a627eb74644ef5d99a7 SHA1 26db1f9b899ffdc52543c7c1b834151d71fa62a2 SHA256 ea8c8ff2429a4d4d3b9a27589185d1ee87e0782b93ee38bf0e70d23e8af77b87
-EBUILD arptables-0.0.3.4-r1.ebuild 1011 RMD160 a9270fdaf533697e405b875c59280e76965a3686 SHA1 9909bb4173350fc13782f9650d4ae09711ee3485 SHA256 4e0c2e83823ab9cfac3c308ca09010e2cf0a6bf87b99cc08675aa1db71fcb470
-EBUILD arptables-0.0.3.4-r2.ebuild 1144 RMD160 24b4391fbd3e2aee6b88517274f44249bc1c24a7 SHA1 1bdbbf296bbeee85e6e501a77dfd44a2f7290ab8 SHA256 3dd33902b95a0a811ac59740fd98be59cf33d6b4ce991cf5f61dbd750da7602b
-EBUILD arptables-0.0.3.4.ebuild 948 RMD160 a99691e31af81152708bbf715aea433295b57de0 SHA1 4227af8cf69ace8d06b4a0fb9c34fb32f6dd2032 SHA256 90725849bd60aa5790673ee3278836850ce3e68afc7756a3f641b3a181bd9019
-MISC ChangeLog 3039 RMD160 a696294b50eaa6b53548efc06d8a86a211b6da64 SHA1 9cc4de02d1548fb561ea7fa2a38e8d706493acdc SHA256 f049db8dd164ebe86934792c3dd51e34d34517e65c9f0ed0fbd4b842f8174f2e
+EBUILD arptables-0.0.3.4-r2.ebuild 1136 RMD160 6ac0681dd3868523ba28a75dfaa6b1fdbd770c78 SHA1 c7da80bc8769857b550bf573564b7207ad1c98d1 SHA256 be751ae6fa4bb658ecedd6c411bfa421c04a89eaf649afdff8fddf204e15c657
+MISC ChangeLog 3241 RMD160 7df9e8105dacdb5c4d2a7e13d353608e1c19bf1a SHA1 dd38aab63b2f69679f03843a217d1fc9d21440db SHA256 c82013c8ee979e3ae6176335081261a87118e79fafaff9d64f0f224b4bf4dd32
 MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
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
-}