Fix bug #347241. Thanks Gary <gem@rellim.com> for reporting.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 93 insertions, 3 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index aaa8e6a34df7..338977f51a6a 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-radio/xastir
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.16 2010/11/21 08:23:01 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.17 2010/12/11 11:49:08 tomjbe Exp $
+
+*xastir-2.0.0-r1 (11 Dec 2010)
+
+  11 Dec 2010; Thomas Beierlein <tomjbe@gentoo.org> +xastir-2.0.0-r1.ebuild,
+  metadata.xml:
+  Fix bug #347241. Thanks Gary <gem@rellim.com> for reporting.
 
 *xastir-2.0.0 (21 Nov 2010)
 
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 0eeeb9ff71a8..5469a67ef454 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -6,6 +6,7 @@ DIST xastir-1.9.8.tar.gz 2471489 RMD160 c5c7d0ab1fe9abfcbda4ddd1db3e97c0548babd5
 DIST xastir-2.0.0.tar.gz 2544827 RMD160 43c7f5c1cf9735b0dbe797a3ccc6aead60f7a7bd SHA1 4dcb6445df134362353a49d34acf866250f205b7 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
 EBUILD xastir-1.9.8-r1.ebuild 2099 RMD160 aa1b36563f2f8e72721bc5478c13972cd3a45306 SHA1 93088bc45fdd397c7908d4759346ca942bf2f13d SHA256 2687a636032a1129334197c0fdc9414988221d982b7d4e5ca349922a5993c99f
 EBUILD xastir-1.9.8.ebuild 2005 RMD160 633788d39722676c986385f767df32b8cb729029 SHA1 fc82443b1bf04950541374e4c0ed45d2e23e38a8 SHA256 5b6ce2c3e3515d1a746dc201d6d804c973f280abb6329c7fc578b3794e247e2a
+EBUILD xastir-2.0.0-r1.ebuild 2234 RMD160 39fa39f60865a1c1ff7ac49d27f69da513bc3690 SHA1 06ed71087b4fd40eb250cbaa9796c89da0ae1bca SHA256 faef3913a847a2dec29af80ea24cdfb5bee5032490f35db3f06a2a2937e51e33
 EBUILD xastir-2.0.0.ebuild 2079 RMD160 96d16d03b1edb1498a2766c9e1b513ad9ca3f1d6 SHA1 cb267bfee7468225b735933c9df73df2a100e37b SHA256 dc66cead05a3cd944c6062261d67b5be4048defa208a322c5623399fa68b3253
-MISC ChangeLog 1166 RMD160 bbe249c3f12b1ed413c75ef04df6a83c762cd9c4 SHA1 ca92ac7c818e3a52109bf1b435b7477cbe7d1c85 SHA256 f9e12baa2f55fb0da750a9824701dcc6df9c6953931fdd77e699754c9ab29280
-MISC metadata.xml 530 RMD160 54ce1ef09ca00341b1bca45f43fb2c1eeb6e8b12 SHA1 e6868af9c19b455d40b3cc484db25fcc90bbf563 SHA256 879907969e00f8138fb25e7a5034d06d00e2c1327fe3355aebe6902f0a0f4b63
+MISC ChangeLog 1355 RMD160 8a761b3ac5a2f368905d31c58049e1fc1c07b33f SHA1 d460c99dbb079e6b30fbbfe6bf1584d18bd9eaeb SHA256 68f98c65ac36dcfb755164a9841d7996316ee9b51ac20409e9298403c653bae4
+MISC metadata.xml 623 RMD160 c15e11b66f29a47ccf82602b9679afc3729ceb9e SHA1 c54e8e9f4dbef019cf933fa5a9b1da57954c7668 SHA256 ee0973fb97b9d627401f2e185950d3af5adccc8b0dc011e21444f4cf9b26b0c1
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index 36b7b07da984..6feda0c5e4c3 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -11,5 +11,7 @@
 		<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='graphicsmagick'>Use graphicsmagick instead imagemagick for
+			rendering</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-radio/xastir/xastir-2.0.0-r1.ebuild b/media-radio/xastir/xastir-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..acd34b9e09f3
--- /dev/null
+++ b/media-radio/xastir/xastir-2.0.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r1.ebuild,v 1.1 2010/12/11 11:49:08 tomjbe Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+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/openmotif-2.3:0
+	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 hardcoded /usr/local paths in scripts
+	epatch "${FILESDIR}"/${PN}-1.9.8-scripts.diff
+	# and patch libdir
+	for f in scripts/permutations.pl scripts/test_coord.pl \
+		scripts/toporama250k.pl scripts/toporama50k.pl; do
+		sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" "${f}" \
+			|| die "sed failed on ${f}"
+	done
+
+	# fix __FORTIFY_SOURCE warning (bug #337365)
+	epatch 	"${FILESDIR}"/${PN}-1.9.8-fortify.diff
+
+	# fix for DESTDIR
+	epatch 	"${FILESDIR}"/${P}-Destdir.diff
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --without-graphicsmagick \
+		--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 || die "emake install failed"
+
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS ChangeLog FAQ README README.Contributing \
+		README.Getting-Started README.MAPS || die "dodoc failed"
+}
+
+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"
+	elog "and /usr/$(get_libdir)/xastir."
+}