No need to treat IUSE as incremental, portage handles it.

16 files changed, 53 insertions, 54 deletions

diff --git a/eclass/cannadic.eclass b/eclass/cannadic.eclass
index cdd35ee3eeae..93d1e39afe16 100644
--- a/eclass/cannadic.eclass
+++ b/eclass/cannadic.eclass
@@ -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/eclass/cannadic.eclass,v 1.11 2005/08/22 16:20:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cannadic.eclass,v 1.12 2005/08/23 14:55:11 swegener Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
@@ -10,7 +10,7 @@
 
 EXPORT_FUNCTIONS src_install pkg_setup pkg_postinst pkg_postrm
 
-IUSE="${IUSE} canna"
+IUSE="canna"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://canna.sourceforge.jp/"		# you need to change this!
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass
index 1b08dcbd0f4d..1953bba94c5a 100644
--- a/eclass/commonbox.eclass
+++ b/eclass/commonbox.eclass
@@ -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/eclass/commonbox.eclass,v 1.29 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.30 2005/08/23 14:55:11 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -13,7 +13,7 @@
 
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 
-IUSE="$IUSE nls kde gnome xinerama truetype"
+IUSE="nls kde gnome xinerama truetype"
 
 DEPEND="dev-util/pkgconfig
 	=sys-apps/sed-4*"
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index 98cbd02785ec..f94bf829ca6a 100644
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.eclass
@@ -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/eclass/kde-meta.eclass,v 1.45 2005/07/30 10:54:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.46 2005/08/23 14:55:11 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 # Simone Gotti <motaboy@gentoo.org>
@@ -8,7 +8,7 @@
 # This is the kde-meta eclass which supports broken-up kde-base packages.
 
 inherit kde multilib
-IUSE="$IUSE kdexdeltas"
+IUSE="kdexdeltas"
 
 # only broken-up ebuilds can use this eclass
 if [ -z "$KMNAME" ]; then
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index dd94ed581547..9baec4722719 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -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/eclass/kde.eclass,v 1.126 2005/08/22 16:20:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.127 2005/08/23 14:55:11 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -10,7 +10,7 @@
 inherit base eutils kde-functions
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://www.kde.org/"
-IUSE="${IUSE} debug arts xinerama kdeenablefinal"
+IUSE="debug arts xinerama kdeenablefinal"
 
 DEPEND=">=sys-devel/automake-1.7.0
 	sys-devel/autoconf
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index d68c1ec5d27a..81822507878c 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.141 2005/08/23 01:57:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.142 2005/08/23 14:55:11 swegener Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -270,10 +270,10 @@ if [[ ${ETYPE} == sources ]]; then
 	kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"
 	SLOT="${PVR}"
 	DESCRIPTION="Sources for the Linux kernel"
-	IUSE="${IUSE} symlink build doc"
+	IUSE="symlink build doc"
 elif [[ ${ETYPE} == headers ]]; then
 	DESCRIPTION="Linux system headers"
-	IUSE="${IUSE}"
+	IUSE=""
 
 	if [[ ${CTARGET} = ${CHOST} ]]; then
 		DEPEND="!virtual/os-headers"
diff --git a/eclass/myth.eclass b/eclass/myth.eclass
index 2eefa8980331..5e8b1ae047c6 100644
--- a/eclass/myth.eclass
+++ b/eclass/myth.eclass
@@ -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/eclass/myth.eclass,v 1.18 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.19 2005/08/23 14:55:11 swegener Exp $
 #
 # Author: Daniel Ahlberg <aliz@gentoo.org>
 #
@@ -13,7 +13,7 @@
 
 inherit multilib versionator toolchain-funcs
 
-IUSE="${IUSE} nls debug"
+IUSE="nls debug"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
diff --git a/eclass/mythtv-plugins.eclass b/eclass/mythtv-plugins.eclass
index 4d57a2d2f2d8..ce3ebb555669 100644
--- a/eclass/mythtv-plugins.eclass
+++ b/eclass/mythtv-plugins.eclass
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.9 2005/08/23 14:55:11 swegener Exp $
 #
 # Author: Doug Goldstein <cardoe@gentoo.org
 #
 
 inherit multilib
 
-IUSE="${IUSE} debug mmx"
+IUSE="debug mmx"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 MYTHPLUGINS="mythbrowser mythdvd mythgallery mythgame mythmusic mythnews mythphone mythvideo mythweather mythweb"
diff --git a/eclass/pcmcia.eclass b/eclass/pcmcia.eclass
index 3911fae44dad..d702b21547b6 100644
--- a/eclass/pcmcia.eclass
+++ b/eclass/pcmcia.eclass
@@ -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/eclass/pcmcia.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.10 2005/08/23 14:55:11 swegener Exp $
 
 # pcmcia.eclass - This eclass facilities writing ebuilds for driver packages
 # that may need to build against the pcmcia-cs drivers, depending on kernel
