Convert from "useq" to "use".

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

7 files changed, 81 insertions, 86 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 3a1997f9ca4e..0324a3348764 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.50 2011/07/02 22:09:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.51 2011/07/08 10:20:59 ssuominen Exp $
+
+  08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> zabbix-1.6.9.ebuild,
+  zabbix-1.8.3.ebuild, zabbix-1.8.4.ebuild, zabbix-1.8.5.ebuild,
+  zabbix-1.9.3.ebuild:
+  Convert from "useq" to "use".
 
   02 Jul 2011; Markos Chandras <hwoarang@gentoo.org> zabbix-1.8.5.ebuild:
   Stable on amd64 wrt bug #370239
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 187a943887e6..cb97fe942fad 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.4.6/init.d/zabbix-agentd 582 RMD160 051a6bf6e8d8181258f99ddb3964881ff78d0954 SHA1 757d60d5f681ea9dd2c32347f6eb787d2c23a5ce SHA256 e6b10adda63ff234bd3c11fd19fd30970dcbda292b2fcfa1c382d9d0b7a795f1
 AUX 1.4.6/init.d/zabbix-server 564 RMD160 f05bfbcbfc163db19076656e995ddc72fbb7a78e SHA1 141f08ae3966fd935df89589eea62554c3b69bb3 SHA256 eb5ea05e53d8bbf502cf3f6b873c9275dba793446b0f5ab11ed7a169d757b3c9
@@ -32,27 +32,17 @@ DIST zabbix-1.8.3.tar.gz 4106152 RMD160 f0d54c1cd8865c952945a8ec3958e7ebdd9a92d5
 DIST zabbix-1.8.4.tar.gz 4123814 RMD160 647e157a59fc55ec903ca5be027eb07b6efe8a10 SHA1 b70a31a39d7f54f32a3d6956594c2bfc4fd1e0e4 SHA256 0cbb237e2524631c4c849f4f19a67ef57e42025d651e213ef0cda48cf823163a
 DIST zabbix-1.8.5.tar.gz 4184672 RMD160 200e1cdddb0f7149c7cfb62237a46a563054f95e SHA1 655f5c7381139ec97d23df4cce0469e1e032c54d SHA256 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32
 DIST zabbix-1.9.3.tar.gz 5493095 RMD160 e28df276a3b3aae2edf59e40c65d8657a412b043 SHA1 b5491972c2614e902e69e42fd19b83d699c753a1 SHA256 3d75ae98f54c6d498baad10c99ed5402e37bcd38c2e7d9e616e815dcfea96d27
