Fixing test failure, closes #284828. Thanks to Kacper Kowalik for extracting the patch from upstream.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 82 insertions, 4 deletions

diff --git a/sci-libs/proj/ChangeLog b/sci-libs/proj/ChangeLog
index cd8cc8452b28..ed8b8f96d5e7 100644
--- a/sci-libs/proj/ChangeLog
+++ b/sci-libs/proj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/proj
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.13 2008/09/11 02:26:15 djay Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.14 2009/09/14 13:16:26 patrick Exp $
+
+  14 Sep 2009; Patrick Lauer <patrick@gentoo.org> proj-4.6.1.ebuild,
+  +files/proj-4.6.1-test.patch:
+  Fixing test failure, closes #284828. Thanks to Kacper Kowalik for
+  extracting the patch from upstream.
 
 *proj-4.6.1 (11 Sep 2008)
 
diff --git a/sci-libs/proj/files/proj-4.6.1-test.patch b/sci-libs/proj/files/proj-4.6.1-test.patch
new file mode 100644
index 000000000000..68df9e5fcab7
--- /dev/null
+++ b/sci-libs/proj/files/proj-4.6.1-test.patch
@@ -0,0 +1,72 @@
+--- proj-4.6.1.orig/nad/Makefile.am	2008-08-22 04:58:20.000000000 +0200
++++ proj-4.6.1/nad/Makefile.am	2009-09-14 14:15:02.061120311 +0200
+@@ -21,7 +21,16 @@
+ 		IGNF testIGNF proj_outIGNF.dist \
+ 		makefile.vc
+ 
+-install-data-local:
++process-nad2bin:
++	@if [ -f conus.lla -a ! -f conus ] ; then \
++          for x in *.lla ; do \
++            DEST=`basename $$x .lla`; \
++            echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
++            ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
++          done; \
++    	fi 
++
++install-data-local: process-nad2bin
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	@if [ -f conus.lla ] ; then \
+ 	  for x in *.lla ; do \
+@@ -43,10 +52,13 @@
+           fi; \
+ 	done
+ 
+-check-local:
++check-local: process-nad2bin
+ 	$(TEST27) $(PROJEXE)
+ 	$(TEST83) $(PROJEXE)
+-	$(TESTVARIOUS) $(CS2CSEXE)
++	@if [ -f conus ] ; then \
++          export PROJ_LIB=. ; \
++          $(TESTVARIOUS) $(CS2CSEXE) ; \
++        fi
+ 
+ #	$(TESTNTV2) $(CS2CSEXE)
+ #	$(TESTIGNF) $(CS2CSEXE)
+--- proj-4.6.1.orig/nad/Makefile.in	2008-08-22 04:58:46.000000000 +0200
++++ proj-4.6.1/nad/Makefile.in	2009-09-14 14:18:19.282650172 +0200
+@@ -374,7 +374,16 @@
+ 	uninstall-pkgdataDATA
+ 
+ 
+-install-data-local:
++process-nad2bin:
++	@if [ -f conus.lla -a ! -f conus ] ; then \
++          for x in *.lla ; do \
++            DEST=`basename $$x .lla`; \
++            echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
++            ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
++          done; \
++        fi 
++
++install-data-local: process-nad2bin
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	@if [ -f conus.lla ] ; then \
+ 	  for x in *.lla ; do \
+@@ -396,10 +405,13 @@
+           fi; \
+ 	done
+ 
+-check-local:
++check-local: process-nad2bin
+ 	$(TEST27) $(PROJEXE)
+ 	$(TEST83) $(PROJEXE)
+-	$(TESTVARIOUS) $(CS2CSEXE)
++	@if [ -f conus ] ; then \
++          export PROJ_LIB=. ; \
++          $(TESTVARIOUS) $(CS2CSEXE) ; \
++        fi
+ 
+ #	$(TESTNTV2) $(CS2CSEXE)
+ #	$(TESTIGNF) $(CS2CSEXE)
diff --git a/sci-libs/proj/proj-4.6.1.ebuild b/sci-libs/proj/proj-4.6.1.ebuild
index 40bf37cb89c7..b210365c4539 100644
--- a/sci-libs/proj/proj-4.6.1.ebuild
+++ b/sci-libs/proj/proj-4.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.6.1.ebuild,v 1.1 2008/09/11 02:26:15 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.6.1.ebuild,v 1.2 2009/09/14 13:16:26 patrick Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	cd "${S}"/nad
 	mv README README.NAD
 	unpack ${PN}-datumgrid-1.4.zip || die
+	epatch "${FILESDIR}/${P}-test.patch"
 }
 
 src_install() {