1 |
caster 10/02/19 11:51:55 |
2 |
|
3 |
Modified: ChangeLog googleearth-5.1.3533.1731-r1.ebuild |
4 |
Removed: googleearth-5.1.3533.1731.ebuild |
5 |
googleearth-5.1.3509.4636_beta.ebuild |
6 |
Log: |
7 |
Fix bug #303789 properly by depending on a fixed version of emul qtlibs. |
8 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.57 x11-misc/googleearth/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.57&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?rev=1.57&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/ChangeLog?r1=1.56&r2=1.57 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v |
20 |
retrieving revision 1.56 |
21 |
retrieving revision 1.57 |
22 |
diff -u -r1.56 -r1.57 |
23 |
--- ChangeLog 19 Feb 2010 08:51:53 -0000 1.56 |
24 |
+++ ChangeLog 19 Feb 2010 11:51:54 -0000 1.57 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for x11-misc/googleearth |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.56 2010/02/19 08:51:53 caster Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/ChangeLog,v 1.57 2010/02/19 11:51:54 caster Exp $ |
30 |
+ |
31 |
+ 19 Feb 2010; Vlastimil Babka <caster@g.o> |
32 |
+ -googleearth-5.1.3509.4636_beta.ebuild, -googleearth-5.1.3533.1731.ebuild, |
33 |
+ googleearth-5.1.3533.1731-r1.ebuild: |
34 |
+ Fix bug #303789 properly by depending on a fixed version of emul qtlibs. |
35 |
|
36 |
19 Feb 2010; Vlastimil Babka <caster@g.o> |
37 |
googleearth-5.1.3533.1731-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.6 x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.6&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?rev=1.6&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild?r1=1.5&r2=1.6 |
46 |
|
47 |
Index: googleearth-5.1.3533.1731-r1.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v |
50 |
retrieving revision 1.5 |
51 |
retrieving revision 1.6 |
52 |
diff -u -r1.5 -r1.6 |
53 |
--- googleearth-5.1.3533.1731-r1.ebuild 19 Feb 2010 08:51:53 -0000 1.5 |
54 |
+++ googleearth-5.1.3533.1731-r1.ebuild 19 Feb 2010 11:51:54 -0000 1.6 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2010 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.5 2010/02/19 08:51:53 caster Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/googleearth/googleearth-5.1.3533.1731-r1.ebuild,v 1.6 2010/02/19 11:51:54 caster Exp $ |
60 |
|
61 |
EAPI=2 |
62 |
|
63 |
@@ -21,8 +21,6 @@ |
64 |
|
65 |
GCC_NEEDED="4.2" |
66 |
|
67 |
-# the 64bit qt-core is needed to put the emul package on LDPATH |
68 |
-# - workaround for bug #303789 |
69 |
RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx] |
70 |
x86? ( |
71 |
media-libs/fontconfig |
72 |
@@ -48,8 +46,7 @@ |
73 |
>=app-emulation/emul-linux-x86-xlibs-20081109 |
74 |
>=app-emulation/emul-linux-x86-baselibs-20081109 |
75 |
!qt-bundled? ( |
76 |
- x11-libs/qt-core |
77 |
- >=app-emulation/emul-linux-x86-qtlibs-20091231 |
78 |
+ >=app-emulation/emul-linux-x86-qtlibs-20091231-r1 |
79 |
) |
80 |
) |
81 |
|| ( |