summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2016-08-15 09:23:08 +0200
committerMarek Szuba <marecki@gentoo.org>2016-08-15 09:39:01 +0200
commita3b2d190daabf9f1e3cf33227772f9b92f27daf4 (patch)
treea3dd58d264dbfd7978c014defd30b38099617657 /sci-geosciences
parentRevert "sci-geosciences/osm-gps-map: add myself as primary maintainer." (diff)
downloadgentoo-a3b2d190daabf9f1e3cf33227772f9b92f27daf4.tar.gz
gentoo-a3b2d190daabf9f1e3cf33227772f9b92f27daf4.tar.bz2
gentoo-a3b2d190daabf9f1e3cf33227772f9b92f27daf4.zip
Revert "sci-geosciences/osm-gps-map: add ebuild for version 1.1.0"
Unfortunately in spite of the upstream statement that 0.7.3 and 1.0.0+ can be installed in parallel there are several file collisions between the two versions, some of which (notably introspection support) are not trivial to fix on our end. Filing an upstream bug report, hopefully the next release will not require jumping through so many hoops. This reverts commit f84d5f38689d291273eab2a3d735f07711eecde9.
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/osm-gps-map/Manifest1
-rw-r--r--sci-geosciences/osm-gps-map/files/osm-gps-map-1.1.0-no-maintainer-mode.patch30
-rw-r--r--sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild40
3 files changed, 0 insertions, 71 deletions
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index de5fcd168a36..17f3169c4b93 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,3 +1,2 @@
DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
-DIST osm-gps-map-1.1.0.tar.gz 440480 SHA256 8f2ff865ed9ed9786cc5373c37b341b876958416139d0065ebb785cf88d33586 SHA512 74924e5caa0b2bac822f678236d94203b34d9af1dce24cfcd44e1fb9f7551558137dd02b35ca970e36472748acfd611c6251ff5c52d998bfaffccb9821cc0fe0 WHIRLPOOL 1fa49ec60bc999fdd3f03171f2383528975590938f63128bfa4aac9cd23e2f0d9085ab0574bba7cf06227e42b8b982463417af80a7b09f2f7be228adf279e3f6
DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-1.1.0-no-maintainer-mode.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-1.1.0-no-maintainer-mode.patch
deleted file mode 100644
index 2120fb6d2738..000000000000
--- a/sci-geosciences/osm-gps-map/files/osm-gps-map-1.1.0-no-maintainer-mode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile.am 2015-11-19 22:49:55.000000000 +0000
-+++ b/Makefile.am 2016-08-10 21:25:53.154107223 +0000
-@@ -18,27 +18,3 @@
-
- DISTCLEANFILES = gtk-doc.make
-
--# ChangeLog generation from nautils
--distclean-local:
-- if test "$(srcdir)" = "."; then :; else \
-- rm -f ChangeLog; \
-- fi
--
--ChangeLog:
-- $(AM_V_GEN)if test -d "$(srcdir)/.git"; then \
-- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.3.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
-- && mv -f $@.tmp $@ \
-- || ($(RM) $@.tmp; \
-- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-- (test -f $@ || echo git-log is required to generate this file >> $@)); \
-- else \
-- test -f $@ || \
-- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-- echo A git checkout and git-log is required to generate this file >> $@); \
-- fi
--
--release: dist
-- scp @PACKAGE@-@VERSION@.tar.gz root@greenbirdsystems.com:/var/www/johnstowers.co.nz/files/osm-gps-map/
--
--.PHONY: ChangeLog
--
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
deleted file mode 100644
index bf30899bd182..000000000000
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A GTK+ viewer for OpenStreetMap files"
-HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
-SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-RDEPEND="
- >=dev-libs/glib-2.16.0:2
- >=net-libs/libsoup-2.4.0:2.4
- >=x11-libs/cairo-1.8.0
- >=x11-libs/gtk+-3.0:3[introspection]
- dev-libs/gobject-introspection"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-maintainer-mode.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}