diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-05 23:03:24 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-05 23:03:24 +0000 |
| commit | fe3ea3aefad4a522881d8309136ae0021fbc2c20 (patch) | |
| tree | 395b47022d3830c52e6de8ccf1ccfa824b9a95b1 /eclass | |
| parent | New version of pambase with a passwdqc USE flag to enable use of pam_passwdqc. (diff) | |
| download | historical-fe3ea3aefad4a522881d8309136ae0021fbc2c20.tar.gz historical-fe3ea3aefad4a522881d8309136ae0021fbc2c20.tar.bz2 historical-fe3ea3aefad4a522881d8309136ae0021fbc2c20.zip | |
qt4.eclass: Added Qt 4.4.0_beta1, fix EAPI handling (EAPI is a string, not necessarily a number).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4.eclass | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass index be14c564dfce..1a96e0d37d63 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.36 2008/02/26 01:11:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.37 2008/03/05 23:03:24 ingmar Exp $ # @ECLASS: qt4.eclass # @MAINTAINER: @@ -18,7 +18,7 @@ inherit eutils multilib toolchain-funcs versionator QTPKG="x11-libs/qt-" QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0" -QT4VERSIONS="4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0" +QT4VERSIONS="4.4.0_beta1 4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0" # @FUNCTION: qt4_min_version # @USAGE: [minimum version] @@ -26,16 +26,21 @@ QT4VERSIONS="4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0- # This function should be called in package DEPENDs whenever it depends on qt4. # Simple example - in your depend, do something like this: # DEPEND="$(qt4_min_version 4.2)" -# if package can be build with qt-4.2 or higher. +# if the package can be build with qt-4.2 or higher. +# +# For builds that use an EAPI with support for SLOT dependencies, this will +# return a SLOT dependency, rather than a list of versions. qt4_min_version() { - # This is much simpler for EAPI 1, we can use a slot dependency - if [[ "${EAPI}" -ge 1 ]]; then - echo ">=${QTPKG}${1}:4" - else - echo "|| (" - qt4_min_version_list "$@" - echo ")" - fi + case ${EAPI:-0} in + # EAPIs without SLOT dependencies + 0) echo "|| (" + qt4_min_version_list "$@" + echo ")" + ;; + # EAPIS with SLOT dependencies. + *) echo ">=${QTPKG}${1}:4" + ;; + esac } qt4_min_version_list() { |