gentoo resync : 10.02.2020

21 files changed, 254 insertions, 429 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f9e87d93bed5..b934edd88828 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index 981a7ab5e84b..2cd2a382a703 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,7 +1,8 @@
+AUX ax25-apps-0.0.8-fno-common.patch 3406 BLAKE2B 528aa74bfb7a6b51215dbc4ace9b257d9bde40dd447051c1484f9bfb82df38befe8de39cc1d91d60a9065e4227c4272606a05d3351dd1d36bf9da148a44df36a SHA512 102672cffc39a942e361ebffc3d1cd910ef7977b653e8c9d1165f5bb0ca456d196f1d63dcaee55e4ea9e257c6d37c053a451c0477a916b50745e7cec2e14aa2d
 AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0a92336a90773968453658964a18db9a6afb2917e41e3688d121718f86d5ee5205effb23b8db4c29155b6eb949b45 SHA512 901218e0dd279f61892e0eadcdcb9e1bc46007c9735efb658f1ee1bd0bb6df9ab8704eec1087ce7550674e03fe643ea13811721c28f9cf0be445e881cb19b626
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
 DIST ax25-apps-0.0.8-rc4.tar.gz 442172 BLAKE2B 59a622c0e675cadc90a7d728b899b1820153d6b9e35f3ccdbac74d191f844d1642dd2e9192d6dce0f1208cbc26b98cb1643f8d1041ec3802b833ad5cbc903f81 SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b
-EBUILD ax25-apps-0.0.8_rc4.ebuild 1077 BLAKE2B f21999568a374b36a8043176f263e75f2597db3ae46d3ec240614abaeb7ab78243ff552424c02ef64ebb5a354bd8d6e2b6f789b15002d9e5cfe16d92230218fd SHA512 d35f590065aa6c84af814215442ee15efe75ed5222f9318508bb07e30ac732e54a19ca573c05e845f806b588d398ae50362a9aabef1bf0b5821664abb3c026b9
+EBUILD ax25-apps-0.0.8_rc4.ebuild 1121 BLAKE2B a8fc996669ddb0649340c40504fe0777621b0b555e553f0284fded4f85b9cd504b036a357a22e7a103e794eb1bfb8e7afd21cde3b6f5302ff32f979ae95f98b9 SHA512 92f3f3aba2a5307884c198d92d90e2bdacf57d8866815233859519b6b23cbb924a02b2289a28882016adfae306f76bd84dac60655614471ca89a03b2daeeed23
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
index 21b6d557a2c5..f63f96a8ec95 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
+	epatch "$FILESDIR"/$PN-0.0.8-fno-common.patch
 	eautoreconf
 }
 
