Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/googleearth: metadata.xml ChangeLog googleearth-7.1.1.1580.ebuild
Date: Sun, 19 May 2013 14:14:13
Message-Id: 20130519141410.1871F2171D@flycatcher.gentoo.org
1 hasufell 13/05/19 14:14:09
2
3 Modified: metadata.xml ChangeLog
4 Added: googleearth-7.1.1.1580.ebuild
5 Log:
6 version bump wrt #466910 thanks to Magnus Kessler for the patchelf hint
7
8 (Portage version: 2.2.0_alpha175/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
9
10 Revision Changes Path
11 1.9 sci-geosciences/googleearth/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/metadata.xml?r1=1.8&r2=1.9
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/metadata.xml,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- metadata.xml 17 Feb 2013 00:28:34 -0000 1.8
24 +++ metadata.xml 19 May 2013 14:14:09 -0000 1.9
25 @@ -5,6 +5,7 @@
26 <email>hasufell@g.o</email>
27 </maintainer>
28 <use>
29 + <flag name='bundled-libs'>Use bundled libraries.</flag>
30 <flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
31 <flag name="mdns-bundled">Use bundled nss-mdns library instead of depending on sys-auth/nss-mdns. Enable this if you want to avoid the deptree.</flag>
32 <flag name="system-qt">Use Qt4 libraries from portage instead of the bundled ones.</flag>
33
34
35
36 1.50 sci-geosciences/googleearth/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.50&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?rev=1.50&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/ChangeLog?r1=1.49&r2=1.50
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v
45 retrieving revision 1.49
46 retrieving revision 1.50
47 diff -u -r1.49 -r1.50
48 --- ChangeLog 21 Apr 2013 19:21:12 -0000 1.49
49 +++ ChangeLog 19 May 2013 14:14:09 -0000 1.50
50 @@ -1,6 +1,13 @@
51 # ChangeLog for sci-geosciences/googleearth
52 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.49 2013/04/21 19:21:12 mgorny Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.50 2013/05/19 14:14:09 hasufell Exp $
55 +
56 +*googleearth-7.1.1.1580 (19 May 2013)
57 +
58 + 19 May 2013; Julian Ospald <hasufell@g.o>
59 + +googleearth-7.1.1.1580.ebuild,
60 + +files/googleearth-7.1.1.1580-desktopfile.patch:
61 + version bump wrt #466910 thanks to Magnus Kessler for the patchelf hint
62
63 21 Apr 2013; Michał Górny <mgorny@g.o>
64 googleearth-5.1.3535.3218-r1.ebuild, googleearth-5.2.1.1588.ebuild,
65
66
67
68 1.1 sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild?rev=1.1&content-type=text/plain
72
73 Index: googleearth-7.1.1.1580.ebuild
74 ===================================================================
75 # Copyright 1999-2013 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.1.1.1580.ebuild,v 1.1 2013/05/19 14:14:09 hasufell Exp $
78
79 EAPI=5
80
81 inherit pax-utils eutils unpacker fdo-mime gnome2-utils
82
83 DESCRIPTION="A 3D interface to the planet"
84 HOMEPAGE="http://earth.google.com/"
85 # no upstream versioning, version determined from help/about
86 # incorrect digest means upstream bumped and thus needs version bump
87 SRC_URI="x86? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb
88 -> GoogleEarthLinux-${PV}_i386.deb )
89 amd64? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb
90 -> GoogleEarthLinux-${PV}_amd64.deb )"
91 LICENSE="googleearth GPL-2"
92 SLOT="0"
93 KEYWORDS="~amd64 ~x86"
94 RESTRICT="mirror splitdebug"
95 IUSE="bundled-libs"
96
97 QA_PREBUILT="*"
98
99 # TODO: find a way to unbundle libQt
100 # ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii
101
102 RDEPEND="
103 dev-libs/glib:2
104 dev-libs/nspr
105 media-libs/fontconfig
106 media-libs/freetype
107 net-misc/curl
108 sys-auth/nss-mdns
109 sys-devel/gcc[cxx]
110 sys-libs/zlib
111 virtual/glu
112 virtual/opengl
113 virtual/ttf-fonts
114 x11-libs/libICE
115 x11-libs/libSM
116 x11-libs/libX11
117 x11-libs/libXi
118 x11-libs/libXext
119 x11-libs/libXrender
120 x11-libs/libXau
121 x11-libs/libXdmcp
122 !bundled-libs? (
123 dev-db/sqlite:3
124 dev-libs/expat
125 dev-libs/nss
126 sci-libs/gdal
127 sci-libs/proj
128 )"
129 DEPEND="dev-util/patchelf"
130
131 S=${WORKDIR}/opt/google/earth/free
132
133 pkg_nofetch() {
134 einfo "Wrong checksum or file size means that Google silently replaced the distfile with a newer version."
135 einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
136 einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for googleearth first!)."
137 einfo "By redigesting the file yourself, you will install a different version than the ebuild says, untested!"
138 }
139
140 src_unpack() {
141 # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
142 unpack_deb GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb
143
144 if ! use bundled-libs ; then
145 einfo "removing bundled libs"
146 cd opt/google/earth/free || die
147 # sci-libs/gdal
148 rm -v libgdal.so.1 || die
149 # dev-db/sqlite
150 rm -v libsqlite3.so || die
151 # dev-libs/nss
152 rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \
153 libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \
154 libsoftokn3.so libssl3.so || die
155 # dev-libs/expat
156 rm -v libexpat.so.1 || die
157 # sci-libs/proj
158 rm -v libproj.so.0 || die
159 # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
160 # rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die
161 # rm -rv plugins/imageformats || die
162 fi
163 }
164
165 src_prepare() {
166 # we have no ld-lsb.so.3 symlink
167 # thanks to Nathan Phillip Brink <ohnobinki@××××××××××××××.net> for suggesting patchelf
168 einfo "running patchelf"
169 patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
170
171 # Set RPATH for preserve-libs handling (bug #265372).
172 local x
173 for x in * ; do
174 # Use \x7fELF header to separate ELF executables and libraries
175 [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
176 patchelf --set-rpath '$ORIGIN' "${x}" ||
177 die "patchelf failed on ${x}"
178 done
179 for x in plugins/imageformats/*.so ; do
180 [[ -f ${x} ]] || continue
181 patchelf --set-rpath /opt/${PN} "${x}" ||
182 die "patchelf failed on ${x}"
183 done
184
185 epatch "${FILESDIR}"/${P}-desktopfile.patch
186 }
187
188 src_install() {
189 make_wrapper ${PN} ./${PN} /opt/${PN} .
190
191 insinto /usr/share/mime/packages
192 doins "${FILESDIR}/${PN}-mimetypes.xml" || die
193
194 domenu google-earth.desktop
195
196 for size in 16 22 24 32 48 64 128 256 ; do
197 newicon -s ${size} product_logo_${size}.png google-earth.png
198 done
199
200 rm -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_*
201
202 insinto /opt/${PN}
203 doins -r *
204
205 fperms +x /opt/${PN}/${PN}{,-bin}
206 cd "${ED}" || die
207 find . -type f -name "*.so.*" -exec fperms +x '{}' +
208
209 pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
210 }
211
212 pkg_preinst() {
213 gnome2_icon_savelist
214 }
215
216 pkg_postinst() {
217 elog "When you get a crash starting Google Earth, try adding a file ~./config/Google/GoogleEarthPlus.conf"
218 elog "the following options:"
219 elog "lastTip = 4"
220 elog "enableTips = false"
221 elog ""
222 elog "In addition, the use of free video drivers may be problems associated with using the Mesa"
223 elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
224 elog "To select the 32bit graphic library use the command:"
225 elog " eselect mesa list"
226 elog "For example, for Radeon R300 (x86):"
227 elog " eselect mesa set r300 2"
228 elog "For Intel Q33 (amd64):"
229 elog " eselect mesa set 32bit i965 2"
230 elog "You may need to restart X afterwards"
231
232 fdo-mime_desktop_database_update
233 fdo-mime_mime_database_update
234 gnome2_icon_cache_update
235 }
236
237 pkg_postrm() {
238 fdo-mime_desktop_database_update
239 fdo-mime_mime_database_update
240 gnome2_icon_cache_update
241 }
Report Message
Find on MARC Find on Google Groups