Created attachment 511660 [details] ebuild for googleearth-7.1.8.3036 under the new pro release scheme Hello all, sci-geosciences/googleearth has been removed from the tree per https://bugs.gentoo.org/624966 back in September, but I believe this was based on some incorrect assumptions since the standalone desktop client for Google Earth is still very much alive - although it was moved to a new URL: https://www.google.com/earth/desktop/ What seems to have happened is that Google has decided to get rid of their separate "Google Earth Free" and "Google Earth Pro" releases, only packaging the Pro release as of version 7.3.0. The Pro version no longer requires a license key for versions >7.1.5 as described on: https://support.google.com/earth/answer/168344 The migration to the new release system has resulted in a change of the path within the data.tar.xz file from /opt/google/earth/free to /opt/google/earth/pro. Secondly, certain occurrences of google-earth were renamed to google-earth-pro, one of the impacted files was google-earth.desktop which meant that the googleearth-7-desktopfile.patch which was called in the last Gentoo-tree ebuild for this package no longer worked. Moreover, I've been able to deduct from the link to Google's KB which I posted earlier that one can actually download specific distfile versions from the official distributor. For example, the (older) Google Earth Free 7.1.8.3036 distfiles which were used in the pre-lastrite Manifest can be grabbed via the following links: https://dl.google.com/dl/earth/client/GE7/release_7_1_8/google-earth-stable_7.1.8.3036-r0_i386.deb https://dl.google.com/dl/earth/client/GE7/release_7_1_8/google-earth-stable_7.1.8.3036-r0_amd64.deb You can save these files in your distfiles with the correct names, and then grab the pre-lastrite ebuild plus corresponding files from git to perform the install: https://gitweb.gentoo.org/repo/sync/gentoo.git/tree/sci-geosciences/googleearth?id=9edc40c0996128996fe0892b8d9c2b207fe2afa3 Moving on to Google Earth Pro which appears to be "the future", the latest release which I have managed to install is the 7.3.0.3832 version. Unfortunately I couldn't actually use this release on my current system due to an incompatibility with the Intel graphics driver that I rely on, it should work better for systems with proprietary NVIDIA/AMD drivers - I'll be able to test that next week: https://productforums.google.com/d/msg/maps/KiKcrMywjWU/7yNfg4eCCQAJ Google Earth Pro 7.1.8.3036 both installed and functioned properly on my Intel graphics system and therefore, if at all possible, I would like to see both the 7.1.8.3036 and 7.3.0.3832 versions back in the tree. I don't personally have experience as a maintainer, but would be willing to learn if no one else (such as the previous maintainer) is available to take care of the package. I have attached the files from my local repository for your review, having made the following changes to the original files that I could pull from git: - Modified the HOMEPAGE variable to https://www.google.com/earth/desktop/ - Used the versionator eclass to define a $MY_PV which makes the SRC_URI fully dynamic, targeting a specific version of the package. This means we should no longer have broken ebuilds as a result of silent version bumps to the "current" release. - One can now version bump googleearth-7.1.8.3036.ebuild into googleearth-7.3.0.3832.ebuild by solely modifying the filename and running "repoman manifest", which is why I haven't attached ebuilds for both versions. - Modified googleearth-7-desktopfile.patch and renamed it to googleearth-7-pro-desktopfile.patch to account for the change/upgrade to Google Earth Pro. - Renamed a few occurrences of google-earth into google-earth-pro within the ebuild itself to account for the change/upgrade to Google Earth Pro. - Updated the Manifest to account for the new Google Earth Pro checksum on the distfiles. Some special attention for the following items: - One of the changes for the 7.3 branch versus the 7.1 branch is that Qt5 libraries are now used rather than Qt4 libraries. I'm personally on a USE=bundled-libs install, but those who are trying to use the system libraries may want to pay special attention. - The src_install phase errors out on the "doins "${FILESDIR}/${PN}-mimetypes.xml" || die" section of the ebuild if I have my TMPDIR on a tmpfs. One could temporarily umount the TMPDIR or work around the issue with the following instructions: https://wiki.gentoo.org/wiki/Portage_TMPDIR_on_tmpfs#Per-package_choices_at_compile_time
Created attachment 511662 [details, diff] modified desktopfile patch to account for the new pro release scheme
Created attachment 511664 [details] original googleearth-mimetypes.xml to be installed into filesdir
Created attachment 511666 [details] googleearth-7.1.8.3036.ebuild
Created attachment 511668 [details, diff] googleearth-7-pro-desktopfile.patch
Created attachment 511670 [details] googleearth-mimetypes.xml
Created attachment 511672 [details] metadata.xml
Created attachment 511674 [details] Manifest
Created attachment 511950 [details] googlearth-7.1.8.3036.ebuild The original ebuild (from the gentoo repository) needs some updates which are fixed in the attached ebuild: 1. /lib/ld-linux-x86-64.so.2 does not exist in amd64/17.1 profile: /$(get_libdir)/ld-linux-x86-64.so.2 should be used instead, see bug 642574 2. Update the ebuild to EAPI=6 3. Do not rely on eutils.eclass inheriting desktop.eclass 4. gdal-1 is no longer in the gentoo repository, hence cannot be unbundled 5. Now that upstream has versioned tarballs, there is no need to rename the tarballs locally -> keep upstream names
(In reply to Martin Väth from comment #8) > Created attachment 511950 [details] > googlearth-7.1.8.3036.ebuild > > The original ebuild (from the gentoo repository) needs some updates which > are fixed in the attached ebuild: Thanks Martin, your ebuild appears to be better than mine so I have obsoleted the previous one. Should we also get rid of the pkg_nofetch() messages now that we don't have to grab the "current" release from the upstream anymore? Or just replace it with a shorter message such as the following? "Note that Gentoo cannot mirror the distfiles due to license reasons."
I am not sure how reliably google will actually increase the version in case of trivial changes. If you think that it is safe, it can be removed completely. I would not keep not a shorter version. BTW, in the moment I maintain a current version (including googleearth-7.3.0.3832) in the mv overlay.
Created attachment 512058 [details] googlearth-7.1.8.3036.ebuild Update of ebuild: Use xdm-utils.eclass instead of obsolete fdo-mime.eclass. Remove nofetch message
Thank you for your contribution. I had a short look on the ebuild. Here a few ideas: • Please test the ebuild with repoman full -x https://wiki.gentoo.org/wiki/Repoman • Please introduce local variables with "local" • Please remember to update the header, while at it • Please remove obsolete attachments • Please check, if you really need eutils here Do you want to (proxy) maintain it?
Created attachment 513144 [details] googleearth-7.1.8.3036.ebuild
(In reply to Jonas Stein from comment #12) > Do you want to (proxy) maintain it? I suppose you mean both Martijn and me (whoever is volunteering…) Due to my past (and again recent) experience with mgorny, I will not proxy-maintain anything. In the moment, I keep and update the ebuilds in the mv overlay. (As mentioned, there is already an ebuild for the differently bundled googleearth-7.3.0…3832). Feel free to pick from there whatever you want, but I will not be a proxy-maintainer. > I had a short look on the ebuild. I actually did not look at it so carefully, because it was previously in the tree. So I had expected that it was written carefully and only checked what changes of portage/eclassed happened since its removal. > • Please test the ebuild with repoman full -x This was tested in the moment when I put it in the mv overlay (before I posted the second version). > • Please introduce local variables with "local" Surprisingly, this was indeed forgotten for "size" already in the original ebuild. > • Please remember to update the header, while at it Thanks for the reminder. BTW, happy new year! > • Please remove obsolete attachments I am always hesitating to mark attachments as obsolete, because then it is impossible to check the changes. > • Please check, if you really need eutils here I had already done so: It is needed because of make_wrapper. Anyway, I had overlooked that "epatch" should be replaced by "eapply -p0" now that the ebuild is EAPI=6.
Hi, shall I use the ebuikld from pg_overlay or from mv_overlay or funtoo or multilib-poratge as of now? Thank you https://gpo.zugaina.org/sci-geosciences/googleearth
Shouldn't sci-geosciences/googleearth be renamed to sci-geosciences/googleearth-bin actually? BTW, is https://github.com/google/earthenterprise doing same thing?
It's been a long time since googleearth was available in the main tree, it is missed, badly.
SO badly !
Please bring Google Earth Pro back please! Merry Christmas!