diff --git a/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
new file mode 100644
index 000000000000..1ea5c779ff38
--- /dev/null
+++ b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
@@ -0,0 +1,87 @@
+diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c
+index 461147d..e85b44d 100644
+--- a/ax25ipd/ax25ipd.c
++++ b/ax25ipd/ax25ipd.c
+@@ -35,6 +35,25 @@ int opt_help = 0;
+ char opt_configfile[PATH_MAX];
+ char opt_ttydevice[PATH_MAX];
+ 
++struct stats_s stats;
++
++int udp_mode;
++int ip_mode;
++unsigned short my_udp;
++char ttydevice[PATH_MAX];
++int ttyspeed;
++signed char mycallsign[7];
++unsigned char mycallsign2[7];
++unsigned char myalias[7];
++unsigned char myalias2[7];
++char bc_text[128];
++int bc_interval;
++int bc_every;
++
++int digi;
++int loglevel;
++int dual_port;
++
+ struct option options[] = {
+ 	{"version", 0, NULL, 'v'},
+ 	{"loglevel", 1, NULL, 'l'},
+diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h
+index b088247..367024b 100644
+--- a/ax25ipd/ax25ipd.h
++++ b/ax25ipd/ax25ipd.h
+@@ -72,24 +72,25 @@
+ #include	<sys/types.h>
+ #include	<netax25/daemon.h>
+ 
+-int udp_mode;                   /* true if we need a UDP socket */
+-int ip_mode;                    /* true if we need the raw IP socket */
+-unsigned short my_udp;          /* the UDP port to use (network byte order) */
+-char ttydevice[PATH_MAX];       /* the tty device for serial comms */
+-int ttyspeed;                   /* The baud rate on the tty device */
+-unsigned char mycallsign[7];    /* My callsign, shifted ASCII with SSID */
+-unsigned char mycallsign2[7];   /* My seconds port callsign, shifted ASCII with SSID */
+-unsigned char myalias[7];       /* An alias to use */
+-unsigned char myalias2[7];      /* An alias for second port */
+-char bc_text[128];              /* The text for beacon messages */
+-int bc_interval;                /* The interval, in seconds, between beacons */
+-int bc_every;                   /* true=every, false=after */
+-int digi;                       /* True if we are connected to a TNC */
+-int loglevel;                   /* Verbosity level */
++extern int udp_mode;            /* true if we need a UDP socket */
++extern int ip_mode;             /* true if we need the raw IP socket */
++extern unsigned short my_udp;   /* the UDP port to use (network byte order) */
++extern char ttydevice[PATH_MAX]; /* the tty device for serial comms */
++extern int ttyspeed;            /* The baud rate on the tty device */
++extern signed char mycallsign[7];    /* My callsign, shifted ASCII with SSID */
++extern unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
++extern unsigned char myalias[7];  /* An alias to use */
++extern unsigned char myalias2[7]; /* An alias for second port */
++extern char bc_text[128];       /* The text for beacon messages */
++extern int bc_interval;         /* The interval, in seconds, between beacons */
++extern int bc_every;            /* true=every, false=after */
++
++extern int digi;                /* True if we are connected to a TNC */
++extern int loglevel;            /* Verbosity level */
+ /* addition for dual port flag */
+-int dual_port;
++extern int dual_port;
+ 
+-struct {
++struct stats_s {
+ 	int kiss_in;            /* # packets received */
+ 	int kiss_toobig;        /* packet too large */
+ 	int kiss_badtype;       /* control byte non-zero */
+@@ -107,7 +108,9 @@ struct {
+ 	int ip_tooshort;        /* packet too short to be a valid frame */
+ 	int ip_not_for_me;      /* packet not for me (in digi mode) */
+ 	int ip_i_am_dest;       /* I am destination (in digi mode) */
+-} stats;
++};
++
++extern struct stats_s stats;
+ 
+ #define MAX_FRAME 2048
+ 
diff --git a/media-radio/ibp/Manifest b/media-radio/ibp/Manifest
index 1a9e4e2817a0..9f06dc9fcc19 100644
--- a/media-radio/ibp/Manifest
+++ b/media-radio/ibp/Manifest
@@ -1,3 +1,3 @@
 DIST ibp-0.21.tgz 33536 BLAKE2B 0fee17215d6e6fc99dba6d216f4e2b79bf0be89f6edd68fe5b0c0f4ca6fee794274a9ec0c08b73f502fd57dd0208d1d0fcf362d0a8671d94d4a6a613f578e443 SHA512 784bdcae61ce41dff7d88eb2068171dafa607012660393188326e94e323fdf5badebf3d8a24016c83c96c770b6d0935fc35aef5aca6bbfd665b7f2ccf39118ca
-EBUILD ibp-0.21-r1.ebuild 1079 BLAKE2B a7711354089e9df2dcd6e0234c4e684d404180fd1ecfc389ded5d2dcf6782ba80f86178dbb591d65458153912d81c5f4997b417e597a4482d008263c84a4c10f SHA512 c31678c38bda533e02c743dfc1b140c4385ce44ee556ec263bd17dc61c7557cc4c26b94619ebc1960def95d1c954e7892f717e278d6f3093cef0c247a7fd6a2c
+EBUILD ibp-0.21-r1.ebuild 1077 BLAKE2B bd5fa345bfe4a4b5a382111c0ac0fe1e4e34316b4632d75d722799bee72412f736c87fcd2d80ae7954725abb1657caacc2e4d122797ffc0d35b50eb738153c51 SHA512 e3522cd32271047da75eab9b3f683566883c54c5ec8c295ea51979c681057e7208d8830d817deaae12c49e9aea76a515b4c87deca66f297639e2594e57e79a74
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r1.ebuild
index b261a501e781..6af13746f582 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)"
-HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}.html"
+HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp.html"
 SRC_URI="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index e18da9e39eca..b8440e77dcca 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,10 +1,13 @@
 AUX js8call-2.1.0-hamlib-type.patch 752 BLAKE2B b58e648597d467ff559d6ea77abef4fa31b3cc3bf14b72a2e66ba6cb839377c59ced2fad97c104cbd8b90acf09e477584baae6238d90524442d10409fb4a0e09 SHA512 ac65d9f6755d2fa2e5ca3593bf73c2d44716e6bbea29906d59e2a023bbe9821ad98a48e6f8d56eafdb5648884b0d1f9f23c05900e0ec67b5785cf65dcc98e899
