gentoo resync : 02.06.2019

4 files changed, 176 insertions, 2 deletions

diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index c5ff555bf7e5..4a818afea08c 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -3,8 +3,11 @@ AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e0
 AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
 AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
 AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c3677f9bc2d1d2d19d728df47f977b546fcddac036eb42b086f7bb73394269175dd3a8e13aeac9fe4ceac8de85bd01 SHA512 28d74029262de2ec58805ca8e042d100436369d330667574c01507a1085d96aa15c5e7ee84c200ccca869941acfe73f46959919c4f205608233505138c80aa8f
+AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
 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
 EBUILD xastir-2.0.8-r1.ebuild 2203 BLAKE2B dc61aac6fedf3718670c310bb6bf7543a3c6b89cde7ce268ae649412573e3abc1b276887dce805cea66bed9a012807bd37c545b32b1b049235645aaa8dc78d5d SHA512 ecbcff6241fa73b88de005fc101c61188f808cf25769144185e42525396cb7ac9b8f0eebd0d1821693cd8ed375ea1fd4afbcb25bf4b54487ba6bd68e4f52196a
-EBUILD xastir-2.1.0.ebuild 2331 BLAKE2B 6a28db68521d9a4f6eefaf8518066921469da6689362ce67020c9af1972cd41d1c073a922defc1c59c98417dbd385a57aee2be76c7e5205c641eaa82bcbc34e1 SHA512 e8e4ecc07a20f4c8fb803380aabf8fbbf7b37a3ee224f9c4673805cfa4f82fcf079e46216e597bde178a0c485a7be6fd2339e08ce3652c1577e9d916ab3a42af
+EBUILD xastir-2.1.0.ebuild 2333 BLAKE2B a67bf08f7dfa2f21ec517e14c7c38154bf2ee1a10c53152c7c40edc734d4389ff7057dbfe647fb0b679eda5a34053f9d7b47937a208d9c271709a121c9e3d086 SHA512 821d55f16f1f8e887060d9fd58a85c19e5fb81202aa5d3656f15b2db77d2445680e405118d9cc8d011fe5b047a9327ac7f85f6a6f47d4c656c53e9fb0dcf7b37
+EBUILD xastir-2.1.2.ebuild 2010 BLAKE2B b6e8f50069e874c74beff4540ca9a4765a9178459b4a335d3e650559a6ec6676f35299412878c84fa422c5a775578b284d3f0d5a3d6d56484cfcbfc3bca2179c SHA512 0c9909ee954c111d8f5df49c0f79ca5b90242f524fa2fe8724322332a284b07e57e3546b490d72fed678113bbdc2e077c9ad26c0430c63e2b32f4660087bd977
 MISC metadata.xml 598 BLAKE2B f264d0c4da8a00f68c94e83e15dd698a5f2332d92711347337a71fa11290570ca582ec6826ca7b62cab3d1935cb370ad71e6d8db893bc92f195fbef3fc06c4c3 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb
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 000000000000..7b52c6895606
--- /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.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/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
index 65a7bb764f60..bb02b59e37fb 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? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
+		sci-libs/libgeotiff:=
 		media-libs/tiff:0 )
 	gdal? ( sci-libs/gdal )
 	festival? ( app-accessibility/festival )"
diff --git a/media-radio/xastir/xastir-2.1.2.ebuild b/media-radio/xastir/xastir-2.1.2.ebuild
new file mode 100644
index 000000000000..b9b5bdb7a8cd
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.2.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? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
+	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
+	geotiff? ( sci-libs/proj
+		sci-libs/libgeotiff:=
+		media-libs/tiff:0 )
+	festival? ( app-accessibility/festival )"
+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
+
+	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 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."
+}