Mark stable on x86 and remove old versions.

13 files changed, 20 insertions, 190 deletions

diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index 5a480e07f6fd..e3a39625ce76 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/firehol
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.11 2004/11/12 19:41:10 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.12 2004/12/30 09:49:52 centic Exp $
+
+  30 Dec 2004; Dominik Stadler <centic@gentoo.org> firehol-1.159-r1.ebuild,
+  -firehol-1.159.ebuild, -firehol-1.191-r1.ebuild, firehol-1.191-r2.ebuild,
+  -firehol-1.191.ebuild, firehol-1.214.ebuild, -firehol-1.91.ebuild:
+  Remove old versions and mark stable on x86.
 
   12 Nov 2004; Simon Stelling <blubb@gentoo.org> firehol-1.214.ebuild:
   added ~amd64
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 80a506826602..49de5e8a593f 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,21 +1,15 @@
-MD5 1b154afe5d4febaadb90daad83821c19 ChangeLog 2155
+MD5 e2e347fc896f920ddea8f48149eb128e ChangeLog 2373
 MD5 4ee85082d33557f1f172e9220b14433e firehol-1.120.ebuild 1113
-MD5 3520a2bedc2847655f09b165eb5e167f firehol-1.159-r1.ebuild 1104
-MD5 6362cf4f0a41bd85afbafbf65b052020 firehol-1.159.ebuild 1066
-MD5 2ed6c1ceb94a3aa65879f8edd9ec084f firehol-1.191-r1.ebuild 1507
-MD5 c3228f3a09a2a15b5cba192b04bea609 firehol-1.191-r2.ebuild 1626
-MD5 b9e974b4c6d63f8cdddacd84458e1215 firehol-1.191.ebuild 1270
+MD5 1ebbc7ddb48d45371f28fbd73c2d5569 firehol-1.159.ebuild 1065
 MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
-MD5 72b6173c306ea111c323aa6e1a8cadb6 firehol-1.214.ebuild 1493
-MD5 013ad6c2ea965b219ac9dd986f763749 firehol-1.91.ebuild 979
+MD5 d0a8ece1504e19c35510fe0527130a8c firehol-1.159-r1.ebuild 1103
+MD5 7a2aefb132d6deb03836c6d177a03788 firehol-1.191-r2.ebuild 1625
+MD5 98c72d2a2130a75fb6cebdbd4d99fbf3 firehol-1.214.ebuild 1492
+MD5 338cc56b7140f4ccd56377488a6aebf5 files/firehol.initrd 1196
 MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
 MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159 65
 MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
-MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191 66
-MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r1 66
-MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r2 66
-MD5 1afffcb0a10f9c0028dc5062244934fc files/digest-firehol-1.91 64
 MD5 32a409eeb7b55602f5a83b77a8f1662b files/firehol-1.191-bash-3.0.patch 5663
-MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
-MD5 338cc56b7140f4ccd56377488a6aebf5 files/firehol.initrd 1196
 MD5 d36dc29cf673b91c56f80e1406f981df files/digest-firehol-1.214 66
+MD5 24f588c8420a4d441a56a632cf827be8 files/digest-firehol-1.191-r2 66
+MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
diff --git a/net-firewall/firehol/files/digest-firehol-1.159 b/net-firewall/firehol/files/digest-firehol-1.159
deleted file mode 100644
index 901af340b7c3..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.159
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b39bd3a3f741244392da42099db4b13d firehol-1.159.tar.bz2 98918
diff --git a/net-firewall/firehol/files/digest-firehol-1.191 b/net-firewall/firehol/files/digest-firehol-1.191
deleted file mode 100644
index a3a8578a11c7..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.191
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29ce4e88059c9bd408711803a569a492 firehol-1.191.tar.bz2 105623
diff --git a/net-firewall/firehol/files/digest-firehol-1.191-r1 b/net-firewall/firehol/files/digest-firehol-1.191-r1
deleted file mode 100644
index a3a8578a11c7..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.191-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29ce4e88059c9bd408711803a569a492 firehol-1.191.tar.bz2 105623
diff --git a/net-firewall/firehol/files/digest-firehol-1.91 b/net-firewall/firehol/files/digest-firehol-1.91
deleted file mode 100644
index 31bffc7d9124..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 378d573523433e5245dd17d919bab656 firehol-1.91.tar.bz2 72500
diff --git a/net-firewall/firehol/firehol-1.159-r1.ebuild b/net-firewall/firehol/firehol-1.159-r1.ebuild
index d70b69fed40e..42223133150f 100644
--- a/net-firewall/firehol/firehol-1.159-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.159-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.3 2004/06/24 22:38:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.159-r1.ebuild,v 1.4 2004/12/30 09:49:52 centic Exp $
 
 DESCRIPTION="iptables firewall generator"
 HOMEPAGE="http://firehol.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2"
