Fix breakage with >=sci-libs-4.8.0. See http://www.mail-archive.com/xastir-dev@lists.xastir.org/msg00285.html for details. Drop old

(Portage version: 2.1.10.64/cvs/Linux x86_64)

6 files changed, 56 insertions, 162 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 29787d825d9b..0dab21609c16 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2012/03/07 16:07:40 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.21 2012/06/04 17:51:52 tomjbe Exp $
+
+  04 Jun 2012; Thomas Beierlein <tomjbe@gentoo.org> -xastir-1.9.8-r1.ebuild,
+  -xastir-2.0.0.ebuild, xastir-2.0.0-r1.ebuild, xastir-2.0.0-r2.ebuild,
+  +files/xastir-2.0.0-proj48.diff:
+  Fix breakage with >=sci-libs-4.8.0. See
+  http://www.mail-archive.com/xastir-dev@lists.xastir.org/msg00285.html for
+  details. Drop old
 
 *xastir-2.0.0-r2 (07 Mar 2012)
 
diff --git a/media-radio/xastir/files/xastir-2.0.0-proj48.diff b/media-radio/xastir/files/xastir-2.0.0-proj48.diff
new file mode 100644
index 000000000000..a4cd9feef68c
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.0-proj48.diff
@@ -0,0 +1,39 @@
+#Replace include of "projects.h" with "proj_api.h" and remove use of what is
+#now considered an internal structure (struct PJ). 
+
+#Proj.4 has removed "projects.h" from the installation of that library, because
+#much that's in it is considered private implementation details that should
+#not have been exposed.  That many packages use those internals directly is
+#considered a problem in those other packages, and a bug request in proj.4's
+#bug tracker to reinstate projects.h as an installed file was closed with
+#the status "wontfix".  Codes that use the public API of proj.4 are supposed
+#to include "proj_api.h" and use the API calls, not direct access to internal
+#data structures or functions that are not intended for use outside the
+#library.
+--- src/map_tif.c	2010/01/31 02:12:24	1.45
++++ src/map_tif.c	2012/05/15 15:29:36	1.46
+@@ -1,5 +1,5 @@
+ /* -*- c-basic-offset: 4; indent-tabs-mode: nil -*-
+- * $Id: xastir-2.0.0-proj48.diff,v 1.1 2012/06/04 17:51:52 tomjbe Exp $
++ * $Id: xastir-2.0.0-proj48.diff,v 1.1 2012/06/04 17:51:52 tomjbe Exp $
+  *
+  * XASTIR, Amateur Station Tracking and Information Reporting
+  * Copyright (C) 1999,2000  Frank Giannandrea
+@@ -93,7 +93,7 @@
+ 
+ // Needed for GTIFProj4FromLatLong() replacement below
+ #ifdef HAVE_LIBGDAL
+-#  include "projects.h"
++#  include "proj_api.h"
+ #endif  // HAVE_LIBGDAL
+ 
+ 
+@@ -378,7 +378,7 @@
+                              double *padfY ) {
+ 
+     char    *pszProjection;
+-    PJ      *psPJ;
++    projPJ      psPJ;
+     int     i;
+ 
+ // --------------------------------------------------------------------
diff --git a/media-radio/xastir/xastir-1.9.8-r1.ebuild b/media-radio/xastir/xastir-1.9.8-r1.ebuild
deleted file mode 100644
index 7456f03a5068..000000000000
--- a/media-radio/xastir/xastir-1.9.8-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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-1.9.8-r1.ebuild,v 1.2 2010/10/10 18:43:46 ulm 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 imagemagick"
-
-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
-	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
-		media-libs/tiff )
-	gdal? ( sci-libs/gdal )
-	imagemagick? ( media-gfx/imagemagick )
-	festival? ( app-accessibility/festival )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix hardcoded /usr/local paths in scripts
-	epatch "${FILESDIR}"/${P}-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}"/${P}-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 geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with gdal) \
-		$(use_with imagemagick) \
-		$(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."
-}
diff --git a/media-radio/xastir/xastir-2.0.0-r1.ebuild b/media-radio/xastir/xastir-2.0.0-r1.ebuild
index 98d596c5f50c..bb92a9cf655e 100644
--- a/media-radio/xastir/xastir-2.0.0-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.3 2011/01/22 17:17:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r1.ebuild,v 1.4 2012/06/04 17:51:52 tomjbe Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -46,6 +46,9 @@ src_prepare() {
 	# fix for DESTDIR
 	epatch 	"${FILESDIR}"/${P}-Destdir.diff
 
+	# fix breakage with >=sci-libs/proj-4.8
+	epatch "${FILESDIR}"/${P}-proj48.diff
+
 	eautoreconf
 }
 
diff --git a/media-radio/xastir/xastir-2.0.0-r2.ebuild b/media-radio/xastir/xastir-2.0.0-r2.ebuild
index bb13aa595dce..6e0ad546e1a8 100644
--- a/media-radio/xastir/xastir-2.0.0-r2.ebuild
+++ b/media-radio/xastir/xastir-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r2.ebuild,v 1.1 2012/03/07 16:07:40 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.2 2012/06/04 17:51:52 tomjbe Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -40,6 +40,9 @@ src_prepare() {
 	# fix for DESTDIR
 	epatch 	"${FILESDIR}"/${P}-Destdir.diff
 
+	# fix breakage with >=sci-libs/proj-4.8
+	epatch "${FILESDIR}"/${P}-proj48.diff
+
 	eautoreconf
 }
 
diff --git a/media-radio/xastir/xastir-2.0.0.ebuild b/media-radio/xastir/xastir-2.0.0.ebuild
deleted file mode 100644
index 5d4bae198117..000000000000
--- a/media-radio/xastir/xastir-2.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.ebuild,v 1.1 2010/11/21 08:23:01 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"
-
-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
-	media-gfx/imagemagick
-	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 \
-		--with-imagemagick \
-		$(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."
-}