media-radio/xastir: Version bump and documentation of USE flags wrt GLEP 56

svn path=/sunrise/; revision=6753

7 files changed, 81 insertions, 96 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 364cf2611..5bb961c78 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Aug 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -xastir-1.9.2.ebuild, -files/xastir-1.9.2-IM.diff,
+  -files/xastir-1.9.2-curl.diff, -files/xastir-1.9.2-scripts.diff,
+  +xastir-1.9.4.ebuild, +files/xastir-1.9.4-scripts.diff, metadata.xml:
+  Version bump and documentation of USE flags wrt GLEP 56
+
   25 Jul 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   xastir-1.9.2.ebuild:
   Dropped sys-libs/zlib from DEPEND as it is in 'system'
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index e54ca4ad7..43aaa7791 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,7 +1,5 @@
-AUX xastir-1.9.2-IM.diff 993 RMD160 f334b93a98510d1ef6969e762c933e3879b01b45 SHA1 8d8ccd2b7ab99147c1d16f87d2fa0d3d402b263f SHA256 76e0bac841f9d37724834b5a08871b68ad86d2ae741e788cd531a675ca8e1f2e
-AUX xastir-1.9.2-curl.diff 862 RMD160 2f56617c99cf8408b1d03b958311bd72d4c10c02 SHA1 ff4b73761fc892a8823f7dccfbc82047d325d1d8 SHA256 0e6f083b268ca8182a26c7b03e33cda59842c363ac59631a947adf87fa8f8cd6
-AUX xastir-1.9.2-scripts.diff 6114 RMD160 fb431c31f39fbef383d190024af4ba938df17bfa SHA1 4f06a4e6584f6a96aa7de30cdd34621f36358e5e SHA256 c6ab1bcaf176a971bb4b4ab9e3dd166f7376b16df8ee9fa884779b9aa631a87b
-DIST xastir-1.9.2.tar.gz 2253001 RMD160 583b8fcc1637ee91e8301585295a1ceb72187593 SHA1 105af73a35c81f27ab0ca6ad3a5bfe966327ee9a SHA256 4fb9ebc84113a504c8c08c563e7f0f5a53688f9aa144c8f21ecd41bc65db0e10
-EBUILD xastir-1.9.2.ebuild 1701 RMD160 25765fa8bec55e568349a855293192808fa32048 SHA1 266f552d27b01f467b8955c455979fac92601278 SHA256 cc3e3c984aa2ba9f315d577c3297fbfe64acbe1346f2b6e66b2acf93533e3d31
-MISC ChangeLog 788 RMD160 708d289ebd3ba11d3b578d600f446cc7fefd4778 SHA1 7b15b923e7b448b66250c16375812704a42ec138 SHA256 6853485316496947e1d9c204d05c5242777a6e12302b00e8ff9e08ca090b8a7f
-MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+AUX xastir-1.9.4-scripts.diff 6814 RMD160 64d8546349948810401b6f0eed7d63daa29d0073 SHA1 ab1174799c7bbed1c77d17b9eab94fa272dce816 SHA256 2d49b9d476364f45132fa118b40340fa976dee30e1dbafe47f07677c85f894c8
+DIST xastir-1.9.4.tar.gz 2348880 RMD160 44019501e7118d274046839b6d302dce57f34e19 SHA1 c29f736991d7866bda7e611f328a7a0a17f5e08e SHA256 b960449bc755e702013cdd62587262bd2be22cbfd5656e4bfe1dd12d62e4c174
+EBUILD xastir-1.9.4.ebuild 1701 RMD160 25765fa8bec55e568349a855293192808fa32048 SHA1 266f552d27b01f467b8955c455979fac92601278 SHA256 cc3e3c984aa2ba9f315d577c3297fbfe64acbe1346f2b6e66b2acf93533e3d31
+MISC ChangeLog 1097 RMD160 3122fb0bf29b0d6e603c785d94bd9aebb1e02bfe SHA1 b7e976e6919b5e0088bee12a07607b54cb583bc4 SHA256 8b773b905dfe0705371cc8270142d77270125a26b841c682952d1fa1b11d4fbc
+MISC metadata.xml 672 RMD160 186519b01d7b4bdb356c6add437115f92bd97762 SHA1 d25b05120533865b203ae87a7566cbee2e517015 SHA256 8f58169c54f495a15953661562feff3106744ee05815750679724d206403c2dc
diff --git a/media-radio/xastir/files/xastir-1.9.2-IM.diff b/media-radio/xastir/files/xastir-1.9.2-IM.diff
deleted file mode 100644
index 65ff3f158..000000000
--- a/media-radio/xastir/files/xastir-1.9.2-IM.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- acinclude.m4.orig	2008-07-05 20:14:40.000000000 +0200
-+++ acinclude.m4	2008-07-05 20:15:20.000000000 +0200
-@@ -450,7 +450,7 @@
- # because AC_CHECK_PROG will do nothing if the variable is already set!
- #
- use_imagemagick=no
--AC_PATH_PROG(MAGIC_BIN, [Magick-config], no, $BINPATH)
-+AC_PATH_PROG(MAGIC_BIN, [MagickCore-config], no, $BINPATH)
- if test "$MAGIC_BIN" != "no"; then
-   use_imagemagick=yes
- #else
-@@ -489,7 +489,7 @@
-   if test "${use_imagemagick}" = "no"; then
-     AC_MSG_WARN(*** Cannot find ImageMagick include files:  Building w/o ImageMagick support. ***)
-   else
--    AC_CHECK_LIB([Magick], [WriteImage], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
-+    AC_CHECK_LIB([MagickCore], [WriteImage], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
-     if test "${use_imagemagick}" = "no"; then
-       AC_MSG_WARN(*** Cannot find ImageMagick library files:  Building w/o ImageMagick support. ***)
-     fi
diff --git a/media-radio/xastir/files/xastir-1.9.2-curl.diff b/media-radio/xastir/files/xastir-1.9.2-curl.diff
deleted file mode 100644
index 833a4a7b8..000000000
--- a/media-radio/xastir/files/xastir-1.9.2-curl.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	2008-07-06 08:01:02.000000000 +0200
-+++ configure.ac	2008-07-06 08:05:51.000000000 +0200
-@@ -138,9 +138,17 @@
- 
- use_curl=no
- if test "${use_lsb}" = "no"; then 
--  AC_CHECK_LIB([curl], [curl_global_init], use_curl="yes")
-+  # Important: when using the three-argument version of AC_CHECK_LIB, you
-+  # must do all of what is normally the default behavior in the third argument,
-+  # not just the extra stuff you want to accomplish:
-+  AC_CHECK_LIB([curl], [curl_global_init],
-+	[use_curl="yes"
-+	LIBS="${LIBS} -lcurl"
-+	AC_DEFINE(HAVE_LIBCURL, ,
-+		[Define to 1 if your `curl' library has curl_global_init.])
-+	])
- else
--  AC_DEFINE(HAVE_LIBCURL, , Define to 1 if your `shp' library has DBFGetFieldIndex. )
-+  AC_DEFINE(HAVE_LIBCURL, , [Define to 1 if your `curl' library has curl_global_init.])
-   LIBS="${LIBS} -lcurl"
-   use_curl=yes
- fi
diff --git a/media-radio/xastir/files/xastir-1.9.2-scripts.diff b/media-radio/xastir/files/xastir-1.9.4-scripts.diff
index 0b9bf3a46..8165dbd5c 100644
--- a/media-radio/xastir/files/xastir-1.9.2-scripts.diff
+++ b/media-radio/xastir/files/xastir-1.9.4-scripts.diff
@@ -1,9 +1,9 @@
 diff -u scripts.orig/Makefile.am scripts/Makefile.am
---- scripts.orig/Makefile.am	2007-01-03 20:40:49.000000000 +0100
-+++ scripts/Makefile.am	2008-07-10 14:39:40.000000000 +0200
+--- scripts.orig/Makefile.am	2008-06-24 17:48:59.000000000 +0200
++++ scripts/Makefile.am	2008-08-16 07:47:00.000000000 +0200
 @@ -8,9 +8,7 @@
      coord-convert.pl \
-     fcc-get \
+     get-fcc-rac.pl \
      get-gnis \
 -    get-maptools.sh \
      get-NWSdata \
@@ -22,7 +22,7 @@ diff -u scripts.orig/Makefile.am scripts/Makefile.am
  
 diff -u scripts.orig/coord-convert.pl scripts/coord-convert.pl
 --- scripts.orig/coord-convert.pl	2002-08-26 23:52:03.000000000 +0200
-+++ scripts/coord-convert.pl	2008-07-10 14:36:21.000000000 +0200
++++ scripts/coord-convert.pl	2008-08-16 07:47:00.000000000 +0200
 @@ -26,7 +26,7 @@
  #
  
@@ -32,47 +32,47 @@ diff -u scripts.orig/coord-convert.pl scripts/coord-convert.pl
  use Coordinate;         # WE7U's Coordinate.pm module
  
  
-diff -u scripts.orig/fcc-get scripts/fcc-get
---- scripts.orig/fcc-get	2007-03-22 18:05:01.000000000 +0100
-+++ scripts/fcc-get	2008-07-10 14:36:21.000000000 +0200
-@@ -10,7 +10,7 @@
- # Note: Run this script as root in order to write the files into the
- # destination directory listed below.
- #
--XASTIR_BASE=/usr/local/share/xastir
-+XASTIR_BASE=/usr/share/xastir
- cd /var/tmp
- #
- #
 diff -u scripts.orig/get-NWSdata scripts/get-NWSdata
---- scripts.orig/get-NWSdata	2007-06-10 18:53:41.000000000 +0200
-+++ scripts/get-NWSdata	2008-07-10 14:36:21.000000000 +0200
-@@ -41,7 +41,7 @@
- FILE7="fz17ap07"  # NWSM Libraries: Fire Weather Zone Boundaries
- 
+--- scripts.orig/get-NWSdata	2008-07-18 17:26:39.000000000 +0200
++++ scripts/get-NWSdata	2008-08-16 07:47:00.000000000 +0200
+@@ -40,7 +40,7 @@
+ FILE6="fz25jn08"  # NWSM Libraries: Fire Weather Zone Boundaries
+ FILE7="c_11mr07"  # County Libraries: AWIPS Counties
  
 -cd /usr/local/share/xastir/Counties
 +cd /usr/share/xastir/Counties
  
  
  # Remove any old zip files hanging around in this directory
+diff -u scripts.orig/get-fcc-rac.pl scripts/get-fcc-rac.pl
+--- scripts.orig/get-fcc-rac.pl	2008-06-24 17:48:59.000000000 +0200
++++ scripts/get-fcc-rac.pl	2008-08-16 08:07:57.000000000 +0200
+@@ -9,7 +9,7 @@
+ #
+ # Note: Run this script as root in order to write the files into the
+ # destination directory listed below, or change directory write access.
+-my $XASTIR_BASE="/usr/local/share/xastir";
++my $XASTIR_BASE="/usr/share/xastir";
+ 
+ 
+ # This script uses temporary storage space in /var/tmp to do its work.
 diff -u scripts.orig/get-gnis scripts/get-gnis
---- scripts.orig/get-gnis	2007-01-03 20:40:49.000000000 +0100
-+++ scripts/get-gnis	2008-07-10 14:36:21.000000000 +0200
+--- scripts.orig/get-gnis	2008-07-01 03:47:48.000000000 +0200
++++ scripts/get-gnis	2008-08-16 08:07:12.000000000 +0200
 @@ -55,8 +55,8 @@
  
-     if ( [ -f ${MYSTATE}_DECI.TXT ] )
+     if ( [ -f ${MYSTATE}_DECI.txt ] )
      then 
 -        printf "File successfully downloaded. Moving to /usr/local/share/xastir/GNIS\n" 
--        sudo mv ${MYSTATE}_DECI.TXT /usr/local/share/xastir/GNIS/${MYSTATE}.gnis
+-        sudo mv ${MYSTATE}_DECI.txt /usr/local/share/xastir/GNIS/${MYSTATE}.gnis
 +        printf "File successfully downloaded. Moving to /usr/share/xastir/GNIS\n" 
-+        sudo mv ${MYSTATE}_DECI.TXT /usr/share/xastir/GNIS/${MYSTATE}.gnis
++        sudo mv ${MYSTATE}_DECI.txt /usr/share/xastir/GNIS/${MYSTATE}.gnis
      else 
          printf "File for %s not successfully downloaded.\n" ${MYSTATE}
      fi 
 diff -u scripts.orig/get-maptools.sh scripts/get-maptools.sh
---- scripts.orig/get-maptools.sh	2007-01-03 20:40:49.000000000 +0100
-+++ scripts/get-maptools.sh	2008-07-10 14:36:21.000000000 +0200
+--- scripts.orig/get-maptools.sh	2008-01-16 20:33:59.000000000 +0100
++++ scripts/get-maptools.sh	2008-08-16 07:47:00.000000000 +0200
 @@ -135,11 +135,11 @@
  	fi 
      fi
@@ -118,7 +118,7 @@ diff -u scripts.orig/get-maptools.sh scripts/get-maptools.sh
  
 diff -u scripts.orig/icontable.pl scripts/icontable.pl
 --- scripts.orig/icontable.pl	2003-07-07 19:17:54.000000000 +0200
-+++ scripts/icontable.pl	2008-07-10 14:36:21.000000000 +0200
++++ scripts/icontable.pl	2008-08-16 07:47:00.000000000 +0200
 @@ -29,7 +29,7 @@
  #--------------------------------------------------------------------------
                                              
@@ -130,7 +130,7 @@ diff -u scripts.orig/icontable.pl scripts/icontable.pl
  %sympix = ();
 diff -u scripts.orig/permutations.pl scripts/permutations.pl
 --- scripts.orig/permutations.pl	2005-03-25 21:53:04.000000000 +0100
-+++ scripts/permutations.pl	2008-07-10 14:36:21.000000000 +0200
++++ scripts/permutations.pl	2008-08-16 07:47:00.000000000 +0200
 @@ -34,7 +34,7 @@
  #
  
@@ -142,7 +142,7 @@ diff -u scripts.orig/permutations.pl scripts/permutations.pl
  
 diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
 --- scripts.orig/test_coord.pl	2003-01-06 23:42:17.000000000 +0100
-+++ scripts/test_coord.pl	2008-07-10 14:36:21.000000000 +0200
++++ scripts/test_coord.pl	2008-08-16 07:47:00.000000000 +0200
 @@ -33,7 +33,7 @@
  
  #------------------------------------------------------------------------------------------------
@@ -153,26 +153,42 @@ diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
  
  
 diff -u scripts.orig/toporama250k.pl scripts/toporama250k.pl
---- scripts.orig/toporama250k.pl	2008-07-10 14:35:01.000000000 +0200
-+++ scripts/toporama250k.pl	2008-07-10 14:36:21.000000000 +0200
-@@ -28,7 +28,7 @@
+--- scripts.orig/toporama250k.pl	2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama250k.pl	2008-08-16 08:03:08.000000000 +0200
+@@ -28,14 +28,14 @@
  # map files for the whole of Canada!
  #
  #
--# * cd /usr/local/share/xastir/maps
-+# * cd /usr/share/xastir/maps
- # * Run this script from there.  Make sure that you have write
- #   privileges there.
- # * Move the directories and contents to whereever makes sense.
+-# - "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/lib/xastir/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ #   .../maps/toporama/images/
 diff -u scripts.orig/toporama50k.pl scripts/toporama50k.pl
---- scripts.orig/toporama50k.pl	2008-07-10 14:35:01.000000000 +0200
-+++ scripts/toporama50k.pl	2008-07-10 14:36:21.000000000 +0200
-@@ -27,7 +27,7 @@
+--- scripts.orig/toporama50k.pl	2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama50k.pl	2008-08-16 08:02:48.000000000 +0200
+@@ -27,14 +27,14 @@
  # map files for the whole of Canada!
  #
  #
--# * cd /usr/local/share/xastir/maps
-+# * cd /usr/share/xastir/maps
- # * Run this script from there.  Make sure that you have write
- #   privileges there.
- # * Move the directories and contents to whereever makes sense.
+-# - "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/lib/xastir/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
index fae7d74a9..f63f5a49c 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -6,4 +6,11 @@
 		<email>maintainer-needed@gentoo.org</email>
 		<name>Default assignee for orphaned packages</name>
 	</maintainer>
+	<use>
+		<flag name='festival'>Enables sound alerts.</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>
+		<flag name='imagemagick'>Support for image handling of screendumps and a lot of map and weather data formats.</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-radio/xastir/xastir-1.9.2.ebuild b/media-radio/xastir/xastir-1.9.4.ebuild
index 829ec1a9e..829ec1a9e 100644
--- a/media-radio/xastir/xastir-1.9.2.ebuild
+++ b/media-radio/xastir/xastir-1.9.4.ebuild