summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-21 09:56:28 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-10-21 09:56:28 +0000
commit34e71a8acce237c9310d35148e45e14d1a13a236 (patch)
tree188513b932de9aa0c4f2f7d3b3b753e6271661ed /eclass/qt4.eclass
parentAdd pkgconfig to DEPEND. (bug #152203) (diff)
downloadhistorical-34e71a8acce237c9310d35148e45e14d1a13a236.tar.gz
historical-34e71a8acce237c9310d35148e45e14d1a13a236.tar.bz2
historical-34e71a8acce237c9310d35148e45e14d1a13a236.zip
Add support for Qt 4.2.0 as masked psi does.
Diffstat (limited to 'eclass/qt4.eclass')
-rw-r--r--eclass/qt4.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass
index 5c86191b77e6..48ff6485a0e8 100644
--- a/eclass/qt4.eclass
+++ b/eclass/qt4.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/qt4.eclass,v 1.5 2006/10/21 09:53:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.6 2006/10/21 09:56:28 flameeyes Exp $
#
# Author Caleb Tennis <caleb@gentoo.org>
#
@@ -16,8 +16,8 @@
inherit versionator
QTPKG="x11-libs/qt-"
-QT4MAJORVERSIONS="4.1 4.0"
-QT4VERSIONS="4.1.4-r2 4.1.4-r2 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4MAJORVERSIONS="4.2 4.1 4.0"
+QT4VERSIONS="4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r2 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
qt4_min_version() {
echo "|| ("
@@ -31,7 +31,7 @@ qt4_min_version_list() {
case "${MINVER}" in
4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
- 4.1|4.1.0)
+ 4.1|4.1.0|4.2|4.2.0)
for x in ${QT4MAJORVERSIONS}; do
if $(version_is_at_least "${MINVER}" "${x}"); then
VERSIONS="${VERSIONS} =${QTPKG}${x}*"