gentoo (leap year) resync : 29.02.2020

4 files changed, 17 insertions, 35 deletions

diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index 5b2d74ac9a1c..d1bea548ba64 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,6 +1,5 @@
 AUX gpredict-2.0-doc.patch 563 BLAKE2B 7c95bb3261774799e7316eaa57b30ad72a9cadb2562103a581339699d7293fa9378aa6e8b224e75930665ec60570a5a60a0367c9a470ec8135c230547f260262 SHA512 04cc303d3bdcd8d312ec9ff99dd7e2f921feef5c50c7d4cd6e20199f7a9caefb5023b6dfdb1cb410ed3693a60f016a6545446e02eff4f678dd2897dc275ecb3e
+AUX gpredict-2.2.1-fno-common.patch 334 BLAKE2B f822b1685c3e5c96a1810c62fb501879cad0c6aeae04ee57845fb0df2cd7c0e4605b668bbb3807723213e896e8feaf19e162ac821c0995a7bf801bcfc8385dee SHA512 7b060f18508202c1b37f6799c83321c0e8a90312e0afa0a24e1ad978458a4a91246892366b39eb505965db1dba13a8cf75d8c2f45e36011d27b99dbdace12f0e
 DIST gpredict-2.2.1.tar.bz2 4647342 BLAKE2B 989b80fd0f0029551854c18c1e00bd5d223bffe4aa20004b828bec87ab56dd488edf4d62289d394225e2a6b0c89ca1c9962cf63afe076a355757371127712ea7 SHA512 590a218bc95a465ca9772f892b77763b92a6c41c7d9f3b48279f28916cef8a5bfe616e6cdda1002e7dda082f37f37a98af8c8180895c572fec9c96aa76888f5d
-DIST gpredict-2.2.tar.bz2 4646331 BLAKE2B 5f07484814cbc3973617e2f161eed4fdc9ead11b9369cd2f6ffacbf60a5a73651e8081c2110ecc7e83a8214d4278a0d7ba9d5b313a9c1bbda7ca3e5c5a6730a9 SHA512 4884459922da4fcbe221252c002e76ac06926bda4745e3eaa480c93c9fdbed9da7a78c7d11a6e7fb5777d8e11cc1f0859c18461fb19f249d924882bfe7ace32c
-EBUILD gpredict-2.2.1.ebuild 673 BLAKE2B a29c4df80eed560c2ea8cee5728777c5a5c11fba55de631fc65e7d27fb20db4d36db101557253532fa92064acf51ec821d1d82e2ba8d3303c374d811f563ddb8 SHA512 89ad3c414051ab016e72523b9e0d3f2e3bb8b4124b81a3012fe01c20a864331cb436a243fa3a9745506bcd9a434cc937fc9ca5d887d2bca49de02e5bc723aced
-EBUILD gpredict-2.2.ebuild 673 BLAKE2B a29c4df80eed560c2ea8cee5728777c5a5c11fba55de631fc65e7d27fb20db4d36db101557253532fa92064acf51ec821d1d82e2ba8d3303c374d811f563ddb8 SHA512 89ad3c414051ab016e72523b9e0d3f2e3bb8b4124b81a3012fe01c20a864331cb436a243fa3a9745506bcd9a434cc937fc9ca5d887d2bca49de02e5bc723aced
+EBUILD gpredict-2.2.1.ebuild 714 BLAKE2B c25ebeaa964701bbac76f8ba1a143f8107213dc9b7d5b3bf5ad7ae4d5f740448ec9ef49a4a25fd88d2f62c3cd2a0f5960ce9574eea640cdeb6cebadbfaa2f41f SHA512 48265566a3b5fbd07d6eea3cf2146b7d7ad42b1bee5bf80db3f4b48a00d155535604bb069a51329cc4101a93220b3316017fd3346732fe6d0f59a17f521bef25
 MISC metadata.xml 327 BLAKE2B 337b6c3aaf2d60785241601818dcaa4c831b122e339826560343f32712bda042b0f5140f321e9de6f2fc680e66702b39b0148aea2aaac52aa3b3faa7ef5292d4 SHA512 8e461ba4d187a96f1e15e1fab90da3755ec7ad6b24f1182b65eeacffa996375bd0bd905907c329bb53a92b94c22b08283ea936956acc58e5153634e464d9a147
diff --git a/media-radio/gpredict/files/gpredict-2.2.1-fno-common.patch b/media-radio/gpredict/files/gpredict-2.2.1-fno-common.patch
new file mode 100644
index 000000000000..cdbffbecb687
--- /dev/null
+++ b/media-radio/gpredict/files/gpredict-2.2.1-fno-common.patch
@@ -0,0 +1,13 @@
+diff --git a/src/qth-data.h b/src/qth-data.h
+index 264f66f..5c6b2de 100644
+--- a/src/qth-data.h
++++ b/src/qth-data.h
+@@ -30,7 +30,7 @@ typedef struct {
+     gint            alt;        /*!< Altitude above sea level in meters. */
+ } qth_small_t;
+ 
+-enum {
++typedef enum {
+     QTH_STATIC_TYPE = 0,
+     QTH_GPSD_TYPE
+ } qth_data_type;
diff --git a/media-radio/gpredict/gpredict-2.2.1.ebuild b/media-radio/gpredict/gpredict-2.2.1.ebuild
index b6f1c87b1200..8232248301fb 100644
--- a/media-radio/gpredict/gpredict-2.2.1.ebuild
+++ b/media-radio/gpredict/gpredict-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,4 +28,5 @@ src_prepare() {
 	eapply_user
 	# remove wrong doc location
 	eapply -p0 "${FILESDIR}/${PN}-2.0-doc.patch"
+	eapply "${FILESDIR}/${P}-fno-common.patch"
 }
diff --git a/media-radio/gpredict/gpredict-2.2.ebuild b/media-radio/gpredict/gpredict-2.2.ebuild
deleted file mode 100644
index b6f1c87b1200..000000000000
--- a/media-radio/gpredict/gpredict-2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Real-time satellite tracking and orbit prediction application"
-HOMEPAGE="http://gpredict.oz9aec.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:3
-	x11-libs/goocanvas:2.0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	eapply_user
-	# remove wrong doc location
-	eapply -p0 "${FILESDIR}/${PN}-2.0-doc.patch"
-}