summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2005-06-30 13:41:26 +0000
committerCaleb Tennis <caleb@gentoo.org>2005-06-30 13:41:26 +0000
commite7c93f31895b06c4fbe634e8619fbb8ed1d2ed76 (patch)
tree6a085bfc58cb64d7f4c73aa3a42eb8cb62d1bb4e /eclass/qt.eclass
parent1.00.00 tree in portage. Removed old ebuilds. (diff)
downloadgentoo-2-e7c93f31895b06c4fbe634e8619fbb8ed1d2ed76.tar.gz
gentoo-2-e7c93f31895b06c4fbe634e8619fbb8ed1d2ed76.tar.bz2
gentoo-2-e7c93f31895b06c4fbe634e8619fbb8ed1d2ed76.zip
handle qt 4 versions as well
Diffstat (limited to 'eclass/qt.eclass')
-rw-r--r--eclass/qt.eclass25
1 files changed, 20 insertions, 5 deletions
diff --git a/eclass/qt.eclass b/eclass/qt.eclass
index a8c546a41431..5e6add3383ad 100644
--- a/eclass/qt.eclass
+++ b/eclass/qt.eclass
@@ -1,6 +1,6 @@
# Copyright 2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt.eclass,v 1.5 2005/06/30 13:34:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt.eclass,v 1.6 2005/06/30 13:41:26 caleb Exp $
#
# Author Caleb Tennis <caleb@gentoo.org>
#
@@ -17,20 +17,24 @@ INHERITED="$INHERITED $ECLASS"
QTPKG="x11-libs/qt-"
QT3VERSIONS="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"
+QT4VERSIONS="4.0.0"
qt_pkg_setup() {
if [ ! $QTDIR ]; then
QTDIR="/usr/qt/3"
fi
+
+ [ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
+ addpredict "$QTDIR/etc/settings"
}
-qt3_min_version() {
+qt_min_version() {
echo -n "|| ( "
- qt3_min_version_list $@
+ qt_min_version_list $@
echo " )"
}
-qt3_min_version_list() {
+qt_min_version_list() {
local MINVER=$1
local VERSIONS=""
@@ -38,13 +42,24 @@ qt3_min_version_list() {
3) VERSIONS="=${QTPKG}3*";;
3.0) VERSIONS="=${QTPKG}3*";;
3.0.0) VERSIONS="=${QTPKG}3*";;
- *)
+ 4) VERSIONS="=${QTPKG}4*"::
+ 4.0) VERSIONS="=${QTPKG}4*"::
+ 4.0.0) VERSIONS="=${QTPKG}4*"::
+ 3*)
for x in $QT3VERSIONS; do
if $(version_is_at_least $MINVER $x); then
VERSIONS="${VERSIONS} =${QTPKG}${x}"
fi
done
;;
+ 4*)
+ for x in $QT4VERSIONS; do
+ if $(version_is_at_least $MINVER $x); then
+ VERSIONS="${VERSIONS} =${QTPKG}${x}"
+ fi
+ done
+ ;;
+ *) echo "!!! error: qt_min_version called with invalid parameter: \"$1\", please report bug" && exit 1;;
esac
echo -n $VERSIONS