-EBUILD zabbix-1.6.9.ebuild 7718 RMD160 7d46a10268f5333da8c9688d9a666b99b947f216 SHA1 fe4534036c7d6257364e82f4b6f04c0505b49ddf SHA256 f7d1e2db4f862fc445763149a62e7b6c0c657d6d6bcd870b9ed349f5e2280b0c
-EBUILD zabbix-1.8.3.ebuild 8147 RMD160 0e8fea6fa79741bed6afb6ca3c18ea05aafde61e SHA1 1dad0c1fbb16d31a18b7f89ee5bcb477769d03e8 SHA256 5439e3da2b76999811585b0d720ed6c917a0e02dedd772c9fb40ee75489361d6
-EBUILD zabbix-1.8.4.ebuild 8151 RMD160 35abbbd21bbd370e2a84cec30bf2a050388ba782 SHA1 27d831fd3750fba11989d16c1f0f7ebb3b53780f SHA256 a8ce8e801e11377b0b7b5e923b907d45cbde754b7cb7c75bad0c9db1bd851d58
-EBUILD zabbix-1.8.5.ebuild 8154 RMD160 20d148061b02e03b6ea89a4811fbdead38ca9bc6 SHA1 bc491adbed24acb1eca8b4576efe31aa02bbd105 SHA256 edbcd0eb0c8292f4a9b7154f96a681bf94c836dfd446486505c18b2d157a9635
-EBUILD zabbix-1.9.3.ebuild 8160 RMD160 8546f2c4f8e89510cf5d52684d3b7183f6cfc35f SHA1 eab649bdbe726c71cb3dd800ffd9f8fc58b01e02 SHA256 f6b5c2d4b469e54a70115a8e07c240f90ad3390eafa1c129b6f7c71961e69005
-MISC ChangeLog 10684 RMD160 29947e3e4e404451e8c3fc1b27715d77638f53f3 SHA1 c6711fb45d08c2f11cc10eb4ccac9c42cd55820e SHA256 ec58864a34115cbcd8795fbf14ff883ca048c2482af0d6d512f33bede40fe320
+EBUILD zabbix-1.6.9.ebuild 7705 RMD160 07bf6eb244199ed055d7ebe5f16a0eaeed13665e SHA1 1f07324bac6976a76150c1477cda531bd2b11de6 SHA256 358a037b5afb9f2801fae2874e67edcdf1a4ffde28e9e356b916ff44956a1f4c
+EBUILD zabbix-1.8.3.ebuild 8132 RMD160 5f7d468cfac532122a11799e31de212246f85f63 SHA1 53fc2016d36e1274b096270593ebb28ab4d2c662 SHA256 75b7d58a1e14aa515836158e4fb143652295828a5d7aa8a59a4e513bab18d668
+EBUILD zabbix-1.8.4.ebuild 8140 RMD160 6b5f4d6fcf787a961a665115ffcd16eaf8a99743 SHA1 9204e162042e46488d710f5757b0e270eff82dcb SHA256 7d3d87f2d890b768920622f2cdd4176d3e1550669334f56bf832bb84ca2a5af8
+EBUILD zabbix-1.8.5.ebuild 8140 RMD160 c2582c9c8360c9371589ee2cfa38342c1206e2ed SHA1 79e0f77b20719bc0ec03f2b49a97eb95b7b7f07f SHA256 fbee800ed18bc85b82cb0e4b44a40bfcb3e655ff4e86bfaf717dee340a651ad1
+EBUILD zabbix-1.9.3.ebuild 8147 RMD160 d2e8a3adf3e0225e36921eab6e12cd8c229ad7a5 SHA1 9705cb516b64c333089541d88ed2cf845aff1d3a SHA256 68a878fd7789355d1efbc9e2d673fb33cdffbddc483e1ecc7400c3fec32dc5ad
+MISC ChangeLog 10881 RMD160 2854704351cc1c35b9316e5f335ee39e1ad16972 SHA1 908e450a5eb71a55e51f65698f609297e933447e SHA256 7c6655b8cbb396c25c9b8b2d70bcb27fb90f01c614e0cf86b583ef61ec04eff0
 MISC metadata.xml 1011 RMD160 37a6d962bdcb89ffab972dc277eac6b522568dfc SHA1 2a9ce386ad7a16a811db090013b5b659bc5a4443 SHA256 5836982f6527902dbc757ff88dfc19ffcc137819673d2231747262a142f057f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOD5cEAAoJEPqDWhW0r/LC1G4QAIttWo+hFB7tt74DqsAvvrRf
