Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4-r2.eclass
Date: Mon, 03 Jun 2013 08:41:24
Message-Id: 20130603084120.03D282171D@flycatcher.gentoo.org
1 pesa 13/06/03 08:41:19
2
3 Modified: qt4-r2.eclass
4 Log:
5 Trivial sync with qt overlay.
6
7 Revision Changes Path
8 1.28 eclass/qt4-r2.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.28&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.28&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.27&r2=1.28
13
14 Index: qt4-r2.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
17 retrieving revision 1.27
18 retrieving revision 1.28
19 diff -u -r1.27 -r1.28
20 --- qt4-r2.eclass 3 Jun 2013 06:35:30 -0000 1.27
21 +++ qt4-r2.eclass 3 Jun 2013 08:41:19 -0000 1.28
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2013 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.27 2013/06/03 06:35:30 pesa Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.28 2013/06/03 08:41:19 pesa Exp $
27
28 # @ECLASS: qt4-r2.eclass
29 # @MAINTAINER:
30 @@ -158,13 +158,16 @@
31 # than one project file are found, then ${PN}.pro is processed, provided
32 # that it exists. Otherwise eqmake4 fails.
33 #
34 -# All other arguments are appended unmodified to qmake command line. For
35 -# recursive build systems, i.e. those based on the subdirs template, you
36 -# should run eqmake4 on the top-level project file only, unless you have
37 -# strong reasons to do things differently. During the building, qmake
38 -# will be automatically re-invoked with the right arguments on every
39 -# directory specified inside the top-level project file.
40 +# All other arguments are appended unmodified to qmake command line.
41 +#
42 +# For recursive build systems, i.e. those based on the subdirs template,
43 +# you should run eqmake4 on the top-level project file only, unless you
44 +# have a valid reason to do otherwise. During the building, qmake will
45 +# be automatically re-invoked with the right arguments on every directory
46 +# specified inside the top-level project file.
47 eqmake4() {
48 + debug-print-function ${FUNCNAME} "$@"
49 +
50 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
51
52 ebegin "Running qmake"
53 @@ -179,7 +182,7 @@
54 if [[ -z ${project_file} ]]; then
55 echo
56 eerror "No project files found in '${PWD}'!"
57 - eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
58 + eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
59 echo
60 die "eqmake4 failed"
61 fi
62 @@ -276,7 +279,7 @@
63 if ! eend $? ; then
64 echo
65 eerror "Running qmake has failed! (see above for details)"
66 - eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
67 + eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
68 echo
69 die "eqmake4 failed"
70 fi