@@ -23,9 +23,8 @@
 
 inherit eutils
 
-
 DESCRIPTION="eclass for drivers that may build against pcmcia-cs"
-IUSE="${IUSE} pcmcia"
+IUSE="pcmcia"
 
 # Be VERY careful when pumping the PCMCIA_BASE_VERSION. May require remaking some patches, etc
 # Ugly, but portage doesn't like more dynamics SRC_URIs.
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 0485770584e5..8a53c9eb82c2 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.85 2005/08/11 09:04:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.86 2005/08/23 14:55:11 swegener Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -43,7 +43,7 @@ SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.6-includepath.diff http://dev.gentoo
 # Where we work
 S=${WORKDIR}/${MY_P}
 
-IUSE="${IUSE} X crypt curl firebird flash freetds gd gd-external gdbm imap informix ipv6 java jpeg ldap mcal memlimit mysql nls oci8 odbc pam png postgres snmp spell ssl tiff truetype xml2 yaz fdftk doc gmp kerberos hardenedphp mssql debug"
+IUSE="X crypt curl firebird flash freetds gd gd-external gdbm imap informix ipv6 java jpeg ldap mcal memlimit mysql nls oci8 odbc pam png postgres snmp spell ssl tiff truetype xml2 yaz fdftk doc gmp kerberos hardenedphp mssql debug"
 
 # Hardened-PHP support
 #
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index fa1b73697d28..3f1469c1e7e3 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.19 2005/07/23 05:25:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.20 2005/08/23 14:55:11 swegener Exp $
 #
 # eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.php.net/"
 LICENSE="PHP-3"
 SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro firebird ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro firebird ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index c1a945562107..05fdf3791be8 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.35 2005/08/04 21:09:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.36 2005/08/23 14:55:11 swegener Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -35,7 +35,7 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt
 ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress
 empress-bcs esoob exif fam firebird frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hardenedphp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mkconfig mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index a0d17a1f1f95..fa4a7985a123 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.21 2005/07/23 05:25:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.22 2005/08/23 14:55:11 swegener Exp $
 #
 # ########################################################################
 #
@@ -37,7 +37,7 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl
 curlwrappers db2 dba dbase dbm dbmaker dbx debug empress empress-bcs esoob exif
 frontbase fdftk flatfile filepro firebird ftp gd gd-external gdbm gmp hardenedphp hyperwave-api imap inifile iconv informix interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mkconfig msession msql mssql mysql mysqli ncurses nls oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index 9616ef488041..94f07b95cec0 100644
--- a/eclass/php5-sapi.eclass
+++ b/eclass/php5-sapi.eclass
@@ -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/eclass/php5-sapi.eclass,v 1.53 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.54 2005/08/23 14:55:11 swegener Exp $
 #
 # eclass/php5-sapi.eclass
 #		Eclass for building different php5 SAPI instances
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.php.net/"
 LICENSE="PHP-3"
 SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk firebird flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk firebird flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass
index 97b3eb8f90e3..2e872ecfdc6a 100644
--- a/eclass/ruby.eclass
+++ b/eclass/ruby.eclass
@@ -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/eclass/ruby.eclass,v 1.47 2005/07/08 00:56:06 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.48 2005/08/23 14:55:11 swegener Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
@@ -43,7 +43,7 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install econf emake einstall
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=${PN}"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-IUSE="${IUSE}"
+IUSE=""
 
 SLOT="0"
 LICENSE="Ruby"
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index 0a0f4008e770..737fed354583 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -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/eclass/vim.eclass,v 1.118 2005/08/09 23:19:16 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.119 2005/08/23 14:55:11 swegener Exp $
 
 # Authors:
 # 	Ryan Phillips <rphillips@gentoo.org>
@@ -54,10 +54,10 @@ else
 fi
 
 if [[ "${MY_PN}" == "vim-core" ]] ; then
-	IUSE="$IUSE livecd"
+	IUSE="${IUSE} livecd"
 else
-	IUSE="$IUSE cscope gpm perl python ruby"
-	DEPEND="$DEPEND
+	IUSE="${IUSE} cscope gpm perl python ruby"
+	DEPEND="${DEPEND}
 		cscope?  ( dev-util/cscope )
 		gpm?     ( >=sys-libs/gpm-1.19.3 )
 		perl?    ( dev-lang/perl )
@@ -65,7 +65,7 @@ else
 		selinux? ( sys-libs/libselinux )
 		acl?     ( sys-apps/acl )
 		ruby?    ( virtual/ruby )"
