commit: 68fccf43c60ca10a1f9d309e3e442d8380bc9408
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 07:20:25 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 07:26:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fccf43
media-radio/xastir: drop 2.1.6
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/xastir/Manifest | 1 -
media-radio/xastir/files/xastir-2.1.2-scripts.diff | 89 ----------------------
.../files/xastir-2.1.6-automake-1.16.5.patch | 13 ----
media-radio/xastir/xastir-2.1.6.ebuild | 83 --------------------
4 files changed, 186 deletions(-)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 1283992f06e1..db413c009cbb 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,2 +1 @@
-DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B
053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914
SHA512
91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B
4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6
SHA512
361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
diff --git a/media-radio/xastir/files/xastir-2.1.2-scripts.diff
b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
deleted file mode 100644
index 7b52c6895606..000000000000
--- a/media-radio/xastir/files/xastir-2.1.2-scripts.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/coord-convert.pl
Xastir-Release-2.1.2/scripts/coord-convert.pl
---- Xastir-Release-2.1.2.orig/scripts/coord-convert.pl 2010-07-03
22:09:48.000000000 +0000
-+++ Xastir-Release-2.1.2/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-Release-2.1.2.orig/scripts/permutations.pl
Xastir-Release-2.1.2/scripts/permutations.pl
---- Xastir-Release-2.1.2.orig/scripts/permutations.pl 2010-07-03
22:09:48.000000000 +0000
-+++ Xastir-Release-2.1.2/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-Release-2.1.2.orig/scripts/test_coord.pl
Xastir-Release-2.1.2/scripts/test_coord.pl
---- Xastir-Release-2.1.2.orig/scripts/test_coord.pl 2010-01-31
02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/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-Release-2.1.2.orig/scripts/toporama250k.pl
Xastir-Release-2.1.2/scripts/toporama250k.pl
---- Xastir-Release-2.1.2.orig/scripts/toporama250k.pl 2010-01-31
02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/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-Release-2.1.2.orig/scripts/toporama50k.pl
Xastir-Release-2.1.2/scripts/toporama50k.pl
---- Xastir-Release-2.1.2.orig/scripts/toporama50k.pl 2010-01-31
02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/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 -Nur -u Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in
Xastir-Release-2.1.2/scripts/get-NWSdata.in
---- Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in 2010-01-31
02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/get-NWSdata.in 2012-03-07
15:47:01.000000000 +0000
-@@ -123,7 +123,7 @@
- echo
- echo $e.dbf
- # Run in a separate shell so we don't mess up the current directory for
the -e test above
-- (cd /usr/local/share/xastir; /usr/local/bin/testdbfawk -D config -d
Counties/$e.dbf 2>&1 | head -3 | tail -1)
-+ (cd /usr/share/xastir; /usr/bin/testdbfawk -D config -d Counties/$e.dbf
2>&1 | head -3 | tail -1)
-
- fi
- done
diff --git a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
deleted file mode 100644
index 51d10a2c8159..000000000000
--- a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/816615
-https://github.com/Xastir/Xastir/pull/181
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,6 @@
- # It should look something like this: ([xastir], [2.0.8],
[[email protected]])
- # The revision number must contain at least one '.' and two digits.
- AC_INIT([xastir], [2.1.6], [[email protected]])
--AM_INIT_AUTOMAKE
- #########################################################################
-
-
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild
b/media-radio/xastir/xastir-2.1.6.ebuild
deleted file mode 100644
index 9ad868bd9212..000000000000
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 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="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: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
-
- # fix eautoreconf with >=sys-devel/automake-1.16.5 (see bug #816615)
- eapply "${FILESDIR}"/${PN}-2.1.6-automake-1.16.5.patch
-
- 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."
-}
