gentoo resync : 24.12.2018

5 files changed, 33 insertions, 94 deletions

diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 258c0787c63a..bb0ae0b0b4fc 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,11 +1,10 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e006f315bd6c97ba1683a97a852067ad5b460a4ea68b3854d70882a1a24f7d7873af7f2e350b010853b124af00944 SHA512 f8ba2e3820e599a41dfcb4e60570b320c54625833e3bf0ab649655b1925e1d21d8de776d705bffd3cf85b2ebf43868de17923cf94fa3e4abd787c5d3ec09b920
-AUX xastir-2.0.4-no-builtin-shapelib.diff 2552 BLAKE2B 40fa961229a2fbcb125818acc16c192b8c0348d8b2192d12466cfb815eb8c2b581f7a53222f6af4e3612a62ec6b25b15ac8d2a5592e64eb3d127b9fa9136307f SHA512 c262ce1147a826d0c82026db7b91d9e97c0e1357aedd59b8d2519252e4439cebcd0d367449daeef7538c5a25bc3c8b078795c1a2dd7d1c67cd4ddd0a45319fab
-AUX xastir-2.0.4-scripts.diff 3589 BLAKE2B 40eb8fa6f283bb746611dd79f13933a4836c064e1f89c06ddd9748bcd10e8331594520ae1ae24e3c0a7b3aefdff89cc2c06f39e57f80b4374531f66985a568da SHA512 c2647694e71c75f702d98ef9ff9743bc711a692e67994cf1a650405f9800c3bd1c463ed9d70f2042191873842029c1b15735b291a52a55b3bdd2d22cb7a55eb8
 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
-DIST xastir-2.0.6.tar.gz 2662042 BLAKE2B ca094be011d25ed1ec3a278923a4e53c785eec76d37ed024136eab66e448339896bcbb0b0bb408947d6fc5b03a8acad470afa879c91641e6db6f735f57f8189f SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3
+AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c3677f9bc2d1d2d19d728df47f977b546fcddac036eb42b086f7bb73394269175dd3a8e13aeac9fe4ceac8de85bd01 SHA512 28d74029262de2ec58805ca8e042d100436369d330667574c01507a1085d96aa15c5e7ee84c200ccca869941acfe73f46959919c4f205608233505138c80aa8f
 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
-EBUILD xastir-2.0.6-r1.ebuild 2228 BLAKE2B 2a93d392769e4f2b21f10a786cbcaf8b6bd071baa72b0932a52a55c88fd06d9fb0caf51c150968ba77920350b966d852ee4f4c700c491f0945dbd02fd521a24f SHA512 0cc7e38cf675ea8771df5455e67eb513eac0bdf5a831efff37f31e6aaf245ae3cd8ef5ea592bb20f99d070c4387d54bd4e324af44158a3e81ea8631ebdff0606
-EBUILD xastir-2.0.8-r1.ebuild 2202 BLAKE2B 6ba9760fbb9d176da1674d7e7443f642e5206f7778b5ddfd6ded9016e734c43dac109fe6e891cbb2376497a281adab02c02873f37ca8ae77bf0b42ecf4a7f8f0 SHA512 7c2ab005eda77a4ca248f2b63c577b7068468fcdec9071bf2c91bb177dffd748e5d90392d09c8b381e6c0211efff4da296856dd3bd82b407339acf7f1e8160b8
+DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288
+EBUILD xastir-2.0.8-r1.ebuild 2203 BLAKE2B dc61aac6fedf3718670c310bb6bf7543a3c6b89cde7ce268ae649412573e3abc1b276887dce805cea66bed9a012807bd37c545b32b1b049235645aaa8dc78d5d SHA512 ecbcff6241fa73b88de005fc101c61188f808cf25769144185e42525396cb7ac9b8f0eebd0d1821693cd8ed375ea1fd4afbcb25bf4b54487ba6bd68e4f52196a
+EBUILD xastir-2.1.0.ebuild 2333 BLAKE2B 163f1da300c3f93e8362d65eb44a3e7afd7dcb8775c0f592200e12427fd36024b1a97550e97075088a23dd5760f8d519040d1657a3a758e79e395180b4738129 SHA512 7d39611bcbf2c38e86ade30140676f86418316b2d497351c2b5229b732c7a11824beca2cb262eeb57602d4125cb19093323b856c8fc1f6b6fbe521c2f84d686e
 MISC metadata.xml 598 BLAKE2B f264d0c4da8a00f68c94e83e15dd698a5f2332d92711347337a71fa11290570ca582ec6826ca7b62cab3d1935cb370ad71e6d8db893bc92f195fbef3fc06c4c3 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb
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 7aef072a5c39..000000000000
--- 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/files/xastir-2.0.4-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
index 369295b07f8c..de8a461bceab 100644
--- a/media-radio/xastir/files/xastir-2.0.4-scripts.diff
+++ b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
@@ -1,20 +1,11 @@
 # patch scripts location (bug #407185). partially backported from upstream.
---- xastir-2.0.0-orig/scripts/Makefile.am.orig	2012-11-27 05:41:23.000000000 +0100
-+++ xastir-2.0.0/scripts/Makefile.am	2012-12-05 06:21:59.000000000 +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 \
+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
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index dd75bd2aeb98..d4421c5da9b6 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? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
 		sci-libs/libgeotiff
@@ -36,7 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-scripts.diff
 
 	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch 	"${FILESDIR}"/${PN}-2.0.4-fortify.diff
+	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)
diff --git a/media-radio/xastir/xastir-2.0.6-r1.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
index 5347439f131a..e11209b5a303 100644
--- a/media-radio/xastir/xastir-2.0.6-r1.ebuild
+++ b/media-radio/xastir/xastir-2.1.0.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+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.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="festival gdal geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
@@ -22,7 +25,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? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
 		sci-libs/libgeotiff
@@ -31,16 +34,20 @@ DEPEND=">=x11-libs/motif-2.3:0
 	festival? ( app-accessibility/festival )"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}"/${MY_P}
+
 src_prepare() {
+	eapply_user
+
 	# fix script location (bug #407185)
-	epatch "${FILESDIR}"/${PN}-2.0.4-scripts.diff
+	epatch "${FILESDIR}"/${P}-scripts.diff
 
 	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch 	"${FILESDIR}"/${PN}-2.0.4-fortify.diff
+	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
+	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
@@ -72,8 +79,8 @@ 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
+	dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
+		README.Getting-Started README.MAPS README.OSM_maps
 }
 
 pkg_postinst() {