Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/, media-radio/xastir/
Date: Sat, 08 Dec 2018 14:13:04
Message-Id: 1544278283.3df5e2ab3fc65d013149563b178803f3258f2136.tomjbe@gentoo
1 commit: 3df5e2ab3fc65d013149563b178803f3258f2136
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 8 14:11:23 2018 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 8 14:11:23 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df5e2ab
7
8 media-radio/xastir: Version bump
9
10 Closes: https://bugs.gentoo.org/670166
11 Package-Manager: Portage-2.3.52, Repoman-2.3.12
12 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
13
14 media-radio/xastir/Manifest | 1 +
15 media-radio/xastir/files/xastir-2.1.0-scripts.diff | 92 ++++++++++++++++++++++
16 media-radio/xastir/xastir-2.1.0.ebuild | 91 +++++++++++++++++++++
17 3 files changed, 184 insertions(+)
18
19 diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
20 index d82bd3b320f..9b0fbe3e783 100644
21 --- a/media-radio/xastir/Manifest
22 +++ b/media-radio/xastir/Manifest
23 @@ -1 +1,2 @@
24 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
25 +DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288
26
27 diff --git a/media-radio/xastir/files/xastir-2.1.0-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
28 new file mode 100644
29 index 00000000000..de8a461bcea
30 --- /dev/null
31 +++ b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
32 @@ -0,0 +1,92 @@
33 +# patch scripts location (bug #407185). partially backported from upstream.
34 +diff -u Xastir-Release-2.1.0/scripts.orig/Makefile.am Xastir-Release-2.1.0/scripts/Makefile.am
35 +--- Xastir-Release-2.1.0/scripts.orig/Makefile.am 2018-12-08 12:14:51.881373754 +0100
36 ++++ Xastir-Release-2.1.0/scripts/Makefile.am 2018-12-08 12:15:53.206401168 +0100
37 +@@ -45,10 +45,8 @@
38 + waypoint-get.pl \
39 + wms.pl \
40 + wxnowsrv.pl \
41 +- xastir-fixcfg.sh \
42 +- xastir-migrate.sh \
43 + Xastir_tigerpoly.py
44 +
45 + install-data-hook:
46 + cd $(DESTDIR)$(scriptsdir) && \
47 +- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
48 ++ chmod a+x *.pl *.py get-* gpx2* *.bash
49 +diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
50 +--- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000
51 ++++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
52 +@@ -26,7 +26,7 @@
53 + #
54 +
55 +
56 +-use lib "${prefix}/lib";
57 ++use lib /usr/share/xastir/scripts;
58 + use Coordinate; # WE7U's Coordinate.pm module
59 +
60 +
61 +diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
62 +--- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
63 ++++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
64 +@@ -34,7 +34,7 @@
65 + #
66 +
67 +
68 +-use lib "/usr/local/lib";
69 ++use lib "/usr/share/xastir/scripts";
70 + use Coordinate; # WE7U's Coordinate.pm module
71 +
72 +
73 +diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
74 +--- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
75 ++++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
76 +@@ -33,7 +33,7 @@
77 +
78 + #------------------------------------------------------------------------------------------------
79 +
80 +-use lib "/usr/local/lib";
81 ++use lib "/usr/share/xastir/scripts";
82 + use Coordinate; # Snag WE7U's Coordinate module
83 +
84 +
85 +diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
86 +--- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
87 ++++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
88 +@@ -28,14 +28,14 @@
89 + # map files for the whole of Canada!
90 + #
91 + #
92 +-# - "cd /usr/local/share/xastir/maps"
93 ++# - "cd /usr/share/xastir/maps"
94 + #
95 + # - Assure you have write privileges in the directory above either
96 + # by becoming root using the "su" command, using "sudo", or
97 + # temporarily changing ownership and/or privileges on the
98 + # "maps" directory.
99 + #
100 +-# - "/usr/local/lib/xastir/toporama250k.pl"
101 ++# - "/usr/share/xastir/scripts/toporama250k.pl"
102 + #
103 + # - The script will create/populate this directory heirarchy:
104 + # .../maps/toporama/images/
105 +diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
106 +--- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
107 ++++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
108 +@@ -27,14 +27,14 @@
109 + # map files for the whole of Canada!
110 + #
111 + #
112 +-# - "cd /usr/local/share/xastir/maps"
113 ++# - "cd /usr/share/xastir/maps"
114 + #
115 + # - Assure you have write privileges in the directory above either
116 + # by becoming root using the "su" command, using "sudo", or
117 + # temporarily changing ownership and/or privileges on the
118 + # "maps" directory.
119 + #
120 +-# - "/usr/local/lib/xastir/toporama50k.pl"
121 ++# - "/usr/share/xastir/scripts/toporama50k.pl"
122 + #
123 + # - The script will create/populate this directory heirarchy:
124 + # .../maps/toporama/images/
125
126 diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
127 new file mode 100644
128 index 00000000000..e11209b5a30
129 --- /dev/null
130 +++ b/media-radio/xastir/xastir-2.1.0.ebuild
131 @@ -0,0 +1,91 @@
132 +# Copyright 1999-2018 Gentoo Authors
133 +# Distributed under the terms of the GNU General Public License v2
134 +
135 +EAPI=6
136 +inherit autotools eutils flag-o-matic toolchain-funcs
137 +
138 +MY_P=${PN/x/X}-Release-${PV}
139 +
140 +DESCRIPTION="X Amateur Station Tracking and Information Reporting"
141 +HOMEPAGE="http://xastir.org/"
142 +SRC_URI="https://github.com/Xastir/Xastir/archive/Release-2.1.0.tar.gz
143 + -> ${P}.tar.gz"
144 +
145 +LICENSE="GPL-2"
146 +SLOT="0"
147 +KEYWORDS="~amd64 ~x86"
148 +IUSE="festival gdal geotiff +graphicsmagick"
149 +
150 +DEPEND=">=x11-libs/motif-2.3:0
151 + x11-libs/libXt
152 + x11-libs/libX11
153 + x11-libs/libXpm
154 + x11-apps/xfontsel
155 + dev-libs/libpcre
156 + net-misc/curl
157 + sys-libs/db:4.8
158 + sci-libs/shapelib
159 + !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
160 + graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
161 + geotiff? ( sci-libs/proj
162 + sci-libs/libgeotiff
163 + media-libs/tiff:0 )
164 + gdal? ( sci-libs/gdal )
165 + festival? ( app-accessibility/festival )"
166 +RDEPEND="${DEPEND}"
167 +
168 +S="${WORKDIR}"/${MY_P}
169 +
170 +src_prepare() {
171 + eapply_user
172 +
173 + # fix script location (bug #407185)
174 + epatch "${FILESDIR}"/${P}-scripts.diff
175 +
176 + # fix __FORTIFY_SOURCE warning (bug #337365)
177 + epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
178 +
179 + # do not use builtin shapelib if sci-libs/shapelib is not installed
180 + # instead build without shapelib support (bug #430704)
181 + epatch "${FILESDIR}"/${PN}-2.0.8-no-builtin-shapelib.diff
182 +
183 + # do not filter duplicate flags (see bug 411095)
184 + epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
185 +
186 + eautoreconf
187 +}
188 +
189 +src_configure() {
190 + # provide include path to GraphicsMagic for configure stage
191 + use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
192 + econf --with-pcre \
193 + --with-shapelib \
194 + --with-dbfawk \
195 + --without-ax25 \
196 + --without-gpsman \
197 + $(use_with !graphicsmagick imagemagick) \
198 + $(use_with graphicsmagick) \
199 + $(use_with geotiff libproj) \
200 + $(use_with geotiff) \
201 + $(use_with gdal) \
202 + $(use_with festival)
203 +}
204 +
205 +src_compile() {
206 + emake AR="$(tc-getAR)"
207 +}
208 +
209 +src_install() {
210 + emake DESTDIR="${D}" install
211 +
212 + rm -rf "${D}"/usr/share/doc/${PN}
213 + dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
214 + README.Getting-Started README.MAPS README.OSM_maps
215 +}
216 +
217 +pkg_postinst() {
218 + elog "Kernel mode AX.25 and GPSman library not supported."
219 + elog
220 + elog "Remember you have to be root to add addditional scripts,"
221 + elog "maps and other configuration data under /usr/share/xastir."
222 +}