Backport crash fix, bug #535886; Drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

6 files changed, 54 insertions, 99 deletions

diff --git a/sci-geosciences/gpx-viewer/ChangeLog b/sci-geosciences/gpx-viewer/ChangeLog
index 6d1260b90e91..395f126930cb 100644
--- a/sci-geosciences/gpx-viewer/ChangeLog
+++ b/sci-geosciences/gpx-viewer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gpx-viewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpx-viewer/ChangeLog,v 1.6 2015/01/07 11:36:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpx-viewer/ChangeLog,v 1.7 2015/06/02 08:46:13 jlec Exp $
+
+*gpx-viewer-0.4.0-r1 (02 Jun 2015)
+
+  02 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gpx-viewer-0.4.0-crash-backport, +gpx-viewer-0.4.0-r1.ebuild,
+  -files/gpx-viewer-0.3.0-autopoint.patch, -gpx-viewer-0.3.0.ebuild,
+  -gpx-viewer-0.4.0.ebuild:
+  Backport crash fix, bug #535886; Drop old
 
 *gpx-viewer-0.4.0 (07 Jan 2015)
 
@@ -26,4 +34,3 @@
   06 Oct 2012; Justin Lecher <jlec@gentoo.org> +gpx-viewer-0.3.0.ebuild,
   +metadata.xml:
   Copied over from sci-geosciences/gpxviewer to fit upstream name
-
diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
index 4da9c90797dc..0eecb9efc353 100644
--- a/sci-geosciences/gpx-viewer/Manifest
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX gpx-viewer-0.3.0-autopoint.patch 448 SHA256 60a9ab76ac7c05386076abca8c098a75d8d4dbeadbdcfbcfff95f8351bb6a8fb SHA512 0b116e5e8d32fb7566a83f73e96e1126cc3cb1a8f7893318be14380f68c152a9cb6994ecbf49f3c968a9048a25d880d1baff16b2c9a5b5eee3cd10656813ec64 WHIRLPOOL cc476de1e83dd141c2cde026b6ee0f65615b44efe7b161669e7eab1d72163b00767a09287d0163a64ed4ad6947be787ce4cba040a0c04f77d05e64a4c43ebe28
-DIST gpx-viewer-0.3.0.tar.gz 483607 SHA256 4c5489c5662294540cd663a269c20cf286fc0c07555e5a5e06b14533f63e55cc SHA512 8467d228a5dcc083eec70b255d3d2303a81b1634898a323abe4b1deb0c5c5de2c741aa6cd8889875ac4f3c487171905542d403478d82ca42c7e58b97998edfea WHIRLPOOL c8047e7546e482e07065b29086c40578c08e0d47dc41f9de15bb31bdff4238d45a679b928db732d52e3c0483a9bed00c2d1bfda4f5445fc0888569a6f98a6195
+AUX gpx-viewer-0.4.0-crash-backport 1152 SHA256 47bbba2183580d5f62a8f00796746ab27ac6758fed176f2d089dcda9cf9487fa SHA512 97152da46ed0699b95a8c1379b6b08997f8fb171b9e07755b5ce44da3ef09601b5a674b97d9fb449e985e8ffd329b49f961bfce0895822027124e1e67dfa6aab WHIRLPOOL 466a82e4892ed35fafc3022f437ea05f2d7195648f63ae00c13f30ade0deb93038150b04941663002e896b9a39fdef8a9991bf2c73442e0951282c596867feb5
 DIST gpx-viewer-0.4.0.tar.gz 534735 SHA256 956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a WHIRLPOOL a46ed33ad9d0579f923b7de1cd42cf48e46c2abb24151e2061d9956f2521569d4035874fff138a78bc71fe7d3922e39396dd6a4fa914c897137bf368cd00072a
