Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass
Date: Tue, 31 Jan 2012 23:02:10
Message-Id: 20120131230201.1660F2004B@flycatcher.gentoo.org
1 hwoarang 12/01/31 23:02:01
2
3 Modified: ChangeLog qt4-build.eclass
4 Log:
5 Initial EAPI4 support in qt4-build eclass
6
7 Revision Changes Path
8 1.110 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.110&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.110&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.109&r2=1.110
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.109
18 retrieving revision 1.110
19 diff -u -r1.109 -r1.110
20 --- ChangeLog 31 Jan 2012 06:53:39 -0000 1.109
21 +++ ChangeLog 31 Jan 2012 23:02:00 -0000 1.110
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.109 2012/01/31 06:53:39 ulm Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.110 2012/01/31 23:02:00 hwoarang Exp $
27 +
28 + 31 Jan 2012; Markos Chandras <hwoarang@g.o> qt4-build.eclass:
29 + Initial EAPI4 support in qt4-build eclass
30
31 31 Jan 2012; Ulrich Müller <ulm@g.o> eutils.eclass:
32 Use ${P}-${PR} instead of ${PF} in epatch_user.
33
34
35
36 1.116 eclass/qt4-build.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.116&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.116&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.115&r2=1.116
41
42 Index: qt4-build.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
45 retrieving revision 1.115
46 retrieving revision 1.116
47 diff -u -r1.115 -r1.116
48 --- qt4-build.eclass 1 Jan 2012 19:01:11 -0000 1.115
49 +++ qt4-build.eclass 31 Jan 2012 23:02:00 -0000 1.116
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2012 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.116 2012/01/31 23:02:00 hwoarang Exp $
55
56 # @ECLASS: qt4-build.eclass
57 # @MAINTAINER:
58 @@ -111,11 +111,11 @@
59 fi
60
61 # Make sure ebuilds use the required EAPI
62 - if [[ ${EAPI} != [23] ]]; then
63 - eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using"
64 + if [[ ${EAPI} != [234] ]]; then
65 + eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
66 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
67 - eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail."
68 - die "qt4-build eclass requires EAPI=2 or EAPI=3"
69 + eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
70 + die "qt4-build eclass requires EAPI 2,3 or 4"
71 fi
72
73 if ! version_is_at_least 4.1 $(gcc-version); then