Fix warning messages because of 'head' and add missing IUSE.

7 files changed, 64 insertions, 8 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index b224b60e5fd6..6f501d768a2c 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/firehol
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.3 2003/10/13 18:50:53 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.4 2004/05/02 15:22:09 centic Exp $
+
+*firehol-1.159-r1 (02 May 2004)
+
+  02 May 2004; Dominik Stadler <centic@gentoo.org> +metadata.xml,
+  firehol-1.120.ebuild, +firehol-1.159-r1.ebuild, firehol-1.159.ebuild:
+  Avoid warnings because of deprectated command syntax when calling 'head'. Add
+  missing IUSE.
 
 *firehol-1.159 (14 Oct 2003)
 
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 18ed4c155893..9c85a7b81fdd 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,7 +1,10 @@
+MD5 3ae413f68279a73c82a77e2a300f951e ChangeLog 1080
+MD5 9a4826948c915aa2026fc6ce4bf89bbb firehol-1.120.ebuild 1120
+MD5 de5a2f398fa58c383c5c53fb71599e92 firehol-1.159.ebuild 1073
+MD5 1677ee66964388aa0d912fb0a8a314b5 firehol-1.91.ebuild 986
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 ec631410bd9c6cb59fcd505285c7b4a5 firehol-1.159-r1.ebuild 1106
 MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
 MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159 65
 MD5 1afffcb0a10f9c0028dc5062244934fc files/digest-firehol-1.91 64
-MD5 e2cd96121697f55bce995c6e3b2a0b9e ChangeLog 813
-MD5 41516dc16c00c54dc5bab7f948af544e firehol-1.120.ebuild 1112
-MD5 4d91cfd46a0a280ae761093d8df9c353 firehol-1.159.ebuild 1065
-MD5 1677ee66964388aa0d912fb0a8a314b5 firehol-1.91.ebuild 986
+MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
diff --git a/net-firewall/firehol/files/digest-firehol-1.159-r1 b/net-firewall/firehol/files/digest-firehol-1.159-r1
new file mode 100644
index 000000000000..901af340b7c3
--- /dev/null
+++ b/net-firewall/firehol/files/digest-firehol-1.159-r1
@@ -0,0 +1 @@
+MD5 b39bd3a3f741244392da42099db4b13d firehol-1.159.tar.bz2 98918
diff --git a/net-firewall/firehol/firehol-1.120.ebuild b/net-firewall/firehol/firehol-1.120.ebuild
index 560752c0859f..ba2391be1c74 100644
--- a/net-firewall/firehol/firehol-1.120.ebuild
+++ b/net-firewall/firehol/firehol-1.120.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.120.ebuild,v 1.3 2004/04/21 16:17:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.120.ebuild,v 1.4 2004/05/02 15:22:09 centic Exp $
 
 DESCRIPTION="iptables firewall generator"
 HOMEPAGE="http://firehol.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 KEYWORDS="x86"
 
 RDEPEND="net-firewall/iptables
diff --git a/net-firewall/firehol/firehol-1.159-r1.ebuild b/net-firewall/firehol/firehol-1.159-r1.ebuild
new file mode 100644
index 000000000000..f14984436e07
--- /dev/null
+++ b/net-firewall/firehol/firehol-1.159-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.159-r1.ebuild,v 1.1 2004/05/02 15:22:09 centic Exp $
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86"
+
+RDEPEND="net-firewall/iptables
+	sys-apps/iproute2"
+
+src_compile() {
+	sed -i firehol.sh \
+		-e 's|/etc/firehol.conf|/etc/firehol/firehol.conf|' \
+		-e 's|/sbin/ip|/usr/sbin/ip|' \
+		-e 's|/usr/sbin/iptables|/sbin/iptables|' \
+		-e 's|head -1|head -n 1|'
+}
+
+src_install() {
+	newsbin firehol.sh firehol
+	dodir /etc/firehol /etc/firehol/examples
+	insinto /etc/firehol/examples
+	doins examples/*
+	dodoc ChangeLog COPYING README TODO WhatIsNew
+	dohtml doc/*.html doc/*.css
+	docinto scripts
+	dodoc get-iana.sh adblock.sh
+}
+
+pkg_postinst() {
+	einfo "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
+	einfo "See /etc/firehol/examples for configuration examples."
+}
diff --git a/net-firewall/firehol/firehol-1.159.ebuild b/net-firewall/firehol/firehol-1.159.ebuild
index 00c5e2d48184..59c1e115cfdd 100644
--- a/net-firewall/firehol/firehol-1.159.ebuild
+++ b/net-firewall/firehol/firehol-1.159.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.159.ebuild,v 1.3 2004/04/21 16:17:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.159.ebuild,v 1.4 2004/05/02 15:22:09 centic Exp $
 
 DESCRIPTION="iptables firewall generator"
 HOMEPAGE="http://firehol.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 KEYWORDS="~x86"
 
 RDEPEND="net-firewall/iptables
diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
new file mode 100644
index 000000000000..20ce219711a2
--- /dev/null
+++ b/net-firewall/firehol/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+</pkgmetadata>