diff --git a/net-firewall/firehol/firehol-1.159.ebuild b/net-firewall/firehol/firehol-1.159.ebuild
deleted file mode 100644
index 5bb622d9aa42..000000000000
--- a/net-firewall/firehol/firehol-1.159.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.5 2004/06/24 22:38:38 agriffis 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|'
-}
-
-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.191-r1.ebuild b/net-firewall/firehol/firehol-1.191-r1.ebuild
deleted file mode 100644
index bdfd332481d9..000000000000
--- a/net-firewall/firehol/firehol-1.191-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r1.ebuild,v 1.2 2004/10/02 18:44:02 centic Exp $
-
-inherit eutils
-
-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
-	virtual/modutils"
-
-# patch for problems with bash-3.0, can be removed in next version of firehol as
-# this is a backport from firehol-CVS.
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-bash-3.0.patch
-}
-
-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
-	doman man/*.1 man/*.5
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/firehol.initrd firehol
-}
-
-pkg_postinst() {
-	einfo "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	einfo "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}
-
diff --git a/net-firewall/firehol/firehol-1.191-r2.ebuild b/net-firewall/firehol/firehol-1.191-r2.ebuild
index 91be4572e5fc..45c2bddaedbe 100644
--- a/net-firewall/firehol/firehol-1.191-r2.ebuild
+++ b/net-firewall/firehol/firehol-1.191-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r2.ebuild,v 1.1 2004/10/02 18:44:02 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191-r2.ebuild,v 1.2 2004/12/30 09:49:52 centic Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2
diff --git a/net-firewall/firehol/firehol-1.191.ebuild b/net-firewall/firehol/firehol-1.191.ebuild
deleted file mode 100644
index 33759da210e8..000000000000
--- a/net-firewall/firehol/firehol-1.191.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.191.ebuild,v 1.2 2004/06/24 22:38:38 agriffis 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_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
-	doman man/*.1 man/*.5
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/firehol.initrd firehol
-}
-
-pkg_postinst() {
-	einfo "The default path to firehol's configuration file is /etc/firehol/firehol.conf"
-	einfo "See /etc/firehol/examples for configuration examples."
-	#
-	# Install a default configuration if none is available yet
-	if [[ ! -e "${ROOT}/etc/firehol/firehol.conf" ]]; then
-		einfo "Installing a sample configuration as ${ROOT}/etc/firehol/firehol.conf"
-		cp "${ROOT}/etc/firehol/examples/client-all.conf" "${ROOT}/etc/firehol/firehol.conf"
-	fi
-}
-
diff --git a/net-firewall/firehol/firehol-1.214.ebuild b/net-firewall/firehol/firehol-1.214.ebuild
index df947ed37784..5114f263dc97 100644
--- a/net-firewall/firehol/firehol-1.214.ebuild
+++ b/net-firewall/firehol/firehol-1.214.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.214.ebuild,v 1.2 2004/11/12 19:41:10 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.214.ebuild,v 1.3 2004/12/30 09:49:52 centic Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2
diff --git a/net-firewall/firehol/firehol-1.91.ebuild b/net-firewall/firehol/firehol-1.91.ebuild
deleted file mode 100644
index 26abf8eb362f..000000000000
--- a/net-firewall/firehol/firehol-1.91.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.91.ebuild,v 1.4 2004/06/24 22:38:38 agriffis Exp $
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="http://firehol.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="net-firewall/iptables"
-
-src_compile() {
-	sed -i \
-		-e 's|/etc/firehol.conf|/etc/firehol/firehol.conf|' \
-		firehol.sh
-}
-
-src_install() {
-	newsbin firehol.sh firehol || die
-	dodir /etc/firehol /etc/firehol/examples
-	insinto /etc/firehol/examples
-	doins examples/*
-	dodoc ChangeLog COPYING README TODO
-	dohtml doc/*.html doc/*.css
-	docinto scripts
-	dodoc get-iana.sh doc/create_services.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."
-}