Gentoo Archives: gentoo-commits

From: Markus Meier <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/maekke:master commit in: sci-geosciences/osm-gps-map/files/, sci-geosciences/osm-gps-map/
Date: Tue, 30 Aug 2016 19:57:43
Message-Id: 1472587009.ff676d7caec6e99a9ed4e320d66b856dc67e31c0.maekke@gentoo
1 commit: ff676d7caec6e99a9ed4e320d66b856dc67e31c0
2 Author: Markus Meier <maekke <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 19:56:49 2016 +0000
4 Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 19:56:49 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=ff676d7c
7
8 Revert "sci-geosciences/osm-gps-map: remove package, updated in main tree"
9
10 This reverts commit 2566bce2242fcfc0b4b3d2059812919c1a34edcd.
11
12 sci-geosciences/osm-gps-map/Manifest | 32 +++++++++
13 ...m-gps-map-0.7.3-disable-compiler-warnings.patch | 12 ++++
14 .../osm-gps-map-0.7.3-fix-docs-location.patch | 12 ++++
15 .../osm-gps-map-0.7.3-fix-introspection.patch | 10 +++
16 .../osm-gps-map-0.7.3-fix-python-setup.py.patch | 15 ++++
17 sci-geosciences/osm-gps-map/metadata.xml | 11 +++
18 .../osm-gps-map/osm-gps-map-0.7.3-r1.ebuild | 83 ++++++++++++++++++++++
19 .../osm-gps-map/osm-gps-map-1.0.2.ebuild | 46 ++++++++++++
20 8 files changed, 221 insertions(+)
21
22 diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
23 new file mode 100644
24 index 0000000..4db946f
25 --- /dev/null
26 +++ b/sci-geosciences/osm-gps-map/Manifest
27 @@ -0,0 +1,32 @@
28 +-----BEGIN PGP SIGNED MESSAGE-----
29 +Hash: SHA256
30 +
31 +AUX osm-gps-map-0.7.3-disable-compiler-warnings.patch 398 SHA256 9f0858eec24f06217b20cad8132a347a32ba643ab65d275fdc79a585ca2d4200 SHA512 2af14a5592741b7336ba7a402f723ae0c9b500fc0873e3d475554c59477cc4fe4af5edcefd752060af952223506b465e67da9c7ecd59a7b42f29d0c854a5a885 WHIRLPOOL dd207b4fce7ab600ae4479b62b0078e21db9e2bf21bd9839511e03f7c6635ea8df58737cccc69dbe19233c8c3657bc1ec2b99110663bac80e40e9d87675634a4
32 +AUX osm-gps-map-0.7.3-fix-docs-location.patch 505 SHA256 0de28ae847e521da9b92f021761ec8c3e9de7c092b00e64e18c36cb4a908b2cd SHA512 48c3aae2881a28173336e46883234a5178184fe5f014506038ab7cfb422ad8f5e750148647430cc13427865539223909621ed599618e253c66d0f95e9cd6a5c2 WHIRLPOOL f7ceadd5c701b891185f4a949a27f00f65bde55e72827010eb5b380c361f5bff17e3479c2327f063c2819426b13434bf41c59cc67cc78dc32381faa69fa60286
33 +AUX osm-gps-map-0.7.3-fix-introspection.patch 405 SHA256 dfc9112c028f29ee6c5914479649c3b9db74bf66dfef49ca4c9269f532b761aa SHA512 066cd78ab4ea91d976e4379659f606844e468960a43176432ff0d30df159313cf0cdd4dca988dccfa9801427c32128e6ec73cc60d7cf26693a997c3942a5dc70 WHIRLPOOL d9d7e1b3c3d747faf9607a098d05ffb56e570bf932e74b5b7fb05be9e58b016a8f60cb044dd6ccb914c71898a58a80deea7af39246237bb3eac0c121a557dd8c
34 +AUX osm-gps-map-0.7.3-fix-python-setup.py.patch 715 SHA256 dbac7652fa11ccd3e8be8aa5e9822e08f9005abb7f3e7097852f607448ec79bb SHA512 d88aeb9e986d5fe547035f35b17e6f4dd117862a85581a839cb6b602c4fdf9c957c7c18a54a1ece015c85036cb0941e952d773f23b8f487755b37100c0f82185 WHIRLPOOL d947ba51cfdc80d975b61bfa2e1a1d729df324622014c0edb2e3f87085c984a81ef96d10434dc9d1503e506f06205f94bd6039244f5b003abd82122146a8ed07
35 +DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
36 +DIST osm-gps-map-1.0.2.tar.gz 431981 SHA256 7db73b83423bdc2168e89b3f1d2868af42b554de7fde02c4278fd2b006ac2a9f SHA512 afcbc968e48adb08fb3c38b7c6f2c27fc5e8d3b4253ca60f35d4bd3f673369f60f5e5701196bb4c522959eb2ea09ec97e8b76356c8ca833d0dd3584ecc8fdea1 WHIRLPOOL df5630cd4ea42b6cd604ab36b40068c741bb426429b354695e34666c77ac2a40407150356eb87e4ea3d7374ea5ad8e00bd05d4f63d2ccd6a5d2eb8991df22839
37 +DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
38 +EBUILD osm-gps-map-0.7.3-r1.ebuild 1947 SHA256 cfa3fc3f955c5b43d4e474fba4f5775b7519c215d19f9389caf36b96f0f45451 SHA512 8fb28675ea45f973c9e94ce7ff6074c438344911749754062b9953f892f8ff5305744b361101ed4ff44b1ba7c8543017a76471c323dfbd096056d639327744b4 WHIRLPOOL 3358de40de7e1a0b0bb151b2919fdd381bf7f7a84bd662f6632d19cf8171ebe0a204d815e1b43c771af953c8cee55acc02a88af9f9d0796b86aab79600fd63bc
39 +EBUILD osm-gps-map-1.0.2.ebuild 1109 SHA256 0b772ded886ab0b9d2d79628d84c5b4c2bebc4d4fda749ea4a5c36793f412f59 SHA512 db42f75959e106cce9511684abb8516d07b60b3067969d2dcad4dae988496075318dc87367635dd51ec88ab644a0dc1733f46582f7247b8fbb67b4bd12d4ddde WHIRLPOOL 9af19de84bd97ac5bc659cde41c29f62851c899d6dd24db37aae14de00c2f0068969c9bc873929d2366aadb4fa472b1889586ccfc179e567f7c5d82fc7f21c6c
40 +MISC metadata.xml 329 SHA256 4089fd65b95cd058ba948769047ef65c81498fad3b699e90a582dfc82d797ee7 SHA512 596756fc41694ba8c0159c45e397cca149a4f5fa28d7ad11799949a531d0a0f67e00398411cbb78b03455b24722440d9c3ef96487f0dfe37665ec8b24db313ba WHIRLPOOL 2a91ffb06c283a5d64e0690043d0a88888e10099a51357ada2565b93b52102cbabf044c9321d604b8fb2c6d915338b76bc7a76e3f35ed82a53d3e9bd58f4ba87
41 +-----BEGIN PGP SIGNATURE-----
42 +Version: GnuPG v2.1
43 +
44 +iQJ8BAEBCABmBQJW2J9oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
45 +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
46 +QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8hFsP/Rnj/4HcGrIu1I1rAUpqHYqm
47 +Q3vlv5JQx9QnbqkGJeCIYKyo9fubBUXZrSYpjpU70IEG9mHvnK+STXpXeL1ttNVU
48 +MneDUxI005tclR/Z3UkmcV5ClOHcT5SoByx4gzJ19Ou/tD2LK5zxzRdTGraTyIWW
49 +kiDlb1bOd4ht5VsDb6fZq/FIvs4otXjPeZCDKOmnyf9URV0F93eN3mO0z0G/bS9W
50 +L58e0sKCe+/vX0jIZlLzWCP3x5h7+/9z3cYMlJko+iGNiyLbW7EQmLD7tX8g7FD9
51 +sk8oBCEJW2/NE9RjI9YElBIfLeeR1Tf+YMZAY1W/iXgrPqdaMbYKkPcKhBDrz7/C
52 +3hW73KUrXfkyBfnq2uHtvI4lcOBubaEYkW6kuXSCJBsqGhY/LBSr8k5pgHVibc++
53 +bKUm2vBSFWWpVW6ldo0IGjhnD2O/7PFXYXA+W0f3wSkvabYbmEeb50FIptZOiGq1
54 +yxZeHz6RdDLA6AU5qs4FIgZpO1EEGyHLgxRow2J45Swc8ISv6uyLo6i7zOvxlAjb
55 ++eW5r+bVvufmiEaVI9mEybWNk/sJs+0brWYo4Obf/cDcRazDZzc9NkiqmKOg9CAa
56 +wF7rhu7/BvnLLI93+dkxHNtnjpPWtuiNV71Oa8sblD1lfeVSPjvogp2LuNfcfaVA
57 +ybpb9raFi/NEN/OAc3kk
58 +=DkGG
59 +-----END PGP SIGNATURE-----
60
61 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
62 new file mode 100644
63 index 0000000..a91e091
64 --- /dev/null
65 +++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch
66 @@ -0,0 +1,12 @@
67 +diff -ur osm-gps-map-0.7.3/configure.ac osm-gps-map-0.7.3-new/configure.ac
68 +--- osm-gps-map-0.7.3/configure.ac 2011-03-19 10:55:04.000000000 +0000
69 ++++ osm-gps-map-0.7.3-new/configure.ac 2011-10-20 22:55:59.392575220 +0000
70 +@@ -62,7 +62,7 @@
71 +
72 + GOBJECT_INTROSPECTION_CHECK([0.6.7])
73 +
74 +-GNOME_COMPILE_WARNINGS([maximum])
75 ++#GNOME_COMPILE_WARNINGS([maximum])
76 + GNOME_MAINTAINER_MODE_DEFINES
77 +
78 + AC_OUTPUT([
79
80 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
81 new file mode 100644
82 index 0000000..1748c16
83 --- /dev/null
84 +++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch
85 @@ -0,0 +1,12 @@
86 +diff -urN osm-gps-map-0.7.3-old/Makefile.am osm-gps-map-0.7.3/Makefile.am
87 +--- osm-gps-map-0.7.3-old/Makefile.am 2011-06-16 12:03:29.562435752 +0000
88 ++++ osm-gps-map-0.7.3/Makefile.am 2011-06-16 12:03:58.535612125 +0000
89 +@@ -7,7 +7,7 @@
90 +
91 + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
92 +
93 +-osm_gps_mapdocdir = ${prefix}/doc/osm-gps-map
94 ++osm_gps_mapdocdir = ${docdir}
95 + osm_gps_mapdoc_DATA = \
96 + README \
97 + COPYING \
98
99 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
100 new file mode 100644
101 index 0000000..350876c
102 --- /dev/null
103 +++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
104 @@ -0,0 +1,10 @@
105 +--- src/Makefile.am 2011-03-19 10:08:23.000000000 +0300
106 ++++ src/Makefile.am 2013-04-02 23:13:01.408952029 +0400
107 +@@ -86,6 +86,7 @@
108 + OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
109 + OsmGpsMap_1_0_gir_LIBS = libosmgpsmap.la
110 + OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
111 ++OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
112 + INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
113 +
114 + girdir = $(datadir)/gir-1.0
115
116 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
117 new file mode 100644
118 index 0000000..f6287bf
119 --- /dev/null
120 +++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
121 @@ -0,0 +1,15 @@
122 +--- setup.py 2011-03-19 10:08:23.000000000 +0300
123 ++++ setup.py 2013-04-02 23:35:01.469947224 +0400
124 +@@ -21,9 +21,9 @@
125 +
126 + _osmgpsmap = Extension(name = 'osmgpsmap',
127 + sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
128 +- include_dirs = get_include('osmgpsmap pygobject-2.0'),
129 +- library_dirs = get_lib_dirs('osmgpsmap pygobject-2.0'),
130 +- libraries = get_libs('osmgpsmap pygobject-2.0'),
131 ++ include_dirs = get_include('gtk+-2.0 pygobject-2.0'),
132 ++ library_dirs = get_lib_dirs('gtk+-2.0 pygobject-2.0'),
133 ++ libraries = get_libs('gtk+-2.0 pygobject-2.0') + ["osmgpsmap"],
134 + define_macros = [('VERSION', '"""%s"""' % VERSION)],
135 + )
136 +
137
138 diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
139 new file mode 100644
140 index 0000000..58a20a4
141 --- /dev/null
142 +++ b/sci-geosciences/osm-gps-map/metadata.xml
143 @@ -0,0 +1,11 @@
144 +<?xml version="1.0" encoding="UTF-8"?>
145 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
146 +<pkgmetadata>
147 + <maintainer>
148 + <email>bman@g.o</email>
149 + <name>Aaron Bauman</name>
150 + </maintainer>
151 + <longdescription lang="en">
152 + A gtk+ viewer for OpenStreetMap files.
153 + </longdescription>
154 +</pkgmetadata>
155
156 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
157 new file mode 100644
158 index 0000000..f9317f2
159 --- /dev/null
160 +++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild
161 @@ -0,0 +1,83 @@
162 +# Copyright 1999-2015 Gentoo Foundation
163 +# Distributed under the terms of the GNU General Public License v2
164 +# $Id$
165 +
166 +EAPI=5
167 +
168 +PYTHON_COMPAT=( python2_7 )
169 +DISTUTILS_OPTIONAL=1
170 +
171 +inherit eutils autotools gnome2 distutils-r1
172 +
173 +DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
174 +HOMEPAGE="https://nzjrs.github.com/osm-gps-map/"
175 +SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
176 +python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
177 +
178 +LICENSE="GPL-2"
179 +SLOT="0/2.0.1"
180 +KEYWORDS="~amd64 ~x86"
181 +IUSE="+introspection python"
182 +
183 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
184 +
185 +RDEPEND="
186 + >=dev-libs/glib-2.16.0:2
187 + >=net-libs/libsoup-2.4.0:2.4
188 + >=x11-libs/cairo-1.6.0
189 + >=x11-libs/gtk+-2.14.0:2[introspection?]
190 + x11-libs/gdk-pixbuf:2[introspection?]
191 + introspection? ( dev-libs/gobject-introspection )
192 + python? ( ${PYTHON_DEPS}
193 + dev-python/pygtk:2[${PYTHON_USEDEP}]
194 + dev-python/pygobject:2[${PYTHON_USEDEP}]
195 + )
196 +"
197 +DEPEND="${RDEPEND}
198 + dev-util/gtk-doc-am
199 + gnome-base/gnome-common:3
200 + virtual/pkgconfig"
201 +
202 +PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
203 +
204 +src_configure() {
205 + # Configure script does not accept quoted EPREFIX...
206 + gnome2_src_configure \
207 + $(use_enable introspection) \
208 + --docdir=/usr/share/doc/${PF} \
209 + --enable-fast-install \
210 + --disable-static
211 +}
212 +
213 +src_prepare() {
214 + epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
215 + "${FILESDIR}/${P}-fix-introspection.patch"
216 + sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \
217 + docs/reference/Makefile.am || die
218 + eautoreconf
219 +
220 + gnome2_src_prepare
221 +
222 + if use python ; then
223 + cd "${PYTHON_S}" || die
224 + epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
225 + fi
226 +}
227 +
228 +src_compile() {
229 + gnome2_src_compile
230 +
231 + if use python ; then
232 + cd "${PYTHON_S}" || die
233 + CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
234 + fi
235 +}
236 +
237 +src_install() {
238 + gnome2_src_install
239 +
240 + if use python ; then
241 + cd "${PYTHON_S}" || die
242 + distutils-r1_src_install
243 + fi
244 +}
245
246 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
247 new file mode 100644
248 index 0000000..7c2f171
249 --- /dev/null
250 +++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild
251 @@ -0,0 +1,46 @@
252 +# Copyright 1999-2015 Gentoo Foundation
253 +# Distributed under the terms of the GNU General Public License v2
254 +# $Id$
255 +
256 +EAPI=5
257 +
258 +inherit autotools eutils gnome2
259 +
260 +DESCRIPTION="A GTK+ viewer for OpenStreetMap files"
261 +HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
262 +SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
263 +
264 +LICENSE="GPL-2"
265 +SLOT="1/0.0.0"
266 +KEYWORDS="~amd64 ~x86"
267 +IUSE="+introspection"
268 +
269 +REQUIRED_USE="introspection"
270 +
271 +RDEPEND="
272 + >=dev-libs/glib-2.16.0:2
273 + >=net-libs/libsoup-2.4.0:2.4
274 + >=x11-libs/cairo-1.8.0
275 + >=x11-libs/gtk+-3.0:3[introspection]
276 + dev-libs/gobject-introspection"
277 +DEPEND="${RDEPEND}
278 + dev-util/gtk-doc-am
279 + gnome-base/gnome-common:3
280 + virtual/pkgconfig
281 + !<sci-geosciences/osm-gps-map-0.7.3"
282 +
283 +src_prepare() {
284 + epatch "${FILESDIR}/${PN}-0.7.3-fix-docs-location.patch"
285 + sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \
286 + docs/reference/Makefile.am || die
287 + eautoreconf
288 + gnome2_src_prepare
289 +}
290 +
291 +src_configure() {
292 + # Configure script does not accept quoted EPREFIX...
293 + gnome2_src_configure \
294 + --docdir=/usr/share/doc/${PF} \
295 + --enable-fast-install \
296 + --disable-static
297 +}