gentoo resync : 20.03.2021

3 files changed, 19 insertions, 23 deletions

diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
index 112fc8780500..92d8ee2f93b8 100644
--- a/sci-geosciences/gpx-viewer/Manifest
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -1,4 +1,4 @@
-AUX gpx-viewer-0.4.0-crash-backport 1152 BLAKE2B dacd8a8f4cf1703257d37be6e230fe535faaad6d337b15fece132ee358b61b00329ef0e4c4e1cabfb233a37b46c22a212696d09cf2fa4cc806c80d83913b31bd SHA512 97152da46ed0699b95a8c1379b6b08997f8fb171b9e07755b5ce44da3ef09601b5a674b97d9fb449e985e8ffd329b49f961bfce0895822027124e1e67dfa6aab
+AUX gpx-viewer-0.4.0-crash-backport 953 BLAKE2B d2c4a3e63d856d8448c993cd99e334068de4f6c018e10e332f88ace0471acbfe88dddc9e21410e5325cdf192878a2fbdf5fcb4cfa2d649379ea59cf6fb03a0be SHA512 09ee63709e69ee13b3358c88f7c7e982b689cccd7501083825a0424d31fc00bf0bebf53bd83818581d388ff6fff8cd08f0f956a7a31cd20c3b0017d8f0dded7a
 DIST gpx-viewer-0.4.0.tar.gz 534735 BLAKE2B 3b6e14961dd79d07ad99d68b7f926b2152413e5512044febdb30306d4045f0074a0a1fdb8c40bd92523e06f1f22853934c63876793f8594af197a17fd0d0a0c9 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a
-EBUILD gpx-viewer-0.4.0-r1.ebuild 1136 BLAKE2B 1708f0b34ecd3ea753ad4fea400091098bba89686ef488d705517bd324e536757de0c20f5e30c3125d093d6672a862745d9cc6deb63c6210d3db65e4c463104c SHA512 c3fa95cc6c57f350ba5349257216c1993618e6abc637dbee7b62b9489356b6f81176efa1456a0efab588c91d44795b2691e815f33cfcbda7ac484fc65bb733bf
+EBUILD gpx-viewer-0.4.0-r1.ebuild 979 BLAKE2B 37ae6db352436daed793699a792fe2e56927cb1ef5dfe1beaf2525a37ee88692e49e950f54f49a01ec57c2dbc7a16ce79deca3f732bc8ab3a0c7d7c3f7862bb2 SHA512 08b12ea0b039459f18e750eac251dd6841191d49b140d56cd1da00e21b8e9b6191f0f159eb15f7cb1165fc63259bb6370d3a7b14a841993be2f53ed41aae26fd
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
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
index 2dff4915dffe..420d18ef5e5a 100644
--- 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
@@ -1,6 +1,5 @@
-=== 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
+--- a/data/gpx-viewer-file-chooser.ui
++++ b/data/gpx-viewer-file-chooser.ui
 @@ -7,7 +7,6 @@
      <property name="title" translatable="yes">Choose gpx file(s)</property>
      <property name="icon_name">gpx-viewer</property>
@@ -10,9 +9,8 @@
      <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
+--- a/data/gpx-viewer-preferences.ui
++++ b/data/gpx-viewer-preferences.ui
 @@ -5,7 +5,6 @@
    <object class="GtkDialog" id="preferences_dialog">
      <property name="border_width">5</property>
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
index 58e714a400e9..f46fb5bf69c7 100644
--- a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils gnome2 vala
+inherit gnome2 vala
 
 DESCRIPTION="Simple program to visualize a gpx file"
 HOMEPAGE="https://github.com/DaveDavenport/gpx-viewer"
-SRC_URI="https://edge.launchpad.net/${PN}/trunk/0.4.0/+download/${P}.tar.gz"
+SRC_URI="https://edge.launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +21,8 @@ RDEPEND="
 	>=media-libs/clutter-gtk-1.4.0:1.0
 	>=media-libs/libchamplain-0.12.3:0.12[gtk]
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	>=dev-util/intltool-0.21
 	virtual/pkgconfig"
@@ -31,23 +30,22 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-crash-backport )
 
 src_prepare() {
+	default
 	vala_src_prepare
-	autotools-utils_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--disable-database-updates )
-	autotools-utils_src_configure
+	econf \
+		$(use_enable nls) \
+		--disable-database-updates
 }
 
 src_compile() {
-	autotools-utils_src_compile gpx_viewer_vala.stamp
-	autotools-utils_src_compile
+	emake gpx_viewer_vala.stamp
+	default
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
 }