1 |
caleb 07/09/14 21:30:04 |
2 |
|
3 |
Modified: qt3.eclass qt4.eclass |
4 |
Log: |
5 |
New versions |
6 |
|
7 |
Revision Changes Path |
8 |
1.31 eclass/qt3.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?rev=1.31&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?rev=1.31&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?r1=1.30&r2=1.31 |
13 |
|
14 |
Index: qt3.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v |
17 |
retrieving revision 1.30 |
18 |
retrieving revision 1.31 |
19 |
diff -u -r1.30 -r1.31 |
20 |
--- qt3.eclass 2 Aug 2007 20:04:40 -0000 1.30 |
21 |
+++ qt3.eclass 14 Sep 2007 21:30:04 -0000 1.31 |
22 |
@@ -1,36 +1,36 @@ |
23 |
# Copyright 2005 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.30 2007/08/02 20:04:40 carlo Exp $ |
26 |
-# |
27 |
-# Author Caleb Tennis <caleb@g.o> |
28 |
-# |
29 |
-# This eclass is simple. Inherit it, and in your depend, do something like this: |
30 |
-# |
31 |
-# DEPEND="$(qt_min_version 3.1)" |
32 |
-# |
33 |
-# and it handles the rest for you |
34 |
-# |
35 |
-# Caveats: |
36 |
-# |
37 |
-# Currently, the ebuild assumes that a minimum version of Qt3 is NOT satisfied by Qt4 |
38 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.31 2007/09/14 21:30:04 caleb Exp $ |
39 |
|
40 |
-inherit toolchain-funcs versionator |
41 |
+# @ECLASS: qt3.eclass |
42 |
+# @MAINTAINER: |
43 |
+# Caleb Tennis <caleb@g.o> |
44 |
+# @BLURB: |
45 |
+# Eclass for Qt3 packages |
46 |
+# @DESCRIPTION: |
47 |
+# This eclass contains various functions that may be useful |
48 |
+# when dealing with packages using Qt3 libraries. |
49 |
|
50 |
-IUSE="${IUSE}" |
51 |
+inherit toolchain-funcs versionator |
52 |
|
53 |
QTPKG="x11-libs/qt-" |
54 |
QT3MAJORVERSIONS="3.3 3.2 3.1 3.0" |
55 |
-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" |
56 |
+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" |
57 |
|
58 |
if [[ -z "${QTDIR}" ]]; then |
59 |
QTDIR="/usr/qt/3" |
60 |
fi |
61 |
|
62 |
-PATH="${QTDIR}/bin:${PATH}" |
63 |
- |
64 |
addwrite "${QTDIR}/etc/settings" |
65 |
addpredict "${QTDIR}/etc/settings" |
66 |
|
67 |
+# @FUNCTION: qt_min_version |
68 |
+# @USAGE: [minimum version] |
69 |
+# @DESCRIPTION: |
70 |
+# This function is simple. In your depend, do something like this: |
71 |
+# DEPEND="$(qt_min_version 3.1)" |
72 |
+# and it handles the rest for you. Currently, the eclass assumes |
73 |
+# that a minimum version of Qt3 is not satisfied by Qt4. |
74 |
qt_min_version() { |
75 |
local list=$(qt_min_version_list "$@") |
76 |
if [[ ${list%% *} == "${list}" ]]; then |
77 |
@@ -66,16 +66,25 @@ |
78 |
echo ${VERSIONS} |
79 |
} |
80 |
|
81 |
+# @FUNCTION: eqmake3 |
82 |
+# @USAGE: [.pro file] [additional parameters to qmake] |
83 |
+# @MAINTAINER: |
84 |
+# Przemyslaw Maciag <troll@g.o> |
85 |
+# Davide Pesavento <davidepesa@×××××.com> |
86 |
+# @DESCRIPTION: |
87 |
+# Runs qmake on the specified .pro file (defaults to |
88 |
+# ${PN}.pro if eqmake3 was called with no argument). |
89 |
+# Additional parameters are passed unmodified to qmake. |
90 |
eqmake3() { |
91 |
local LOGFILE="${T}/qmake-$$.out" |
92 |
local projprofile="${1}" |
93 |
- [ -z ${projprofile} ] && projprofile="${PN}.pro" |
94 |
+ [[ -z ${projprofile} ]] && projprofile="${PN}.pro" |
95 |
shift 1 |
96 |
|
97 |
ebegin "Processing qmake ${projprofile}" |
98 |
|
99 |
# file exists? |
100 |
- if [ ! -f ${projprofile} ]; then |
101 |
+ if [[ ! -f ${projprofile} ]]; then |
102 |
echo |
103 |
eerror "Project .pro file \"${projprofile}\" does not exists" |
104 |
eerror "qmake cannot handle non-existing .pro files" |
105 |
@@ -101,6 +110,7 @@ |
106 |
fi |
107 |
|
108 |
${QTDIR}/bin/qmake ${projprofile} \ |
109 |
+ QTDIR=${QTDIR} \ |
110 |
QMAKE=${QTDIR}/bin/qmake \ |
111 |
QMAKE_CC=$(tc-getCC) \ |
112 |
QMAKE_CXX=$(tc-getCXX) \ |
113 |
@@ -120,7 +130,7 @@ |
114 |
eend ${result} |
115 |
|
116 |
# was qmake successful? |
117 |
- if [ ${result} -ne 0 ]; then |
118 |
+ if [[ ${result} -ne 0 ]]; then |
119 |
echo |
120 |
eerror "Running qmake on \"${projprofile}\" has failed" |
121 |
echo |
122 |
|
123 |
|
124 |
|
125 |
1.26 eclass/qt4.eclass |
126 |
|
127 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.26&view=markup |
128 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.26&content-type=text/plain |
129 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.25&r2=1.26 |
130 |
|
131 |
Index: qt4.eclass |
132 |
=================================================================== |
133 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v |
134 |
retrieving revision 1.25 |
135 |
retrieving revision 1.26 |
136 |
diff -u -r1.25 -r1.26 |
137 |
--- qt4.eclass 8 Aug 2007 12:58:31 -0000 1.25 |
138 |
+++ qt4.eclass 14 Sep 2007 21:30:04 -0000 1.26 |
139 |
@@ -1,6 +1,6 @@ |
140 |
# Copyright 2005 Gentoo Foundation |
141 |
# Distributed under the terms of the GNU General Public License v2 |
142 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.25 2007/08/08 12:58:31 caleb Exp $ |
143 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.26 2007/09/14 21:30:04 caleb Exp $ |
144 |
# |
145 |
# Author Caleb Tennis <caleb@g.o> |
146 |
# |
147 |
@@ -19,7 +19,7 @@ |
148 |
|
149 |
QTPKG="x11-libs/qt-" |
150 |
QT4MAJORVERSIONS="4.3 4.2 4.1 4.0" |
151 |
-QT4VERSIONS="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" |
152 |
+QT4VERSIONS="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" |
153 |
|
154 |
qt4_min_version() { |
155 |
echo "|| (" |
156 |
|
157 |
|
158 |
|
159 |
-- |
160 |
gentoo-commits@g.o mailing list |