summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-12-05 10:08:38 +0000
committerPeter Volkov <pva@gentoo.org>2009-12-05 10:08:38 +0000
commit235a909c0aec35ed32e9055701e184eeb50c7be7 (patch)
tree4f643c482fbc55770d57335b04f8b049c6409e1f /net-firewall/ebtables
parentStabilize for peeps #290539 by Stefan Huber. (diff)
downloadhistorical-235a909c0aec35ed32e9055701e184eeb50c7be7.tar.gz
historical-235a909c0aec35ed32e9055701e184eeb50c7be7.tar.bz2
historical-235a909c0aec35ed32e9055701e184eeb50c7be7.zip
Added static USE flag, bug #275460, thank Joakim Tjernlund for report. Drop old.
Package-Manager: portage-2.1.7.10/cvs/Linux x86_64
Diffstat (limited to 'net-firewall/ebtables')
-rw-r--r--net-firewall/ebtables/ChangeLog9
-rw-r--r--net-firewall/ebtables/Manifest5
-rw-r--r--net-firewall/ebtables/ebtables-2.0.9.1-r1.ebuild (renamed from net-firewall/ebtables/ebtables-2.0.8.2-r2.ebuild)48
3 files changed, 40 insertions, 22 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/Manifest b/net-firewall/ebtables/Manifest
index e9b1c098ec75..55e19d99f21a 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -4,9 +4,8 @@ AUX ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch 1619 RMD160 62f324507577cdcb
AUX ebtables-v2.0.9-1-LDFLAGS.diff 1874 RMD160 e7c0fc175b1d44fbc4c91f50377b8e3fb74e54f2 SHA1 e8cddfd6ee81b13f0ccb3d3cb7cfc003eee0bd29 SHA256 988bf04df31a3696e12d8c8d856610291038c383956857ee3b239108213e8212
AUX ebtables.confd 466 RMD160 84f7bea9b78ae9fab08cc446c1cd64e74fe4e4f9 SHA1 2bf5e4db2fde07a9791c43cb27575aefe30cc895 SHA256 fa8dedd95f1a6834022e409754e1e41219a7671a1bbb99b2094356239135730d
AUX ebtables.initd 2078 RMD160 da8ca12a06bf4134436b8c858b022935b95f7ab4 SHA1 d8d3628cbdc251d22558fc5761be95d012586f7f SHA256 14d443045dc1f9a3da84a4dc07040ac8a6d6042a2d87305b9eeca8495703cb53
-DIST ebtables-v2.0.8-2.tar.gz 97065 RMD160 b53fca7e2f34dd23ecb11af3804fa10c1702e815 SHA1 3e9331a55e02f0930047b7198501f380ebf6c2d9 SHA256 dd78c0dfa0dbeb128952dec9e916be948bf561dcb8ba3149ea7ce0166a2caf9b
DIST ebtables-v2.0.9-1.tar.gz 101781 RMD160 9ec134cbb21be5eb085ad7f405c26363d29d38f9 SHA1 b0b011edb5872f266b9bbb127fe292d1e745dbc3 SHA256 8aefbc4480b1f6b6766fdb26779cd9eb9609278ad294b7585e533270e039bdc6
-EBUILD ebtables-2.0.8.2-r2.ebuild 1689 RMD160 c11c320da7f8ffdf5126cb96d9865c3d26c407d2 SHA1 6291db9938a4a6f0765c849b85f60e98d82dd8c7 SHA256 d3b15127426e0dc30d15760a53ca184fae589a4a9c57bb3a7f0c58fee6de368e
+EBUILD ebtables-2.0.9.1-r1.ebuild 1993 RMD160 bc84b703e8866c4954c87564c91f12e6ff4e0939 SHA1 130a847a733a235ec70e63183aca9e6498478d9f SHA256 8885bcd1ae14dcb86c5ecc4d1bb7f37cf36bbc456792f4b586013bb534a87e45
EBUILD ebtables-2.0.9.1.ebuild 1703 RMD160 7bd7b57d7b2117cbf5f44a0f5aea57f1db713ca0 SHA1 3e16ccc4dff504aa8e8683989ee5fb7d238ec878 SHA256 25807c88a348854d3b58ba1e0e99ae2ace4f6d4b85ea05f1573864aea2b9ae52
-MISC ChangeLog 5235 RMD160 361dc4664faa05c6b6aec684966b60081c86f92d SHA1 78306606844cf157fa4b9c7853f981c322109765 SHA256 bb4c2609e8b95b16071ec634a89d0296a7f191ad98f1ca1a8a4dcd846bb3b953
+MISC ChangeLog 5459 RMD160 e2e2086650b774af6b9a55ee73aaed7f5ee3f8a2 SHA1 20f5178e73c51cf42ce9b422ad05a2c8687fb9ea SHA256 c78c0813ca980f92304fb7df04fa2691176f7c880452b42f9ae4b20f8cc62822
MISC metadata.xml 251 RMD160 2acabb95dba06572ab5dfd2a6d7bca5ab53d7a64 SHA1 6bf96c40f48fb4f92026dd80b7b3e1ce7ebdc9d1 SHA256 8d646b2f01acd31f9bc065850081adfa7f1dfabd8e305e05331fc6d21cbbd504
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
}