reinit the tree, so we can have metadata

10 files changed, 661 insertions, 0 deletions

diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
new file mode 100644
index 000000000000..70feadf438f6
--- /dev/null
+++ b/media-radio/xastir/Manifest
@@ -0,0 +1,13 @@
+AUX xastir-2.0.0-dont-filter-flags.diff 621 SHA256 00d3dbefc6b06f183d29d60a31cfa9331764015a2e849af883fc8b0a364b0062 SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b WHIRLPOOL 9a932bbf5bae244f818e94e2de186a2ea390d4c7353cd7eb79632fde99c926585f8390df8e674172b80a2f5382de462b04f3537903aeff8e38c72b761681a85a
+AUX xastir-2.0.4-fortify.diff 4404 SHA256 d0f8e3828d498a2d65288c14664200e5b2115f42c1a392e69f0c7cdc1f3c15a7 SHA512 f8ba2e3820e599a41dfcb4e60570b320c54625833e3bf0ab649655b1925e1d21d8de776d705bffd3cf85b2ebf43868de17923cf94fa3e4abd787c5d3ec09b920 WHIRLPOOL 2a3d021a9e1863ce28c8a38744f8ccf4abd870a2bc7c1cb96054eff9db5fc5d98abb42235d6806406c6b00e507f4b89f695568491a49a905072049d385a63e9e
+AUX xastir-2.0.4-no-builtin-shapelib.diff 2552 SHA256 599ed97bd2e1a60ccbff5a04fd27279b0e29682b59c40eb333ef2c0f162d032d SHA512 c262ce1147a826d0c82026db7b91d9e97c0e1357aedd59b8d2519252e4439cebcd0d367449daeef7538c5a25bc3c8b078795c1a2dd7d1c67cd4ddd0a45319fab WHIRLPOOL 98fea37dc08b3bff85c2aca8636af1ca232bf2d478ad4d4ece50ba5e6c3533c65cbe165003e2093f0db74ae4d9fc9c8086bd2577f2916c2789127c1e05c2080a
+AUX xastir-2.0.4-scripts.diff 3589 SHA256 c9016531585c45c0259d8b5cd04d8cf5102c0eee1c29e36812f5ad5309c4c4dd SHA512 c2647694e71c75f702d98ef9ff9743bc711a692e67994cf1a650405f9800c3bd1c463ed9d70f2042191873842029c1b15735b291a52a55b3bdd2d22cb7a55eb8 WHIRLPOOL e36c952216ebfb8dd7f0280a7296616373b6b589520c158e3700e4835bfacb52d4f86b5e57a88c142f53384ccbe09cdc68518a6f10d07a46f5d1890393a934db
+AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 SHA256 fc1f5ba5d0157fa9717f3564b954e12b17d71b01ea0f4d24f18aa1bceec47913 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6 WHIRLPOOL 3a93765d8c501065337a4463e016a37a75462cfd33535238506523c432821e9f10e0a90f18ba0225ff009e118f7c4448458aaf8304be381149a3440fa93201ff
+AUX xastir-2.0.8-scripts.diff 3398 SHA256 811b2901854fdd4951c9cfd246fa58593d96e59f2bf619d74ef5f3e5c5522666 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda WHIRLPOOL ec5e3d06ba4afcf56d66d6de04bd71b4205ac922f85baf815e1554f1c5b603fb321a3ae9bb93167f10596243d6ef6ae73247765f4173c1ef5de38743fcf78624
+DIST xastir-2.0.6.tar.gz 2662042 SHA256 e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8eeee436c3bc8a8dd43 SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3 WHIRLPOOL 39a097dba585d5bcdcdb880ddb5e530eb118bd1645abf911948ed2c0b562a4b12cf4b453b0295db1f37d00380873440e251466f7b12440cd41f50578ae90f170
+DIST xastir-2.0.8.tar.gz 2697256 SHA256 775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f WHIRLPOOL 970750a3cc0d1ab51bd754450ab348a88efba26d6e8e3c3ced95b9885e63dffbc2d4ed94ced42d1a309b2fa8d23f203fb98bae6021c5556d3e39bcc79835be89
+EBUILD xastir-2.0.6-r1.ebuild 2228 SHA256 d8dfc97572642cdb32a5de4e5de5c2dc540193bc220012774e3d62f551cfe437 SHA512 0cc7e38cf675ea8771df5455e67eb513eac0bdf5a831efff37f31e6aaf245ae3cd8ef5ea592bb20f99d070c4387d54bd4e324af44158a3e81ea8631ebdff0606 WHIRLPOOL 36dd49ad5e1192b5dac0261964cfd70437458d16fab7b20e3ff1dedd37c8d45a4d1e154566d888721d8326204e6dbf1e9ac2fb1b2d2f1557d297dbcd3ee23b84
+EBUILD xastir-2.0.8-r1.ebuild 2202 SHA256 bfc590446cccf633dfd2a6f8fa5ba5b06097fe6c6e7eb70a9a000c8ee34d0a46 SHA512 7c2ab005eda77a4ca248f2b63c577b7068468fcdec9071bf2c91bb177dffd748e5d90392d09c8b381e6c0211efff4da296856dd3bd82b407339acf7f1e8160b8 WHIRLPOOL dbc1ec65c6da6039f2d4dbfe39d304c27c8493debe57d255efae948d0c85b0332d4474037ec885f5e13a47e78f5e140bf7dff93b14d53ecc9868d4ac1e5fd957
+MISC ChangeLog 2982 SHA256 25f91879a1a08e00483f9b21536312179164d80a2c070286d3cbeaf3db7c2518 SHA512 63db6694d60a832fca7751d0acf2a5d50e94e1e46808a20203b0f35c7849ad24c629a8ca4a1d5a9a978ae80d1afffaf98d0d65d1a6aafe1af41f153718541b56 WHIRLPOOL f8ff792c85bedf4c182ad6d0b6b259748203e66d128d360692c5418d6c83832a8f1570da1bed02d48d48930420002b6cab82fc1084ebc2d2098a8bb363a0017f
+MISC ChangeLog-2015 5142 SHA256 ecc7b100690a12fdb65ec3f2c2c74e9310c248baf85bec3025425392158a6c4f SHA512 7c831e463325e2db1635657fe237ba339cd6a75c5b260248d6698c4baff9d42cb08dd9508f618759c34aae23ef20a320117f850c2189b76f7e954f642e9b7321 WHIRLPOOL a194e1fe20345df5479e739e46d3e54ef36a0bba67b989f52dce7166b7e18ee242339ab78520e3cb78e45e1a642def5a87535d61c9c3b4ad48adc910ddb3af12
+MISC metadata.xml 598 SHA256 76f8d579cd97449397a202541a2e4dd9f98dd1b16c613a23e97cc1cf54493ad8 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb WHIRLPOOL d61fc732276d8255825b552402c7d50111a2813447b7158c301cfe3a937e1d7862fe5197a209cbb98586973db4710a30f6c5562ce3955a19ae5d4e94a99ea236
diff --git a/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
new file mode 100644
index 000000000000..1fbea1d61a57
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
@@ -0,0 +1,11 @@
+# Do not filter duplicate CFLAGS (bug 411095)
+--- configure.ac.orig	2012-12-07 15:12:43.000000000 +0100
++++ configure.ac	2012-12-07 15:13:08.000000000 +0100
+@@ -709,7 +709,6 @@
+ # "-llibrary" that needs it.
+ # 
+ changequote(,) 
+-CFLAGS=`echo  "$CFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ CPPFLAGS=`echo  "$CPPFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ LDFLAGS=`echo "$LDFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ #LIBS=`echo "$LIBS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
diff --git a/media-radio/xastir/files/xastir-2.0.4-fortify.diff b/media-radio/xastir/files/xastir-2.0.4-fortify.diff
new file mode 100644
index 000000000000..e2c34b007475
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.4-fortify.diff
@@ -0,0 +1,144 @@
+--- src/rac_data.c.orig	2012-09-23 18:19:22.000000000 +0200
++++ src/rac_data.c	2012-11-29 21:00:53.000000000 +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;
+     /*char        filler[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,
+             sizeof(data->qual_a),
+             "%s",
+-            racdata.qual_a);
++            racdata->qual_a);
+  
+         xastir_snprintf(data->qual_b,
+             sizeof(data->qual_b),
+             "%s",
+-            racdata.qual_b);
++            racdata->qual_b);
+  
+         xastir_snprintf(data->qual_c,
+             sizeof(data->qual_c),
+             "%s",
+-            racdata.qual_c);
++            racdata->qual_c);
+  
+         xastir_snprintf(data->qual_d,
+             sizeof(data->qual_d),
+             "%s",
+-            racdata.qual_d);
++            racdata->qual_d);
+  
+         xastir_snprintf(data->club_name,
+             sizeof(data->club_name),
+             "%s",
+-            racdata.club_name);
++            racdata->club_name);
+  
+         xastir_snprintf(data->club_address,
+             sizeof(data->club_address),
+             "%s",
+-            racdata.club_address);
++            racdata->club_address);
+  
+         xastir_snprintf(data->club_city,
+             sizeof(data->club_city),
+             "%s",
+-            racdata.club_city);
++            racdata->club_city);
+  
+         xastir_snprintf(data->club_province,
+             sizeof(data->club_province),
+             "%s",
+-            racdata.club_province);
++            racdata->club_province);
+  
+         xastir_snprintf(data->club_postal_code,
+             sizeof(data->club_postal_code),
+             "%s",
+-            racdata.club_postal_code);
++            racdata->club_postal_code);
+  
+     }
+     (void)fclose(fdb);
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
new file mode 100644
index 000000000000..7aef072a5c39
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff
@@ -0,0 +1,58 @@
+--- 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.0.4-scripts.diff
new file mode 100644
index 000000000000..369295b07f8c
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.4-scripts.diff
@@ -0,0 +1,101 @@
+# 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 \
+     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.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/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 000000000000..8cbdbc2cdb62
--- /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-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"
+@@ -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 000000000000..35c73246c9ee
--- /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:23.000000000 +0100
++++ xastir-2.0.0/scripts/Makefile.am	2012-12-05 06:21:59.000000000 +0100
+@@ -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.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/metadata.xml b/media-radio/xastir/metadata.xml
new file mode 100644
index 000000000000..be15613be578
--- /dev/null
+++ b/media-radio/xastir/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<use>
+		<flag name="festival">Enable text to speech synthesizer</flag>
+		<flag name="gdal">Support for some further map formats</flag>
+		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
+			maps or other types of geotiff mapes/images</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xastir</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-radio/xastir/xastir-2.0.6-r1.ebuild b/media-radio/xastir/xastir-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..5347439f131a
--- /dev/null
+++ b/media-radio/xastir/xastir-2.0.6-r1.ebuild
@@ -0,0 +1,84 @@
+# 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."
+}
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..dd75bd2aeb98
--- /dev/null
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -0,0 +1,84 @@
+# 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.org/"
+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}"/${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}"/${P}-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."
+}