+AUX js8call-2.1.1-hamlib-type.patch 377 BLAKE2B 32d0de06d20ec6172a8a2b703f55bbcb46d584ba2fec7de21ae37e8c123f6d27867ff5f6406985dde84186b14f9e048377a43d35562fb7c239b1f1b4d7283891 SHA512 2db6db5042c17cb01a0fb84b93c2b0b4af6912c61c4b2fac02f3097d4325aa4e4d897ef615a37c1348b9a46168c1aa3b1decd07ebecda265314f12afe5570d53
 DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a18170088df65d1b16a581709065cf45edb23533b9c89193b01a85ec326638efc99202489db54455298a5033696de SHA512 64f24821c9ffd86123ede2baac46bcefd33b5dc5e0496cd44e594e79706ec2f3fdde5ce13c379addbf2bded3e392a1f0fc0f2df0298ce57a22e434a6ab6a1e7a
 DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
 DIST js8call-2.0.0.tar.bz2 14434190 BLAKE2B 2d016c93175fe41cd4c24b57fc0a6c65ff5d5630aff68aac4e3e941570f315abe9f083f1686cb95e49d90ea41ac82752fcdd37041727e95820d34bcd0e82e2b1 SHA512 58566d4e6009339ef9a1459bdf2902748200b7a002c8be22067ec97eae16cc42465001e7084ebc00b1e406ae47fe45092226e1c6568253a1bbf95c65f040ab75
 DIST js8call-2.1.0.tar.bz2 14432328 BLAKE2B 3f48be58905cf05af8230b715956ecfec71fd792fafb029cba84c799e51bb1189e158c16ef05bd8959572778aad556a11b0896647a47cc1e6b10ddd48bd033cd SHA512 0edfbc8cbbe3df551d7dc97c7362100d2714e2d37934a053233ca8107247f7fdc67a36b59b1fe701154c9348f27171ddab9c21ffc763072d390431f9dd5382a0
+DIST js8call-2.1.1.tar.bz2 14467115 BLAKE2B 8ebac342a1fc0bd22d6d53d9d6548ba4ec8f49088aa4901fb542f1d82ecdb9c2a23024aa8638191a3e862ab689c004cdde1562a834029bf53c535510300ed82a SHA512 deee4fe56f457b2bd533e9a44a812d8abcd5733079722504d4f06bee5c824a0a1b8c21ae805793fe419fde85f9e2e4aed10c33192f71378cf40afd68648a20a1
 EBUILD js8call-1.0.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-1.1.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-2.0.0-r1.ebuild 881 BLAKE2B f2b37d220b6b7bac193df394ebc92c3c03c9b9dfa5cd0f51308a41362fa402577a7ca6d8c71c19717972f38eecac32292e39783cae824885e361a17c4ad470e8 SHA512 4836807736c2433d3e48ba50aa1adc07a6a6f6c3a43a947bc2fa0111aabde0366e4b3752066787676c2b47c3cb036bf191adc67d3683b8bf16381fca7d3c4c04
 EBUILD js8call-2.1.0.ebuild 936 BLAKE2B 23704d418b26b9f5cc02e5520a01ca67efbc5c5085067676544ed6beb18a87ccfc43b118769773d2035321ff90bfca4d432af3b98c2a4115ff5a6a00bdf734c7 SHA512 bc67a252baec3e06e00bbde9d388a4bae820012a9165d78dba56a0b82ff9db575c412d68722af07f33a20fb268811b86d6e1c3e62ee2de3173861eb40e72a289
+EBUILD js8call-2.1.1.ebuild 936 BLAKE2B 8f7fadf4e5abb1f951cf69de1e6445aaff92c0a592c0f00df3f09c7a22443f5092fc321b0593162f3686ea76dc9d6e54f8f35cd04f834cf9b625353f25ccf5da SHA512 3f0b7dc70b2ed0af0abd4e80e0cf4c1d0496a4b84f7497fd7767e8a3cbbaa0ef5e772aa841096f323ea389a97a643cc1e0354b3601f04ec27e12acf8a2319cdd
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
new file mode 100644
index 000000000000..6714949468ad
--- /dev/null
+++ b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
@@ -0,0 +1,14 @@
+--- a/HamlibTransceiver.hpp	2020-02-08 19:14:50.584626858 -0500
++++ b/HamlibTransceiver.hpp	2020-02-08 19:15:09.857524125 -0500
+@@ -14,11 +14,7 @@
+ {
+   typedef struct rig RIG;
+   struct rig_caps;
+-#ifdef JS8_USE_LEGACY_HAMLIB
+   typedef int vfo_t;
+-#else
+-  typedef unsigned int vfo_t;
+-#endif
+ }
+ 
+ // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
diff --git a/media-radio/js8call/js8call-2.1.1.ebuild b/media-radio/js8call/js8call-2.1.1.ebuild
new file mode 100644
index 000000000000..f461bf8f6b3e
--- /dev/null
+++ b/media-radio/js8call/js8call-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	<media-libs/hamlib-3.4
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-hamlib-type.patch" )
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
+}
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 6123381ab029..6e74f5366294 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,11 +1,6 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
-AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e006f315bd6c97ba1683a97a852067ad5b460a4ea68b3854d70882a1a24f7d7873af7f2e350b010853b124af00944 SHA512 f8ba2e3820e599a41dfcb4e60570b320c54625833e3bf0ab649655b1925e1d21d8de776d705bffd3cf85b2ebf43868de17923cf94fa3e4abd787c5d3ec09b920
-AUX xastir-2.0.8-fix-graphicsmagick.diff 1201 BLAKE2B 60c16089c786178b91eb6731b1b95d676fe3a1620d8e55709ccf657a8f3b155d62cebfd141ae41eaac03d8ff26230d6e4f59a0e5bc795db7eb00ea64cf276d1e SHA512 d3ec865bdb2645ef54e555e33659761588f79aafb96261c65112d94a6d17ce3825555dc33cee6b3af1ef45f9c9e588cf8c6f3f67f5587c3a2651886c6869ec11
-AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
-AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
-DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
+AUX xastir-2.1.4-fno-common.diff 1930 BLAKE2B 97393a5a11af3797819ec68558fc273b059358b6df463b4aa28b5babc31a0fdba395fead457aa485b18bb9119ffdbb865457e7455891194bcd67fc7184126427 SHA512 e4a671f44ad0b4664be30487c45908466acf646389a890ab7448eacfa11ff22fc9a335e18dc06683b3a0b4789c8e2d85c510e456a387647e589b504e77853530
 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
