From 2a84d85cc3eb005d988accff71e3712b113b33d8 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sat, 5 Dec 2009 10:08:38 +0000 Subject: Added static USE flag, bug #275460, thank Joakim Tjernlund for report. Drop old. (Portage version: 2.1.7.10/cvs/Linux x86_64) --- net-firewall/ebtables/ChangeLog | 9 +++- net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild | 51 ------------------- net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild | 63 ++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 52 deletions(-) delete mode 100644 net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild create mode 100644 net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild (limited to 'net-firewall') 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 -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 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.8.2-r2.ebuild deleted file mode 100644 index d4671213ca13..000000000000 --- a/net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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 $ - -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." -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -HOMEPAGE="http://ebtables.sourceforge.net/" -KEYWORDS="amd64 ppc x86" -IUSE="" -LICENSE="GPL-2" -SLOT="0" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - # 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 - - 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 - sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile - sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile -} - -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" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc ChangeLog THANKS - keepdir /var/lib/ebtables/ - newinitd "${FILESDIR}"/ebtables.initd ebtables - newconfd "${FILESDIR}"/ebtables.confd ebtables -} diff --git a/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild new file mode 100644 index 000000000000..f4b36c960ade --- /dev/null +++ b/net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild @@ -0,0 +1,63 @@ +# 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.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} + +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" + 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," \ + -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/${PF}," \ + -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/${PF}," \ + -e "s,^LIBDIR:=.*,LIBDIR:=/$(get_libdir)/\$(PROGNAME)," Makefile + sed -i -e "s/^CFLAGS:=/CFLAGS+=/" Makefile + sed -i -e "s,^CC:=.*,CC:=$(tc-getCC)," Makefile +} + +src_compile() { + # This package uses _init functions to initialise extensions. With + # --as-needed this will not work. + append-ldflags $(no-as-needed) + emake $(use static && echo static) || die "emake failed" +} + +src_install() { + 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 +} -- cgit v1.2.3-65-gdbad