Revert "sci-geosciences/osm-gps-map: remove package, updated in main tree"

This reverts commit 2566bce2242fcfc0b4b3d2059812919c1a34edcd.

8 files changed, 221 insertions, 0 deletions

diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
new file mode 100644
index 0000000..4db946f
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -0,0 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX osm-gps-map-0.7.3-disable-compiler-warnings.patch 398 SHA256 9f0858eec24f06217b20cad8132a347a32ba643ab65d275fdc79a585ca2d4200 SHA512 2af14a5592741b7336ba7a402f723ae0c9b500fc0873e3d475554c59477cc4fe4af5edcefd752060af952223506b465e67da9c7ecd59a7b42f29d0c854a5a885 WHIRLPOOL dd207b4fce7ab600ae4479b62b0078e21db9e2bf21bd9839511e03f7c6635ea8df58737cccc69dbe19233c8c3657bc1ec2b99110663bac80e40e9d87675634a4
+AUX osm-gps-map-0.7.3-fix-docs-location.patch 505 SHA256 0de28ae847e521da9b92f021761ec8c3e9de7c092b00e64e18c36cb4a908b2cd SHA512 48c3aae2881a28173336e46883234a5178184fe5f014506038ab7cfb422ad8f5e750148647430cc13427865539223909621ed599618e253c66d0f95e9cd6a5c2 WHIRLPOOL f7ceadd5c701b891185f4a949a27f00f65bde55e72827010eb5b380c361f5bff17e3479c2327f063c2819426b13434bf41c59cc67cc78dc32381faa69fa60286
+AUX osm-gps-map-0.7.3-fix-introspection.patch 405 SHA256 dfc9112c028f29ee6c5914479649c3b9db74bf66dfef49ca4c9269f532b761aa SHA512 066cd78ab4ea91d976e4379659f606844e468960a43176432ff0d30df159313cf0cdd4dca988dccfa9801427c32128e6ec73cc60d7cf26693a997c3942a5dc70 WHIRLPOOL d9d7e1b3c3d747faf9607a098d05ffb56e570bf932e74b5b7fb05be9e58b016a8f60cb044dd6ccb914c71898a58a80deea7af39246237bb3eac0c121a557dd8c
+AUX osm-gps-map-0.7.3-fix-python-setup.py.patch 715 SHA256 dbac7652fa11ccd3e8be8aa5e9822e08f9005abb7f3e7097852f607448ec79bb SHA512 d88aeb9e986d5fe547035f35b17e6f4dd117862a85581a839cb6b602c4fdf9c957c7c18a54a1ece015c85036cb0941e952d773f23b8f487755b37100c0f82185 WHIRLPOOL d947ba51cfdc80d975b61bfa2e1a1d729df324622014c0edb2e3f87085c984a81ef96d10434dc9d1503e506f06205f94bd6039244f5b003abd82122146a8ed07
+DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
+DIST osm-gps-map-1.0.2.tar.gz 431981 SHA256 7db73b83423bdc2168e89b3f1d2868af42b554de7fde02c4278fd2b006ac2a9f SHA512 afcbc968e48adb08fb3c38b7c6f2c27fc5e8d3b4253ca60f35d4bd3f673369f60f5e5701196bb4c522959eb2ea09ec97e8b76356c8ca833d0dd3584ecc8fdea1 WHIRLPOOL df5630cd4ea42b6cd604ab36b40068c741bb426429b354695e34666c77ac2a40407150356eb87e4ea3d7374ea5ad8e00bd05d4f63d2ccd6a5d2eb8991df22839
+DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
+EBUILD osm-gps-map-0.7.3-r1.ebuild 1947 SHA256 cfa3fc3f955c5b43d4e474fba4f5775b7519c215d19f9389caf36b96f0f45451 SHA512 8fb28675ea45f973c9e94ce7ff6074c438344911749754062b9953f892f8ff5305744b361101ed4ff44b1ba7c8543017a76471c323dfbd096056d639327744b4 WHIRLPOOL 3358de40de7e1a0b0bb151b2919fdd381bf7f7a84bd662f6632d19cf8171ebe0a204d815e1b43c771af953c8cee55acc02a88af9f9d0796b86aab79600fd63bc
+EBUILD osm-gps-map-1.0.2.ebuild 1109 SHA256 0b772ded886ab0b9d2d79628d84c5b4c2bebc4d4fda749ea4a5c36793f412f59 SHA512 db42f75959e106cce9511684abb8516d07b60b3067969d2dcad4dae988496075318dc87367635dd51ec88ab644a0dc1733f46582f7247b8fbb67b4bd12d4ddde WHIRLPOOL 9af19de84bd97ac5bc659cde41c29f62851c899d6dd24db37aae14de00c2f0068969c9bc873929d2366aadb4fa472b1889586ccfc179e567f7c5d82fc7f21c6c
+MISC metadata.xml 329 SHA256 4089fd65b95cd058ba948769047ef65c81498fad3b699e90a582dfc82d797ee7 SHA512 596756fc41694ba8c0159c45e397cca149a4f5fa28d7ad11799949a531d0a0f67e00398411cbb78b03455b24722440d9c3ef96487f0dfe37665ec8b24db313ba WHIRLPOOL 2a91ffb06c283a5d64e0690043d0a88888e10099a51357ada2565b93b52102cbabf044c9321d604b8fb2c6d915338b76bc7a76e3f35ed82a53d3e9bd58f4ba87
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQJ8BAEBCABmBQJW2J9oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8hFsP/Rnj/4HcGrIu1I1rAUpqHYqm
+Q3vlv5JQx9QnbqkGJeCIYKyo9fubBUXZrSYpjpU70IEG9mHvnK+STXpXeL1ttNVU
+MneDUxI005tclR/Z3UkmcV5ClOHcT5SoByx4gzJ19Ou/tD2LK5zxzRdTGraTyIWW
+kiDlb1bOd4ht5VsDb6fZq/FIvs4otXjPeZCDKOmnyf9URV0F93eN3mO0z0G/bS9W
+L58e0sKCe+/vX0jIZlLzWCP3x5h7+/9z3cYMlJko+iGNiyLbW7EQmLD7tX8g7FD9
+sk8oBCEJW2/NE9RjI9YElBIfLeeR1Tf+YMZAY1W/iXgrPqdaMbYKkPcKhBDrz7/C
+3hW73KUrXfkyBfnq2uHtvI4lcOBubaEYkW6kuXSCJBsqGhY/LBSr8k5pgHVibc++
+bKUm2vBSFWWpVW6ldo0IGjhnD2O/7PFXYXA+W0f3wSkvabYbmEeb50FIptZOiGq1
+yxZeHz6RdDLA6AU5qs4FIgZpO1EEGyHLgxRow2J45Swc8ISv6uyLo6i7zOvxlAjb
++eW5r+bVvufmiEaVI9mEybWNk/sJs+0brWYo4Obf/cDcRazDZzc9NkiqmKOg9CAa
+wF7rhu7/BvnLLI93+dkxHNtnjpPWtuiNV71Oa8sblD1lfeVSPjvogp2LuNfcfaVA
+ybpb9raFi/NEN/OAc3kk
+=DkGG
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch
new file mode 100644
index 0000000..a91e091
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur osm-gps-map-0.7.3/configure.ac osm-gps-map-0.7.3-new/configure.ac
+--- osm-gps-map-0.7.3/configure.ac	2011-03-19 10:55:04.000000000 +0000
++++ osm-gps-map-0.7.3-new/configure.ac	2011-10-20 22:55:59.392575220 +0000
+@@ -62,7 +62,7 @@
+ 
+ GOBJECT_INTROSPECTION_CHECK([0.6.7])
+ 
+-GNOME_COMPILE_WARNINGS([maximum])
++#GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_MAINTAINER_MODE_DEFINES
+ 
+ AC_OUTPUT([
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch
new file mode 100644
index 0000000..1748c16
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch
@@ -0,0 +1,12 @@
+diff -urN osm-gps-map-0.7.3-old/Makefile.am osm-gps-map-0.7.3/Makefile.am
+--- osm-gps-map-0.7.3-old/Makefile.am	2011-06-16 12:03:29.562435752 +0000
++++ osm-gps-map-0.7.3/Makefile.am	2011-06-16 12:03:58.535612125 +0000
+@@ -7,7 +7,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-osm_gps_mapdocdir = ${prefix}/doc/osm-gps-map
++osm_gps_mapdocdir = ${docdir}
+ osm_gps_mapdoc_DATA =                           \
+ 	README                                      \
+ 	COPYING                                     \
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
new file mode 100644
index 0000000..350876c
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.am	2011-03-19 10:08:23.000000000 +0300
++++ src/Makefile.am	2013-04-02 23:13:01.408952029 +0400
+@@ -86,6 +86,7 @@
+ OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
+ OsmGpsMap_1_0_gir_LIBS = libosmgpsmap.la
+ OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
++OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
+ INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
+ 
+ girdir = $(datadir)/gir-1.0
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
new file mode 100644
index 0000000..f6287bf
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
@@ -0,0 +1,15 @@
+--- setup.py	2011-03-19 10:08:23.000000000 +0300
++++ setup.py	2013-04-02 23:35:01.469947224 +0400
+@@ -21,9 +21,9 @@
+ 
+ _osmgpsmap = Extension(name = 'osmgpsmap',
+             sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
+-            include_dirs = get_include('osmgpsmap pygobject-2.0'),
+-            library_dirs = get_lib_dirs('osmgpsmap pygobject-2.0'),
+-            libraries = get_libs('osmgpsmap pygobject-2.0'),
++            include_dirs = get_include('gtk+-2.0 pygobject-2.0'),
++            library_dirs = get_lib_dirs('gtk+-2.0 pygobject-2.0'),
++            libraries = get_libs('gtk+-2.0 pygobject-2.0') + ["osmgpsmap"],
+             define_macros = [('VERSION', '"""%s"""' % VERSION)],
+             )
+ 
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
new file mode 100644
index 0000000..58a20a4
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>bman@gentoo.org</email>
+    <name>Aaron Bauman</name>
+  </maintainer>
+  <longdescription lang="en">
+    A gtk+ viewer for OpenStreetMap files.
+  </longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild
new file mode 100644
index 0000000..f9317f2
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit eutils autotools gnome2 distutils-r1
+
+DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
+HOMEPAGE="https://nzjrs.github.com/osm-gps-map/"
+SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
+python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0/2.0.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.16.0:2
+	>=net-libs/libsoup-2.4.0:2.4
+	>=x11-libs/cairo-1.6.0
+	>=x11-libs/gtk+-2.14.0:2[introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	introspection? ( dev-libs/gobject-introspection )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	gnome-base/gnome-common:3
+	virtual/pkgconfig"
+
+PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
+
+src_configure() {
+	# Configure script does not accept quoted EPREFIX...
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-fast-install \
+		--disable-static
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
+		"${FILESDIR}/${P}-fix-introspection.patch"
+	sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \
+		docs/reference/Makefile.am || die
+	eautoreconf
+
+	gnome2_src_prepare
+
+	if use python ; then
+		cd "${PYTHON_S}" || die
+		epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
+	fi
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	if use python ; then
+		cd "${PYTHON_S}" || die
+		CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python ; then
+		cd "${PYTHON_S}" || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild
new file mode 100644
index 0000000..7c2f171
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils gnome2
+
+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="1/0.0.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+REQUIRED_USE="introspection"
+
+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}
+	dev-util/gtk-doc-am
+	gnome-base/gnome-common:3
+	virtual/pkgconfig
+	!<sci-geosciences/osm-gps-map-0.7.3"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.7.3-fix-docs-location.patch"
+	sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \
+		docs/reference/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Configure script does not accept quoted EPREFIX...
+	gnome2_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-fast-install \
+		--disable-static
+}