[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: dd49289fe331179328b326d3fc6a83bc1c54d94b Author: Thomas Beierlein gentoo org> AuthorDate: Tue Jan 16 08:44:01 2024 + Commit: Thomas Beierlein gentoo org> CommitDate: Tue Jan 16 08:44:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd49289f media-radio/xastir: drop 2.1.8-r3, 2.1.8-r4 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 - .../xastir/files/xastir-2.1.8-configure.diff | 16 - media-radio/xastir/xastir-2.1.8-r3.ebuild | 79 - media-radio/xastir/xastir-2.1.8-r4.ebuild | 82 -- 4 files changed, 178 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index eedf37811bbc..7289a2bfedba 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1 @@ -DIST xastir-2.1.8.tar.gz 586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d DIST xastir-2.2.0.tar.gz 2232411 BLAKE2B 901a22ee9db6f2c416807dd11f532975bbaf38314224327a43acff0d7164200456e373cefd852b4022187a6c0c4d2182c2088c12bac93d0fc6ed6771c957c11f SHA512 d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b diff --git a/media-radio/xastir/files/xastir-2.1.8-configure.diff b/media-radio/xastir/files/xastir-2.1.8-configure.diff deleted file mode 100644 index 0340f00e241e.. --- a/media-radio/xastir/files/xastir-2.1.8-configure.diff +++ /dev/null @@ -1,16 +0,0 @@ -# Fix implicit function declaration in configure.ac -# bug 899846 -diff --git a/configure.ac b/configure.ac -index 687bbe9..c137c80 100644 a/configure.ac -+++ b/configure.ac -@@ -646,7 +646,8 @@ fi - save_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,--no-keep-memory $LDFLAGS" - AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -+ [AC_LANG_PROGRAM([[#include -+ #include ]], - [[/* Stupid useless test for linker flags */ - exit(0);]])], - [xa_cv_no_keep_memory=yes], diff --git a/media-radio/xastir/xastir-2.1.8-r3.ebuild b/media-radio/xastir/xastir-2.1.8-r3.ebuild deleted file mode 100644 index 01d7d4d56c52.. --- a/media-radio/xastir/xastir-2.1.8-r3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 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:= )" -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." -} diff --git a/media-radio/xastir/xastir-2.1.8-r4.ebuild b/media-radio/xastir/xastir-2.1.8-r4.ebuild deleted file mode 100644 index 321686006d1b.. --- a/media-radio/xastir/xastir-2.1.8-r4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-20
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: acaa305b6c9107c23e8dc5573919795649af15a4 Author: Sam James gentoo org> AuthorDate: Mon Jan 15 19:57:22 2024 + Commit: Sam James gentoo org> CommitDate: Mon Jan 15 19:57:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acaa305b media-radio/xastir: Stabilize 2.2.0 amd64, #922175 Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.2.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-radio/xastir/xastir-2.2.0.ebuild b/media-radio/xastir/xastir-2.2.0.ebuild index 9cf4649e7f13..59c2d308cdc3 100644 --- a/media-radio/xastir/xastir-2.2.0.ebuild +++ b/media-radio/xastir/xastir-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 66a55bd7ca1a76434eaa165ecb5576e5719acc8d Author: Thomas Beierlein gentoo org> AuthorDate: Thu Nov 16 18:40:40 2023 + Commit: Thomas Beierlein gentoo org> CommitDate: Thu Nov 16 18:43:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a55bd7 media-radio/xastir: add 2.2.0 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/xastir-2.2.0.ebuild | 79 ++ 2 files changed, 80 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index db413c009cbb..eedf37811bbc 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.1.8.tar.gz 586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d +DIST xastir-2.2.0.tar.gz 2232411 BLAKE2B 901a22ee9db6f2c416807dd11f532975bbaf38314224327a43acff0d7164200456e373cefd852b4022187a6c0c4d2182c2088c12bac93d0fc6ed6771c957c11f SHA512 d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b diff --git a/media-radio/xastir/xastir-2.2.0.ebuild b/media-radio/xastir/xastir-2.2.0.ebuild new file mode 100644 index ..9cf4649e7f13 --- /dev/null +++ b/media-radio/xastir/xastir-2.2.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 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:= )" +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.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." +}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 1fb04c6812477a865bddc158842f24377a6eaa43 Author: Thomas Beierlein gentoo org> AuthorDate: Tue Mar 7 17:02:33 2023 + Commit: Thomas Beierlein gentoo org> CommitDate: Tue Mar 7 17:03:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb04c68 media-radio/xastir: Fix implicit function declaration in configure.ac Closes: https://bugs.gentoo.org/899846 Signed-off-by: Thomas Beierlein gentoo.org> .../xastir/files/xastir-2.1.8-configure.diff | 16 + media-radio/xastir/xastir-2.1.8-r4.ebuild | 82 ++ 2 files changed, 98 insertions(+) diff --git a/media-radio/xastir/files/xastir-2.1.8-configure.diff b/media-radio/xastir/files/xastir-2.1.8-configure.diff new file mode 100644 index ..0340f00e241e --- /dev/null +++ b/media-radio/xastir/files/xastir-2.1.8-configure.diff @@ -0,0 +1,16 @@ +# Fix implicit function declaration in configure.ac +# bug 899846 +diff --git a/configure.ac b/configure.ac +index 687bbe9..c137c80 100644 +--- a/configure.ac b/configure.ac +@@ -646,7 +646,8 @@ fi + save_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,--no-keep-memory $LDFLAGS" + AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], ++ [AC_LANG_PROGRAM([[#include ++ #include ]], + [[/* Stupid useless test for linker flags */ + exit(0);]])], + [xa_cv_no_keep_memory=yes], diff --git a/media-radio/xastir/xastir-2.1.8-r4.ebuild b/media-radio/xastir/xastir-2.1.8-r4.ebuild new file mode 100644 index ..321686006d1b --- /dev/null +++ b/media-radio/xastir/xastir-2.1.8-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 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:= )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-2.1.8-configure.diff ) + +S="${WORKDIR}"/${MY_P} + +src_prepare() { + eapply_user + eapply ${PATCHES} + + # 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." +}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: e1a5ab826d0975c02d376ff4f8b6036618b6a1e2 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 07:37:34 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 07:46:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a5ab82 media-radio/xastir: drop 2.1.8-r2 Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.1.8-r2.ebuild | 80 --- 1 file changed, 80 deletions(-) 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.. --- 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? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: f3d618f122bebf7873bf52fe9321fcd56262495e Author: Sam James gentoo org> AuthorDate: Sun Dec 18 07:37:20 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 07:46:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d618f1 media-radio/xastir: fix revbump order Sorry for the noise. The script didn't get ordering right in all cases. Signed-off-by: Sam James gentoo.org> media-radio/xastir/{xastir-2.1.8-r1.ebuild => xastir-2.1.8-r3.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-radio/xastir/xastir-2.1.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r3.ebuild similarity index 100% rename from media-radio/xastir/xastir-2.1.8-r1.ebuild rename to media-radio/xastir/xastir-2.1.8-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 1d69eb48210f31783270a1916835d8cde96fafb2 Author: Sam James gentoo org> AuthorDate: Fri Dec 16 01:30:12 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 01:38:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d69eb48 media-radio/xastir: add media-libs/libtiff subslot dep libtiff changed SONAME. Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.1.8-r1.ebuild | 2 +- media-radio/xastir/{xastir-2.1.8.ebuild => xastir-2.1.8-r2.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-radio/xastir/xastir-2.1.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r1.ebuild index 2951c91e43e7..d37d400967ec 100644 --- a/media-radio/xastir/xastir-2.1.8-r1.ebuild +++ b/media-radio/xastir/xastir-2.1.8-r1.ebuild @@ -28,7 +28,7 @@ DEPEND=">=x11-libs/motif-2.3:0 media-gfx/graphicsmagick:=[-q32] geotiff? ( sci-libs/proj sci-libs/libgeotiff:= - media-libs/tiff:0 )" + media-libs/tiff:= )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MY_P} diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8-r2.ebuild similarity index 98% rename from media-radio/xastir/xastir-2.1.8.ebuild rename to media-radio/xastir/xastir-2.1.8-r2.ebuild index 796b47bf4772..dcf860a2cf5f 100644 --- a/media-radio/xastir/xastir-2.1.8.ebuild +++ b/media-radio/xastir/xastir-2.1.8-r2.ebuild @@ -29,7 +29,7 @@ DEPEND=">=x11-libs/motif-2.3:0 graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= - media-libs/tiff:0 )" + media-libs/tiff:= )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 4df02ba8e75566a33e0dd56884ba694bbb4080dd Author: Sam James gentoo org> AuthorDate: Mon Aug 22 17:25:46 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 22 17:25:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df02ba8 media-radio/xastir: Stabilize 2.1.8-r1 x86, #865995 Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.1.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r1.ebuild index 80f555d70e6d..2951c91e43e7 100644 --- a/media-radio/xastir/xastir-2.1.8-r1.ebuild +++ b/media-radio/xastir/xastir-2.1.8-r1.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" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 14aab0eaf874e16f18eb22b6bd7941cecec0d2d1 Author: Sam James gentoo org> AuthorDate: Mon Aug 22 17:25:07 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 22 17:25:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14aab0ea media-radio/xastir: Stabilize 2.1.8-r1 amd64, #865995 Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.1.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.8-r1.ebuild b/media-radio/xastir/xastir-2.1.8-r1.ebuild index c1f909e7a2a0..80f555d70e6d 100644 --- a/media-radio/xastir/xastir-2.1.8-r1.ebuild +++ b/media-radio/xastir/xastir-2.1.8-r1.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" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
commit: 68fccf43c60ca10a1f9d309e3e442d8380bc9408 Author: Thomas Beierlein gentoo org> AuthorDate: Sun Jul 17 07:20:25 2022 + Commit: Thomas Beierlein gentoo org> CommitDate: Sun Jul 17 07:26:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fccf43 media-radio/xastir: drop 2.1.6 Signed-off-by: Thomas Beierlein 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 586 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.. --- 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.0 + -+++ Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + -@@ -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.0 + -+++ Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07 15:42:34.0 + -@@ -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.pl2010-01-31 02:12:23.0 + -+++ Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.0 + -@@ -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.0 + -+++ Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + -@@ -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.0 + -+++ Xastir-Release-2.1.2/scripts/toporama50k.pl2012-03-07 15:47:01.0 + -@@ -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: - # .../m
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: a9ee8cff41bd892d88bb270a38be43999ec7f04c Author: Thomas Beierlein gentoo org> AuthorDate: Sun Jul 17 07:24:06 2022 + Commit: Thomas Beierlein gentoo org> CommitDate: Sun Jul 17 07:26:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ee8cff media-radio/xastir: Drop dep on imagemagick-6 Closes: https://bugs.gentoo.org/858434 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/xastir-2.1.8-r1.ebuild | 79 +++ 1 file changed, 79 insertions(+) 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 ..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." +}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: b6cd6f14088cea32d72a9c54b336adb6e28ac9da Author: Sam James gentoo org> AuthorDate: Sun Apr 10 10:03:13 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 10 10:11:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6cd6f14 media-radio/xastir: add github upstream metadata Signed-off-by: Sam James gentoo.org> media-radio/xastir/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml index b96de3345070..791f91c41ca6 100644 --- a/media-radio/xastir/metadata.xml +++ b/media-radio/xastir/metadata.xml @@ -9,4 +9,7 @@ Install geotiff support. Allows using USGS DRG topo maps or other types of geotiff mapes/images + + Xastir/Xastir +
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 261b130a728200e94c979d4e6fd37722e516c3a4 Author: Sam James gentoo org> AuthorDate: Sun Apr 10 10:02:58 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 10 10:11:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261b130a media-radio/xastir: use HTTPS for HOMEPAGE Signed-off-by: Sam James gentoo.org> media-radio/xastir/xastir-2.1.6.ebuild | 4 ++-- media-radio/xastir/xastir-2.1.8.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild index fcd3f2a7f254..9ad868bd9212 100644 --- a/media-radio/xastir/xastir-2.1.6.ebuild +++ b/media-radio/xastir/xastir-2.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,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/"; +HOMEPAGE="https://xastir.org/"; SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8.ebuild index fa5dfcadd886..796b47bf4772 100644 --- a/media-radio/xastir/xastir-2.1.8.ebuild +++ b/media-radio/xastir/xastir-2.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,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/"; +HOMEPAGE="https://xastir.org/"; SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 1a80bd9e3820212d30ef0db0018d94e9a2b6cfa0 Author: Jakov Smolić gentoo org> AuthorDate: Thu Dec 23 10:32:49 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Dec 23 10:32:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a80bd9e media-radio/xastir: Stabilize 2.1.8 amd64, #829857 Signed-off-by: Jakov Smolić gentoo.org> media-radio/xastir/xastir-2.1.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8.ebuild index 7bdd1b27a629..886a94b37948 100644 --- a/media-radio/xastir/xastir-2.1.8.ebuild +++ b/media-radio/xastir/xastir-2.1.8.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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 2f1f7256ce6ac0b0ce93b5ba1b4564920658e277 Author: Jakov Smolić gentoo org> AuthorDate: Thu Dec 23 10:33:00 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Dec 23 10:33:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1f7256 media-radio/xastir: Stabilize 2.1.8 x86, #829857 Signed-off-by: Jakov Smolić gentoo.org> media-radio/xastir/xastir-2.1.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8.ebuild index 886a94b37948..fa5dfcadd886 100644 --- a/media-radio/xastir/xastir-2.1.8.ebuild +++ b/media-radio/xastir/xastir-2.1.8.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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
commit: 9e0aa1213386fa6d7fb01aa1857c03a1d0ab90fd Author: Thomas Beierlein gentoo org> AuthorDate: Sun Oct 31 14:42:16 2021 + Commit: Thomas Beierlein gentoo org> CommitDate: Sun Oct 31 14:43:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0aa121 media-radio/xastir: Version bump Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/files/xastir-2.1.8-scripts.diff | 77 + media-radio/xastir/xastir-2.1.8.ebuild | 80 ++ 3 files changed, 158 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index cf9bd0de8f5..1283992f06e 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08 +DIST xastir-2.1.8.tar.gz 586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d diff --git a/media-radio/xastir/files/xastir-2.1.8-scripts.diff b/media-radio/xastir/files/xastir-2.1.8-scripts.diff new file mode 100644 index 000..752f0f50cd0 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.1.8-scripts.diff @@ -0,0 +1,77 @@ +# 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.0 + Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07 15:42:34.0 + +@@ -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.pl2010-01-31 02:12:23.0 + Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/toporama50k.pl2012-03-07 15:47:01.0 + +@@ -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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: c17842594d88838be5c6dd98eb7e475aac91ac3d Author: Thomas Beierlein gentoo org> AuthorDate: Thu Oct 14 16:07:51 2021 + Commit: Thomas Beierlein gentoo org> CommitDate: Thu Oct 14 16:09:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1784259 media-radio/xastir: Drop wrong upstream location Closes: https://bugs.gentoo.org/818091 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml index c4a39d65021..b96de334507 100644 --- a/media-radio/xastir/metadata.xml +++ b/media-radio/xastir/metadata.xml @@ -9,7 +9,4 @@ Install geotiff support. Allows using USGS DRG topo maps or other types of geotiff mapes/images - - xastir -
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
commit: 0e6288041fab5991deea8362cd5ddc0cdc9cb07b Author: Sam James gentoo org> AuthorDate: Thu Oct 14 07:23:24 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 07:23:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e628804 media-radio/xastir: fix autoreconf with newer automake Closes: https://bugs.gentoo.org/816615 Signed-off-by: Sam James gentoo.org> media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch | 13 + media-radio/xastir/xastir-2.1.6.ebuild | 7 +-- 2 files changed, 18 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..51d10a2c815 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch @@ -0,0 +1,13 @@ +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], [xas...@xastir.org]) + # The revision number must contain at least one '.' and two digits. + AC_INIT([xastir], [2.1.6], [xas...@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 index 1da0b5592d8..fcd3f2a7f25 100644 --- a/media-radio/xastir/xastir-2.1.6.ebuild +++ b/media-radio/xastir/xastir-2.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,9 +40,12 @@ src_prepare() { # fix script location (bug #407185) eapply "${FILESDIR}"/${PN}-2.1.2-scripts.diff - # do not filter duplicate flags (see bug 411095) + # 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 }
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
commit: 2958e55e617197713da52ca46d5b2f7b44414541 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jul 28 13:34:31 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Jul 28 18:19:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2958e55e media-radio/xastir: remove unused patch Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16875 Signed-off-by: Aaron Bauman gentoo.org> .../xastir/files/xastir-2.1.4-fno-common.diff | 63 -- 1 file changed, 63 deletions(-) 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 f2580b5977e..000 --- 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 */
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: e864f207cef0f30149c9cbb060ec67f579a3a2a2 Author: Thomas Beierlein gentoo org> AuthorDate: Mon Jul 20 05:29:16 2020 + Commit: Thomas Beierlein gentoo org> CommitDate: Mon Jul 20 05:30:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e864f207 media-radio/xastir: Drop old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 - media-radio/xastir/xastir-2.1.4.ebuild | 84 -- 2 files changed, 85 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index db9c6180bcb..cf9bd0de8f5 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1 @@ -DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08 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 d779bc0c568..000 --- 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? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 98b8022e803b4ce146b0d0f66c4456c0bbc5e012 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 19 12:17:55 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 19 12:17:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b8022e media-radio/xastir: amd64 stable wrt bug #732552 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-radio/xastir/xastir-2.1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild index f001b459c47..1da0b5592d8 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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 3bd9a0aec54903a4bc088a3638e6ae488a53dcfa Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jul 17 15:17:16 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jul 17 15:17:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd9a0ae media-radio/xastir: x86 stable wrt bug #732552 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-radio/xastir/xastir-2.1.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild index 344c4d649b7..f001b459c47 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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 29d557d830b4e3c08f15179d9b745afb96a62171 Author: Thomas Beierlein gentoo org> AuthorDate: Sat May 16 15:05:30 2020 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat May 16 15:06:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d557d8 media-radio/xastir: Minor maintennace release Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/xastir-2.1.6.ebuild | 80 ++ 2 files changed, 81 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 48be224f00b..db9c6180bcb 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 +DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08 diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild new file mode 100644 index 000..344c4d649b7 --- /dev/null +++ b/media-radio/xastir/xastir-2.1.6.ebuild @@ -0,0 +1,80 @@ +# 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? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 0a1dcb42dc36ca5c96cb87a16a56fc10cbd84d0b Author: Thomas Beierlein gentoo org> AuthorDate: Sat Feb 8 07:53:46 2020 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Feb 8 07:55:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1dcb42 media-radio/xastir: Fix build with -fno-common Closes: https://bugs.gentoo.org/706952 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Thomas Beierlein gentoo.org> .../xastir/files/xastir-2.1.4-fno-common.diff | 63 ++ media-radio/xastir/xastir-2.1.4.ebuild | 5 +- 2 files changed, 67 insertions(+), 1 deletion(-) 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 000..f2580b5977e --- /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/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild index c3f29e3674c..d779bc0c568 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 }
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 0e7062f23983725a502804b4b83a618620fd88a4 Author: Thomas Beierlein gentoo org> AuthorDate: Sat Feb 8 07:28:01 2020 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Feb 8 07:29:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7062f2 media-radio/xastir: Drop old Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 - media-radio/xastir/files/xastir-2.0.4-fortify.diff | 144 - .../files/xastir-2.0.8-fix-graphicsmagick.diff | 32 - .../files/xastir-2.0.8-no-builtin-shapelib.diff| 58 - media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 - media-radio/xastir/metadata.xml| 1 - media-radio/xastir/xastir-2.0.8-r1.ebuild | 86 7 files changed, 413 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 6fd1281880e..48be224f00b 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1 @@ -DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 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 e2c34b00747..000 --- a/media-radio/xastir/files/xastir-2.0.4-fortify.diff +++ /dev/null @@ -1,144 +0,0 @@ src/rac_data.c.orig2012-09-23 18:19:22.0 +0200 -+++ src/rac_data.c 2012-11-29 21:00:53.0 +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; - /*charfiller[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, -
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
commit: 1a69a17cc3c1a96b4689fd19f077f11212ec44d4 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Nov 12 17:22:49 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Nov 13 01:05:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a69a17c media-radio/xastir: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13622 Signed-off-by: Aaron Bauman gentoo.org> media-radio/xastir/files/xastir-2.1.0-scripts.diff | 92 -- 1 file changed, 92 deletions(-) diff --git a/media-radio/xastir/files/xastir-2.1.0-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff deleted file mode 100644 index de8a461bcea..000 --- a/media-radio/xastir/files/xastir-2.1.0-scripts.diff +++ /dev/null @@ -1,92 +0,0 @@ -# patch scripts location (bug #407185). partially backported from upstream. -diff -u Xastir-Release-2.1.0/scripts.orig/Makefile.am Xastir-Release-2.1.0/scripts/Makefile.am Xastir-Release-2.1.0/scripts.orig/Makefile.am 2018-12-08 12:14:51.881373754 +0100 -+++ Xastir-Release-2.1.0/scripts/Makefile.am 2018-12-08 12:15:53.206401168 +0100 -@@ -45,10 +45,8 @@ - waypoint-get.pl \ - wms.pl \ - wxnowsrv.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.0 + -+++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.0 + -@@ -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.pl2010-01-31 02:12:23.0 + -+++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/toporama50k.pl2012-03-07 15:47:01.0 + -@@ -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/
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 3e222dd95c8e02ce529296dfb2b19458288d5b13 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 23 10:37:20 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 23 10:37:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e222dd9 media-radio/xastir: x86 stable wrt bug #692750 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> media-radio/xastir/xastir-2.1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild index ad1900a8f02..c3e87f73acc 100644 --- a/media-radio/xastir/xastir-2.1.4.ebuild +++ b/media-radio/xastir/xastir-2.1.4.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="festival geotiff +graphicsmagick" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: ce4d1289092ef094ff5ee21dc7a2c0cee025fe93 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 23 10:02:35 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 23 10:02:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce4d1289 media-radio/xastir: amd64 stable wrt bug #692750 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> media-radio/xastir/xastir-2.1.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild index b9b5bdb7a8c..ad1900a8f02 100644 --- a/media-radio/xastir/xastir-2.1.4.ebuild +++ b/media-radio/xastir/xastir-2.1.4.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="festival geotiff +graphicsmagick" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 7cea10caf90d0c0f7a3865d0ee7ba9b6c7494596 Author: Thomas Beierlein gentoo org> AuthorDate: Fri Jul 26 14:08:50 2019 + Commit: Thomas Beierlein gentoo org> CommitDate: Fri Jul 26 14:09:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cea10ca media-radio/xastir: Drop buggy versions Do not compile with newer Graphicsmagick (bug #688444) Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 2 - media-radio/xastir/xastir-2.1.0.ebuild | 91 -- media-radio/xastir/xastir-2.1.2.ebuild | 82 -- 3 files changed, 175 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 4c1e6f375a3..6fd1281880e 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,4 +1,2 @@ DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f -DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 -DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B 4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef SHA512 6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild deleted file mode 100644 index bb02b59e37f..000 --- a/media-radio/xastir/xastir-2.1.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils 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-2.1.0.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="festival 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? ( 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="festival 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? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 93a4241e7cb9e23bed3025dd678f654ad6e9a98a Author: Thomas Beierlein gentoo org> AuthorDate: Fri Jul 26 14:06:46 2019 + Commit: Thomas Beierlein gentoo org> CommitDate: Fri Jul 26 14:06:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a4241e media-radio/xastir: Fix for compile error with newer Graphicsmagick Backport from xastir-2.1.4 for stable version Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Thomas Beierlein gentoo.org> .../files/xastir-2.0.8-fix-graphicsmagick.diff | 32 ++ media-radio/xastir/xastir-2.0.8-r1.ebuild | 5 +++- 2 files changed, 36 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..8919239fbfd --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff @@ -0,0 +1,32 @@ +# backported from xastir-2.1.4 (see bug #688444) +--- a/src/map_geo.c2019-07-26 15:54:19.534488550 +0200 b/src/map_geo.c2019-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 */ +-/* 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 +-#else // HAVE_GRAPHICSMAGICK +-#include +-#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/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild index d4421c5da9b..c16d857f5d6 100644 --- a/media-radio/xastir/xastir-2.0.8-r1.ebuild +++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -45,6 +45,9 @@ src_prepare() { # 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 }
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: fc7cb2fa8041e3b632af514cfccfce427898cd22 Author: Thomas Beierlein gentoo org> AuthorDate: Thu Jul 18 06:03:27 2019 + Commit: Thomas Beierlein gentoo org> CommitDate: Thu Jul 18 06:03:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7cb2fa media-radio/xastir: Maintenance release Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/xastir-2.1.4.ebuild | 82 ++ 2 files changed, 83 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index b011e2bc3b5..4c1e6f375a3 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,3 +1,4 @@ DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B 4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef SHA512 6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93 +DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild new file mode 100644 index 000..b9b5bdb7a8c --- /dev/null +++ b/media-radio/xastir/xastir-2.1.4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 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="festival 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? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: a918142dc97bd41a33d038b6242c1d3e287f4e70 Author: Thomas Beierlein gentoo org> AuthorDate: Fri May 31 12:10:02 2019 + Commit: Thomas Beierlein gentoo org> CommitDate: Fri May 31 12:10:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a918142d media-radio/xastir: Version bump Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/files/xastir-2.1.2-scripts.diff | 89 ++ media-radio/xastir/xastir-2.1.2.ebuild | 82 3 files changed, 172 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 9b0fbe3e783..b011e2bc3b5 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1,3 @@ DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 +DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B 4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef SHA512 6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93 diff --git a/media-radio/xastir/files/xastir-2.1.2-scripts.diff b/media-radio/xastir/files/xastir-2.1.2-scripts.diff new file mode 100644 index 000..7b52c689560 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.1.2-scripts.diff @@ -0,0 +1,89 @@ +# 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.0 + Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07 15:42:34.0 + +@@ -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.pl2010-01-31 02:12:23.0 + Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + +@@ -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.0 + Xastir-Release-2.1.2/scripts/toporama50k.pl2012-03-07 15:47:01.0 + +@@ -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 "
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 1d01b8cb709f3ce15b527762274d14d22baa5121 Author: Thomas Beierlein gentoo org> AuthorDate: Fri May 31 11:10:17 2019 + Commit: Thomas Beierlein gentoo org> CommitDate: Fri May 31 11:10:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d01b8cb media-radio/xastir: Fix dependency on sci-libs/geotiff:= Closes: https://bugs.gentoo.org/686834 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/xastir-2.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild index 65a7bb764f6..bb02b59e37f 100644 --- a/media-radio/xastir/xastir-2.1.0.ebuild +++ b/media-radio/xastir/xastir-2.1.0.ebuild @@ -28,7 +28,7 @@ DEPEND=">=x11-libs/motif-2.3:0 !graphicsmagick? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: caa8c00188d5d0f699629fd8de5d8d1af1d2a5fb Author: Mikle Kolyada gentoo org> AuthorDate: Mon May 20 11:04:39 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon May 20 11:04:39 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa8c001 media-radio/xastir: amd64 stable wrt bug #684510 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" media-radio/xastir/xastir-2.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild index ee93367a3a7..65a7bb764f6 100644 --- a/media-radio/xastir/xastir-2.1.0.ebuild +++ b/media-radio/xastir/xastir-2.1.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-2.1.0.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="festival gdal geotiff +graphicsmagick" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 33d691125119108194700039d7e7a6d67afa31c3 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 19 15:21:05 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 19 15:21:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d69112 media-radio/xastir: x86 stable (bug #684510) Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> media-radio/xastir/xastir-2.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild index e11209b5a30..ee93367a3a7 100644 --- a/media-radio/xastir/xastir-2.1.0.ebuild +++ b/media-radio/xastir/xastir-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-2.1.0.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="festival gdal geotiff +graphicsmagick" DEPEND=">=x11-libs/motif-2.3:0
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
commit: 3df5e2ab3fc65d013149563b178803f3258f2136 Author: Thomas Beierlein gentoo org> AuthorDate: Sat Dec 8 14:11:23 2018 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Dec 8 14:11:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df5e2ab media-radio/xastir: Version bump Closes: https://bugs.gentoo.org/670166 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 + media-radio/xastir/files/xastir-2.1.0-scripts.diff | 92 ++ media-radio/xastir/xastir-2.1.0.ebuild | 91 + 3 files changed, 184 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index d82bd3b320f..9b0fbe3e783 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f +DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 diff --git a/media-radio/xastir/files/xastir-2.1.0-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff new file mode 100644 index 000..de8a461bcea --- /dev/null +++ b/media-radio/xastir/files/xastir-2.1.0-scripts.diff @@ -0,0 +1,92 @@ +# patch scripts location (bug #407185). partially backported from upstream. +diff -u Xastir-Release-2.1.0/scripts.orig/Makefile.am Xastir-Release-2.1.0/scripts/Makefile.am +--- Xastir-Release-2.1.0/scripts.orig/Makefile.am 2018-12-08 12:14:51.881373754 +0100 Xastir-Release-2.1.0/scripts/Makefile.am 2018-12-08 12:15:53.206401168 +0100 +@@ -45,10 +45,8 @@ + waypoint-get.pl \ + wms.pl \ + wxnowsrv.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.0 + xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + +@@ -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.0 + xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.0 + +@@ -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.pl2010-01-31 02:12:23.0 + xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.0 + +@@ -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.0 + xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + +@@ -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.0 + xastir-2.0.0/scripts/toporama50k.pl2012-03-07 15:47:01.0 + +@@ -27,14 +27,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: c69b5abed22691e5bf09d86da9a5fab35ff346d4 Author: Thomas Beierlein gentoo org> AuthorDate: Sat Dec 8 14:07:13 2018 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Dec 8 14:07:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69b5abe media-radio/xastir: Depend on danweeks.net> Closes: https://bugs.gentoo.org/672640 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/xastir-2.0.8-r1.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild index dd75bd2aeb9..d4421c5da9b 100644 --- a/media-radio/xastir/xastir-2.0.8-r1.ebuild +++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="festival gdal geotiff graphicsmagick" +IUSE="festival gdal geotiff +graphicsmagick" DEPEND=">=x11-libs/motif-2.3:0 x11-libs/libXt @@ -22,7 +22,7 @@ DEPEND=">=x11-libs/motif-2.3:0 net-misc/curl sys-libs/db:4.8 sci-libs/shapelib - !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] ) + !graphicsmagick? (
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
commit: ae2ff5064c5bc47cea0ba85337b9d74bec47285a Author: Thomas Beierlein gentoo org> AuthorDate: Sat Dec 8 14:04:12 2018 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Dec 8 14:04:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2ff506 media-radio/xastir: Drop also forgotten patch file Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/files/xastir-2.0.4-scripts.diff | 101 - 1 file changed, 101 deletions(-) diff --git a/media-radio/xastir/files/xastir-2.0.4-scripts.diff b/media-radio/xastir/files/xastir-2.0.4-scripts.diff deleted file mode 100644 index 369295b07f8..000 --- a/media-radio/xastir/files/xastir-2.0.4-scripts.diff +++ /dev/null @@ -1,101 +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.0 +0100 -+++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.0 +0100 -@@ -12,9 +12,7 @@ - get-fcc-rac.pl \ - get-gnis \ - get-pop \ --get-maptools.sh \ - get-NWSdata \ --get_shapelib.sh \ - gpx2shape \ - icontable.pl \ - inf2geo.pl \ -@@ -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.0 + -+++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.0 + -@@ -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.pl2010-01-31 02:12:23.0 + -+++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.0 + -@@ -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.0 + -+++ xastir-2.0.0/scripts/toporama50k.pl2012-03-07 15:47:01.0 + -@@ -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/
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
commit: 37f3073520c865cceb220148ba394975b87cb009 Author: Thomas Beierlein gentoo org> AuthorDate: Sat Dec 8 13:16:10 2018 + Commit: Thomas Beierlein gentoo org> CommitDate: Sat Dec 8 13:22:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f30735 media-radio/xastir: Drop old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/xastir/Manifest| 1 - .../files/xastir-2.0.4-no-builtin-shapelib.diff| 58 --- media-radio/xastir/xastir-2.0.6-r1.ebuild | 84 -- 3 files changed, 143 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 47d340259cb..d82bd3b320f 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1 @@ -DIST xastir-2.0.6.tar.gz 2662042 BLAKE2B ca094be011d25ed1ec3a278923a4e53c785eec76d37ed024136eab66e448339896bcbb0b0bb408947d6fc5b03a8acad470afa879c91641e6db6f735f57f8189f SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f diff --git a/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff deleted file mode 100644 index 7aef072a5c3..000 --- a/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff +++ /dev/null @@ -1,58 +0,0 @@ configure.ac.orig 2012-11-30 08:29:51.0 +0100 -+++ configure.ac 2012-11-30 08:29:56.0 +0100 -@@ -368,27 +368,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-shapelibDisable 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" -@@ -397,26 +387,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 shpproj shpdata shpwkb" -- fi --fi - AC_SUBST(SUBSHP) - AC_SUBST(CONTSHP) - AC_SUBST(LIBSHP) diff --git a/media-radio/xastir/xastir-2.0.6-r1.ebuild b/media-radio/xastir/xastir-2.0.6-r1.ebuild deleted file mode 100644 index 5347439f131..000 --- a/media-radio/xastir/xastir-2.0.6-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICE
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: 0a79bbd34b91162383bb9062957e456289a031ba Author: David Seifert gentoo org> AuthorDate: Sat Feb 11 19:21:57 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 11 19:47:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a79bbd3 media-radio/xastir: Use sub-slot operators for imagemagick Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3907 media-radio/xastir/{xastir-2.0.6.ebuild => xastir-2.0.6-r1.ebuild} | 6 +++--- media-radio/xastir/{xastir-2.0.8.ebuild => xastir-2.0.8-r1.ebuild} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-radio/xastir/xastir-2.0.6.ebuild b/media-radio/xastir/xastir-2.0.6-r1.ebuild similarity index 93% rename from media-radio/xastir/xastir-2.0.6.ebuild rename to media-radio/xastir/xastir-2.0.6-r1.ebuild index 85fc86e658..0fa7d4e46f 100644 --- a/media-radio/xastir/xastir-2.0.6.ebuild +++ b/media-radio/xastir/xastir-2.0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,8 +23,8 @@ DEPEND=">=x11-libs/motif-2.3:0 net-misc/curl sys-libs/db:4.8 sci-libs/shapelib - !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) - graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) + !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) diff --git a/media-radio/xastir/xastir-2.0.8.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild similarity index 93% rename from media-radio/xastir/xastir-2.0.8.ebuild rename to media-radio/xastir/xastir-2.0.8-r1.ebuild index 38b4af021b..f37c567781 100644 --- a/media-radio/xastir/xastir-2.0.8.ebuild +++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,8 +23,8 @@ DEPEND=">=x11-libs/motif-2.3:0 net-misc/curl sys-libs/db:4.8 sci-libs/shapelib - !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) - graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) + !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 )
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: dbae9a64201ff5546f5cd3e56d7623eb5fc8a115 Author: Thomas Beierlein gentoo org> AuthorDate: Tue Jul 12 05:25:01 2016 + Commit: Thomas Beierlein gentoo org> CommitDate: Tue Jul 12 05:25:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbae9a64 media-radio/xastir: Version bump Package-Manager: portage-2.3.0 media-radio/xastir/Manifest| 1 + .../files/xastir-2.0.8-no-builtin-shapelib.diff| 58 ++ media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 ++ media-radio/xastir/xastir-2.0.8.ebuild | 85 4 files changed, 235 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index b630719..bdf87d5 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.0.6.tar.gz 2662042 SHA256 e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8436c3bc8a8dd43 SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3 WHIRLPOOL 39a097dba585d5bcdcdb880ddb5e530eb118bd1645abf911948ed2c0b562a4b12cf4b453b0295db1f37d00380873440e251466f7b12440cd41f50578ae90f170 +DIST xastir-2.0.8.tar.gz 2697256 SHA256 775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f WHIRLPOOL 970750a3cc0d1ab51bd754450ab348a88efba26d6e8e3c3ced95b9885e63dffbc2d4ed94ced42d1a309b2fa8d23f203fb98bae6021c5556d3e39bcc79835be89 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 new file mode 100644 index 000..8cbdbc2 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff @@ -0,0 +1,58 @@ +--- 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-shapelibDisable 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 new file mode 100644 index 000..35c7324 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-scripts.diff @@ -0,0 +1,91 @@ +# patch scripts location (bug #407185). partially backported from upstream. +--- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:2
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/
commit: eebd28dc6f27c8d199148b1a5de6c4928bd04213 Author: Thomas Beierlein gentoo org> AuthorDate: Sun May 1 14:17:12 2016 + Commit: Thomas Beierlein gentoo org> CommitDate: Sun May 1 14:17:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebd28dc media-radio/xastir: Drop old Package-Manager: portage-2.2.28 media-radio/xastir/Manifest| 1 - media-radio/xastir/xastir-2.0.4.ebuild | 88 -- 2 files changed, 89 deletions(-) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index 6458a95..b630719 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1,2 +1 @@ -DIST xastir-2.0.4.tar.gz 2655250 SHA256 975f1cbe1ee32334e579588dcf2e19bcc607ad7b5f9d0848075f6d283d65af86 SHA512 766124ae717742e93bef24cd4c84946e146c3ba8a61775afada25a1c60f225edf91fc8eb4f59881564b14187e523c98a07d515adea74d73e03e2ab10dbae92b3 WHIRLPOOL 640616e698e2e3cfe2bdd6619ac601017c37d4d18cd1fa3ab5391ade170b6108a845a4fe2860b618a5cd2281e884399874b554c3960e1f5ad6420f016c88260c DIST xastir-2.0.6.tar.gz 2662042 SHA256 e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8436c3bc8a8dd43 SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3 WHIRLPOOL 39a097dba585d5bcdcdb880ddb5e530eb118bd1645abf911948ed2c0b562a4b12cf4b453b0295db1f37d00380873440e251466f7b12440cd41f50578ae90f170 diff --git a/media-radio/xastir/xastir-2.0.4.ebuild b/media-radio/xastir/xastir-2.0.4.ebuild deleted file mode 100644 index c211549..000 --- a/media-radio/xastir/xastir-2.0.4.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit autotools eutils flag-o-matic toolchain-funcs - -DESCRIPTION="X Amateur Station Tracking and Information Reporting" -HOMEPAGE="http://xastir.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="festival 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 - sci-libs/shapelib - !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) - graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) - geotiff? ( sci-libs/proj - sci-libs/libgeotiff - media-libs/tiff ) - gdal? ( sci-libs/gdal ) - festival? ( app-accessibility/festival )" -RDEPEND="${DEPEND}" - -src_prepare() { - # fix script location (bug #407185) - epatch "${FILESDIR}"/${P}-scripts.diff - - # fix __FORTIFY_SOURCE warning (bug #337365) - epatch "${FILESDIR}"/${P}-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 deprectated AM_CONFIG_HEADER macro - sed -i -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die - - 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-gpsman \ - $(use_with !graphicsmagick imagemagick) \ - $(use_with graphicsmagick) \ - $(use_with geotiff libproj) \ - $(use_with geotiff) \ - $(use_with gdal) \ - $(use_with festival) -} - -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." -}