| 1 |
ingmar 08/03/05 23:03:24 |
| 2 |
|
| 3 |
Modified: qt4.eclass |
| 4 |
Log: |
| 5 |
qt4.eclass: Added Qt 4.4.0_beta1, fix EAPI handling (EAPI is a string, not necessarily a number). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.37 eclass/qt4.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.37&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.37&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.36&r2=1.37 |
| 13 |
|
| 14 |
Index: qt4.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v |
| 17 |
retrieving revision 1.36 |
| 18 |
retrieving revision 1.37 |
| 19 |
diff -u -r1.36 -r1.37 |
| 20 |
--- qt4.eclass 26 Feb 2008 01:11:13 -0000 1.36 |
| 21 |
+++ qt4.eclass 5 Mar 2008 23:03:24 -0000 1.37 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 2005 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.36 2008/02/26 01:11:13 flameeyes Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.37 2008/03/05 23:03:24 ingmar Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -18,7 +18,7 @@ |
| 31 |
|
| 32 |
QTPKG="x11-libs/qt-" |
| 33 |
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0" |
| 34 |
-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" |
| 35 |
+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" |
| 36 |
|
| 37 |
# @FUNCTION: qt4_min_version |
| 38 |
# @USAGE: [minimum version] |
| 39 |
@@ -26,16 +26,21 @@ |
| 40 |
# This function should be called in package DEPENDs whenever it depends on qt4. |
| 41 |
# Simple example - in your depend, do something like this: |
| 42 |
# DEPEND="$(qt4_min_version 4.2)" |
| 43 |
-# if package can be build with qt-4.2 or higher. |
| 44 |
+# if the package can be build with qt-4.2 or higher. |
| 45 |
+# |
| 46 |
+# For builds that use an EAPI with support for SLOT dependencies, this will |
| 47 |
+# return a SLOT dependency, rather than a list of versions. |
| 48 |
qt4_min_version() { |
| 49 |
- # This is much simpler for EAPI 1, we can use a slot dependency |
| 50 |
- if [[ "${EAPI}" -ge 1 ]]; then |
| 51 |
- echo ">=${QTPKG}${1}:4" |
| 52 |
- else |
| 53 |
- echo "|| (" |
| 54 |
- qt4_min_version_list "$@" |
| 55 |
- echo ")" |
| 56 |
- fi |
| 57 |
+ case ${EAPI:-0} in |
| 58 |
+ # EAPIs without SLOT dependencies |
| 59 |
+ 0) echo "|| (" |
| 60 |
+ qt4_min_version_list "$@" |
| 61 |
+ echo ")" |
| 62 |
+ ;; |
| 63 |
+ # EAPIS with SLOT dependencies. |
| 64 |
+ *) echo ">=${QTPKG}${1}:4" |
| 65 |
+ ;; |
| 66 |
+ esac |
| 67 |
} |
| 68 |
|
| 69 |
qt4_min_version_list() { |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
-- |
| 74 |
gentoo-commits@l.g.o mailing list |
Archives