Version bump.

(Portage version: 2.1.10.39/cvs/Linux x86_64)

2 files changed, 74 insertions, 1 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index a1f61e3e3343..a595bd2edf7b 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ebtables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.45 2011/10/20 16:33:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.46 2011/12/17 03:29:13 pva Exp $
+
+*ebtables-2.0.10.4 (17 Dec 2011)
+
+  17 Dec 2011; Peter Volkov <pva@gentoo.org> +ebtables-2.0.10.4.ebuild:
+  Version bump.
 
   20 Oct 2011; Brent Baude <ranger@gentoo.org> ebtables-2.0.9.2-r2.ebuild:
   Marking ebtables-2.0.9.2-r2 ppc for bug 373291
diff --git a/net-firewall/ebtables/ebtables-2.0.10.4.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
new file mode 100644
index 000000000000..a647bd3f83ef
--- /dev/null
+++ b/net-firewall/ebtables/ebtables-2.0.10.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.10.4.ebuild,v 1.1 2011/12/17 03:29:13 pva Exp $
+
+EAPI="4"
+
+inherit versionator eutils toolchain-funcs multilib flag-o-matic
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_P=${PN}-v${MY_PV}
+
+DESCRIPTION="Utility that enables basic 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"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+LICENSE="GPL-2"
+SLOT="0"
+
+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)
+	# This package correctly aliases pointers, but gcc is unable to know that:
+	# unsigned char ip[4];
+	# if (*((uint32_t*)ip) == 0) {
+	#append-cflags -Wno-strict-aliasing
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		$(use static && echo static)
+}
+
+src_install() {
+	if ! use static; then
+		make DESTDIR="${D}" install
+		keepdir /var/lib/ebtables/
+		newinitd "${FILESDIR}"/ebtables.initd-r1 ebtables
+		newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
+	else
+		into /
+		newsbin static ebtables
+		insinto /etc
+		doins ethertypes
+	fi
+	dodoc ChangeLog THANKS || die
+}