sci-geosciences/gmapcatcher: remove conflicting ebuilds.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>

4 files changed, 5 insertions, 63 deletions

diff --git a/sci-geosciences/gmapcatcher/ChangeLog b/sci-geosciences/gmapcatcher/ChangeLog
new file mode 100644
index 0000000..53798f7
--- /dev/null
+++ b/sci-geosciences/gmapcatcher/ChangeLog
@@ -0,0 +1,3 @@
+  05 Feb 2021; AstroFloyd <AstroFloyd@gmail.com>
+  -files/gmapcatcher-0.8.0.4-setuppy-docs.patch, -gmapcatcher-0.8.0.4.ebuild:
+  sci-geosciences/gmapcatcher: remove conflicting ebuilds.
diff --git a/sci-geosciences/gmapcatcher/Manifest b/sci-geosciences/gmapcatcher/Manifest
index 8bbdbe8..1db4e24 100644
--- a/sci-geosciences/gmapcatcher/Manifest
+++ b/sci-geosciences/gmapcatcher/Manifest
@@ -1,4 +1,2 @@
-AUX gmapcatcher-0.8.0.4-setuppy-docs.patch 836 SHA256 840abad39048a17e00236290ce940066782bdd46536cac43337fe9244964cddf SHA512 784c5557839d975bb4bbe179f5585c330eee1f09739f91edee41498b6b2091a5a07a7492c926c1c874826bb1dc525f5253d8681facaa5a2f5b0cfe422f322ce2 WHIRLPOOL dbd2bcc999e75329c7e381b35f47cc600e052b2bfe5b8cc839cb14016c44d1b5a93a67802b79c3584ec7d195d0046d5589876630332087260d1d99e4b15501a1
-DIST gmapcatcher-0.8.0.4.tar.gz 3782763 SHA256 c08a8116c9be323801bb897474d0b312157d1e523658500ae85898a68abe72b1 SHA512 9ff11ca2c61f01090e7cd616c5fe0c4faf7fb1eb11962071601d87a7f84b309b25de36c82d713c1d08ffdb0f806c8fcccfc877ac7fc5eadf3d49625ce360d719 WHIRLPOOL 045c84b78421b9db48b697682b7b8b863480286a214cc81f72f2cffcb97c652c827d940a22c333c929a30eb88ec96fc806315c6a53290df56471de23c9950928
-EBUILD gmapcatcher-0.8.0.4.ebuild 1161 SHA256 68ed52e928b09313f4ed93b61816b623697e9bfb2337acbcfc01110a2b8dd916 SHA512 c821b0e058a1d1cb78eb153d59160e0bff0ffd4e008c5b94d4bcfd2a11b6b59f730639fcc222643b30522c8c6fb3f8cc9e3ae0b98b33337a17f6f1836adb6ae8 WHIRLPOOL 5d5466f285af6a10b771d82ba075c35c83936de92cff220a110511c3b15dc899585baf107cfc4a056843bb194132a596959f3e0ec64b0a2d748cc747032b0f32
-MISC metadata.xml 253 SHA256 002dfdeaaa53663f7512229bd2a28dbd77d8a7ed35a17bb7346905220934ee26 SHA512 a1c29277a89a78932d522342eb0cca76efb127dffdbd1ab26c2feadaa844d354ff0da3db4dbbf2a0ae1e3205752539b31fb461ec261e3097bdba4e900c0bf90e WHIRLPOOL 126ef3b46e66f959ef9a4ed1740fb40c97dad6605433ed2e1a9d48eb97aa163ead9496d117f1f030346868bca40e5362b3e1c9d6d765faa3763e95e9014003e3
+MISC ChangeLog 186 BLAKE2B cbd444568993dbc49d68db80b19e3776f14d9fa7d72c32776c18fd7084b5e6cf9c2324151fddd261eacfd87d6b237c88874f1ca0d210bf57409ced2ee3ff0834 SHA512 c1bf34335b599157169bb195eca45184cf8bec19414022428fd5425226ad16fa588a1b18ac90a28d2d1f7232dd7625cd52c51ae1bf046b08ee03ff8bba82cc29
+MISC metadata.xml 253 BLAKE2B 4bb1fad6cafe75d140edbd678a8509403506fcb43633000c955454bace6c845bb31023879bc01de9aec293f65d916d1daaeb049fb309a97744db84d4ddff3a06 SHA512 a1c29277a89a78932d522342eb0cca76efb127dffdbd1ab26c2feadaa844d354ff0da3db4dbbf2a0ae1e3205752539b31fb461ec261e3097bdba4e900c0bf90e
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
deleted file mode 100644
index 77383f1..0000000
--- a/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
-
---- 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/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
deleted file mode 100644
index de657af..0000000
--- a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit vcs-snapshot distutils-r1
-
-MY_COMMIT_HASH="b3156dc56d105bcab8a1123793dcc16b7f9f3a9a"
-DESCRIPTION="An offline viewer for different map providers"
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-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
-}