Version bump

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

6 files changed, 400 insertions, 5 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 7b88bd9aee03..7a4464482c49 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-radio/xastir
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.29 2012/12/07 14:27:31 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.30 2012/12/07 14:31:19 tomjbe Exp $
+
+*xastir-2.0.4 (07 Dec 2012)
+
+  07 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> +xastir-2.0.4.ebuild,
+  +files/xastir-2.0.4-fortify.diff,
+  +files/xastir-2.0.4-no-builtin-shapelib.diff,
+  +files/xastir-2.0.4-scripts.diff:
+  Version bump
 
   07 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> xastir-2.0.0-r2.ebuild,
   +files/xastir-2.0.0-dont-filter-flags.diff:
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index c7ce20a7ebed..da05d48d14db 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -9,15 +9,20 @@ AUX xastir-2.0.0-dont-filter-flags.diff 621 SHA256 00d3dbefc6b06f183d29d60a31cfa
 AUX xastir-2.0.0-no-builtin-shapelib.diff 2425 SHA256 ae518747d81a03cd831d065228fd03e5b2e1809f09abed13c23d8a4e9e5bf75c SHA512 e33405f105ce2e425034cc94468ea8010026d0089e7912983c273238c8a8442c563ba9f934a36d29649b58967984d722f0dacb845a512babff015c7f208ecbfb WHIRLPOOL 1b2c0b8fb4138f2f3c0a03ace22a6e4b7a4c46476de24cd9fa3a5cb9e6523ce8eed6e0853944fe65731a1c53a35422c6f11ec17f836b91a7c2cee1d4aa8b4126
 AUX xastir-2.0.0-proj48.diff 1245 SHA256 03c648a3c8bd5a6c4c28279b5c75457cdeae6f39e3d2e2ebf0cec8dce1b3e544 SHA512 0fcebcfbe56fd1f3374ec63a11866b6092ce5158101348e4fcc74f6763fb00c114dcaec02db274f5a438e681c1c8ed1f819da4c49af69ee366b3818b2cffa615 WHIRLPOOL 943572176c99b4c6f598a8925dea5173cb1f2eb76c547d45333857a7939b374b7db9359e6723b59fb1d64e3a6bcf6bcad12582421358fc0f93fa8c0c6845de07
 AUX xastir-2.0.0-scripts.diff 3732 SHA256 c0d06a9884d33cc8093d85b6f970dbfa8c24e49520cc2157fa5d6141afe41161 SHA512 c218cc0a970dcf0921e608fc4cb682111301ae3ff44906bf3ac30d202235a859b19872f687b3409a3eea68a839b9dd089521640f7323eab7866f51493394d764 WHIRLPOOL 19cde21bba12df2528d35935eb66119d5e474ba090545a2f255f7fc0dc217b3172a0adbf1d457dcc32614396e1c96d904dbaf6fc78299daccbc11908b5297cb5
+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
 DIST xastir-2.0.0.tar.gz 2544827 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281 SHA512 60051a1cf9a49b172fe13340f82b73426bed11b7b785f91c8d33f69b03ef03a19443ec02c9cc86c0bad990266fcb7edc170b8a70883cca85095edebd65453e63 WHIRLPOOL 3edce24e200d5695c31f58fa3cb70a6d0187105af9205c2d46402c9c0181a3954a3321e17a6b57345fa9927cc558729bb7b68751e1f2c537fb81b143cf4c3c23
+DIST xastir-2.0.4.tar.gz 2655250 SHA256 975f1cbe1ee32334e579588dcf2e19bcc607ad7b5f9d0848075f6d283d65af86 SHA512 766124ae717742e93bef24cd4c84946e146c3ba8a61775afada25a1c60f225edf91fc8eb4f59881564b14187e523c98a07d515adea74d73e03e2ab10dbae92b3 WHIRLPOOL 640616e698e2e3cfe2bdd6619ac601017c37d4d18cd1fa3ab5391ade170b6108a845a4fe2860b618a5cd2281e884399874b554c3960e1f5ad6420f016c88260c
 EBUILD xastir-2.0.0-r1.ebuild 2306 SHA256 502ad679f36eef7b98540018295224e612954b043456b30f90886a16f4a0116e SHA512 f297363236006811af276d8efcbf36d654f9e0bdf3285fc4dce904e3d45367c85fa3c83cc2420ebc11e2912d36d676260fbd5a842e586359dbe9489c90d5b768 WHIRLPOOL 80642be5ac9254c5e3859f9ae010d3cdb8e1a3accf850f34b4d5f1818ba6440d6a011aaf9309e80b5480767cd6d252bd0bf78e8e0f673a0bcc5bce5ec25aa259
 EBUILD xastir-2.0.0-r2.ebuild 2307 SHA256 13593d705b4328ddbb6e51ff50710386ba098bdc900151244aafc3ab2f339cda SHA512 5df2c6f7a00f35f1b4616e74d7a447c4f2ffce5e8e1715de9a0a610884aff635c93446a86ebc0e3b90ccab796f9bad9778df66732bce35d4b1e8aa1303b7391e WHIRLPOOL 69fc8f042b922943996a4f7792e6c9239a6f376d40b2bf65f91b855a689247d54a1676448c1610b5d9b462c0d5a6890f8e7a7fee455bfb7730288d5321b8b003
