1 |
pesa 12/04/04 15:43:37 |
2 |
|
3 |
Modified: qt-mobility-1.2.0.ebuild ChangeLog |
4 |
Log: |
5 |
Restrict qt deps to 4.7.x only, qt-mobility doesn't build against qt 4.8. Restrict qmf dependency too. Drop false deps on udisks and upower, they're used only on meego. |
6 |
|
7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: qt-mobility-1.2.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- qt-mobility-1.2.0.ebuild 27 Mar 2012 18:43:29 -0000 1.2 |
23 |
+++ qt-mobility-1.2.0.ebuild 4 Apr 2012 15:43:36 -0000 1.3 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild,v 1.2 2012/03/27 18:43:29 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild,v 1.3 2012/04/04 15:43:36 pesa Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
@@ -15,11 +15,6 @@ |
33 |
SLOT="0" |
34 |
KEYWORDS="~amd64 ~x86" |
35 |
|
36 |
-# FIXME |
37 |
-# Check possible automagic deps in: |
38 |
-# - plugins/contacts/serviceactionmanager |
39 |
-# - plugins/feedback/mmk |
40 |
- |
41 |
QT_MOBILITY_MODULES="bearer connectivity contacts feedback gallery |
42 |
location messaging multimedia organizer publishsubscribe |
43 |
sensors serviceframework systeminfo versit" |
44 |
@@ -31,22 +26,23 @@ |
45 |
" |
46 |
|
47 |
RDEPEND=" |
48 |
- >=x11-libs/qt-core-4.7.0:4 |
49 |
+ =x11-libs/qt-core-4.7* |
50 |
bearer? ( |
51 |
networkmanager? ( |
52 |
net-misc/networkmanager |
53 |
- >=x11-libs/qt-dbus-4.7.0:4 |
54 |
+ =x11-libs/qt-dbus-4.7* |
55 |
) |
56 |
) |
57 |
connectivity? ( |
58 |
+ =x11-libs/qt-dbus-4.7* |
59 |
bluetooth? ( net-wireless/bluez ) |
60 |
) |
61 |
- gallery? ( >=x11-libs/qt-dbus-4.7.0:4 ) |
62 |
+ gallery? ( =x11-libs/qt-dbus-4.7* ) |
63 |
location? ( |
64 |
- >=x11-libs/qt-gui-4.7.0:4 |
65 |
- >=x11-libs/qt-sql-4.7.0:4[sqlite] |
66 |
+ =x11-libs/qt-gui-4.7* |
67 |
+ =x11-libs/qt-sql-4.7*[sqlite] |
68 |
) |
69 |
- messaging? ( net-libs/qmf ) |
70 |
+ messaging? ( ~net-libs/qmf-2.0_p201143 ) |
71 |
multimedia? ( |
72 |
media-libs/alsa-lib |
73 |
>=media-libs/gstreamer-0.10.19:0.10 |
74 |
@@ -54,29 +50,30 @@ |
75 |
x11-libs/libX11 |
76 |
x11-libs/libXext |
77 |
x11-libs/libXv |
78 |
- >=x11-libs/qt-gui-4.7.0:4 |
79 |
- opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) |
80 |
+ =x11-libs/qt-gui-4.7* |
81 |
+ opengl? ( =x11-libs/qt-opengl-4.7* ) |
82 |
pulseaudio? ( media-sound/pulseaudio[alsa] ) |
83 |
) |
84 |
publishsubscribe? ( |
85 |
- tools? ( >=x11-libs/qt-gui-4.7.0:4 ) |
86 |
+ tools? ( =x11-libs/qt-gui-4.7* ) |
87 |
) |
88 |
- qml? ( >=x11-libs/qt-declarative-4.7.0:4 ) |
89 |
+ qml? ( =x11-libs/qt-declarative-4.7* ) |
90 |
serviceframework? ( |
91 |
- >=x11-libs/qt-dbus-4.7.0:4 |
92 |
- >=x11-libs/qt-sql-4.7.0:4[sqlite] |
93 |
- tools? ( >=x11-libs/qt-gui-4.7.0:4 ) |
94 |
+ =x11-libs/qt-dbus-4.7* |
95 |
+ =x11-libs/qt-sql-4.7*[sqlite] |
96 |
+ tools? ( =x11-libs/qt-gui-4.7* ) |
97 |
) |
98 |
systeminfo? ( |
99 |
sys-apps/util-linux |
100 |
sys-fs/udev |
101 |
x11-libs/libX11 |
102 |
x11-libs/libXrandr |
103 |
- >=x11-libs/qt-dbus-4.7.0:4 |
104 |
- >=x11-libs/qt-gui-4.7.0:4 |
105 |
+ =x11-libs/qt-dbus-4.7* |
106 |
+ =x11-libs/qt-gui-4.7* |
107 |
bluetooth? ( net-wireless/bluez ) |
108 |
networkmanager? ( net-misc/networkmanager ) |
109 |
) |
110 |
+ versit? ( =x11-libs/qt-gui-4.7* ) |
111 |
" |
112 |
DEPEND="${RDEPEND} |
113 |
dev-util/pkgconfig |
114 |
@@ -90,13 +87,10 @@ |
115 |
connectivity? ( |
116 |
bluetooth? ( app-mobilephone/obexd ) |
117 |
) |
118 |
- systeminfo? ( |
119 |
- sys-fs/udisks:0 |
120 |
- sys-power/upower |
121 |
- ) |
122 |
" |
123 |
|
124 |
-S="${WORKDIR}/${MY_P}" |
125 |
+S=${WORKDIR}/${MY_P} |
126 |
+ |
127 |
DOCS="changes-${PV}" |
128 |
|
129 |
pkg_setup() { |
130 |
@@ -169,9 +163,8 @@ |
131 |
qt4-r2_src_install |
132 |
|
133 |
if use doc; then |
134 |
- cd "${S}"/doc |
135 |
- dohtml -r html/* |
136 |
- insinto /usr/share/doc/${PF} |
137 |
- doins qch/qtmobility.qch |
138 |
+ dohtml -r doc/html/* |
139 |
+ dodoc doc/qch/qtmobility.qch |
140 |
+ docompress -x /usr/share/doc/${PF}/qtmobility.qch |
141 |
fi |
142 |
} |
143 |
|
144 |
|
145 |
|
146 |
1.3 x11-libs/qt-mobility/ChangeLog |
147 |
|
148 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/ChangeLog?rev=1.3&view=markup |
149 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/ChangeLog?rev=1.3&content-type=text/plain |
150 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-mobility/ChangeLog?r1=1.2&r2=1.3 |
151 |
|
152 |
Index: ChangeLog |
153 |
=================================================================== |
154 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v |
155 |
retrieving revision 1.2 |
156 |
retrieving revision 1.3 |
157 |
diff -u -r1.2 -r1.3 |
158 |
--- ChangeLog 27 Mar 2012 18:43:29 -0000 1.2 |
159 |
+++ ChangeLog 4 Apr 2012 15:43:36 -0000 1.3 |
160 |
@@ -1,6 +1,11 @@ |
161 |
# ChangeLog for x11-libs/qt-mobility |
162 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
163 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.2 2012/03/27 18:43:29 ssuominen Exp $ |
164 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.3 2012/04/04 15:43:36 pesa Exp $ |
165 |
+ |
166 |
+ 04 Apr 2012; Davide Pesavento <pesa@g.o> qt-mobility-1.2.0.ebuild: |
167 |
+ Restrict qt deps to 4.7.x only, qt-mobility doesn't build against qt 4.8. |
168 |
+ Restrict qmf dependency too. Drop false deps on udisks and upower, they're |
169 |
+ used only on meego. |
170 |
|
171 |
27 Mar 2012; Samuli Suominen <ssuominen@g.o> qt-mobility-1.2.0.ebuild: |
172 |
Pin to SLOT="0" of sys-fs/udisks. |