Remove old versions including some that have security problems, fixes part

(Portage version: 2.1.1_pre2-r8)
 (Signed Manifest commit)

11 files changed, 36 insertions, 509 deletions

diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index 0ecdfea49ee5..ff4fc93a28bf 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,17 +1,38 @@
-MD5 1327142e6da8458136a6e3aec0f6d8ac ChangeLog 3665
-MD5 354dc2b953dae45ec818e9493f5f46a1 firehol-1.120.ebuild 1111
-MD5 9e95e869b12d85696a6faf1b1106daf1 firehol-1.224.ebuild 1637
-MD5 cd64ad4c0a154cfdde7e36757d61e758 firehol-1.226.ebuild 1494
-MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
-MD5 4efca5574b9f1e90a16df17797ef557c firehol-1.159-r1.ebuild 1101
-MD5 317b52d0e52a696fffd3a1355bc11f97 firehol-1.226-r1.ebuild 2015
-MD5 9217f80319c21b460ace2c676d2a8430 files/firehol.initrd 1212
-MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
-MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
-MD5 b1fe20f99ed0e74e40f3b11f1261b50b files/digest-firehol-1.224 66
-MD5 c38742ecf1870604915679223db730fd files/digest-firehol-1.226 66
-MD5 32a409eeb7b55602f5a83b77a8f1662b files/firehol-1.191-bash-3.0.patch 5663
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX firehol-1.226-to-228.patch 2311 RMD160 9adefc751d465dd193134b3243e6d34300216f7c SHA1 5f900b6e2a6f475596aa1bff4eafad37109fb5c9 SHA256 8a682147e82665124b256d9fadf16d989bf310f2480168e888d4b048e60b910c
 MD5 0d4eceaa49f1a12171145a685e42c015 files/firehol-1.226-to-228.patch 2311
-MD5 c38742ecf1870604915679223db730fd files/digest-firehol-1.226-r1 66
+RMD160 9adefc751d465dd193134b3243e6d34300216f7c files/firehol-1.226-to-228.patch 2311
+SHA256 8a682147e82665124b256d9fadf16d989bf310f2480168e888d4b048e60b910c files/firehol-1.226-to-228.patch 2311
+AUX firehol.conf.d 70 RMD160 a87dc5fb7ba67d3f87d9672de62ba5081925ddcb SHA1 5a31d6751f0ea13550218132ff210e3286694152 SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c
 MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
