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: ChangeLog qmake-utils.eclass
Date: Mon, 29 Jun 2015 00:27:29
Message-Id: 20150629002717.3F639748@oystercatcher.gentoo.org
1 pesa 15/06/29 00:27:17
2
3 Modified: ChangeLog qmake-utils.eclass
4 Log:
5 Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
6
7 Revision Changes Path
8 1.1694 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1693&r2=1.1694
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1693
18 retrieving revision 1.1694
19 diff -u -r1.1693 -r1.1694
20 --- ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693
21 +++ ChangeLog 29 Jun 2015 00:27:17 -0000 1.1694
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29 00:27:17 pesa Exp $
27 +
28 + 29 Jun 2015; Davide Pesavento <pesa@g.o> qmake-utils.eclass:
29 + Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
30
31 28 Jun 2015; James Le Cuirot <chewi@g.o> java-utils-2.eclass:
32 The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
33
34
35
36 1.12 eclass/qmake-utils.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.11&r2=1.12
41
42 Index: qmake-utils.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
45 retrieving revision 1.11
46 retrieving revision 1.12
47 diff -u -r1.11 -r1.12
48 --- qmake-utils.eclass 22 Jun 2015 14:18:19 -0000 1.11
49 +++ qmake-utils.eclass 29 Jun 2015 00:27:17 -0000 1.12
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.11 2015/06/22 14:18:19 pesa Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.12 2015/06/29 00:27:17 pesa Exp $
55
56 # @ECLASS: qmake-utils.eclass
57 # @MAINTAINER:
58 @@ -22,6 +22,7 @@
59 # @FUNCTION: qt4_get_bindir
60 # @DESCRIPTION:
61 # Echoes the directory where Qt4 binaries are installed.
62 +# EPREFIX is already prepended to the returned path.
63 qt4_get_bindir() {
64 has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
65
66 @@ -36,7 +37,6 @@
67 # @FUNCTION: qt4_get_headerdir
68 # @DESCRIPTION:
69 # Echoes the directory where Qt4 headers are installed.
70 -# Does not take EPREFIX into account.
71 qt4_get_headerdir() {
72 echo /usr/include/qt4
73 }
74 @@ -44,7 +44,6 @@
75 # @FUNCTION: qt4_get_libdir
76 # @DESCRIPTION:
77 # Echoes the directory where Qt4 libraries are installed.
78 -# Does not take EPREFIX into account.
79 qt4_get_libdir() {
80 echo /usr/$(get_libdir)/qt4
81 }
82 @@ -52,14 +51,21 @@
83 # @FUNCTION: qt4_get_mkspecsdir
84 # @DESCRIPTION:
85 # Echoes the directory where Qt4 mkspecs are installed.
86 -# Does not take EPREFIX into account.
87 qt4_get_mkspecsdir() {
88 echo /usr/share/qt4/mkspecs
89 }
90
91 +# @FUNCTION: qt4_get_plugindir
92 +# @DESCRIPTION:
93 +# Echoes the directory where Qt4 plugins are installed.
94 +qt4_get_plugindir() {
95 + echo $(qt4_get_libdir)/plugins
96 +}
97 +
98 # @FUNCTION: qt5_get_bindir
99 # @DESCRIPTION:
100 # Echoes the directory where Qt5 binaries are installed.
101 +# EPREFIX is already prepended to the returned path.
102 qt5_get_bindir() {
103 has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
104
105 @@ -69,7 +75,6 @@
106 # @FUNCTION: qt5_get_headerdir
107 # @DESCRIPTION:
108 # Echoes the directory where Qt5 headers are installed.
109 -# Does not take EPREFIX into account.
110 qt5_get_headerdir() {
111 echo /usr/include/qt5
112 }
113 @@ -77,7 +82,6 @@
114 # @FUNCTION: qt5_get_libdir
115 # @DESCRIPTION:
116 # Echoes the directory where Qt5 libraries are installed.
117 -# Does not take EPREFIX into account.
118 qt5_get_libdir() {
119 echo /usr/$(get_libdir)
120 }
121 @@ -85,11 +89,17 @@
122 # @FUNCTION: qt5_get_mkspecsdir
123 # @DESCRIPTION:
124 # Echoes the directory where Qt5 mkspecs are installed.
125 -# Does not take EPREFIX into account.
126 qt5_get_mkspecsdir() {
127 echo $(qt5_get_libdir)/qt5/mkspecs
128 }
129
130 +# @FUNCTION: qt5_get_plugindir
131 +# @DESCRIPTION:
132 +# Echoes the directory where Qt5 plugins are installed.
133 +qt5_get_plugindir() {
134 + echo $(qt5_get_libdir)/qt5/plugins
135 +}
136 +
137 # @FUNCTION: qmake-utils_find_pro_file
138 # @RETURN: zero or one qmake .pro file names
139 # @INTERNAL
140 @@ -136,10 +146,10 @@
141 # @FUNCTION: eqmake4
142 # @USAGE: [project_file] [parameters to qmake]
143 # @DESCRIPTION:
144 -# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
145 -# look for it in the current directory (${S}, non-recursively). If more
146 -# than one project file are found, then ${PN}.pro is processed, provided
147 -# that it exists. Otherwise eqmake4 fails.
148 +# Wrapper for Qt4's qmake. If project_file is not specified, eqmake4 looks
149 +# for one in the current directory (non-recursively). If multiple project
150 +# files are found, then ${PN}.pro is used, if it exists, otherwise eqmake4
151 +# will not be able to continue.
152 #
153 # All other arguments are appended unmodified to qmake command line.
154 #