gentoo auto-resync : 18:12:2022 - 09:41:22

3 files changed, 1 insertions, 82 deletions

diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 348c47bb00ce..464feaefb4da 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,6 +1,5 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.1.8-scripts.diff 3112 BLAKE2B 2e2d96ab6788c700f0f660ce1698dbf59ccf697896404cbd11777cefa077660a1ee2abc7efb208683eb3b131a93c9ffc048c077054b9cf3d77c2458f1c522b39 SHA512 fcf5dc5ead6a0871d219323e78b9c33747e9ba1289a2c75e211af752f8a8d53d919b51dc5ef4c0618780c3d8869b19c10cbe785be8e70f5b75cbe71c97b70a4c
 DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
-EBUILD xastir-2.1.8-r1.ebuild 1782 BLAKE2B e7c9cc4c6f6f2070a254ae50f793d8cdeeb575b6034ee7b5b003929dd1bb831808d880dc040a6fba284551370c785916caa2a13fa187dba8b05a7c1c8b0baca7 SHA512 d141eb3703c4deffc76bd62c0e5886d38c70a8f04d2a30871ac37922aa5d08a79b19109f4fac037f85379b11f2c9bc6b8abe19cc0e9d46be82a3b8b6848c6588
-EBUILD xastir-2.1.8-r2.ebuild 1927 BLAKE2B b3474eacd5522841c41eb6a55a45e768c81f0e496ec00081a0ba3074a384a05de7397bf02aed2460b05c01bee937b5a8d725b5c4e92718d07e1ed4a0893f9305 SHA512 b21e6fa7823cac049463fc5e9514b074cd8eaf6a345ca15573fc8b7988f7665b6ebfe3165a85f1e13e48c332be5f0efef515b36dcb1e9012a35128fb4a378087
+EBUILD xastir-2.1.8-r3.ebuild 1782 BLAKE2B e7c9cc4c6f6f2070a254ae50f793d8cdeeb575b6034ee7b5b003929dd1bb831808d880dc040a6fba284551370c785916caa2a13fa187dba8b05a7c1c8b0baca7 SHA512 d141eb3703c4deffc76bd62c0e5886d38c70a8f04d2a30871ac37922aa5d08a79b19109f4fac037f85379b11f2c9bc6b8abe19cc0e9d46be82a3b8b6848c6588
 MISC metadata.xml 472 BLAKE2B ce31d7060b0e735a8ecda8ad847e3cd45c4f4a2749470d79cd6542be0ae164a5e06e476c536c67c34e23d6a19c6f4a6b94fcfdfdc77827784b4459737c99ccfa SHA512 40d9aa951fe33a6dae574a9cafe564d3241e2121fc7ff0852b4f0f2044661b1b4f49abe1b2819d4291f6bb8f53bceef29b880ab05584d416c0dc08595b92eab8
diff --git a/media-radio/xastir/xastir-2.1.8-r2.ebuild b/media-radio/xastir/xastir-2.1.8-r2.ebuild
deleted file mode 100644
index dcf860a2cf5f..000000000000
--- a/media-radio/xastir/xastir-2.1.8-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${PN/x/X}-Release-${PV}
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="https://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:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# fix script location (bug #407185)
-	eapply  "${FILESDIR}"/${PN}-2.1.8-scripts.diff
-
-	# do not filter duplicate flags (see bug #411095)
-	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
-	eautoreconf
-}
-
-src_configure() {
-	# provide include path to GraphicsMagic for configure stage
-	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
-	econf \
-		--with-shapelib \
-		--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.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r3.ebuild
index d37d400967ec..d37d400967ec 100644
--- a/media-radio/xastir/xastir-2.1.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.1.8-r3.ebuild