Added static USE flag, bug #275460, thank Joakim Tjernlund for report. Drop old.

(Portage version: 2.1.7.10/cvs/Linux x86_64)

2 files changed, 38 insertions, 19 deletions

diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 6586f24d7143..bb9417739764 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ebtables
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.31 2009/11/08 19:20:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.32 2009/12/05 10:08:38 pva Exp $
+
+*ebtables-2.0.9.1-r1 (05 Dec 2009)
+
+  05 Dec 2009; Peter Volkov <pva@gentoo.org> -ebtables-2.0.8.2-r2.ebuild,
+  +ebtables-2.0.9.1-r1.ebuild:
+  Added static USE flag, bug #275460, thank Joakim Tjernlund for report.
+  Drop old.
 
   08 Nov 2009; nixnut <nixnut@gentoo.org> ebtables-2.0.9.1.ebuild:
   ppc stable #288289
diff --git a/net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
index d4671213ca13..f4b36c960ade 100644
--- a/net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild
@@ -1,30 +1,37 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild,v 1.4 2009/10/04 14:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild,v 1.1 2009/12/05 10:08:38 pva Exp $
+
+EAPI="2"
 
 inherit versionator eutils toolchain-funcs multilib flag-o-matic
 
 MY_PV=$(replace_version_separator 3 '-' )
-MY_P="${PN}-v${MY_PV}"
+MY_P=${PN}-v${MY_PV}
 
 DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://ebtables.sourceforge.net/"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
 LICENSE="GPL-2"
 SLOT="0"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+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
+}
 
-	# Enchance ebtables-save to take table names as parameters bug #189315
-	epatch "${FILESDIR}"/${PN}-2.0.8.1-ebt-save.diff
-	epatch "${FILESDIR}"/${PN}-v2.0.8-2-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch
+src_prepare() {
+	# Enhance ebtables-save to take table names as parameters bug #189315
+	epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff"
+	epatch "${FILESDIR}/${PN}-2.0.9.1-LDFLAGS.diff"
+	epatch "${FILESDIR}/${PN}-v2.0.8-2-ethertype-DESTDIR-mkdir.patch"
 
 	sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \
 		-e "s,^BINDIR:=.*,BINDIR:=/sbin," \
@@ -39,13 +46,18 @@ src_compile() {
 	# This package uses _init functions to initialise extensions. With
 	# --as-needed this will not work.
 	append-ldflags $(no-as-needed)
-	emake || die "emake failed"
+	emake $(use static && echo static) || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog THANKS
-	keepdir /var/lib/ebtables/
-	newinitd "${FILESDIR}"/ebtables.initd ebtables
-	newconfd "${FILESDIR}"/ebtables.confd ebtables
+	if ! use static; then
+		make DESTDIR="${D}" install || die
+		keepdir /var/lib/ebtables/
+		newinitd "${FILESDIR}"/ebtables.initd ebtables || die
+		newconfd "${FILESDIR}"/ebtables.confd ebtables || die
+	else
+		into /
+		newsbin static ebtables || die
+	fi
+	dodoc ChangeLog THANKS || die
 }