sci-geosciences/gmapcatcher: migrate away from google code #544092

Package-Manager: portage-2.3.0

diff --git a/sci-geosciences/gmapcatcher/Manifest b/sci-geosciences/gmapcatcher/Manifest
index d55466b775ac69960b0c26b0faf685f23126f876..49785db9983504ecbd991e8f0a95d0473436435a 100644 (file)
--- a/sci-geosciences/gmapcatcher/Manifest
+++ b/sci-geosciences/gmapcatcher/Manifest
@@ -1 +1 @@
-DIST mapcatcher_0.8.0.4.tar.gz 441925 SHA256 9cc969e9c4fb7fe42e7afb33b5bf60a868c626e2ec957d3003daeecdaa1dae76 SHA512 9612df238fe2c723d4668a4587fbc2028b4c83e2d6372de4f03bf696a3900114a1b08352910c3ab2dc304eb694d2a5469441fbb35d9325750298c0cb02e40734 WHIRLPOOL 9bf330218c136a6d196ff7620e5983640114ecbbf98a611a1c19abe7faf93b1ee13fea0f09e7298f41c65ed08d79acab6e5aa95d11419a9c46e0524296a34839
+DIST gmapcatcher-0.8.0.4.tar.gz 3782763 SHA256 c08a8116c9be323801bb897474d0b312157d1e523658500ae85898a68abe72b1 SHA512 9ff11ca2c61f01090e7cd616c5fe0c4faf7fb1eb11962071601d87a7f84b309b25de36c82d713c1d08ffdb0f806c8fcccfc877ac7fc5eadf3d49625ce360d719 WHIRLPOOL 045c84b78421b9db48b697682b7b8b863480286a214cc81f72f2cffcb97c652c827d940a22c333c929a30eb88ec96fc806315c6a53290df56471de23c9950928

diff --git a/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch b/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
index 35efed02a322fb5d2db3015123a92d612e1da4d0..77383f1989920f666e9592688ff8899003f82745 100644 (file)
--- a/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
+++ b/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
@@ -1,14 +1,18 @@
 Drop docs from setup.py, distutils-r1 takes care of it.
+Handle the man pages in the ebuild because the tarball does not
+contain compressed man files.
 
---- setup.py.orig      2013-07-25 03:24:35.987668173 +0200
-+++ setup.py   2013-07-25 03:24:51.770668448 +0200
-@@ -13,8 +13,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -13,10 +13,7 @@
          description = 'Offline Map Viewer',
          version = VERSION,
          url = WEB_ADDRESS,
 -        data_files = [('share/doc/mapcatcher', ['README', 'changelog']),
 -                    ('share/applications', ['gmapcatcher.desktop']),
+-                    ('share/man/man1',
+-                        ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
 +        data_files = [('share/applications', ['gmapcatcher.desktop']),
-                     ('share/man/man1',
-                         ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
                      ('share/pixmaps', ['images/mapcatcher.png']),
+                     ('share/pixmaps/gmapcatcher',
+                     map(lambda(thestr): "images/" + thestr, os.listdir('images')))

diff --git a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
index 3ad9eb5b1aa82466bcb06f388a3f53694cdbc369..eb6de53565e9e65c4086b5b509a9949428268109 100644 (file)
--- a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
+++ b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
+inherit vcs-snapshot distutils-r1
 
+MY_COMMIT_HASH="b3156dc56d105bcab8a1123793dcc16b7f9f3a9a"
 DESCRIPTION="An offline viewer for different map providers"
-HOMEPAGE="https://code.google.com/p/gmapcatcher/"
-SRC_URI="https://gmapcatcher.googlecode.com/files/mapcatcher_${PV}.tar.gz"
+HOMEPAGE="https://github.com/heldersepu/GMapCatcher"
+SRC_URI="https://github.com/heldersepu/GMapCatcher/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,10 +24,19 @@ RDEPEND="x11-libs/gtk+:2
        dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/mapcatcher-${PV}
 PATCHES=("${FILESDIR}"/${P}-setuppy-docs.patch)
 
 src_prepare() {
+       # Move things around to make setup.py happy
+       mv installer/setup.py "${S}/" || die
+       mv maps.py mapcatcher || die
+       mv download.py mapdownloader || die
+       mv images/map.png images/mapcatcher.png || die
        sed -i -e "/Version=/d" -e "s/Application;//" gmapcatcher.desktop || die
        distutils-r1_src_prepare
 }
+
+src_install() {
+       distutils-r1_src_install
+       doman man/mapcatcher.1 man/mapdownloader.1
+}