-O89sMeOKRl7IWT4lnSCFrFGMdcVlT2Y+ybJU/XM/I1G1NNmdOlBG6EvYKDRqo1kc
-MZa7wVUXVqX6reUfrUYSt1i0KXd/82ygCOo7xxSFqBRueUggzAKFK2UNlMbpyY6X
-8Z4RAvfSle3OPW2KIRhRbcK8xdYz/E7VKA9IPzcTx0aqGYug/RRGDvIBtTE/6D+0
-zqwhf8Gk3qeyk8LdkX9QEqFRUx33UVQKYU26QKMan+G4jDeLTFVt++TjPldaF7QO
-V8a1gQaqUjw+6/aBKUSbQiSqbLn1MZu+Vb77f9P2CQ1B6XBTIRV9hom7WpIFskaW
-hwmaC8v/O3MB0CBMwlYEbaZbpG8ASEaf1Z+KxfWAsl09ZSvs9AUC4BTAEJ8Q5WWH
-Z0um+8+fqLaMJwfPoiTsBUh5vfjvcTZH1tibfaEAAbUgS7bR5chF+6eZkaSaG6L7
-afP1w2SfwSml33uQj+Nr1FkOy1Ar5kjVvyqk7oCY0ZOszWB2r+OCcth/hngS8YNl
-26Q+zTVzXE0D9ZjtboGIzchvlEiyTiKShOuUwmvUOcP/hshfbtN3ofA9rndTb3Yn
-Azwa5hplONsFPYC5ksKZ3Yw9dtPwpqKOOGyryRont+EGkYJYb8hIaCT9vxX9oWQJ
-X8k26gVFBYC1ajqU8NsN
-=3oAH
+iF4EAREIAAYFAk4W2bwACgkQXkR9YqOcLPHYxwD9Hw5N+exFHE653BbOoR1Zbbkp
+e189KQBYtUT1dE1JcOEBAJ+uOvuizYlO8s6wmWkmkl5IoAquPK/5zgWiJHa/OohT
+=+KVH
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-1.6.9.ebuild b/net-analyzer/zabbix/zabbix-1.6.9.ebuild
index e2cf2570800d..fd0490810de8 100644
--- a/net-analyzer/zabbix/zabbix-1.6.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.6.9.ebuild,v 1.1 2011/03/04 15:49:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.6.9.ebuild,v 1.2 2011/07/08 10:20:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,14 +31,14 @@ RDEPEND="${RDEPEND}
 	server? ( net-analyzer/fping )
 	frontend? ( dev-lang/php )"
 
-useq frontend && need_php_httpd
+use frontend && need_php_httpd
 
 pkg_setup() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
+			use ${dbtype} && let dbnum++
 		done
 		if [ ${dbnum} -gt 1 ]; then
 			eerror