-	RDEPEND="$RDEPEND
+	RDEPEND="${RDEPEND}
 		cscope?  ( dev-util/cscope )
 		gpm?     ( >=sys-libs/gpm-1.19.3 )
 		perl?    ( dev-lang/perl )
@@ -75,11 +75,11 @@ else
 		ruby?    ( virtual/ruby )"
 
 	if [[ "${MY_PN}" == "vim" ]] ; then
-		IUSE="$IUSE vim-with-x minimal"
-		DEPEND="$DEPEND vim-with-x? ( virtual/x11 )"
-		RDEPEND="$RDEPEND vim-with-x? ( virtual/x11 )"
+		IUSE="${IUSE} vim-with-x minimal"
+		DEPEND="${DEPEND} vim-with-x? ( virtual/x11 )"
+		RDEPEND="${RDEPEND} vim-with-x? ( virtual/x11 )"
 	elif [[ "${MY_PN}" == "gvim" ]] ; then
-		IUSE="$IUSE gnome gtk gtk2 motif"
+		IUSE="${IUSE} gnome gtk gtk2 motif"
 	fi
 fi
 
@@ -90,20 +90,20 @@ fi
 if [[ $(get_major_version ) -ge 7 ]] ; then
 	if [[ "${MY_PN}" != "vim-core" ]] ; then
 		IUSE="${IUSE} tcltk mzscheme"
-		DEPEND="$DEPEND
+		DEPEND="${DEPEND}
 			tcltk?    ( dev-lang/tcl )
 			mzscheme? ( dev-lisp/mzscheme )"
-		RDEPEND="$RDEPEND
+		RDEPEND="${RDEPEND}
 			tcltk?    ( dev-lang/tcl )
 			mzscheme? ( dev-lisp/mzscheme )"
 	fi
 	if [[ "${MY_PN}" == "gvim" ]] ; then
-		IUSE="$IUSE netbeans aqua nextaw qt"
-		DEPEND="$DEPEND   netbeans? ( dev-util/netbeans )"
-		RDEPEND="$RDEPEND netbeans? ( dev-util/netbeans )"
+		IUSE="${IUSE} netbeans aqua nextaw qt"
+		DEPEND="${DEPEND}   netbeans? ( dev-util/netbeans )"
+		RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
 	fi
 	if [[ "${MY_PN}" == "vim" ]] ; then
-		IUSE="$IUSE vim-pager"
+		IUSE="${IUSE} vim-pager"
 	fi
 
 	# app-vim blocks
@@ -123,25 +123,25 @@ LICENSE="vim"
 # Portage dependancy is for use_with/use_enable.
 # ctags dependancy allows help tags to be rebuilt properly, along
 # with detection of exuberant-ctags by configure.
-DEPEND="$DEPEND
+DEPEND="${DEPEND}
 	>=sys-apps/portage-2.0.45-r3
 	>=sys-apps/sed-4
 	sys-devel/autoconf
 	dev-util/ctags"
-RDEPEND="$RDEPEND dev-util/ctags"
+RDEPEND="${RDEPEND} dev-util/ctags"
 
 if version_is_at_least "6.3.075" ; then
-	DEPEND="$DEPEND
+	DEPEND="${DEPEND}
 		!termcap-compat?  ( >=sys-libs/ncurses-5.2-r2 )
 		termcap-compat?   ( sys-libs/libtermcap-compat )"
-	RDEPEND="$RDEPEND
+	RDEPEND="${RDEPEND}
 		!termcap-compat?  ( >=sys-libs/ncurses-5.2-r2 )
 		termcap-compat?   ( sys-libs/libtermcap-compat )"
 else
-	DEPEND="$DEPEND
+	DEPEND="${DEPEND}
 		ncurses?  ( >=sys-libs/ncurses-5.2-r2 )
 		!ncurses? ( sys-libs/libtermcap-compat )"
-	RDEPEND="$RDEPEND
+	RDEPEND="${RDEPEND}
 		ncurses?  ( >=sys-libs/ncurses-5.2-r2 )
 		!ncurses? ( sys-libs/libtermcap-compat )"
 fi
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index e24664e25e22..f4bf9f664790 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -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/eclass/webapp.eclass,v 1.35 2005/07/14 15:38:16 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.36 2005/08/23 14:55:11 swegener Exp $
 #
 # eclass/webapp.eclass
 #				Eclass for installing applications to run under a web server
@@ -20,8 +20,8 @@
 # ------------------------------------------------------------------------
 
 SLOT="${PVR}"
-IUSE="$IUSE vhosts"
-DEPEND="$DEPEND net-www/webapp-config app-portage/gentoolkit"
+IUSE="vhosts"
+DEPEND="net-www/webapp-config app-portage/gentoolkit"
 
 EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm