gentoo resync : 25.08.2020

4 files changed, 2 insertions, 152 deletions

diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index d65c0107bf5a..c299ba89e152 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,8 +1,5 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
-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
 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
-EBUILD xastir-2.1.4.ebuild 2039 BLAKE2B 3dda4bc66aba2db047b0ba56b19aea2a0110491efc32d1539f9a487c8636b0d7439f664072e62f1ae48448669dacea49919230fba71931326539367f911a52cd SHA512 6fb0927483b04660af44b1a4a939569ae852a7ec010f48f89048b84e25a434a0cf616505fde70da5d9e07c2b1eef008d4e5f49f3d2d1d8cb78ffb814340fe64c
-EBUILD xastir-2.1.6.ebuild 1927 BLAKE2B 6ad4c099272f06e258f408e40c07ccebe68c54287715630e5bb385e045e646361187d26f36c0ee7a635619905ed532d6ecba8378baaf160d7943264505f8294f SHA512 d0db47118ce95e9eea198375bf07620065fbe042f50b4e88f3099073699599f91d8ec9ae9e6be1b57fd1e9bb27049ac09298583a66a908c7d015c5a24137b2a4
+EBUILD xastir-2.1.6.ebuild 1925 BLAKE2B eb058e099fb416870dc9269b59fa853f7c54e65cc890b341ed3df3e143ad06e1f05b63e7ec0d0b7d8d9a3e5a65450b642f771b2612dcb0bc2b709f38d00c33ee SHA512 490fbceccc239a2174f83bd7a0d4fd7a777a9cd7f63ea8918ac2cc87801cce42d3ba9ac3f15d8bde27b041b96765ef617e6e43b9e0fc13856ef57e42689b90c0
 MISC metadata.xml 469 BLAKE2B 2e70497e0928a6ca00c783a8dd257ac66333cd2d9e34e271ca222b0df4dd5ea55b124d2728398d0a8b013355d63bf30907b29b121578921d09f7aee8667f480b SHA512 9ad337ee6c62205e9f7d3350763123bc25ff2e75bd3af6ac4438cc0b164439aa406339b9c2f7a3d6eef439965c888513c5089108944a281a781f27b1fb735758
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
deleted file mode 100644
index f2580b5977e6..000000000000
--- a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild
deleted file mode 100644
index d779bc0c568b..000000000000
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${PN/x/X}-Release-${PV}
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
-SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
-			-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# fix script location (bug #407185)
-	eapply  "${FILESDIR}"/${PN}-2.1.2-scripts.diff
-
-	# 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
-}
-
-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)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
-		README.Getting-Started README.MAPS README.OSM_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.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
index 344c4d649b7b..1da0b5592d83 100644
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ b/media-radio/xastir/xastir-2.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0