@@ -52,7 +52,7 @@ pkg_setup() {
 			eerror
 			die "No database type selected."
 		fi
-		if useq oracle; then
+		if use oracle; then
 			if [ -z "${ORACLE_HOME}" ]; then
 				eerror
 				eerror "The environment variable ORACLE_HOME must be set"
@@ -70,7 +70,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_pkg_setup
 		require_gd
 	fi
@@ -80,7 +80,7 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		elog
 		elog "You need to configure your database for Zabbix."
 		elog
@@ -109,7 +109,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if useq server; then
+	if use server; then
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -151,7 +151,7 @@ pkg_postinst() {
 	chmod 0640 \
 		"${ROOT}"/etc/zabbix/zabbix_*
 
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		# check for fping
 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
 		case "${fping_perms}" in
@@ -209,7 +209,7 @@ src_install() {
 		/var/log/zabbix \
 		/var/run/zabbix
 
-	if useq server; then
+	if use server; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
@@ -232,7 +232,7 @@ src_install() {
 			/etc/zabbix/zabbix_trapper.conf
 	fi
 
-	if useq proxy; then
+	if use proxy; then
 		doinitd \
 			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
 		dosbin \
@@ -248,7 +248,7 @@ src_install() {
 			create
 	fi
 
-	if useq agent; then
+	if use agent; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
@@ -286,7 +286,7 @@ src_install() {
 
 	dodoc README INSTALL NEWS ChangeLog
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
 		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
diff --git a/net-analyzer/zabbix/zabbix-1.8.3.ebuild b/net-analyzer/zabbix/zabbix-1.8.3.ebuild
index 31d519056f5f..1885f9203319 100644
--- a/net-analyzer/zabbix/zabbix-1.8.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.3.ebuild,v 1.7 2011/02/11 18:28:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.3.ebuild,v 1.8 2011/07/08 10:20:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	jabber? ( dev-util/pkgconfig )"
 
-useq frontend && need_php_httpd
+use frontend && need_php_httpd
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-as-needed.patch"
@@ -49,11 +49,11 @@ src_prepare() {
 }
 
 pkg_setup() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
+			use ${dbtype} && let dbnum++
 		done
 		if [ ${dbnum} -gt 1 ]; then
 			eerror
@@ -67,7 +67,7 @@ pkg_setup() {
 			eerror
 			die "No database type selected."
 		fi
-		if useq oracle; then
+		if use oracle; then
 			if [ -z "${ORACLE_HOME}" ]; then
 				eerror
 				eerror "The environment variable ORACLE_HOME must be set"
@@ -85,7 +85,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_pkg_setup
 	fi
 
@@ -94,7 +94,7 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		elog
 		elog "You need to configure your database for Zabbix."
 		elog
@@ -123,7 +123,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if useq server; then
+	if use server; then
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -165,7 +165,7 @@ pkg_postinst() {
 	chmod 0640 \
 		"${ROOT}"/etc/zabbix/zabbix_*
 
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		# check for fping
 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
 		case "${fping_perms}" in
@@ -225,7 +225,7 @@ src_install() {
 		/var/log/zabbix \
 		/var/run/zabbix
 
-	if useq server; then
+	if use server; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
@@ -248,7 +248,7 @@ src_install() {
 			/etc/zabbix/zabbix_trapper.conf
 	fi
 
-	if useq proxy; then
+	if use proxy; then
 		doinitd \
 			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
 		dosbin \
@@ -264,7 +264,7 @@ src_install() {
 			create
 	fi
 
-	if useq agent; then
+	if use agent; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
@@ -302,7 +302,7 @@ src_install() {
 
 	dodoc README INSTALL NEWS ChangeLog
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
 		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
diff --git a/net-analyzer/zabbix/zabbix-1.8.4.ebuild b/net-analyzer/zabbix/zabbix-1.8.4.ebuild
index ea9d7a4f8e46..477cacadce06 100644
--- a/net-analyzer/zabbix/zabbix-1.8.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.4.ebuild,v 1.5 2011/05/06 07:39:28 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.4.ebuild,v 1.6 2011/07/08 10:20:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	jabber? ( dev-util/pkgconfig )"
 
-useq frontend && need_php_httpd
+use frontend && need_php_httpd
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8.3-as-needed.patch"
@@ -49,11 +49,11 @@ src_prepare() {
 }
 
 pkg_setup() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
+			use ${dbtype} && let dbnum++
 		done
 		if [ ${dbnum} -gt 1 ]; then
 			eerror
@@ -67,7 +67,7 @@ pkg_setup() {
 			eerror
 			die "No database type selected."
 		fi
-		if useq oracle; then
+		if use oracle; then
 			if [ -z "${ORACLE_HOME}" ]; then
 				eerror
 				eerror "The environment variable ORACLE_HOME must be set"
@@ -85,7 +85,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_pkg_setup
 	fi
 
@@ -94,7 +94,7 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		elog
 		elog "You need to configure your database for Zabbix."
 		elog
@@ -123,7 +123,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if useq server; then
+	if use server; then
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -165,7 +165,7 @@ pkg_postinst() {
 	chmod 0640 \
 		"${ROOT}"/etc/zabbix/zabbix_*
 
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		# check for fping
 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
 		case "${fping_perms}" in
@@ -225,7 +225,7 @@ src_install() {
 		/var/log/zabbix \
 		/var/run/zabbix
 
-	if useq server; then
+	if use server; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
@@ -248,7 +248,7 @@ src_install() {
 			/etc/zabbix/zabbix_trapper.conf
 	fi
 
-	if useq proxy; then
+	if use proxy; then
 		doinitd \
 			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
 		dosbin \
@@ -264,7 +264,7 @@ src_install() {
 			create
 	fi
 
-	if useq agent; then
+	if use agent; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
@@ -302,7 +302,7 @@ src_install() {
 
 	dodoc README INSTALL NEWS ChangeLog
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
 		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
diff --git a/net-analyzer/zabbix/zabbix-1.8.5.ebuild b/net-analyzer/zabbix/zabbix-1.8.5.ebuild
index 3469e57a344e..327cb593a487 100644
--- a/net-analyzer/zabbix/zabbix-1.8.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.5.ebuild,v 1.3 2011/07/02 22:09:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.5.ebuild,v 1.4 2011/07/08 10:20:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	jabber? ( dev-util/pkgconfig )"
 
-useq frontend && need_php_httpd
+use frontend && need_php_httpd
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8.3-as-needed.patch"
@@ -49,11 +49,11 @@ src_prepare() {
 }
 
 pkg_setup() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
+			use ${dbtype} && let dbnum++
 		done
 		if [ ${dbnum} -gt 1 ]; then
 			eerror
@@ -67,7 +67,7 @@ pkg_setup() {
 			eerror
 			die "No database type selected."
 		fi
-		if useq oracle; then
+		if use oracle; then
 			if [ -z "${ORACLE_HOME}" ]; then
 				eerror
 				eerror "The environment variable ORACLE_HOME must be set"
@@ -85,7 +85,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_pkg_setup
 	fi
 
@@ -94,7 +94,7 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		elog
 		elog "You need to configure your database for Zabbix."
 		elog
@@ -123,7 +123,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if useq server; then
+	if use server; then
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -165,7 +165,7 @@ pkg_postinst() {
 	chmod 0640 \
 		"${ROOT}"/etc/zabbix/zabbix_*
 
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		# check for fping
 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
 		case "${fping_perms}" in
@@ -225,7 +225,7 @@ src_install() {
 		/var/log/zabbix \
 		/var/run/zabbix
 
-	if useq server; then
+	if use server; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
@@ -248,7 +248,7 @@ src_install() {
 			/etc/zabbix/zabbix_trapper.conf
 	fi
 
-	if useq proxy; then
+	if use proxy; then
 		doinitd \
 			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
 		dosbin \
@@ -264,7 +264,7 @@ src_install() {
 			create
 	fi
 
-	if useq agent; then
+	if use agent; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
@@ -302,7 +302,7 @@ src_install() {
 
 	dodoc README INSTALL NEWS ChangeLog
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
 		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
diff --git a/net-analyzer/zabbix/zabbix-1.9.3.ebuild b/net-analyzer/zabbix/zabbix-1.9.3.ebuild
index 6d4c11df96e5..b5af331f7a04 100644
--- a/net-analyzer/zabbix/zabbix-1.9.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.9.3.ebuild,v 1.2 2011/04/13 16:59:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.9.3.ebuild,v 1.3 2011/07/08 10:20:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -41,7 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	jabber? ( dev-util/pkgconfig )"
 
-useq frontend && need_php_httpd
+use frontend && need_php_httpd
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8.3-as-needed.patch"
@@ -49,11 +49,11 @@ src_prepare() {
 }
 
 pkg_setup() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
 		declare -i dbnum=0
 		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
+			use ${dbtype} && let dbnum++
 		done
 		if [ ${dbnum} -gt 1 ]; then
 			eerror
@@ -67,7 +67,7 @@ pkg_setup() {
 			eerror
 			die "No database type selected."
 		fi
-		if useq oracle; then
+		if use oracle; then
 			if [ -z "${ORACLE_HOME}" ]; then
 				eerror
 				eerror "The environment variable ORACLE_HOME must be set"
@@ -85,7 +85,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_pkg_setup
 	fi
 
@@ -94,7 +94,7 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		elog
 		elog "You need to configure your database for Zabbix."
 		elog
@@ -123,7 +123,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if useq server; then
+	if use server; then
 		elog
 		elog "For distributed monitoring you have to run:"
 		elog
@@ -165,7 +165,7 @@ pkg_postinst() {
 	chmod 0640 \
 		"${ROOT}"/etc/zabbix/zabbix_*
 
-	if useq server || useq proxy ; then
+	if use server || use proxy ; then
 		# check for fping
 		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
 		case "${fping_perms}" in
@@ -225,7 +225,7 @@ src_install() {
 		/var/log/zabbix \
 		/var/run/zabbix
 
-	if useq server; then
+	if use server; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
@@ -248,7 +248,7 @@ src_install() {
 			/etc/zabbix/zabbix_trapper.conf
 	fi
 
-	if useq proxy; then
+	if use proxy; then
 		doinitd \
 			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
 		dosbin \
@@ -264,7 +264,7 @@ src_install() {
 			create
 	fi
 
-	if useq agent; then
+	if use agent; then
 		insinto /etc/zabbix
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
@@ -302,7 +302,7 @@ src_install() {
 
 	dodoc README INSTALL NEWS ChangeLog
 
-	if useq frontend; then
+	if use frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
 		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt