New versions

1 files changed, 31 insertions, 21 deletions

diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass
index 616e6403ae10..44046b2cdbb0 100644
--- a/eclass/qt3.eclass
+++ b/eclass/qt3.eclass
@@ -1,36 +1,36 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.30 2007/08/02 20:04:40 carlo Exp $
-#
-# Author Caleb Tennis <caleb@gentoo.org>
-#
-# This eclass is simple.  Inherit it, and in your depend, do something like this:
-#
-# DEPEND="$(qt_min_version 3.1)"
-#
-# and it handles the rest for you
-#
-# Caveats:
-#
-# Currently, the ebuild assumes that a minimum version of Qt3 is NOT satisfied by Qt4
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.31 2007/09/14 21:30:04 caleb Exp $
 
-inherit toolchain-funcs versionator
+# @ECLASS: qt3.eclass
+# @MAINTAINER:
+# Caleb Tennis <caleb@gentoo.org>
+# @BLURB:
+# Eclass for Qt3 packages
+# @DESCRIPTION:
+# This eclass contains various functions that may be useful
+# when dealing with packages using Qt3 libraries.
 
-IUSE="${IUSE}"
+inherit toolchain-funcs versionator
 
 QTPKG="x11-libs/qt-"
 QT3MAJORVERSIONS="3.3 3.2 3.1 3.0"
-QT3VERSIONS="3.3.8-r3 3.3.8-r2 3.3.8-r1 3.3.8 3.3.6-r5 3.3.6-r4 3.3.6-r3 3.3.6-r2 3.3.6-r1 3.3.6 3.3.5-r1 3.3.5 3.3.4-r9 3.3.4-r8 3.3.4-r7 3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0"
+QT3VERSIONS="3.3.8-r4 3.3.8-r3 3.3.8-r2 3.3.8-r1 3.3.8 3.3.6-r5 3.3.6-r4 3.3.6-r3 3.3.6-r2 3.3.6-r1 3.3.6 3.3.5-r1 3.3.5 3.3.4-r9 3.3.4-r8 3.3.4-r7 3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0"
 
 if [[ -z "${QTDIR}" ]]; then
 	QTDIR="/usr/qt/3"
 fi
 
-PATH="${QTDIR}/bin:${PATH}"
-
 addwrite "${QTDIR}/etc/settings"
 addpredict "${QTDIR}/etc/settings"
 
+# @FUNCTION: qt_min_version
+# @USAGE: [minimum version]
+# @DESCRIPTION:
+# This function is simple.  In your depend, do something like this:
+# DEPEND="$(qt_min_version 3.1)"
+# and it handles the rest for you. Currently, the eclass assumes
+# that a minimum version of Qt3 is not satisfied by Qt4.
 qt_min_version() {
 	local list=$(qt_min_version_list "$@")
 	if [[ ${list%% *} == "${list}" ]]; then
@@ -66,16 +66,25 @@ qt_min_version_list() {
 	echo ${VERSIONS}
 }
 
+# @FUNCTION: eqmake3
+# @USAGE: [.pro file] [additional parameters to qmake]
+# @MAINTAINER:
+# Przemyslaw Maciag <troll@gentoo.org>
+# Davide Pesavento <davidepesa@gmail.com>
+# @DESCRIPTION:
+# Runs qmake on the specified .pro file (defaults to
+# ${PN}.pro if eqmake3 was called with no argument).
+# Additional parameters are passed unmodified to qmake.
 eqmake3() {
 	local LOGFILE="${T}/qmake-$$.out"
 	local projprofile="${1}"
-	[ -z ${projprofile} ] && projprofile="${PN}.pro"
+	[[ -z ${projprofile} ]] && projprofile="${PN}.pro"
 	shift 1
 
 	ebegin "Processing qmake ${projprofile}"
 
 	# file exists?
-	if [ ! -f ${projprofile} ]; then
+	if [[ ! -f ${projprofile} ]]; then
 		echo
 		eerror "Project .pro file \"${projprofile}\" does not exists"
 		eerror "qmake cannot handle non-existing .pro files"
@@ -101,6 +110,7 @@ eqmake3() {
 	fi
 
 	${QTDIR}/bin/qmake ${projprofile} \
+		QTDIR=${QTDIR} \
 		QMAKE=${QTDIR}/bin/qmake \
 		QMAKE_CC=$(tc-getCC) \
 		QMAKE_CXX=$(tc-getCXX) \
@@ -120,7 +130,7 @@ eqmake3() {
 	eend ${result}
 
 	# was qmake successful?
-	if [ ${result} -ne 0 ]; then
+	if [[ ${result} -ne 0 ]]; then
 		echo
 		eerror "Running qmake on \"${projprofile}\" has failed"
 		echo