-MISC ChangeLog 3340 SHA256 1a3e42367dd780519d1176fa702df877b4581de8ef5cc7048426b7ffea1d3d31 SHA512 cd81315efa5d8a0195fa44541947efd59cb46d4f61bdf6d93ae7266914fb0ee8d6519a7d22148ff913830866c53d7f9f88a0025d6c0b28ac3665bd7bbeeb96da WHIRLPOOL a49dd7ac1627e351a90944cc97f5b3c9e60c083000fa88fba8015b61bed60e8a620421920732959f2b4290a68da22309dc4a69fc879123b4c28a9874bac6320f
+EBUILD xastir-2.0.4.ebuild 2112 SHA256 57aa6a0b0ee324b4d0605005d09647621010cd1ba6c0c7fd1d7b80bbcac583c4 SHA512 a47241efe7673c1d4f17478b27b2adedc8ee6694f6b23a8ff650bd1a93da4778c9044b64ff9de2e90572abacdaf9b5fff13f706084672e66deb2c3c03b47463f WHIRLPOOL e0aec42db0b24e1c0c45eb618bbc1d83e6a26a51ceb224955f23588de4db88a1b9c5c3d6bd1f6278d50230622e37f191e1739414b95e2558a62ce7e6a55e2808
+MISC ChangeLog 3579 SHA256 f81bde6600ee5aa543f6d817521ae4d59b2f928ef553729c925e6fb049a541ff SHA512 d16a852c02a113176e3990af068f69e52f067cb6b52d8f4c075efeef5101f56dd7b294b0b0664b6c200bc29a2bec602a27d137538b6629930a97ae18b6ffd4d4 WHIRLPOOL 90dac637efb6aa6c7ea653522b355c75f5008e494a11e0d2775c3a30216d3086649387a802513508420b20cf71686816e54ac0f6fd13ce2b47536bf95bf52e3c
 MISC metadata.xml 601 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773 SHA512 371ee7f590a846b095776f687c7bbb3920509923949121872875b8fa7ab22912cf806019998e16ea8443e2efdff3734ec9dbb8aaf9737bd17556eacae9478fa8 WHIRLPOOL d2de0305aee8d707a736a4d03b972a2470cd6dec1f34a1c011e0ef7d62fa42d34a61dab74658e8ae93ad5995768af5cf202a711fcc6c5e51cedaec5426cf68cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDB/NkACgkQQe4uqXYgU9VgNACeMTkt//QPbkMbKK3vb6yclwJd
-9LwAn3HKMlNJB29My9k2qMSXkvQP5AoO
-=YXVs
+iEYEAREIAAYFAlDB/bgACgkQQe4uqXYgU9XxRgCg2ZmOrPhey7JDgIE5e372xQxj
+x+8AoNX3u2InjuuH4c+uFN8xucpFDEHr
+=UYQt
 -----END PGP SIGNATURE-----
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/xastir-2.0.4.ebuild b/media-radio/xastir/xastir-2.0.4.ebuild
new file mode 100644
index 000000000000..080cbd2eba50
--- /dev/null
+++ b/media-radio/xastir/xastir-2.0.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.4.ebuild,v 1.1 2012/12/07 14:31:19 tomjbe Exp $
+
+EAPI=4
+inherit autotools eutils
+
+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
+	sci-libs/shapelib
+	!graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] )
+	graphicsmagick? ( media-gfx/graphicsmagick[-q32] )
+	geotiff? ( sci-libs/proj
+		sci-libs/libgeotiff
+		media-libs/tiff )
+	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}"/${P}-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() {
+	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_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."
+}