-EBUILD gpx-viewer-0.3.0.ebuild 1391 SHA256 d9fa3c9da47265f7b3f95b7d1c2fb06e2156e81a4af881f41d4dc0ce4979bd27 SHA512 79ede1769ee9ea3c3776618bbe332e0aa2c4ceeb12a7a1aeed345dfee17cabd28263f2685e0c3f84ef075bf210fe4afb5f9bbd720226474d821529e7d0bb55b9 WHIRLPOOL 9fd8ef7b0fef960f99e539b5d382c9a6f3e972c2a9dd32f1ce4a6945993424b7a2fa5990724b7ee44681952d753d9cede37ac454c273771e82260d7689df9194
-EBUILD gpx-viewer-0.4.0.ebuild 1205 SHA256 31d95771336698bf145dbf1138ea30a61bea72a0209be99d65a35b6eaed6def7 SHA512 9c34b6dc30a25825b494013064255a0a045fd5a39b3ecb9936a3eba292497796bf3356ec1b6453165e21717980a426d61c3ce07d436c1604723fde5fbb3584f9 WHIRLPOOL 0c20f29fe5e7a3090c413fe45f0c651715e1366c317835b239e267c1ea26441d79ccd68ef385cf82d0dfc900eb69b5abab8c702438f84bdb3ef3f9cd9ab76db5
-MISC ChangeLog 1046 SHA256 2268f806a6b3e75ec7c5a7d3093b71c60b487e9f3f502e56762fbe454a3e4eaf SHA512 d9f13de96444022ad27e75f9a7600f084c799f55ff116d18305aaf4d8269ca0f0c5da276b3ac1c1776a68984416fbdff86adc95dd016f6970eea55c35369392f WHIRLPOOL 3539ff97beea5694780746ea2e670a04a8144a6b25c48f0f3f3fa554b790a5d9beadff3116d8e0441b79da5c8d91877fd9fecf9d9c0c650f8f285c917f01a4c4
+EBUILD gpx-viewer-0.4.0-r1.ebuild 1255 SHA256 2afd0c67850df7bf6beae3267f2be8a47f5b0fdaf9052650a92e3192da49be55 SHA512 8a846997cf1708a372ff2edbed531149a3beb317050f34f7a9645ea849cc7cce6df85207cd8769fdf05309edfb9c00b6c1edefc0dffbc5c42aa51ea35ec8ff0b WHIRLPOOL f43c7345d2c3d73ae0dd5d697acdb155537f5eefd26f7cd2f457266a9ec43ccd75a2c4e6dd3492b707a49de39a5666b2a223e79ef640cdba385e8832f1552448
+MISC ChangeLog 1341 SHA256 7b0d8483aa8ea1dfbaedeb087017c8f48b207737e1caf38583e5c0fff8423180 SHA512 9a2ed248fd9df5c0c0f377a6c2b373c45725f77669d5d9f4b012878e0567ff6ed8e55a78ade664fd10390ea8333ff16ca9726d37cfd273833de5ef9a6ef26ae5 WHIRLPOOL 64428f92a69fd5eee3edf2ab4527febe76c25fb82cfb4768a7912b6b1d758cbcbec59b60082eb9204641b8c4f363e7be55b0d8c792b6b8dceae075292cf997d9
 MISC metadata.xml 236 SHA256 86e0839fab2e929d3b0db83dd0c16ac11c958afb71b4591463ec77e47817f4f8 SHA512 96273a80e28dafee171e5da47d3ed139600688860143bb4f3f1601e965c9260a9d1cefc220e5fcce61eac36f82a01f5358156e13b591aa89b98da2662ce6d23d WHIRLPOOL c7f0ecce73db7cc0f024e9fc4da81c676831e39749ef8623f07d0cfbc2d0a5cfc1f54d3aff59637f0e2766e2b7da967d59d4eb8bcf0ba3fbcea776c84192b802
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUrRoiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirt1sP/iGxdqHbXesgKIViRpHzRLxT
-QL3naDgNhmUTW7Zf0JfBer2cNj2wUu6AVYedTwdGJiY7QmUIoQPNeftzw+N6Lk3T
-l/PnCraoND4yCyDLl9se4NHV7GaavJ5B3u/YZi4ktZdbqhtjUV6SupLZrUGxmzbX
-T97lIKuKL0ITj8qOynR6UR5AgxMwv4vEG3ZfnQj09gdiGwA9ghvOyQRhyW6lKSCS
-pnpiziL615fcVqfFEaQ4DKg+2QJg3ZoeHxkdkhrhyzBbxBdF7OLAMPq5ES7EA6/7
-UrxvGK/J6EP6wHmtNxT+dZG77brxForCGveHBFib5E4BQVvHlLV4cs3JeL9Zirtd
-QP8WamVsDACEP0QPM6hz6dSGlTqmzJ6dEhsC9rd6N6MDf8jLorXndEnpKLtv0GyD
-kYHCqYb34siL7ZKjZgI3o6XSMC+N4rM8KptypUMZNdUxZ2SupEIcFx3V8cNBR29w
-hfv0fXxmlerKQBd9WZwbXzy6D3xL2/Et7L9SN8BWLGYpLey09uGMUYf52aH6HMb+
-SvU9TM5ihoI7yrNozyeNJi33peMkAWF6DM6LUywrmHs5lNs6al9qRbRa1tph2/b0
-/AMLB12iSynJVAwR5Vwwa9IutZdKjORIgvf+AKCq+0PkxP3PQbhDiM+9nAY7RGBG
-1mlM4PL3O23geWL5UxWm
-=eEOq
+iQJ8BAEBCgBmBQJVbW1WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8SEP+gMf9GDrydYvkcSDfczrH2Xx
+6C2AXedsJB8ZMGONzdY73/n+iLNuGdOajAIQTs9YvWMtRRG/nDxdexaSb9xwxP4s
+yM1aGfO1qPUyb/FIqQPiyz+xwb8czVcGrmx0p4G92NiNT/J4KeBgeKPRuDzqIbk1
+zaIRnncFld4r4kyiNQ3i+SesGO/lOUgcO+noS1+k5YB/3Pr0sJ8Q5ZicuSTE0KvT
+SiT5DEjHueQz3pN/Wp/zlxld5cfe2Sj0nA1Qmz+ekIDAVSCZV72XN9I72Zm97OA2
+QyVlQqpPG0d8Jpi/x/lbHx/jSRMSDdBo9h4GbuTH3uRlt8zj+A0UPSNI7Virq9YT
+FxwEqSzCY6w638b15hXZDF0wTaK7VzpKqK3jSSu6TIpWXSvaLYPt7o32/jy/A0L4
+/YJNloiLgYdjMDvs1bVxqW/Xl8UEaD3MrUf/az1odWPaXl3jOJOepXrJv1Tk4Awm
+Rjusg7XBDBmiRkomg0mzHAGpnFLuim62V/Guj5it8YwMQF9tkAVAmGONo4wRUFrc
+uS2g/x4yeIXYTnePJo6dfIoifYRupi9+BkALs/NiKVDDSzdruov7Ap9fHi6s0WbJ
++DfPJQ8EvJbDO9LC8ud/AR6booDM2q8sCsh+iAucaB8Cx+Esy22iHc8hsInY9rj3
+sUJ/bx6E1kyg7enJNdqO
+=Q16N
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.3.0-autopoint.patch b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.3.0-autopoint.patch
deleted file mode 100644
index 22c7bb06e764..000000000000
--- a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.3.0-autopoint.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6240cab..be1e761 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,6 +6,7 @@ m4_define([package_version], [package_major_version.package_minor_version.packag
- 
- AC_INIT([GPX Viewer],[package_version],[qball@sarine.nl],[gpx-viewer],[http://blog.sarine.nl/gpx-viewer/])
- 
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE
diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
new file mode 100644
index 000000000000..2dff4915dffe
--- /dev/null
+++ b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
@@ -0,0 +1,24 @@
+=== modified file 'data/gpx-viewer-file-chooser.ui'
+--- data/gpx-viewer-file-chooser.ui	2012-03-04 10:18:33 +0000
++++ data/gpx-viewer-file-chooser.ui	2015-06-01 19:44:21 +0000
+@@ -7,7 +7,6 @@
+     <property name="title" translatable="yes">Choose gpx file(s)</property>
+     <property name="icon_name">gpx-viewer</property>
+     <property name="type_hint">normal</property>
+-    <property name="has_separator">False</property>
+     <property name="select_multiple">True</property>
+     <property name="filter">gpx_viewer_file_chooser_filter</property>
+     <property name="local_only">False</property>
+
+=== modified file 'data/gpx-viewer-preferences.ui'
+--- data/gpx-viewer-preferences.ui	2012-03-06 08:49:48 +0000
++++ data/gpx-viewer-preferences.ui	2015-06-01 19:44:21 +0000
+@@ -5,7 +5,6 @@
+   <object class="GtkDialog" id="preferences_dialog">
+     <property name="border_width">5</property>
+     <property name="type_hint">normal</property>
+-    <property name="has_separator">False</property>
+     <signal name="response" handler="gpx_viewer_preferences_close"/>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox1">
+
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.3.0.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.3.0.ebuild
deleted file mode 100644
index 8da9a43f8cfc..000000000000
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpx-viewer/gpx-viewer-0.3.0.ebuild,v 1.5 2013/09/18 18:48:18 jlec Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils gnome2 vala
-
-DESCRIPTION="Simple program to visualize a gpx file"
-HOMEPAGE="http://blog.sarine.nl/gpx-viewer/"
-SRC_URI="http://edge.launchpad.net/${PN}/trunk/0.2.0/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/gdl:3
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	media-libs/libchamplain:0.12[gtk]
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.21
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-autopoint.patch )
-
-src_prepare() {
-	mkdir m4 || die
-	sed \
-		-e '/desktopdir/s:$(DESTDIR)::g' \
-		-i Makefile.am || die
-	sed \
-		-e '/MimeType/s:$:;:g' \
-		-i data/gpx-viewer.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-database-updates )
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile gpx_viewer_vala.stamp
-	autotools-utils_src_compile
-}
-
-src_install () {
-	autotools-utils_src_install
-	dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
-}
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
index f8fcdc451c56..1947ee96961a 100644
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0.ebuild
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0.ebuild,v 1.1 2015/01/07 11:36:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild,v 1.1 2015/06/02 08:46:13 jlec Exp $
 
 EAPI=5
 
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-crash-backport )
+
 src_prepare() {
 	vala_src_prepare
 	autotools-utils_src_prepare