-EBUILD xastir-2.0.8-r1.ebuild 2257 BLAKE2B 090d1625ac5caf048c4765ebd505264624f70dde36a02d8cee9f8444dfcb9dd135e108cf99a40eb29267a7744fbd624355a642ae15a07ee77d38646440a97377 SHA512 9725bfc7e33b60189441c5da81017eb9d5f79e07d27cb55f59a7834992cd93d9d3db9326e30e64f2955b677f046b4839ac6fe348ce6e171ff1a01be2f2746518
-EBUILD xastir-2.1.4.ebuild 1955 BLAKE2B 7c03b17aeba557689ba2cfbc61a51161a18034cdb253741398cf528f429409240b30eec9f45ed6afbe5092f3142fc7087783170347a7a82bfd326bd533d6610f SHA512 cb087cfcc9251c4163e339644eb932efe1b4ff6e3bda221691ecdc4020e10969e1b52a513011c90357f33a9ac58fcc536e700cdb802829ecb2a38a49b657d9de
-MISC metadata.xml 533 BLAKE2B 78ef77d6fa8e34acb3f3a4b1d01fa72fa1dbca850938561fe22ef8c0ab8e17128f2c2174ad72e55915c42f37a9f441314cbbc80c49df7406418b57b7319fb7e6 SHA512 efdef63c89df43ea0761e6f84ec3d285a6592fc199820084767905f66945140a624c117a0bf7b0ec982e47dbe9445252115e31c92a4bc7b006055c0c030c0ff5
+EBUILD xastir-2.1.4.ebuild 2039 BLAKE2B 3dda4bc66aba2db047b0ba56b19aea2a0110491efc32d1539f9a487c8636b0d7439f664072e62f1ae48448669dacea49919230fba71931326539367f911a52cd SHA512 6fb0927483b04660af44b1a4a939569ae852a7ec010f48f89048b84e25a434a0cf616505fde70da5d9e07c2b1eef008d4e5f49f3d2d1d8cb78ffb814340fe64c
+MISC metadata.xml 469 BLAKE2B 2e70497e0928a6ca00c783a8dd257ac66333cd2d9e34e271ca222b0df4dd5ea55b124d2728398d0a8b013355d63bf30907b29b121578921d09f7aee8667f480b SHA512 9ad337ee6c62205e9f7d3350763123bc25ff2e75bd3af6ac4438cc0b164439aa406339b9c2f7a3d6eef439965c888513c5089108944a281a781f27b1fb735758
diff --git a/media-radio/xastir/files/xastir-2.0.4-fortify.diff b/media-radio/xastir/files/xastir-2.0.4-fortify.diff
deleted file mode 100644
index e2c34b007475..000000000000
--- a/media-radio/xastir/files/xastir-2.0.4-fortify.diff
+++ /dev/null
@@ -1,144 +0,0 @@
---- src/rac_data.c.orig	2012-09-23 18:19:22.000000000 +0200
-+++ src/rac_data.c	2012-11-29 21:00:53.000000000 +0100
-@@ -212,7 +212,8 @@
-     char char_offset[16];
-     char index[32];
-     int found = 0;
--    rac_record racdata;
-+    char buffer[sizeof(rac_record)];
-+    rac_record *racdata = (rac_record *)buffer;
-     /*char        filler[8];*/
-     char amacall_path[MAX_VALUE];
- 
-@@ -220,7 +221,7 @@
- 
- 
-     xastir_snprintf(index, sizeof(index)," ");
--    xastir_snprintf(racdata.callsign, sizeof(racdata.callsign)," ");
-+    xastir_snprintf(racdata->callsign, sizeof(racdata->callsign)," ");
- 
-     /* ====================================================================    */
-     /*    Search thru the index, get the RBA                */
-@@ -257,19 +258,19 @@
-         if (callsign[5] == '-')
-             (void)chomp(callsign,5);
- 
--        while (!feof(fdb) && strncmp((char *)&racdata, callsign, 6) < 0)
-+        while (!feof(fdb) && strncmp(buffer, callsign, 6) < 0)
- 
- //WE7U
- // Problem here:  We're sticking 8 bytes too many into racdata!
--            rc = fgets((char *)&racdata, sizeof(racdata), fdb);
-+            rc = fgets(buffer, sizeof(buffer), fdb);
- 
-     } else
-         fprintf(stderr,"Search:Could not open RAC data base: %s\n", get_data_base_dir("fcc/AMACALL.LST") );
- 
-     /*  || (callsign[5] == '-' && strncmp((char *)&racdata,callsign,5) < 0)) */
--    (void)chomp(racdata.callsign, 6);
-+    (void)chomp(racdata->callsign, 6);
- 
--    if (!strncmp((char *)racdata.callsign, callsign, 6)) {
-+    if (!strncmp(racdata->callsign, callsign, 6)) {
-         found = 1;
- 
- // Some of these cause problems on 64-bit processors, so commented
-@@ -293,82 +294,82 @@
-         xastir_snprintf(data->callsign,
-             sizeof(data->callsign),
-             "%s",
--            racdata.callsign);
-+            racdata->callsign);
- 
-         xastir_snprintf(data->first_name,
-             sizeof(data->first_name),
-             "%s",
--            racdata.first_name);
-+            racdata->first_name);
-  
-         xastir_snprintf(data->last_name,
-             sizeof(data->last_name),
-             "%s",
--            racdata.last_name);
-+            racdata->last_name);
-  
-         xastir_snprintf(data->address,
-             sizeof(data->address),
-             "%s",
--            racdata.address);
-+            racdata->address);
-  
-         xastir_snprintf(data->city,
-             sizeof(data->city),
-             "%s",
--            racdata.city);
-+            racdata->city);
-  
-         xastir_snprintf(data->province,
-             sizeof(data->province),
-             "%s",
--            racdata.province);
-+            racdata->province);
-  
-         xastir_snprintf(data->postal_code,
-             sizeof(data->postal_code),
-             "%s",
--            racdata.postal_code);
-+            racdata->postal_code);
-  
-         xastir_snprintf(data->qual_a,
-             sizeof(data->qual_a),
-             "%s",
--            racdata.qual_a);
-+            racdata->qual_a);
-  
-         xastir_snprintf(data->qual_b,
-             sizeof(data->qual_b),
-             "%s",
--            racdata.qual_b);
-+            racdata->qual_b);
-  
-         xastir_snprintf(data->qual_c,
-             sizeof(data->qual_c),
-             "%s",
--            racdata.qual_c);
-+            racdata->qual_c);
-  
-         xastir_snprintf(data->qual_d,
-             sizeof(data->qual_d),
-             "%s",
--            racdata.qual_d);
-+            racdata->qual_d);
-  
-         xastir_snprintf(data->club_name,
-             sizeof(data->club_name),
-             "%s",
--            racdata.club_name);
-+            racdata->club_name);
-  
-         xastir_snprintf(data->club_address,
-             sizeof(data->club_address),
-             "%s",
--            racdata.club_address);
-+            racdata->club_address);
-  
-         xastir_snprintf(data->club_city,
-             sizeof(data->club_city),
-             "%s",
--            racdata.club_city);
-+            racdata->club_city);
-  
-         xastir_snprintf(data->club_province,
-             sizeof(data->club_province),
-             "%s",
--            racdata.club_province);
-+            racdata->club_province);
-  
-         xastir_snprintf(data->club_postal_code,
-             sizeof(data->club_postal_code),
-             "%s",
--            racdata.club_postal_code);
-+            racdata->club_postal_code);
-  
-     }
-     (void)fclose(fdb);
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
deleted file mode 100644
index 8919239fbfde..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-# backported from xastir-2.1.4 (see bug #688444)
---- a/src/map_geo.c	2019-07-26 15:54:19.534488550 +0200
-+++ b/src/map_geo.c	2019-07-26 15:56:47.779713950 +0200
-@@ -125,20 +125,7 @@
- #undef PACKAGE_TARNAME
- #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
- #undef PACKAGE_VERSION
--#ifdef HAVE_GRAPHICSMAGICK
--/*#include <GraphicsMagick/magick/api.h>*/
--/* Define MAGICK_IMPLEMENTATION to access private interfaces
-- * such as DestroyImagePixels(). This may not be a good thing,
-- * but DestroyImagePixels() has been in this code for a long
-- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
-- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
-- * OpenSuSE-11.3)
-- */
--#define MAGICK_IMPLEMENTATION
- #include <magick/api.h>
--#else   // HAVE_GRAPHICSMAGICK
--#include <magick/api.h>
--#endif  // HAVE_GRAPHICSMAGICK
- #undef PACKAGE_BUGREPORT
- #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
- #undef XASTIR_PACKAGE_BUGREPORT
-@@ -2030,7 +2017,6 @@
-             if (!SyncImagePixels(image))
-                 fprintf(stderr, "SyncImagePixels Failed....\n");
- 	}
--        DestroyImagePixels(image);
-     }
- 
-     // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
deleted file mode 100644
index 8cbdbc2cdb62..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.ac.orig	2016-07-12 07:08:17.988160777 +0200
-+++ configure.ac	2016-07-12 07:11:42.591138389 +0200
-@@ -382,27 +382,17 @@
- 
- # Check for Shapelib
- use_shapelib=yes
--force_internal_shapelib=no
- shapelib_desired=yes
- LIBSHP=""
- SUBSHP=""
- # This symbol will be blank if the proj library hasn't been found, and will
- # have the three programs that need proj if it has
- CONTSHP=""
--AC_ARG_WITH(internal-shapelib,[  --with-internal-shapelib  Force use of internal shapelib library.],force_internal_shapelib=$withval)
- AC_ARG_WITH(shapelib,[  --without-shapelib        Disable shapelib features.],shapelib_desired=$withval)
- if test "${shapelib_desired}" = "no"; then
-   use_shapelib=no
--  force_internal_shapelib=no
- fi
--if test "${force_internal_shapelib}" = "yes"; then
--  AC_MSG_WARN([***************************************************************** ])  
--  AC_MSG_WARN([Internal Shapelib library has been forced.                        ])
--  AC_MSG_WARN([***************************************************************** ])
--  # Temporary setting to get into if block below
--  use_shapelib=no
--fi
--if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then
-+if test "${shapelib_desired}" = "yes" ; then
-   use_shapelib=no
-   AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes
-     LIBS="$LIBS -lshp"
-@@ -411,26 +401,6 @@
-     AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
-     break)])
- fi
--if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then
-- AC_MSG_WARN([**************************************************************** ])  
-- AC_MSG_WARN([Your system does not have shapelib installed.  Using an internal ])
-- AC_MSG_WARN([version.  This may lead to a larger filesize for the executable. ])
-- AC_MSG_WARN([Install shapelib on your system to eliminate this warning.       ])
-- AC_MSG_WARN([**************************************************************** ])  
-- LIBSHP="-Lshapelib -lshape"
-- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS"
-- SUBSHP="shapelib" 
-- use_shapelib=yes
-- force_internal_shapelib=yes
-- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) 
-- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
-- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. )
--
-- if  test  $use_proj = "yes" 
-- then
--   CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) shpwkb$(EXEEXT)"
-- fi
--fi
- AC_SUBST(SUBSHP)
- AC_SUBST(CONTSHP)
- AC_SUBST(LIBSHP)
diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff b/media-radio/xastir/files/xastir-2.0.8-scripts.diff
deleted file mode 100644
index 35c73246c9ee..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-scripts.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
---- xastir-2.0.0-orig/scripts/Makefile.am.orig	2012-11-27 05:41:23.000000000 +0100
-+++ xastir-2.0.0/scripts/Makefile.am	2012-12-05 06:21:59.000000000 +0100
-@@ -43,10 +41,8 @@
-     values \
-     values.pl \
-     waypoint-get.pl \
--    xastir-fixcfg.sh \
--    xastir-migrate.sh \
-     Xastir_tigerpoly.py
- 
- install-data-hook:
- 	cd $(DESTDIR)$(scriptsdir) && \
--	chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+	chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl	2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
- 
- 
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
- 
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
- 
- #------------------------------------------------------------------------------------------------
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;		# Snag WE7U's Coordinate module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl	2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl	2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/
diff --git a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
new file mode 100644
index 000000000000..f2580b5977e6
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
@@ -0,0 +1,63 @@
+# Fixes build with -fno-common (bug #706952)
+
+diff --git a/src/objects.h b/src/objects.h
+index b1bf8b5..ef5b9b1 100644
+--- a/src/objects.h
++++ b/src/objects.h
+@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid to %d and egid to %d\n", (
+ //
+ // number_of_predefined_objects holds the actual number of predefined
+ // objects available to display on the Create/Move popup menu.
+-int number_of_predefined_objects;
++extern int number_of_predefined_objects;
+ // File name of ~/.xastir/config file containing definitions for
+ // a predefined object menu.
+ extern char predefined_object_definition_filename[256];
+diff --git a/src/x_spider.c b/src/x_spider.c
+index a1fabc4..e5a0bc3 100644
+--- a/src/x_spider.c
++++ b/src/x_spider.c
+@@ -185,6 +185,7 @@ extern void split_string( char *data, char *cptr[], int max, char search_char );
+ // From database.h
+ extern char my_callsign[];
+ 
++extern char *pname;
+ 
+ typedef struct _pipe_object
+ {
+diff --git a/src/x_spider.h b/src/x_spider.h
+index d8af8e9..a168b1f 100644
+--- a/src/x_spider.h
++++ b/src/x_spider.h
+@@ -31,7 +31,7 @@
+ #define SERV_UDP_PORT       2023
+ 
+ 
+-char *pname;
++extern char *pname;
+ extern int pipe_xastir_to_tcp_server;
+ extern int pipe_tcp_server_to_xastir;
+ extern int pipe_xastir_to_udp_server;
+diff --git a/src/xa_config.c b/src/xa_config.c
+index 9a6f1f3..2ded26c 100644
+--- a/src/xa_config.c
++++ b/src/xa_config.c
+@@ -65,7 +65,7 @@
+ 
+ #define MAX_VALUE 300
+ 
+-//extern char xa_config_dir[];
++char xa_config_dir[1000];       /* cmdline option user config dir */
+ 
+ 
+ 
+diff --git a/src/xa_config.h b/src/xa_config.h
+index 9947145..530fc06 100644
+--- a/src/xa_config.h
++++ b/src/xa_config.h
+@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
+ void save_data(void);
+ void load_data_or_default(void);
+ 
+-char xa_config_dir[1000];       /* cmdline option user config dir */
++extern char xa_config_dir[1000];       /* cmdline option user config dir */
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index e44c45094ca1..f7dfda2f7084 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name="gdal">Support for some further map formats</flag>
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
 	</use>
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
deleted file mode 100644
index 4d12a2c14255..000000000000
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gdal geotiff +graphicsmagick"
-
-DEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-apps/xfontsel
-	dev-libs/libpcre
-	net-misc/curl
-	sys-libs/db:4.8
-	sci-libs/shapelib
-	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
-	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
-		media-libs/tiff:0 )
-	gdal? ( sci-libs/gdal )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix script location (bug #407185)
-	epatch "${FILESDIR}"/${P}-scripts.diff
-
-	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
-
-	# do not use builtin shapelib if sci-libs/shapelib is not installed
-	# instead build without shapelib support (bug #430704)
-	epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff
-
-	# do not filter duplicate flags (see bug 411095)
-	epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
-	# fix compile problem with newer graphicsmagic
-	epatch "${FILESDIR}"/${PN}-2.0.8-fix-graphicsmagick.diff
-
-	eautoreconf
-}
-
-src_configure() {
-	# provide include path to GraphicsMagic for configure stage
-	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
-	econf --with-pcre \
-		--with-shapelib \
-		--with-dbfawk \
-		--without-ax25 \
-		--without-festival \
-		--without-gpsman \
-		$(use_with !graphicsmagick imagemagick) \
-		$(use_with graphicsmagick) \
-		$(use_with geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with gdal)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog FAQ README README.Contributing \
-		README.Getting-Started README.MAPS
-}
-
-pkg_postinst() {
-	elog "Kernel mode AX.25 and GPSman library not supported."
-	elog
-	elog "Remember you have to be root to add addditional scripts,"
-	elog "maps and other configuration data under /usr/share/xastir."
-}
diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild
index c3f29e3674c3..d779bc0c568b 100644
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ b/media-radio/xastir/xastir-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,9 @@ src_prepare() {
 	# do not filter duplicate flags (see bug 411095)
 	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# build with -fno-common (bug #706952)
+	eapply "${FILESDIR}"/${P}-fno-common.diff
+
 	eautoreconf
 }
 
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index 61f352c6ebbe..f8e82a446e8a 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,3 +1,4 @@
+AUX xdx-2.5.0-fno-common.patch 720 BLAKE2B 9ac513df6b9d6f4bd4ab34f97ec3bf5d7815d441b85b4ec6dcbd2b1318988b76660e9997bcd39a9585761387ea1aeb617ae98ee37bf74393848e46078487d502 SHA512 43c1a08ba59a06a8d8d6984e78a117328f4ee8910b8cef2cb66e6415a432a54131a48f8018e4fc4c2f85562bb9c3cbd79bd087fd6b57810088bb4ffb5fdb225c
 DIST xdx-2.5.0.tar.gz 342548 BLAKE2B 58f0ab6740f77460d7fc6d19fa7d43a399de4a79d5647174491043eded515dc03e2fb97de8d10e5be16f5ff2b65dda96be78b5710e52c02d48ebcf23b575e6c4 SHA512 e03ac1fde04f921d33a7075a0f9ddc632336c2c4506e69c3e51386c25080c527eb7195729a89edb895308beff05e7544c93831ad03df6db376b9624063a2972a
