cleanups !@

7 files changed, 198 insertions, 344 deletions

diff --git a/x11-libs/qt/qt-2.3.2-r1.ebuild b/x11-libs/qt/qt-2.3.2-r1.ebuild
index a6a736c7527b..b5bbdec03787 100644
--- a/x11-libs/qt/qt-2.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-2.3.2-r1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.22 2003/06/19 17:26:09 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.23 2003/08/03 05:20:57 vapier Exp $
 
-IUSE="gif opengl nas"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
-SLOT="2"
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
+
 LICENSE="QPL-1.0 | GPL-2"
+SLOT="2"
 KEYWORDS="x86 ppc sparc hppa alpha"
+IUSE="gif opengl nas"
 
 RDEPEND="virtual/x11
 	media-libs/libpng
@@ -21,16 +20,13 @@ RDEPEND="virtual/x11
 		media-libs/libungif )
 	nas? ( >=media-libs/nas-1.4.1 )
 	opengl? ( virtual/opengl virtual/glu )"
-	
-
-DEPEND="$RDEPEND
+DEPEND="${RDEPEND}
 	sys-devel/gcc"
 
 QTBASE=/usr/qt/2
 export QTDIR=${S}
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S}
@@ -43,11 +39,9 @@ src_unpack() {
 	sed -e "s/SYSCONF_CXXFLAGS	/SYSCONF_CXXFLAGS = ${CXXFLAGS} \#/" \
 	-e "s/SYSCONF_CFLAGS	/SYSCONF_CFLAGS = ${CFLAGS} \#/" \
 	linux-g++-shared.orig > linux-g++-shared || die
-
 }
 
 src_compile() {
-
 	export LDFLAGS="$LDFLAGS -ldl"
 	local myconf
 
@@ -58,7 +52,7 @@ src_compile() {
 
 	use gif	&& myconf="${myconf} -gif"
 
-	[ -n "$DEBUG" ] \
+	use debug \
 		&& myconf="${myconf} -debug" \
 		|| myconf="${myconf} -release"
 	
@@ -67,15 +61,10 @@ src_compile() {
 		-system-libmng -system-libpng -gif -platform linux-g++ \
 		-ldl -lpthread -no-g++-exceptions -no-xft || die
 
-	cd ${S}
 	make symlinks src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -101,5 +90,4 @@ src_install() {
 	# misc
 	insinto /etc/env.d
 	doins ${FILESDIR}/{50qt2,45qtdir2}
-
 }
diff --git a/x11-libs/qt/qt-3.0.5-r2.ebuild b/x11-libs/qt/qt-3.0.5-r2.ebuild
index eaf8958fefd8..7d625ec1ecf6 100644
--- a/x11-libs/qt/qt-3.0.5-r2.ebuild
+++ b/x11-libs/qt/qt-3.0.5-r2.ebuild
@@ -1,19 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.5-r2.ebuild,v 1.10 2003/06/13 20:51:28 caleb Exp $
-
-IUSE="nas nls postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/qt-x11-free-${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.5-r2.ebuild,v 1.11 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-KEYWORDS="x86 ppc sparc "
-
+HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.gz"
 
-HOMEPAGE="http://www.trolltech.com/"
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="x86 ppc sparc"
+IUSE="nas nls postgres opengl mysql odbc gif"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -26,20 +22,18 @@ DEPEND="virtual/x11
 	mysql? ( >=dev-db/mysql-3.2.10 )
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( >=dev-db/postgresql-7.2 )"
-	
+
+S=${WORKDIR}/qt-x11-free-${PV}
 
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack qt-x11-free-${PV}.tar.gz
 
 	# qt patch - for ami, fixed on the spot bug. 
 	cd ${S}
-	use nls && patch -p1 < ${FILESDIR}/qt-x11-free-3.0.5-ko_input.patch
+	use nls && epatch ${FILESDIR}/qt-x11-free-3.0.5-ko_input.patch
 	
 	cd ${S}
 	cp configure configure.orig
@@ -48,22 +42,18 @@ src_unpack() {
 	cd $S/mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= cc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= cc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
-
 }
 
 src_compile() {
-
-	export QTDIR=${S}
-	
 	export LDFLAGS="-ldl"
 
 	use nas		&& myconf="${myconf} -system-nas-sound"
@@ -71,8 +61,8 @@ src_compile() {
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
-	use opengl  && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -80,23 +70,15 @@ src_compile() {
 	export YACC='byacc -d'
 	
 	./configure -sm -thread -stl -system-zlib -system-libjpeg -tablet \
-	-system-libmng -system-libpng -ldl -lpthread -xft -platform linux-g++ \
-	-qt-imgfmt-{jpeg,mng,png} -xplatform linux-g++ -prefix ${QTBASE} \
-	${myconf} || die
+		-system-libmng -system-libpng -ldl -lpthread -xft -platform linux-g++ \
+		-qt-imgfmt-{jpeg,mng,png} -xplatform linux-g++ -prefix ${QTBASE} \
+		${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -104,11 +86,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0 lib/libeditor.so.1.0.0
 	cd ${D}$QTBASE/lib
-	for x in libqui.so libeditor.so
-	do
-	ln -s $x.1.0.0 $x.1.0
-	ln -s $x.1.0 $x.1
-	ln -s $x.1 $x
+	for x in libqui.so libeditor.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 
 	# version symlinks - 3.0.3->3.0->3->.so
@@ -117,10 +98,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.${PV} 	libqt.so.${PV}
-	ln -s libqt-mt.so.3.0	libqt.so.3.0
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.${PV} libqt.so.${PV}
+	ln -s libqt-mt.so.3.0 libqt.so.3.0
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -138,27 +119,22 @@ src_install() {
 
 	sed -e "s:${D}::g" \
 		-e "s:qt-x11-free-3.0.1::g" \
-	-e "s:${WORKDIR}:${QTBASE}:" \
-	-e "s:/usr/local/qt:${QTBASE}:" \
-	${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		-e "s:${WORKDIR}:${QTBASE}:" \
+		-e "s:/usr/local/qt:${QTBASE}:" \
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
 	# plugins
 	cd ${S}
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
-
 }
 
-
 pkg_postinst() {
-
-einfo "NOTE: If you are upgrading from an older QT, you must remerge any versions of
-kde-base/kdelibs and x11-themes/mosfet-liquid-widgets, or QT/KDE widget style plugns
-will not work!"
-
+	ewarn "NOTE: If you are upgrading from an older QT,"
+	ewarn "you must remerge any versions of kde-base/kdelibs"
+	ewarn "and x11-themes/mosfet-liquid-widgets, or QT/KDE"
+	ewarn "widget style plugns will not work!"
 }
-
-
diff --git a/x11-libs/qt/qt-3.1.0-r3.ebuild b/x11-libs/qt/qt-3.1.0-r3.ebuild
index 56a4b20c9ccb..bc4aa3afde89 100644
--- a/x11-libs/qt/qt-3.1.0-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.0-r3.ebuild
@@ -1,21 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.0-r3.ebuild,v 1.9 2003/06/13 20:51:28 caleb Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/qt-x11-free-${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.0-r3.ebuild,v 1.10 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc hppa"
-
+HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
-HOMEPAGE="http://www.trolltech.com/"
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="x86 ppc ~alpha sparc hppa"
+IUSE="cups nas postgres opengl mysql odbc gif"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -30,14 +24,12 @@ DEPEND="virtual/x11
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( >=dev-db/postgresql-7.2 )"
 	
+S=${WORKDIR}/qt-x11-free-${PV}
 
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack ${A}
 
 	cd ${S}
@@ -52,14 +44,14 @@ src_unpack() {
 	cd mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
 
 	# hppa need some additional flags
@@ -71,9 +63,9 @@ src_unpack() {
 	
 	# on alpha we need to compile everything with -fPIC
 	if [ ${ARCH} == "alpha" ]; then
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
-	    cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
+		cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
 QMAKE_CFLAGS += -fPIC
 QMAKE_CXXFLAGS += -fPIC
 _EOF_
@@ -82,22 +74,19 @@ _EOF_
 }
 
 src_compile() {
-    
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
 
-	export QTDIR=${S}
-	
 	export LDFLAGS="-ldl"
 
-	use cups || myconf="${myconf} -no-cups"
+	use cups	|| myconf="${myconf} -no-cups"
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -110,17 +99,10 @@ src_compile() {
 		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -128,11 +110,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.3.1.0 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
 	cd ${D}$QTBASE/lib
-	for x in libqui.so
-	do
-	    ln -s $x.1.0.0 $x.1.0
-	    ln -s $x.1.0 $x.1
-	    ln -s $x.1 $x
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 	
 	# version symlinks - 3.0.3->3.0->3->.so
@@ -141,10 +122,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.1.0 	libqt.so.3.1.0
-	ln -s libqt-mt.so.3.1		libqt.so.3.1
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.3.1.0 libqt.so.3.1.0
+	ln -s libqt-mt.so.3.1 libqt.so.3.1
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -168,15 +149,13 @@ src_install() {
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
-
 }
-pkg_postinst() {
 
+pkg_postinst() {
 	ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies of kdelibs"
 	ewarn "you have installed. Otherwise, other kde packages may not compile properly."
 	ewarn "If you upgraded QT from 3.0.x to 3.1.x in the past but have not remerged kdelibs"
 	ewarn "since then, please do so now."
-
 }
diff --git a/x11-libs/qt/qt-3.1.1-r2.ebuild b/x11-libs/qt/qt-3.1.1-r2.ebuild
index b60bda339ff1..c9707a2f8d02 100644
--- a/x11-libs/qt/qt-3.1.1-r2.ebuild
+++ b/x11-libs/qt/qt-3.1.1-r2.ebuild
@@ -1,21 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.1-r2.ebuild,v 1.5 2003/06/13 20:51:28 caleb Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/qt-x11-free-${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.1-r2.ebuild,v 1.6 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
-
+HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
-HOMEPAGE="http://www.trolltech.com/"
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
+IUSE="cups nas postgres opengl mysql odbc gif debug"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -30,14 +24,12 @@ DEPEND="virtual/x11
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( >=dev-db/postgresql-7.2 )"
 	
+S=${WORKDIR}/qt-x11-free-${PV}
 
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack ${A}
 
 	cd ${S}
@@ -50,14 +42,14 @@ src_unpack() {
 	cd mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
 
 	# hppa need some additional flags
@@ -69,29 +61,26 @@ src_unpack() {
 
 	# on alpha we need to compile everything with -fPIC
 	if [ ${ARCH} == "alpha" ]; then
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
 	fi
 
 }
 
 src_compile() {
-    
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
-
-	export QTDIR=${S}
 	
 	export LDFLAGS="-ldl"
 
-	use cups || myconf="${myconf} -no-cups"
+	use cups	|| myconf="${myconf} -no-cups"
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -104,17 +93,10 @@ src_compile() {
 		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -122,11 +104,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.3.1.1 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
 	cd ${D}$QTBASE/lib
-	for x in libqui.so
-	do
-	    ln -s $x.1.0.0 $x.1.0
-	    ln -s $x.1.0 $x.1
-	    ln -s $x.1 $x
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 	
 	# version symlinks - 3.1.1->3.1->3->.so
@@ -135,10 +116,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.1.1 	libqt.so.3.1.1
-	ln -s libqt-mt.so.3.1		libqt.so.3.1
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.3.1.1 libqt.so.3.1.1
+	ln -s libqt-mt.so.3.1 libqt.so.3.1
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -155,22 +136,21 @@ src_install() {
 	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
 
 	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
 	# plugins
 	cd ${S}
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
 
 }
-pkg_postinst() {
-
-    ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies of kdelibs"
-    ewarn "you have installed. Otherwise, other kde packages may not compile properly."
-    ewarn "If you upgraded QT from 3.0.x to 3.1.x in the past but have not remerged kdelibs"
-    ewarn "since then, please do so now."
 
+pkg_postinst() {
+	ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies of kdelibs"
+	ewarn "you have installed. Otherwise, other kde packages may not compile properly."
+	ewarn "If you upgraded QT from 3.0.x to 3.1.x in the past but have not remerged kdelibs"
+	ewarn "since then, please do so now."
 }
diff --git a/x11-libs/qt/qt-3.1.2-r3.ebuild b/x11-libs/qt/qt-3.1.2-r3.ebuild
index 9d1c0c35e85e..79d05cc9d05a 100644
--- a/x11-libs/qt/qt-3.1.2-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r3.ebuild
@@ -1,23 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.9 2003/07/22 19:34:59 tester Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/qt-x11-free-${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.10 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
 KEYWORDS="x86 ppc sparc alpha amd64"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
-
-HOMEPAGE="http://www.trolltech.com/"
+IUSE="cups nas postgres opengl mysql odbc gif debug"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -39,17 +32,15 @@ DEPEND="virtual/x11
 	!=kde-base/kdebase-3.1-r1
 	!=kde-base/kdebase-3.1.1"
 # WARNING: the versions blocked above are known to be buggy. DO NOT use them with this qt	
-
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
 	doc? ( ~app-doc/qt-docs-$PV )"
 	
+S=${WORKDIR}/qt-x11-free-${PV}
+
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack ${A}
 
 	cd ${S}
@@ -66,14 +57,14 @@ src_unpack() {
 	cd mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
 	
 	# hppa people, please review the following
@@ -87,22 +78,19 @@ src_unpack() {
 }
 
 src_compile() {
-    
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
 
-	export QTDIR=${S}
-	
 	export LDFLAGS="-ldl"
 
-	use cups || myconf="${myconf} -no-cups"
+	use cups	|| myconf="${myconf} -no-cups"
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -115,17 +103,10 @@ src_compile() {
 		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -133,11 +114,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
 	cd ${D}$QTBASE/lib
-	for x in libqui.so
-	do
-	    ln -s $x.1.0.0 $x.1.0
-	    ln -s $x.1.0 $x.1
-	    ln -s $x.1 $x
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 	
 	# version symlinks - 3.1.2->3.1->3->.so
@@ -146,10 +126,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.1.2 	libqt.so.3.1.2
-	ln -s libqt-mt.so.3.1		libqt.so.3.1
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.3.1.2 libqt.so.3.1.2
+	ln -s libqt-mt.so.3.1 libqt.so.3.1
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -166,22 +146,20 @@ src_install() {
 	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
 
 	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
 	# plugins
 	cd ${S}
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
-
 }
-pkg_postinst() {
-
-    ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
-    ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
-    ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
-    ewarn "but have not remerged kdelib, since then, you should proobably do so now."
 
+pkg_postinst() {
+	ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
+	ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
+	ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
+	ewarn "but have not remerged kdelib, since then, you should proobably do so now."
 }
diff --git a/x11-libs/qt/qt-3.1.2-r4.ebuild b/x11-libs/qt/qt-3.1.2-r4.ebuild
index 4b9b2e993760..bbcd34cc6d2e 100644
--- a/x11-libs/qt/qt-3.1.2-r4.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r4.ebuild
@@ -1,23 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.3 2003/07/31 02:55:27 caleb Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/qt-x11-free-${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.4 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
-
-HOMEPAGE="http://www.trolltech.com/"
+IUSE="cups nas postgres opengl mysql odbc gif debug"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -39,17 +32,15 @@ DEPEND="virtual/x11
 	!=kde-base/kdebase-3.1-r1
 	!=kde-base/kdebase-3.1.1"
 # WARNING: the versions blocked above are known to be buggy. DO NOT use them with this qt	
-
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
 	doc? ( ~app-doc/qt-docs-$PV )"
+
+S=${WORKDIR}/qt-x11-free-${PV}
 	
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack ${A}
 
 	cd ${S}
@@ -70,18 +61,17 @@ src_unpack() {
 	cd mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
-	
+
 	# hppa people, please review the following
-	
 	# hppa need some additional flags
 	if [ "${ARCH}" = "hppa" ]; then
 		echo "QMAKE_CFLAGS += -fPIC -ffunction-sections" >> qmake.conf
@@ -91,22 +81,19 @@ src_unpack() {
 }
 
 src_compile() {
-    
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
 
-	export QTDIR=${S}
-	
 	export LDFLAGS="-ldl"
 
-	use cups || myconf="${myconf} -no-cups"
+	use cups	|| myconf="${myconf} -no-cups"
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -119,17 +106,10 @@ src_compile() {
 		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -137,11 +117,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a lib/*.la lib/*.prl
 	cd ${D}$QTBASE/lib
-	for x in libqui.so
-	do
-	    ln -s $x.1.0.0 $x.1.0
-	    ln -s $x.1.0 $x.1
-	    ln -s $x.1 $x
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 	
 	# version symlinks - 3.1.2->3.1->3->.so
@@ -150,10 +129,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.1.2 	libqt.so.3.1.2
-	ln -s libqt-mt.so.3.1		libqt.so.3.1
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.3.1.2 libqt.so.3.1.2
+	ln -s libqt-mt.so.3.1 libqt.so.3.1
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -170,22 +149,20 @@ src_install() {
 	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
 
 	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
 	# plugins
 	cd ${S}
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
-
 }
-pkg_postinst() {
-
-    ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
-    ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
-    ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
-    ewarn "but have not remerged kdelib, since then, you should proobably do so now."
 
+pkg_postinst() {
+	ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
+	ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
+	ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
+	ewarn "but have not remerged kdelib, since then, you should proobably do so now."
 }
diff --git a/x11-libs/qt/qt-3.2.0.ebuild b/x11-libs/qt/qt-3.2.0.ebuild
index d6213f6b3e96..b4bd80503c89 100644
--- a/x11-libs/qt/qt-3.2.0.ebuild
+++ b/x11-libs/qt/qt-3.2.0.ebuild
@@ -1,22 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0.ebuild,v 1.2 2003/07/31 07:41:21 pauldv Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-S=${WORKDIR}/${PV}
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0.ebuild,v 1.3 2003/08/03 05:20:57 vapier Exp $
 
 DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-
-KEYWORDS="~x86"
-
+HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
-HOMEPAGE="http://www.trolltech.com/"
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="~x86"
+IUSE="cups nas postgres opengl mysql odbc gif"
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -31,17 +24,15 @@ DEPEND="virtual/x11
 	mysql? ( >=dev-db/mysql-3.2.10 )
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 	#doc? ( ~app-doc/qt-docs- )"
+
+S=${WORKDIR}/${PV}
 	
 QTBASE=/usr/qt/3
 export QTDIR=${S}
 
 src_unpack() {
-
-	export QTDIR=${S}
-
 	unpack ${A}
 
 	cd ${S}
@@ -52,14 +43,14 @@ src_unpack() {
 	cd mkspecs/linux-g++
 	# use env's $CC, $CXX
 	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
 	fi
 	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
 	
 	# hppa and alpha people, please review the following
@@ -73,34 +64,29 @@ src_unpack() {
 	
 	# on alpha we need to compile everything with -fPIC
 	if [ ${ARCH} == "alpha" ]; then
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
-	    cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
+		cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
 QMAKE_CFLAGS += -fPIC
 QMAKE_CXXFLAGS += -fPIC
 _EOF_
 	fi
-
-
 }
 
 src_compile() {
-    
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
 
-	export QTDIR=${S}
-	
 	export LDFLAGS="-ldl"
 
-	use cups || myconf="${myconf} -no-cups"
+	use cups	|| myconf="${myconf} -no-cups"
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
 	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
@@ -113,17 +99,10 @@ src_compile() {
 		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
-
 	emake src-qmake src-moc sub-src sub-tools || die
-
 }
 
 src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
 	# binaries
 	into $QTBASE
 	dobin bin/*
@@ -131,11 +110,10 @@ src_install() {
 	# libraries
 	dolib lib/libqt-mt.so.3.2.0 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
 	cd ${D}$QTBASE/lib
-	for x in libqui.so
-	do
-	    ln -s $x.1.0.0 $x.1.0
-	    ln -s $x.1.0 $x.1
-	    ln -s $x.1 $x
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
 	done
 	
 	# version symlinks - 3.2.0->3.2->3->.so
@@ -144,10 +122,10 @@ src_install() {
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.2.0 	libqt.so.3.2.0
-	ln -s libqt-mt.so.3.2		libqt.so.3.2
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
+	ln -s libqt-mt.so.3.2.0 libqt.so.3.2.0
+	ln -s libqt-mt.so.3.2 libqt.so.3.2
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
 
 	# includes
 	cd ${S}
@@ -164,15 +142,13 @@ src_install() {
 	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
 
 	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
 
 	# plugins
 	cd ${S}
 	plugins=`find plugins -name "lib*.so" -print`
 	for x in $plugins; do
 		insinto ${QTBASE}/`dirname $x`
-	doins $x
+		doins $x
 	done
-
 }
-