From 9c26151d84a72781f240cc7ca3e2f0ab4ba60f74 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Jul 2022 14:31:38 +0100 Subject: gentoo auto-resync : 17:07:2022 - 14:31:38 --- media-radio/xastir/Manifest | 5 +- 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 -------------------- media-radio/xastir/xastir-2.1.8-r1.ebuild | 79 +++++++++++++++++++ 5 files changed, 80 insertions(+), 189 deletions(-) delete mode 100644 media-radio/xastir/files/xastir-2.1.2-scripts.diff delete mode 100644 media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch delete mode 100644 media-radio/xastir/xastir-2.1.6.ebuild create mode 100644 media-radio/xastir/xastir-2.1.8-r1.ebuild (limited to 'media-radio/xastir') diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index c8670c3d33f8..5558a3c0fa2c 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,9 +1,6 @@ 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.6-automake-1.16.5.patch 426 BLAKE2B bded6c304ce675046d833fe1b52d474ef47ec1c237eaa8b23976cba80e2d773cea94ff3f0e28b7c4ea33a75092710be312c37940684223cc2959b07a1224bb7e SHA512 c5ea9a433473a2f0766911ad9acb38f21bd168fe46af166cef2c338cc5277e24bb972f8edb90b1664ecbb4eb991e34290d8661163579c2c91e9491b41f62705f AUX xastir-2.1.8-scripts.diff 3112 BLAKE2B 2e2d96ab6788c700f0f660ce1698dbf59ccf697896404cbd11777cefa077660a1ee2abc7efb208683eb3b131a93c9ffc048c077054b9cf3d77c2458f1c522b39 SHA512 fcf5dc5ead6a0871d219323e78b9c33747e9ba1289a2c75e211af752f8a8d53d919b51dc5ef4c0618780c3d8869b19c10cbe785be8e70f5b75cbe71c97b70a4c -DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08 DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d -EBUILD xastir-2.1.6.ebuild 2054 BLAKE2B 41a349cf8f61aa60ec54cb5498a42fceeefe05cc722bff8916ae4645488ae27cf59acf925b6836ca82d4a7e56ba3c848f7750de2c6a1b3eaafec5064b9a5a456 SHA512 2eda8c4f570c75e6490cf840e9093f8f19c2a2cd80b8e452b28d2af065fe582eaa7d023e4eef95ab0352b619e2993bd1b799a5ef7f3b28d41abd5fe45e7fa7fb +EBUILD xastir-2.1.8-r1.ebuild 1784 BLAKE2B 92ebbcb0aeb0cf53f9aecb03f50f08e16026d213b56a924f65a97c56b00f3b3feec9b23b0e989c9d68aa50c0742e246a1a5de607ea0809fb600f0a728499ed6a SHA512 4558f7c024b9ca1072214d29483baf40175f4cfe8eefb827f751ce0486b41676bfca3a6f7d664f99544f302d2542bbab573d8624e2876ef94fd052da6ed561cd EBUILD xastir-2.1.8.ebuild 1927 BLAKE2B d851873c1b8f9ebc3bc33ef5d0d56f90ca94bc170648df3a4a56cff57de3853c336c0b1cae90b8b1dbdc7bd62979b082c4c1cb12e37b1dcd63382c5f552d1411 SHA512 c7124938b3060b921d34f44c9a6f9bbc81b5ce5f3d6ef949826eedc04d134cc3ae4621b1999af11768892b62dc634cea9b9ce4a6c313a1591b833f89938c363d MISC metadata.xml 472 BLAKE2B ce31d7060b0e735a8ecda8ad847e3cd45c4f4a2749470d79cd6542be0ae164a5e06e476c536c67c34e23d6a19c6f4a6b94fcfdfdc77827784b4459737c99ccfa SHA512 40d9aa951fe33a6dae574a9cafe564d3241e2121fc7ff0852b4f0f2044661b1b4f49abe1b2819d4291f6bb8f53bceef29b880ab05584d416c0dc08595b92eab8 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], [xastir@xastir.org]) - # The revision number must contain at least one '.' and two digits. - AC_INIT([xastir], [2.1.6], [xastir@xastir.org]) --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? ( =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." -} diff --git a/media-radio/xastir/xastir-2.1.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r1.ebuild new file mode 100644 index 000000000000..c1f909e7a2a0 --- /dev/null +++ b/media-radio/xastir/xastir-2.1.8-r1.ebuild @@ -0,0 +1,79 @@ +# 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" + +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:= + sci-libs/shapelib + 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.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 + append-cflags -I/usr/include/GraphicsMagick + econf \ + --with-shapelib \ + --without-ax25 \ + --without-festival \ + --without-gpsman \ + --without-imagemagick \ + --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." +} -- cgit v1.2.3