-EBUILD xdx-2.5.0.ebuild 776 BLAKE2B 0477b18c6e7de236d5b2b65a2ed6bd6a6b143cb1faf151282f40930b103290d576001ecb6afb3ec0efa6e47968d055d9aac519cb5a502dbae803aa71537b9490 SHA512 d26765b8b892c4764dfd513307bce3be76d77ecba63ce8db6fe57d2b5ea2917673584ea746e0e1f52a17f8ea25acfa51fc82c9572ddbe0965aed26852bd26e19
+EBUILD xdx-2.5.0.ebuild 838 BLAKE2B 8a004da7c5d7ad7541eff68ef4ebe493987af67191f4e27bcf0006b68196ad20af400d4210f7301c8ac694e826166c32bc8b52016cb43325ed2c6793e42c2b0f SHA512 0b14aea08da15e73b6ecd4495293724e9e4f8ece123e5ed3e51c6a268baaca7fc47f7cdf765567d77d53dcfce9fa9599964f51603e3214385361426244954a4b
 MISC metadata.xml 335 BLAKE2B d8d6b599df79920e9b97d52adf01f12668c12d61a546367cea81fa7ed31d8bcbce7e4b124cc8e575d9064ed4086e1de32d26b985add25c83ed417ea71d3f7524 SHA512 491d22817b73ee8eda2c59a361682fb63ee8eeaeb15f610e7f55ffbf297f85b667c33ebad1fe1739d36f5995ccaec77d363a9c53f1976742c338553c347c5f0b