-MD5 90281f0915d86f29b50587c1ff726b01 files/firehol-1.224-to-226.patch 2339
+RMD160 a87dc5fb7ba67d3f87d9672de62ba5081925ddcb files/firehol.conf.d 70
+SHA256 0e6bae0a5329d6b527cf0ae7183acf04f0f08f5a931bf5e82a789053faed4e3c files/firehol.conf.d 70
+AUX firehol.initrd 1212 RMD160 2c683cc4064d5cbc357c7f1a3da10eb7306ed94c SHA1 1757c1ba84d1f631b8254fe54a4a954f6ef924a9 SHA256 dbba1eafc4b3bff40f187eb2f83051529e30a35fd5bc04409278b6d3e8b92015
+MD5 9217f80319c21b460ace2c676d2a8430 files/firehol.initrd 1212
+RMD160 2c683cc4064d5cbc357c7f1a3da10eb7306ed94c files/firehol.initrd 1212
+SHA256 dbba1eafc4b3bff40f187eb2f83051529e30a35fd5bc04409278b6d3e8b92015 files/firehol.initrd 1212
+DIST firehol-1.226.tar.bz2 118113 RMD160 bff910e8a3a67ce91f0634177b5ee361edc90e96 SHA1 c54496bc0cadb6d9728738e826464cf35cf7b96e SHA256 b434e8142eb4093516794c6f2213d03efa3c08161758ff836dbd266f0a9438cf
+EBUILD firehol-1.226-r1.ebuild 2015 RMD160 4952db240d2023b8c6e5b649de800c2587ca4340 SHA1 1119beb1cdbd936830cbfbad813e24018062fcc5 SHA256 a5359686137b73b2db4b8f3c404e7154a28fafb1d47b9bd0fc2e1cbfd72b8333
+MD5 317b52d0e52a696fffd3a1355bc11f97 firehol-1.226-r1.ebuild 2015
+RMD160 4952db240d2023b8c6e5b649de800c2587ca4340 firehol-1.226-r1.ebuild 2015
+SHA256 a5359686137b73b2db4b8f3c404e7154a28fafb1d47b9bd0fc2e1cbfd72b8333 firehol-1.226-r1.ebuild 2015
+MISC ChangeLog 3946 RMD160 00b221e28e2766047b7c1624901e462f0ce091b0 SHA1 5646e3d8a341859497dae86f61f8ccd79dce17f5 SHA256 8dadbc33a5aa01427bccca715a179b7f96352e7e2df79c4b1ec44d7784bdb39b
+MD5 c10a5ebed2e215d9b4aedc21625c1469 ChangeLog 3946
+RMD160 00b221e28e2766047b7c1624901e462f0ce091b0 ChangeLog 3946
+SHA256 8dadbc33a5aa01427bccca715a179b7f96352e7e2df79c4b1ec44d7784bdb39b ChangeLog 3946
+MISC metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 SHA1 b417ff2a1791163c7ef78c244c84f4ac0dd28396 SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4
+MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
+RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 metadata.xml 232
+SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4 metadata.xml 232
+MD5 307ce774f075b24a9f1c58d191f0aa17 files/digest-firehol-1.226-r1 244
+RMD160 46fa3ffb007c7979d8261ed9eb2ba932fd6046bf files/digest-firehol-1.226-r1 244
+SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/digest-firehol-1.226-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEwys17IRIh26aCTkRAsJCAJ4zfPfyuZpgb87YqL8t/TmMuJQA0ACgt6pK
+p+aMJ1E+aqgY+EDEmjCpygE=
+=R/c+
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/firehol/files/digest-firehol-1.120 b/net-firewall/firehol/files/digest-firehol-1.120
deleted file mode 100644
index ee272a4b7167..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e87ec47335753ad0611b56ce9f55cfe6 firehol-1.120.tar.bz2 79843
diff --git a/net-firewall/firehol/files/digest-firehol-1.159-r1 b/net-firewall/firehol/files/digest-firehol-1.159-r1
deleted file mode 100644
index 901af340b7c3..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.159-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b39bd3a3f741244392da42099db4b13d firehol-1.159.tar.bz2 98918
diff --git a/net-firewall/firehol/files/digest-firehol-1.224 b/net-firewall/firehol/files/digest-firehol-1.224
deleted file mode 100644
index 681ee07fd536..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.224
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8033f99120b6df9de17e27914fbaf9be firehol-1.224.tar.bz2 117988
diff --git a/net-firewall/firehol/files/digest-firehol-1.226 b/net-firewall/firehol/files/digest-firehol-1.226
deleted file mode 100644
index 65582f9c48c3..000000000000
--- a/net-firewall/firehol/files/digest-firehol-1.226
+++ /dev/null
@@ -1 +0,0 @@
-MD5 958f6e95bad37013e544da587f55c8b7 firehol-1.226.tar.bz2 118113
diff --git a/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch b/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch
deleted file mode 100644
index b810323a2bb8..000000000000
--- a/net-firewall/firehol/files/firehol-1.191-bash-3.0.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- firehol.sh	2004-05-03 00:51:38.000000000 +0200
-+++ firehol.sh.new	2004-08-01 23:16:42.390810920 +0200
-@@ -1788,7 +1788,7 @@
- 	local prface="${work_inface}"
- 	
- 	local pre="pr"
--	unset reverse
-+	local reverse=
- 	if [ "${1}" = "reverse" ]
- 	then
- 		local reverse="reverse"	# needed to recursion
-@@ -2691,7 +2691,7 @@
- 				action="${2}"
- 				shift 2
- 				
--				unset action_param
-+				local -a action_param=()
- 				local action_is_chain=0
- 				case "${action}" in
- 					accept|ACCEPT)
-@@ -3287,7 +3287,7 @@
- 			local pr=
- 			for pr in ${proto}
- 			do
--				unset proto_arg
-+				local -a proto_arg=()
- 				
- 				case ${pr} in
- 					any|ANY)
-@@ -3299,7 +3299,7 @@
- 				esac
- 				
- 				rule_action_param "${negative_action}" "${pr}" "${action_param[@]}" -- ${table} -A "${negative_chain}" "${proto_arg[@]}"
--				unset action_param
-+				local -a action_param=()
- 			done
- 		fi
- 	fi
-@@ -3311,8 +3311,8 @@
- 	local tuid=
- 	for tuid in ${uid}
- 	do
--		unset uid_arg
--		unset owner_arg
-+		local -a uid_arg=()
-+		local -a owner_arg=()
- 		
- 		case ${tuid} in
- 			any|ANY)
-@@ -3327,7 +3327,7 @@
- 		local tgid=
- 		for tgid in ${gid}
- 		do
--			unset gid_arg
-+			local -a gid_arg=()
- 			
- 			case ${tgid} in
- 				any|ANY)
-@@ -3342,7 +3342,7 @@
- 			local tpid=
- 			for tpid in ${pid}
- 			do
--				unset pid_arg
-+				local -a pid_arg=()
- 				
- 				case ${tpid} in
- 					any|ANY)
-@@ -3357,7 +3357,7 @@
- 				local tsid=
- 				for tsid in ${sid}
- 				do
--					unset sid_arg
-+					local -a sid_arg=()
- 					
- 					case ${tsid} in
- 						any|ANY)
-@@ -3372,7 +3372,7 @@
- 					local tcmd=
- 					for tcmd in ${cmd}
- 					do
--						unset cmd_arg
-+						local -a cmd_arg=()
- 						
- 						case ${tcmd} in
- 							any|ANY)
-@@ -3387,7 +3387,7 @@
- 						local pr=
- 						for pr in ${proto}
- 						do
--							unset proto_arg
-+							local -a proto_arg=()
- 							
- 							case ${pr} in
- 								any|ANY)
-@@ -3401,7 +3401,7 @@
- 							local inf=
- 							for inf in ${inface}
- 							do
--								unset inf_arg
-+								local -a inf_arg=()
- 								case ${inf} in
- 									any|ANY)
- 										;;
-@@ -3414,7 +3414,7 @@
- 								local outf=
- 								for outf in ${outface}
- 								do
--									unset outf_arg
-+									local -a outf_arg=()
- 									case ${outf} in
- 										any|ANY)
- 											;;
-@@ -3427,7 +3427,7 @@
- 									local inph=
- 									for inph in ${physin}
- 									do
--										unset inph_arg
-+										local -a inph_arg=()
- 										case ${inph} in
- 											any|ANY)
- 												;;
-@@ -3441,7 +3441,7 @@
- 										local outph=
- 										for outph in ${physout}
- 										do
--											unset outph_arg
-+											local -a outph_arg=()
- 											case ${outph} in
- 												any|ANY)
- 													;;
-@@ -3455,7 +3455,7 @@
- 											local sp=
- 											for sp in ${sport}
- 											do
--												unset sp_arg
-+												local -a sp_arg=()
- 												case ${sp} in
- 													any|ANY)
- 													;;
-@@ -3468,7 +3468,7 @@
- 												local dp=
- 												for dp in ${dport}
- 												do
--													unset dp_arg
-+													local -a dp_arg=()
- 													case ${dp} in
- 														any|ANY)
- 															;;
-@@ -3481,7 +3481,7 @@
- 													local mc=
- 													for mc in ${mac}
- 													do
--														unset mc_arg
-+														local -a mc_arg=()
- 														case ${mc} in
- 															any|ANY)
- 																;;
-@@ -3494,7 +3494,7 @@
- 														local s=
- 														for s in ${src}
- 														do
--															unset s_arg
-+															local -a s_arg=()
- 															case ${s} in
- 																any|ANY)
- 																	;;
-@@ -3507,7 +3507,7 @@
- 															local d=
- 															for d in ${dst}
- 															do
--																unset d_arg
-+																local -a d_arg=()
- 																case ${d} in
- 																	any|ANY)
- 																		;;
-@@ -3517,19 +3517,19 @@
- 																		;;
- 																esac
- 																
--																unset state_arg
-+																local -a state_arg=()
- 																if [ ! -z "${state}" ]
- 																then
- 																	local -a state_arg=("-m" "state" "${statenot}" "--state" "${state}")
- 																fi
- 																
--																unset limit_arg
-+																local -a limit_arg=()
- 																if [ ! -z "${limit}" ]
- 																then
- 																	local -a limit_arg=("-m" "limit" "--limit" "${limit}" "--limit-burst" "${burst}")
- 																fi
- 																
--																unset iplimit_arg
-+																local -a iplimit_arg=()
- 																if [ ! -z "${iplimit}" ]
- 																then
- 																	local -a iplimit_arg=("-m" "iplimit" "--iplimit-above" "${iplimit}" "--iplimit-mask" "${iplimit_mask}")
-@@ -3537,7 +3537,7 @@
- 																
- 																declare -a basecmd=("${inf_arg[@]}" "${outf_arg[@]}" "${physdev_arg[@]}" "${inph_arg[@]}" "${outph_arg[@]}" "${limit_arg[@]}" "${iplimit_arg[@]}" "${proto_arg[@]}" "${s_arg[@]}" "${sp_arg[@]}" "${d_arg[@]}" "${dp_arg[@]}" "${owner_arg[@]}" "${uid_arg[@]}" "${gid_arg[@]}" "${pid_arg[@]}" "${sid_arg[@]}" "${cmd_arg[@]}" "${state_arg[@]}" "${mc_arg[@]}")
- 																
--																unset logopts_arg
-+																local -a logopts_arg=()
- 																if [ "${FIREHOL_LOG_MODE}" = "ULOG" ]
- 																then
- 																	local -a logopts_arg=("--ulog-prefix='${logtxt}:'")
-@@ -4822,10 +4822,8 @@
- 			# find all the networks this IP can access directly
- 			# or through its peer
- 			netcount=0
--			unset ifnets
--			unset ofnets
--			set -a ifnets=
--			set -a ofnets=
-+			ifnets=
-+			ofnets=
- 			for net in ${nets}
- 			do
- 				test "${net}" = "default" && continue
diff --git a/net-firewall/firehol/files/firehol-1.224-to-226.patch b/net-firewall/firehol/files/firehol-1.224-to-226.patch
deleted file mode 100644
index 1e6cf4c83b0f..000000000000
--- a/net-firewall/firehol/files/firehol-1.224-to-226.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-===================================================================
-RCS file: /cvsroot/firehol/firehol/firehol.sh,v
-retrieving revision 1.224
-retrieving revision 1.226
-diff -u -r1.224 -r1.226
---- firehol/firehol/firehol.sh	2005/01/24 22:24:48	1.224
-+++ firehol/firehol/firehol.sh	2005/01/25 21:28:19	1.226
-@@ -144,7 +144,7 @@
- # Directories and files
- 
- # These files will be created and deleted during our run.
--FIREHOL_DIR="/tmp/firehol-tmp-$$"
-+FIREHOL_DIR="/tmp/.firehol-tmp-$$-${RANDOM}-${RANDOM}"
- FIREHOL_CHAINS_DIR="${FIREHOL_DIR}/chains"
- FIREHOL_OUTPUT="${FIREHOL_DIR}/firehol-out.sh"
- FIREHOL_SAVED="${FIREHOL_DIR}/firehol-save.sh"
-@@ -211,7 +211,7 @@
- # Externally defined services can be placed in "${FIREHOL_CONFIG_DIR}/services/"
- if [ ! -d "${FIREHOL_CONFIG_DIR}/services" ]
- then
--	"${MKDIR_CMD}" -p "${FIREHOL_CONFIG_DIR}/services"
-+	"${MKDIR_CMD}" "${FIREHOL_CONFIG_DIR}/services"
- 	if [ $? -ne 0 ]
- 	then
- 		echo >&2
-@@ -239,14 +239,14 @@
- 		exit 1
- 	fi
- fi
--"${MKDIR_CMD}" -p "${FIREHOL_DIR}"				|| exit 1
--"${MKDIR_CMD}" -p "${FIREHOL_CHAINS_DIR}"			|| exit 1
-+"${MKDIR_CMD}" "${FIREHOL_DIR}"				|| exit 1
-+"${MKDIR_CMD}" "${FIREHOL_CHAINS_DIR}"			|| exit 1
- 
- 
- # Make sure we have a directory for our data.
- if [ ! -d "${FIREHOL_SPOOL_DIR}" ]
- then
--	"${MKDIR_CMD}" -p "${FIREHOL_SPOOL_DIR}"		|| exit 1
-+	"${MKDIR_CMD}" "${FIREHOL_SPOOL_DIR}"			|| exit 1
- 	"${CHOWN_CMD}" root:root "${FIREHOL_CONFIG_DIR}"	|| exit 1
- 	"${CHMOD_CMD}" 700 "${FIREHOL_CONFIG_DIR}"		|| exit 1
- fi
-@@ -1055,7 +1055,7 @@
- 	local x=
- 	for x in ${servers}
- 	do
--		local tmp="${FIREHOL_DIR}/firehol.rpcinfo.$$"
-+		local tmp="${FIREHOL_DIR}/firehol.rpcinfo.$$.${RANDOM}"
- 		
- 		set_work_function "Getting RPC information from server '${x}'"
- 		
-@@ -1169,7 +1169,7 @@
- 	local x=
- 	for x in ${servers}
- 	do
--		local tmp="${FIREHOL_DIR}/firehol.rpcinfo.$$"
-+		local tmp="${FIREHOL_DIR}/firehol.rpcinfo.$$.${RANDOM}"
- 		
- 		set_work_function "Getting RPC information from server '${x}'"
- 		
-@@ -2567,9 +2567,9 @@
- if [ -f "/proc/config" ]
- then
- 	KERNEL_CONFIG="/proc/config"
--	${CAT_CMD} /proc/config >/tmp/kcfg.$$
--	source /tmp/kcfg.$$
--	${RM_CMD} -f /tmp/kcfg.$$
-+	${CAT_CMD} /proc/config >${FIREHOL_DIR}/kcfg
-+	source ${FIREHOL_DIR}/kcfg
-+	${RM_CMD} -f ${FIREHOL_DIR}/kcfg
- 	
- elif [ -f "/lib/modules/`${UNAME_CMD} -r`/build/.config" ]
- then
diff --git a/net-firewall/firehol/firehol-1.120.ebuild b/net-firewall/firehol/firehol-1.120.ebuild
deleted file mode 100644
index ea0f44c64ec6..000000000000
--- a/net-firewall/firehol/firehol-1.120.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.6 2005/01/27 17:44:47 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() {
-	mv firehol.sh firehol.sh.orig
-	sed <firehol.sh.orig >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
-	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."
-}
diff --git a/net-firewall/firehol/firehol-1.159-r1.ebuild b/net-firewall/firehol/firehol-1.159-r1.ebuild
deleted file mode 100644
index de8fa2d637d0..000000000000
--- a/net-firewall/firehol/firehol-1.159-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 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.5 2005/01/27 17:44:47 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 ~ppc"
-
-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.224.ebuild b/net-firewall/firehol/firehol-1.224.ebuild
deleted file mode 100644
index 303f1bb3e1ee..000000000000
--- a/net-firewall/firehol/firehol-1.224.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.224.ebuild,v 1.2 2005/01/31 20:36:27 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 ~amd64"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-# patch for security problems
-# backport from firehol-CVS.
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-to-226.patch || die
-}
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/firehol.conf.d firehol || die
-
-	dodoc ChangeLog COPYING README TODO WhatIsNew || die
-	dohtml doc/*.html doc/*.css  || die
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh || die
-
-	doman man/*.1 man/*.5 || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/firehol.initrd firehol || die
-}
-
-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.226.ebuild b/net-firewall/firehol/firehol-1.226.ebuild
deleted file mode 100644
index 6aef606b1f9d..000000000000
--- a/net-firewall/firehol/firehol-1.226.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.226.ebuild,v 1.1 2005/02/02 20:33:13 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 ~amd64"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	virtual/modutils
-	|| (
-		net-misc/wget
-		net-misc/curl
-	)"
-
-src_install() {
-	newsbin firehol.sh firehol
-
-	dodir /etc/firehol /etc/firehol/examples /etc/firehol/services
-	insinto /etc/firehol/examples
-	doins examples/* || die
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/firehol.conf.d firehol || die
-
-	dodoc ChangeLog COPYING README TODO WhatIsNew || die
-	dohtml doc/*.html doc/*.css  || die
-
-	docinto scripts
-	dodoc get-iana.sh adblock.sh || die
-
-	doman man/*.1 man/*.5 || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/firehol.initrd firehol || die
-}
-
-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
-}
-