1 |
commit: f2699c5c3ed279c944584589473d73e07f441267 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 11 18:44:48 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 11 18:56:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2699c5c |
7 |
|
8 |
sci-geosciences/googleearth: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/624966 |
11 |
|
12 |
profiles/package.mask | 4 - |
13 |
sci-geosciences/googleearth/Manifest | 2 - |
14 |
.../files/googleearth-7-desktopfile.patch | 17 -- |
15 |
.../googleearth/files/googleearth-mimetypes.xml | 21 --- |
16 |
.../googleearth/googleearth-7.1.8.3036.ebuild | 174 --------------------- |
17 |
sci-geosciences/googleearth/metadata.xml | 10 -- |
18 |
6 files changed, 228 deletions(-) |
19 |
|
20 |
diff --git a/profiles/package.mask b/profiles/package.mask |
21 |
index 003c486bfba..6a34e2aacb6 100644 |
22 |
--- a/profiles/package.mask |
23 |
+++ b/profiles/package.mask |
24 |
@@ -416,10 +416,6 @@ dev-libs/DFB++ |
25 |
# (#601358). Removal in a month. |
26 |
x11-misc/tinymount |
27 |
|
28 |
-# Pacho Ramos <pacho@g.o> (26 Jul 2017) |
29 |
-# EOL, severely broken, impossible to bump (#624966). Removal in a month. |
30 |
-sci-geosciences/googleearth |
31 |
- |
32 |
# Kent Fredric <kentnl@g.o> (21 Jul 2017) |
33 |
# Masked due to serious regression that introduces widespread data |
34 |
# corruption when storing data in blobs. Masked, because any code |
35 |
|
36 |
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest |
37 |
deleted file mode 100644 |
38 |
index 17391443425..00000000000 |
39 |
--- a/sci-geosciences/googleearth/Manifest |
40 |
+++ /dev/null |
41 |
@@ -1,2 +0,0 @@ |
42 |
-DIST GoogleEarthLinux-7.1.8.3036_amd64.deb 45349754 SHA256 6612d107d271b7210399c23a631e88cf424bbd6744bedc265f855a5decbd9637 SHA512 4dd8c29247a85df903ef0e4552081f6b25abae5020ce3ce59277fa1ab566fa429a0e674674e844bf12fa9747a1becff3ad124f1325755771359ffadcbed1e9e2 WHIRLPOOL 6378a6a29e46ce8bfd937b45733bfe1530659a3374a8146e1d5dbb9e90b6afb4fe7989198c54034596735991b953acef4ad9ad65130635b318168cb79a5d0c00 |
43 |
-DIST GoogleEarthLinux-7.1.8.3036_i386.deb 44160280 SHA256 82028d65869f6f1e40e4e09764ea7db020ca467651722c6113eccd21735fcd3e SHA512 e28fa3bbd84fb5dc09c8a2e318274bebb04e6b272ca9d2df8a36835700ed20a33682d84d249fde8d7235bfaeff6c89cd5325518528931e4cff2117cca842add3 WHIRLPOOL 487ecba9ff8528515f66c96f01b5aad621065c672516eabe6f21de3a0f2c2273b44da3ccd75b0684469d4155023630c7e3cdf8da8b128c00939fa1350ecf12af |
44 |
|
45 |
diff --git a/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch b/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch |
46 |
deleted file mode 100644 |
47 |
index 0de8b589b77..00000000000 |
48 |
--- a/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch |
49 |
+++ /dev/null |
50 |
@@ -1,17 +0,0 @@ |
51 |
---- google-earth.desktop |
52 |
-+++ google-earth.desktop |
53 |
-@@ -3,10 +3,10 @@ |
54 |
- Name=Google Earth |
55 |
- GenericName=3D planet viewer |
56 |
- Comment=Explore, search and discover the planet |
57 |
--Exec=/opt/google/earth/free/google-earth %f |
58 |
-+Exec=/opt/googleearth/googleearth %f |
59 |
- Terminal=false |
60 |
--MultipleArgs=false |
61 |
-+X-MultipleArgs=false |
62 |
- Icon=google-earth |
63 |
- Type=Application |
64 |
--Categories=Application;Network |
65 |
--MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole |
66 |
-+Categories=Network; |
67 |
-+MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole; |
68 |
|
69 |
diff --git a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml |
70 |
deleted file mode 100644 |
71 |
index 3ecfa97cdae..00000000000 |
72 |
--- a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml |
73 |
+++ /dev/null |
74 |
@@ -1,21 +0,0 @@ |
75 |
-<?xml version="1.0"?> |
76 |
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> |
77 |
- <mime-type type="application/vnd.google-earth.kml+xml"> |
78 |
- <comment>Keyhole Markup Language data</comment> |
79 |
- <glob pattern="*.kml"/> |
80 |
- </mime-type> |
81 |
- |
82 |
- <mime-type type="application/vnd.google-earth.kmz"> |
83 |
- <comment>Keyhole Markup Language archive</comment> |
84 |
- <glob pattern="*.kmz"/> |
85 |
- </mime-type> |
86 |
- |
87 |
- <mime-type type="application/keyhole"> |
88 |
- <comment>Keyhole Markup Language data</comment> |
89 |
- </mime-type> |
90 |
- |
91 |
- <mime-type type="application/earthviewer"> |
92 |
- <comment>Keyhole Markup Language data</comment> |
93 |
- </mime-type> |
94 |
-</mime-info> |
95 |
- |
96 |
|
97 |
diff --git a/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild b/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild |
98 |
deleted file mode 100644 |
99 |
index 74329abbc43..00000000000 |
100 |
--- a/sci-geosciences/googleearth/googleearth-7.1.8.3036.ebuild |
101 |
+++ /dev/null |
102 |
@@ -1,174 +0,0 @@ |
103 |
-# Copyright 1999-2017 Gentoo Foundation |
104 |
-# Distributed under the terms of the GNU General Public License v2 |
105 |
- |
106 |
-EAPI=5 |
107 |
- |
108 |
-inherit pax-utils eutils unpacker fdo-mime gnome2-utils |
109 |
- |
110 |
-DESCRIPTION="A 3D interface to the planet" |
111 |
-HOMEPAGE="https://earth.google.com/" |
112 |
-# no upstream versioning, version determined from help/about |
113 |
-# incorrect digest means upstream bumped and thus needs version bump |
114 |
-SRC_URI="x86? ( https://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb |
115 |
- -> GoogleEarthLinux-${PV}_i386.deb ) |
116 |
- amd64? ( https://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb |
117 |
- -> GoogleEarthLinux-${PV}_amd64.deb )" |
118 |
-LICENSE="googleearth GPL-2" |
119 |
-SLOT="0" |
120 |
-KEYWORDS="~amd64 ~x86" |
121 |
-RESTRICT="mirror splitdebug" |
122 |
-IUSE="+bundled-libs" |
123 |
- |
124 |
-QA_PREBUILT="*" |
125 |
- |
126 |
-# TODO: find a way to unbundle libQt |
127 |
-# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii |
128 |
- |
129 |
-RDEPEND=" |
130 |
- dev-libs/glib:2 |
131 |
- dev-libs/nspr |
132 |
- media-libs/fontconfig |
133 |
- media-libs/freetype |
134 |
- net-misc/curl |
135 |
- sys-devel/gcc[cxx] |
136 |
- sys-libs/zlib |
137 |
- virtual/glu |
138 |
- virtual/opengl |
139 |
- virtual/ttf-fonts |
140 |
- x11-libs/libICE |
141 |
- x11-libs/libSM |
142 |
- x11-libs/libX11 |
143 |
- x11-libs/libXi |
144 |
- x11-libs/libXext |
145 |
- x11-libs/libXrender |
146 |
- x11-libs/libXau |
147 |
- x11-libs/libXdmcp |
148 |
- !bundled-libs? ( |
149 |
- dev-db/sqlite:3 |
150 |
- dev-libs/expat |
151 |
- dev-libs/nss |
152 |
- sci-libs/gdal |
153 |
- sci-libs/proj |
154 |
- )" |
155 |
-DEPEND="dev-util/patchelf" |
156 |
- |
157 |
-S=${WORKDIR}/opt/google/earth/free |
158 |
- |
159 |
-pkg_nofetch() { |
160 |
- einfo "Wrong checksum or file size means that Google silently replaced the distfile with a newer version." |
161 |
- einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump." |
162 |
- einfo "Please file a version bump bug on https://bugs.gentoo.org (search existing bugs for googleearth first!)." |
163 |
- einfo "By redigesting the file yourself, you will install a different version than the ebuild says, untested!" |
164 |
-} |
165 |
- |
166 |
-src_unpack() { |
167 |
- # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well |
168 |
- unpack_deb GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb |
169 |
- |
170 |
- if ! use bundled-libs ; then |
171 |
- einfo "removing bundled libs" |
172 |
- cd opt/google/earth/free || die |
173 |
- # sci-libs/gdal |
174 |
- rm -v libgdal.so.1 || die |
175 |
- # dev-db/sqlite |
176 |
- rm -v libsqlite3.so || die |
177 |
- # dev-libs/nss |
178 |
- rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \ |
179 |
- libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \ |
180 |
- libsoftokn3.so libssl3.so || die |
181 |
- # dev-libs/expat |
182 |
- rm -v libexpat.so.1 || die |
183 |
- # sci-libs/proj |
184 |
- rm -v libproj.so.0 || die |
185 |
- # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 |
186 |
-# rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die |
187 |
-# rm -rv plugins/imageformats || die |
188 |
- fi |
189 |
-} |
190 |
- |
191 |
-src_prepare() { |
192 |
- |
193 |
- # we have no ld-lsb.so.3 symlink |
194 |
- # thanks to Nathan Phillip Brink <ohnobinki@××××××××××××××.net> for suggesting patchelf |
195 |
- einfo "running patchelf" |
196 |
- patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed" |
197 |
- |
198 |
- # Set RPATH for preserve-libs handling (bug #265372). |
199 |
- local x |
200 |
- for x in * ; do |
201 |
- # Use \x7fELF header to separate ELF executables and libraries |
202 |
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue |
203 |
- fperms u+w "${x}" |
204 |
- patchelf --set-rpath '$ORIGIN' "${x}" || |
205 |
- die "patchelf failed on ${x}" |
206 |
- done |
207 |
- # prepare file permissions so that >patchelf-0.8 can work on the files |
208 |
- fperms u+w plugins/*.so plugins/imageformats/*.so |
209 |
- for x in plugins/*.so ; do |
210 |
- [[ -f ${x} ]] || continue |
211 |
- patchelf --set-rpath '$ORIGIN/..' "${x}" || |
212 |
- die "patchelf failed on ${x}" |
213 |
- done |
214 |
- for x in plugins/imageformats/*.so ; do |
215 |
- [[ -f ${x} ]] || continue |
216 |
- patchelf --set-rpath '$ORIGIN/../..' "${x}" || |
217 |
- die "patchelf failed on ${x}" |
218 |
- done |
219 |
- |
220 |
- epatch "${FILESDIR}"/${PN}-${PV%%.*}-desktopfile.patch |
221 |
-} |
222 |
- |
223 |
-src_install() { |
224 |
- make_wrapper ${PN} ./${PN} /opt/${PN} . |
225 |
- |
226 |
- insinto /usr/share/mime/packages |
227 |
- doins "${FILESDIR}/${PN}-mimetypes.xml" || die |
228 |
- |
229 |
- domenu google-earth.desktop |
230 |
- |
231 |
- for size in 16 22 24 32 48 64 128 256 ; do |
232 |
- newicon -s ${size} product_logo_${size}.png google-earth.png |
233 |
- done |
234 |
- |
235 |
- rm -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_* |
236 |
- |
237 |
- insinto /opt/${PN} |
238 |
- doins -r * |
239 |
- |
240 |
- fperms +x /opt/${PN}/${PN}{,-bin} |
241 |
- cd "${ED}" || die |
242 |
- find . -type f -name "*.so.*" -exec fperms +x '{}' + |
243 |
- |
244 |
- pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin |
245 |
-} |
246 |
- |
247 |
-pkg_preinst() { |
248 |
- gnome2_icon_savelist |
249 |
-} |
250 |
- |
251 |
-pkg_postinst() { |
252 |
- elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf" |
253 |
- elog "with the following options:" |
254 |
- elog "lastTip = 4" |
255 |
- elog "enableTips = false" |
256 |
- elog "" |
257 |
- elog "In addition, the use of free video drivers may cause problems associated with using the Mesa" |
258 |
- elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant." |
259 |
- elog "To select the 32bit graphic library use the command:" |
260 |
- elog " eselect mesa list" |
261 |
- elog "For example, for Radeon R300 (x86):" |
262 |
- elog " eselect mesa set r300 2" |
263 |
- elog "For Intel Q33 (amd64):" |
264 |
- elog " eselect mesa set 32bit i965 2" |
265 |
- elog "You may need to restart X afterwards" |
266 |
- |
267 |
- fdo-mime_desktop_database_update |
268 |
- fdo-mime_mime_database_update |
269 |
- gnome2_icon_cache_update |
270 |
-} |
271 |
- |
272 |
-pkg_postrm() { |
273 |
- fdo-mime_desktop_database_update |
274 |
- fdo-mime_mime_database_update |
275 |
- gnome2_icon_cache_update |
276 |
-} |
277 |
|
278 |
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml |
279 |
deleted file mode 100644 |
280 |
index 813f0412313..00000000000 |
281 |
--- a/sci-geosciences/googleearth/metadata.xml |
282 |
+++ /dev/null |
283 |
@@ -1,10 +0,0 @@ |
284 |
-<?xml version="1.0" encoding="UTF-8"?> |
285 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
286 |
-<pkgmetadata> |
287 |
- <maintainer type="person"> |
288 |
- <email>mschiff@g.o</email> |
289 |
- </maintainer> |
290 |
- <use> |
291 |
- <flag name="bundled-libs">Use bundled libraries.</flag> |
292 |
- </use> |
293 |
-</pkgmetadata> |