diff --git a/media-radio/xdx/files/xdx-2.5.0-fno-common.patch b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
new file mode 100644
index 000000000000..a707d09b0a78
--- /dev/null
+++ b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
@@ -0,0 +1,25 @@
+diff --git a/src/gui.c b/src/gui.c
+index a3af442..5298c11 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -76,6 +76,7 @@ extern preferencestype preferences;
+ static void on_highcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
+ static void on_soundcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
+ 
++guitype *gui;
+ 
+ /**********************************MAIN WINDOW********************************/
+ guitype *
+diff --git a/src/gui.h b/src/gui.h
+index 77b442f..6ba406f 100644
+--- a/src/gui.h
++++ b/src/gui.h
+@@ -53,7 +53,7 @@ typedef struct guitype {
+     gchar           *high8tagname;
+ } guitype;
+ 
+-guitype *gui;
++extern guitype *gui;
+ 
+ guitype *new_gui(void);
+ void create_mainwindow(void);
diff --git a/media-radio/xdx/xdx-2.5.0.ebuild b/media-radio/xdx/xdx-2.5.0.ebuild
index 92511501a99d..ed0eaf1b2f52 100644
--- a/media-radio/xdx/xdx-2.5.0.ebuild
+++ b/media-radio/xdx/xdx-2.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils
 
@@ -19,13 +19,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}/"${P}-fno-common.patch )
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_configure() {
 	econf $(use_enable nls)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	einstalldocs
 }
 
 pkg_postinst() {