Fix use invocation and replace unnecessary subshell with if..then..fi

5 files changed, 30 insertions, 24 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 5b4f712fad2d..6ad481c00b82 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.27 2004/06/07 13:31:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.28 2004/06/09 21:52:35 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9.ebuild:
+  Fix use invocation and replace unnecessary subshell with if..then..fi
 
   07 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
   + Only run check_KV if /usr/src/liunx is a symlink or a directory, possible fix
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index dbc7e4bc9cc0..0d01e0f7f3cc 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,31 +1,31 @@
-MD5 54906c7ffcd304a8202c5058287041ac iptables-1.2.7a-r3.ebuild 1968
-MD5 25a33c9c34aa8cb3b67c61932d7e2994 iptables-1.2.9.ebuild 2792
-MD5 39eaaeb61906389765432c838709a237 iptables-1.2.9-r1.ebuild 3513
-MD5 49968ed6b7f322af616f96df22a503b4 ChangeLog 10388
+MD5 3f1964bbbc5a55928ed0b9bffac49bb8 ChangeLog 10592
+MD5 dafaffff331fd6b7689e9d2fb90c2363 iptables-1.2.7a-r3.ebuild 1971
+MD5 8dc8edd101e75586fc02c0d31fd68989 iptables-1.2.9-r1.ebuild 3508
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
+MD5 efc10ad0d8a21e4d81c550cb9f4caf36 iptables-1.2.9.ebuild 2789
+MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
+MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
 MD5 04a4f2f4455c1c5df002cde52d354dee files/ip6tables.init 2108
-MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
-MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
-MD5 1025b42a35b4bb5855b2e023c6acbf25 files/iptables-1.2.9-r1.init 1788
+MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
 MD5 a691c35088525c77c3c9b107cdb74da1 files/iptables.init 2092
+MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
-MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
 MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213
-MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
-MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211
 MD5 1b471ec513634d33e2074998b0a9942d files/ip6tables-1.2.9-r1.init 1796
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211
+MD5 1025b42a35b4bb5855b2e023c6acbf25 files/iptables-1.2.9-r1.init 1788
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.7a-files/02_all_imq.patch.bz2 2936
 MD5 0b7b54af1ab69e8e10ddcaab93fd62ff files/1.2.7a-files/03_all_mac_fix.patch.bz2 305
 MD5 76d3e579f6be5bc9d4f22f7cdbfd8c71 files/1.2.7a-files/04_all_no_optimize_fix.patch.bz2 549
 MD5 d0e0fa48b2181f3cf1fe8d145d202dc6 files/1.2.8-files/01_all_grsecurity.patch.bz2 1180
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.8-files/03_hppa_gentoo.patch.bz2 278
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.8-files/02_all_imq.patch.bz2 2936
-MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.8-files/03_hppa_gentoo.patch.bz2 278
 MD5 d5afce91314f40a8448cd20a8b585ee5 files/1.2.9-files/01_all_grsecurity.patch.bz2 1224
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2 278
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936
-MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2 278
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334
 MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
+MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455
diff --git a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
index 648e6b4a8857..34a3ee566965 100644
--- a/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.7a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.5 2004/04/21 11:58:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.7a-r3.ebuild,v 1.6 2004/06/09 21:52:35 agriffis Exp $
 
 inherit eutils
 
diff --git a/net-firewall/iptables/iptables-1.2.9-r1.ebuild b/net-firewall/iptables/iptables-1.2.9-r1.ebuild
index 66cf9ffaf943..d7dbb1478992 100644
--- a/net-firewall/iptables/iptables-1.2.9-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.4 2004/06/07 13:31:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r1.ebuild,v 1.5 2004/06/09 21:52:35 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -79,7 +79,7 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/${PF}.confd iptables
 
-	if [ `use ipv6` ]; then
+	if use ipv6; then
 		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
 		exeinto /etc/init.d
 		newexe ${FILESDIR}/${PF/iptables/ip6tables}.init ip6tables
@@ -104,7 +104,9 @@ pkg_postinst() {
 	einfo "Until a more permanent solution is implemented adding the following"
 	einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:"
 	einfo "  echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding"
-	use ipv6 >/dev/null && ( einfo "and/or"
+	if useq ipv6; then
+		einfo "and/or"
 		einfo "  echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding"
-		einfo "for ipv6." )
+		einfo "for ipv6."
+	fi
 }
diff --git a/net-firewall/iptables/iptables-1.2.9.ebuild b/net-firewall/iptables/iptables-1.2.9.ebuild
index ca10d1b1b986..936e418ff500 100644
--- a/net-firewall/iptables/iptables-1.2.9.ebuild
+++ b/net-firewall/iptables/iptables-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.11 2004/06/07 13:24:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9.ebuild,v 1.12 2004/06/09 21:52:35 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -71,7 +71,7 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/iptables.confd iptables
 
-	if [ `use ipv6` ]; then
+	if use ipv6; then
 		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
 		exeinto /etc/init.d
 		newexe ${FILESDIR}/ip6tables.init ip6tables