1 |
caster 10/09/08 22:40:04 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: googleearth-5.2.1.1588.ebuild |
5 |
Removed: googleearth-5.2.1.1329_beta.ebuild |
6 |
Log: |
7 |
Version bump, fixes bug #336331. |
8 |
|
9 |
(Portage version: 2.2_rc77/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.18 sci-geosciences/googleearth/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.18&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.18&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.17&r2=1.18 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v |
21 |
retrieving revision 1.17 |
22 |
retrieving revision 1.18 |
23 |
diff -u -r1.17 -r1.18 |
24 |
--- ChangeLog 22 Aug 2010 17:26:07 -0000 1.17 |
25 |
+++ ChangeLog 8 Sep 2010 22:40:04 -0000 1.18 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sci-geosciences/googleearth |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.17 2010/08/22 17:26:07 caster Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.18 2010/09/08 22:40:04 caster Exp $ |
31 |
+ |
32 |
+*googleearth-5.2.1.1588 (08 Sep 2010) |
33 |
+ |
34 |
+ 08 Sep 2010; Vlastimil Babka <caster@g.o> |
35 |
+ -googleearth-5.2.1.1329_beta.ebuild, +googleearth-5.2.1.1588.ebuild: |
36 |
+ Version bump, fixes bug #336331. |
37 |
|
38 |
*googleearth-5.2.1.1547_beta (22 Aug 2010) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: googleearth-5.2.1.1588.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2010 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild,v 1.1 2010/09/08 22:40:04 caster Exp $ |
53 |
|
54 |
EAPI=2 |
55 |
|
56 |
inherit eutils fdo-mime versionator toolchain-funcs |
57 |
|
58 |
DESCRIPTION="A 3D interface to the planet" |
59 |
HOMEPAGE="http://earth.google.com/" |
60 |
# no upstream versioning, version determined from help/about |
61 |
# incorrect digest means upstream bumped and thus needs version bump |
62 |
SRC_URI="http://dl.google.com/earth/client/current/GoogleEarthLinux.bin |
63 |
-> GoogleEarthLinux-${PV}.bin" |
64 |
|
65 |
LICENSE="googleearth GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~amd64 ~x86" |
68 |
RESTRICT="mirror strip" |
69 |
IUSE="mdns-bundled +qt-bundled" |
70 |
|
71 |
GCC_NEEDED="4.2" |
72 |
|
73 |
RDEPEND=">=sys-devel/gcc-${GCC_NEEDED}[-nocxx] |
74 |
x86? ( |
75 |
media-libs/fontconfig |
76 |
media-libs/freetype |
77 |
virtual/opengl |
78 |
x11-libs/libICE |
79 |
x11-libs/libSM |
80 |
x11-libs/libX11 |
81 |
x11-libs/libXi |
82 |
x11-libs/libXext |
83 |
x11-libs/libXrender |
84 |
x11-libs/libXau |
85 |
x11-libs/libXdmcp |
86 |
sys-libs/zlib |
87 |
dev-libs/glib:2 |
88 |
!qt-bundled? ( |
89 |
>=x11-libs/qt-core-4.5.3 |
90 |
>=x11-libs/qt-gui-4.5.3 |
91 |
>=x11-libs/qt-webkit-4.5.3 |
92 |
) |
93 |
net-misc/curl |
94 |
sci-libs/gdal |
95 |
!mdns-bundled? ( sys-auth/nss-mdns ) |
96 |
) |
97 |
amd64? ( |
98 |
>=app-emulation/emul-linux-x86-xlibs-20081109 |
99 |
>=app-emulation/emul-linux-x86-baselibs-20081109 |
100 |
app-emulation/emul-linux-x86-opengl |
101 |
!qt-bundled? ( |
102 |
>=app-emulation/emul-linux-x86-qtlibs-20091231-r1 |
103 |
) |
104 |
) |
105 |
virtual/ttf-fonts" |
106 |
|
107 |
S="${WORKDIR}" |
108 |
|
109 |
QA_TEXTRELS="opt/googleearth/libflightsim.so |
110 |
opt/googleearth/libwebbrowser.so |
111 |
opt/googleearth/libinput_plugin.so |
112 |
opt/googleearth/libIGGfx.so |
113 |
opt/googleearth/liblayer.so |
114 |
opt/googleearth/libbase.so |
115 |
opt/googleearth/libevll.so |
116 |
opt/googleearth/libmoduleframework.so |
117 |
opt/googleearth/libcommon_webbrowser.so |
118 |
opt/googleearth/libbasicingest.so |
119 |
opt/googleearth/libsgutil.so |
120 |
opt/googleearth/libnavigate.so |
121 |
opt/googleearth/librender.so |
122 |
opt/googleearth/libauth.so |
123 |
opt/googleearth/libgeobaseutils.so |
124 |
opt/googleearth/libcommon.so |
125 |
opt/googleearth/libQtGui.so.4 |
126 |
opt/googleearth/libcommon_platform.so |
127 |
opt/googleearth/libgoogleearth_free.so |
128 |
opt/googleearth/libcollada.so |
129 |
opt/googleearth/libviewsync.so |
130 |
opt/googleearth/libgps.so |
131 |
opt/googleearth/libgooglesearch.so |
132 |
opt/googleearth/plugins/imageformats/libqjpeg.so |
133 |
opt/googleearth/libmeasure.so |
134 |
" |
135 |
|
136 |
pkg_setup() { |
137 |
GCC_VER="$(gcc-version)" |
138 |
if ! version_is_at_least ${GCC_NEEDED} ${GCC_VER}; then |
139 |
ewarn "${PN} needs libraries from gcc-${GCC_NEEDED} or higher to run" |
140 |
ewarn "Your active gcc version is only ${GCC_VER}" |
141 |
ewarn "Please consult the GCC upgrade guide to set a higher version:" |
142 |
ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml" |
143 |
fi |
144 |
} |
145 |
|
146 |
src_unpack() { |
147 |
unpack_makeself |
148 |
|
149 |
cd "${WORKDIR}"/bin || die |
150 |
unpack ./../${PN}-linux-x86.tar |
151 |
|
152 |
mkdir "${WORKDIR}"/data && cd "${WORKDIR}"/data || die |
153 |
unpack ./../${PN}-data.tar |
154 |
|
155 |
cd "${WORKDIR}"/bin || die |
156 |
|
157 |
if ! use qt-bundled; then |
158 |
rm -v libQt{Core,Gui,Network,WebKit}.so.4 ../data/qt.conf || die |
159 |
rm -frv ../data/plugins/imageformats || die |
160 |
fi |
161 |
rm -v libGLU.so.1 libcurl.so.4 || die |
162 |
if ! use mdns-bundled; then |
163 |
rm -v libnss_mdns4_minimal.so.2 || die |
164 |
fi |
165 |
|
166 |
if use x86; then |
167 |
# no 32 bit libs for gdal |
168 |
rm -v libgdal.so.1 || die |
169 |
fi |
170 |
} |
171 |
|
172 |
src_prepare() { |
173 |
cd "${WORKDIR}"/bin || die |
174 |
# bug #262780 |
175 |
epatch "${FILESDIR}/decimal-separator.patch" |
176 |
|
177 |
# make the postinst script only create the files; it's installation |
178 |
# are too complicated and inserting them ourselves is easier than |
179 |
# hacking around it |
180 |
sed -i -e 's:$SETUP_INSTALLPATH/::' \ |
181 |
-e 's:$SETUP_INSTALLPATH:1:' \ |
182 |
-e "s:^xdg-desktop-icon.*$::" \ |
183 |
-e "s:^xdg-desktop-menu.*$::" \ |
184 |
-e "s:^xdg-mime.*$::" "${WORKDIR}"/postinstall.sh || die |
185 |
} |
186 |
|
187 |
src_install() { |
188 |
make_wrapper ${PN} ./${PN} /opt/${PN} . || die "make_wrapper failed" |
189 |
./postinstall.sh |
190 |
insinto /usr/share/mime/packages |
191 |
doins ${PN}-mimetypes.xml || die |
192 |
domenu Google-${PN}.desktop || die |
193 |
doicon ${PN}-icon.png || die |
194 |
dodoc README.linux || die |
195 |
|
196 |
cd bin || die |
197 |
exeinto /opt/${PN} |
198 |
doexe * || die |
199 |
|
200 |
cp -pPR "${WORKDIR}"/data/* "${D}"/opt/${PN} || die |
201 |
fowners -R root:root /opt/${PN} |
202 |
fperms -R a-x,a+X /opt/googleearth/resources |
203 |
} |
204 |
|
205 |
pkg_postinst() { |
206 |
fdo-mime_desktop_database_update |
207 |
fdo-mime_mime_database_update |
208 |
|
209 |
elog "The qt-bundled flag is now enabled by default due to crashes on startup with system Qt." |
210 |
elog "Testing and reporting outcome with/without the flag is welcome (bug #319813)." |
211 |
elog "If it crashes in both cases, put this version in your package.mask and revert to the stable 5.1.*" |
212 |
} |