* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
@ 2018-12-08 13:22 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2018-12-08 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 37f3073520c865cceb220148ba394975b87cb009
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 13:16:10 2018 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 13:22:04 2018 +0000
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 <tomjbe <AT> 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..00000000000
--- 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.000000000 +0100
-+++ configure.ac 2012-11-30 08:29:56.000000000 +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-shapelib Disable 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..00000000000
--- 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"
-
-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? ( media-gfx/imagemagick:=[-hdri,-q32] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
- geotiff? ( sci-libs/proj
- sci-libs/libgeotiff
- media-libs/tiff:0 )
- gdal? ( sci-libs/gdal )
- festival? ( app-accessibility/festival )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # fix script location (bug #407185)
- epatch "${FILESDIR}"/${PN}-2.0.4-scripts.diff
-
- # fix __FORTIFY_SOURCE warning (bug #337365)
- epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
-
- # do not use builtin shapelib if sci-libs/shapelib is not installed
- # instead build without shapelib support (bug #430704)
- epatch "${FILESDIR}"/${PN}-2.0.4-no-builtin-shapelib.diff
-
- # do not filter duplicate flags (see bug 411095)
- epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
- eautoreconf
-}
-
-src_configure() {
- # provide include path to GraphicsMagic for configure stage
- use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
- econf --with-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."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
@ 2018-12-08 14:12 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2018-12-08 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 3df5e2ab3fc65d013149563b178803f3258f2136
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 14:11:23 2018 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 14:11:23 2018 +0000
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 <tomjbe <AT> 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 00000000000..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.000000000 +0000
++++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
+@@ -26,7 +26,7 @@
+ #
+
+
+-use lib "${prefix}/lib";
++use lib /usr/share/xastir/scripts;
+ use Coordinate; # WE7U's Coordinate.pm module
+
+
+diff -Nur -u xastir-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.000000000 +0000
++++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
+@@ -34,7 +34,7 @@
+ #
+
+
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate; # WE7U's Coordinate.pm module
+
+
+diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
+--- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
++++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
+@@ -33,7 +33,7 @@
+
+ #------------------------------------------------------------------------------------------------
+
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate; # Snag WE7U's Coordinate module
+
+
+diff -Nur -u xastir-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.000000000 +0000
++++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
+@@ -28,14 +28,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama250k.pl"
++# - "/usr/share/xastir/scripts/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/
+diff -Nur -u xastir-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.000000000 +0000
++++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
+@@ -27,14 +27,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama50k.pl"
++# - "/usr/share/xastir/scripts/toporama50k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/
diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
new file mode 100644
index 00000000000..e11209b5a30
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 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? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
+ geotiff? ( sci-libs/proj
+ sci-libs/libgeotiff
+ media-libs/tiff:0 )
+ gdal? ( sci-libs/gdal )
+ festival? ( app-accessibility/festival )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ eapply_user
+
+ # fix script location (bug #407185)
+ epatch "${FILESDIR}"/${P}-scripts.diff
+
+ # fix __FORTIFY_SOURCE warning (bug #337365)
+ epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
+
+ # do not use builtin shapelib if sci-libs/shapelib is not installed
+ # instead build without shapelib support (bug #430704)
+ epatch "${FILESDIR}"/${PN}-2.0.8-no-builtin-shapelib.diff
+
+ # do not filter duplicate flags (see bug 411095)
+ epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+
+ eautoreconf
+}
+
+src_configure() {
+ # provide include path to GraphicsMagic for configure stage
+ use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
+ econf --with-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 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."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
@ 2021-10-14 7:23 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-14 7:23 UTC (permalink / raw
To: gentoo-commits
commit: 0e6288041fab5991deea8362cd5ddc0cdc9cb07b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 07:23:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 07:23:47 2021 +0000
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 <sam <AT> 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 00000000000..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], [xastir@xastir.org])
+ # The revision number must contain at least one '.' and two digits.
+ AC_INIT([xastir], [2.1.6], [xastir@xastir.org])
+-AM_INIT_AUTOMAKE
+ #########################################################################
+
+
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
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
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
@ 2021-10-31 14:43 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2021-10-31 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 9e0aa1213386fa6d7fb01aa1857c03a1d0ab90fd
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 14:42:16 2021 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 14:43:30 2021 +0000
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 <tomjbe <AT> 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 2222586 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 00000000000..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.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
+@@ -26,7 +26,7 @@
+ #
+
+
+-use lib "${prefix}/lib";
++use lib /usr/share/xastir/scripts;
+ use Coordinate; # WE7U's Coordinate.pm module
+
+
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/permutations.pl Xastir-Release-2.1.2/scripts/permutations.pl
+--- Xastir-Release-2.1.2.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
+@@ -34,7 +34,7 @@
+ #
+
+
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate; # WE7U's Coordinate.pm module
+
+
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/test_coord.pl Xastir-Release-2.1.2/scripts/test_coord.pl
+--- Xastir-Release-2.1.2.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
+@@ -33,7 +33,7 @@
+
+ #------------------------------------------------------------------------------------------------
+
+-use lib "/usr/local/lib";
++use lib "/usr/share/xastir/scripts";
+ use Coordinate; # Snag WE7U's Coordinate module
+
+
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama250k.pl Xastir-Release-2.1.2/scripts/toporama250k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
+@@ -28,14 +28,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama250k.pl"
++# - "/usr/share/xastir/scripts/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama50k.pl Xastir-Release-2.1.2/scripts/toporama50k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
++++ Xastir-Release-2.1.2/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
+@@ -27,14 +27,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ # by becoming root using the "su" command, using "sudo", or
+ # temporarily changing ownership and/or privileges on the
+ # "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama50k.pl"
++# - "/usr/share/xastir/scripts/toporama50k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ # .../maps/toporama/images/
diff --git a/media-radio/xastir/xastir-2.1.8.ebuild b/media-radio/xastir/xastir-2.1.8.ebuild
new file mode 100644
index 00000000000..7bdd1b27a62
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 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="http://xastir.org/"
+SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geotiff +graphicsmagick"
+
+DEPEND=">=x11-libs/motif-2.3:0
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-apps/xfontsel
+ dev-libs/libpcre
+ net-misc/curl
+ sys-libs/db:4.8
+ sci-libs/shapelib
+ !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
+ geotiff? ( sci-libs/proj
+ sci-libs/libgeotiff:=
+ media-libs/tiff:0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ eapply_user
+
+ # fix script location (bug #407185)
+ eapply "${FILESDIR}"/${PN}-2.1.8-scripts.diff
+
+ # do not filter duplicate flags (see bug #411095)
+ eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+
+ eautoreconf
+}
+
+src_configure() {
+ # provide include path to GraphicsMagic for configure stage
+ use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
+ econf \
+ --with-shapelib \
+ --without-ax25 \
+ --without-festival \
+ --without-gpsman \
+ $(use_with !graphicsmagick imagemagick) \
+ $(use_with graphicsmagick) \
+ $(use_with geotiff libproj) \
+ $(use_with geotiff)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${D}"/usr/share/doc/${PN}
+ dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
+ README.Getting-Started README.MAPS README.OSM_maps
+}
+
+pkg_postinst() {
+ elog "Kernel mode AX.25 and GPSman library not supported."
+ elog
+ elog "Remember you have to be root to add addditional scripts,"
+ elog "maps and other configuration data under /usr/share/xastir."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
@ 2022-07-17 7:26 Thomas Beierlein
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Beierlein @ 2022-07-17 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 68fccf43c60ca10a1f9d309e3e442d8380bc9408
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 07:20:25 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 07:26:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fccf43
media-radio/xastir: drop 2.1.6
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/xastir/Manifest | 1 -
media-radio/xastir/files/xastir-2.1.2-scripts.diff | 89 ----------------------
.../files/xastir-2.1.6-automake-1.16.5.patch | 13 ----
media-radio/xastir/xastir-2.1.6.ebuild | 83 --------------------
4 files changed, 186 deletions(-)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 1283992f06e1..db413c009cbb 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,2 +1 @@
-DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
diff --git a/media-radio/xastir/files/xastir-2.1.2-scripts.diff b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
deleted file mode 100644
index 7b52c6895606..000000000000
--- a/media-radio/xastir/files/xastir-2.1.2-scripts.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/coord-convert.pl Xastir-Release-2.1.2/scripts/coord-convert.pl
---- Xastir-Release-2.1.2.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
-
-
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/permutations.pl Xastir-Release-2.1.2/scripts/permutations.pl
---- Xastir-Release-2.1.2.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/test_coord.pl Xastir-Release-2.1.2/scripts/test_coord.pl
---- Xastir-Release-2.1.2.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
-
- #------------------------------------------------------------------------------------------------
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # Snag WE7U's Coordinate module
-
-
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama250k.pl Xastir-Release-2.1.2/scripts/toporama250k.pl
---- Xastir-Release-2.1.2.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/toporama50k.pl Xastir-Release-2.1.2/scripts/toporama50k.pl
---- Xastir-Release-2.1.2.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -Nur -u Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in Xastir-Release-2.1.2/scripts/get-NWSdata.in
---- Xastir-Release-2.1.2.orig/scripts/get-NWSdata.in 2010-01-31 02:12:23.000000000 +0000
-+++ Xastir-Release-2.1.2/scripts/get-NWSdata.in 2012-03-07 15:47:01.000000000 +0000
-@@ -123,7 +123,7 @@
- echo
- echo $e.dbf
- # Run in a separate shell so we don't mess up the current directory for the -e test above
-- (cd /usr/local/share/xastir; /usr/local/bin/testdbfawk -D config -d Counties/$e.dbf 2>&1 | head -3 | tail -1)
-+ (cd /usr/share/xastir; /usr/bin/testdbfawk -D config -d Counties/$e.dbf 2>&1 | head -3 | tail -1)
-
- fi
- done
diff --git a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
deleted file mode 100644
index 51d10a2c8159..000000000000
--- a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/816615
-https://github.com/Xastir/Xastir/pull/181
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,6 @@
- # It should look something like this: ([xastir], [2.0.8], [xastir@xastir.org])
- # The revision number must contain at least one '.' and two digits.
- AC_INIT([xastir], [2.1.6], [xastir@xastir.org])
--AM_INIT_AUTOMAKE
- #########################################################################
-
-
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
deleted file mode 100644
index 9ad868bd9212..000000000000
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${PN/x/X}-Release-${PV}
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="https://xastir.org/"
-SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="geotiff +graphicsmagick"
-
-DEPEND=">=x11-libs/motif-2.3:0
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXpm
- x11-apps/xfontsel
- dev-libs/libpcre
- net-misc/curl
- sys-libs/db:4.8
- sci-libs/shapelib
- !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
- geotiff? ( sci-libs/proj
- sci-libs/libgeotiff:=
- media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- eapply_user
-
- # fix script location (bug #407185)
- eapply "${FILESDIR}"/${PN}-2.1.2-scripts.diff
-
- # do not filter duplicate flags (see bug #411095)
- eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
- # fix eautoreconf with >=sys-devel/automake-1.16.5 (see bug #816615)
- eapply "${FILESDIR}"/${PN}-2.1.6-automake-1.16.5.patch
-
- eautoreconf
-}
-
-src_configure() {
- # provide include path to GraphicsMagic for configure stage
- use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
- econf \
- --with-shapelib \
- --without-ax25 \
- --without-festival \
- --without-gpsman \
- $(use_with !graphicsmagick imagemagick) \
- $(use_with graphicsmagick) \
- $(use_with geotiff libproj) \
- $(use_with geotiff)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- rm -rf "${D}"/usr/share/doc/${PN}
- dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
- README.Getting-Started README.MAPS README.OSM_maps
-}
-
-pkg_postinst() {
- elog "Kernel mode AX.25 and GPSman library not supported."
- elog
- elog "Remember you have to be root to add addditional scripts,"
- elog "maps and other configuration data under /usr/share/xastir."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-17 7:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-17 7:26 [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2021-10-31 14:43 Thomas Beierlein
2021-10-14 7:23 Sam James
2018-12-08 14:12 Thomas Beierlein
2018-12-08 13:22 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox