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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 85 insertions, 6 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/Manifest b/sci-libs/proj/Manifest
index fb74f3aafd31..78dfa4814339 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,4 +1,5 @@
 AUX proj-4.4.7-gentoo.patch 914 RMD160 99365adb7e7e2080c08dd1cf156e4ea8b02069b3 SHA1 43f1cf0e521e784760926a551ca40bfc56b77143 SHA256 d85efb76a1b02aef962ccfa422b353c15fd177265202d49b8eeaea46000efa65
+AUX proj-4.6.1-test.patch 1961 RMD160 3fe7439610c3bd63094b1e89ebb0c78f994f3db7 SHA1 11377ddf8d05d1b0a918f16b4f64377dbb50c437 SHA256 e6dc6f022d8dd21d9a9e77cae85f5790c34924fd553104e196bc7e909a845371
 DIST proj-4.4.9.tar.gz 612722 RMD160 77b06a905c6c95068b015eb532e696e4dd01a1fa SHA1 18a2ac933b37487f60a3ce51fa6b0565fc465b87 SHA256 672b753f911bfb7cbf996ece57f46dd91d3bac9aa852178e3a56b5e111672aa9
 DIST proj-4.5.0.tar.gz 655450 RMD160 7bb79f248567287736f63148b63cb5c7e3d3a58c SHA1 891960e1c15f462fa4b56e4ee778184afec3d39a SHA256 1b535719028cdbd8fa381fcb4597804ef0b4205d139eaf9e9b7084fb36f858b4
 DIST proj-4.6.0.tar.gz 674411 RMD160 f7b138634f7a718f035415b28167b65fdd8020f1 SHA1 972b74922d764f71fb0c01cd3f69255611291368 SHA256 2aec7111d286edb225bb51953f240f391ce74575585a64b4158ebae54b05e127
@@ -9,6 +10,6 @@ DIST proj-nad27-1.2.tar.gz 1830374 RMD160 79624b4e51ea0e7a85266516a0dca63b62a4ba
 EBUILD proj-4.4.9.ebuild 1008 RMD160 2ddf5bbcac1d105de3f0d9441370d36c0278c99e SHA1 e6d255fae652460595e0ac8cdb2d510b65e20579 SHA256 07fe41ddd87e7d2e5171e6d7dc5a0325529a4ce8a2e403cd35ef0d32b6e4ce25
 EBUILD proj-4.5.0.ebuild 981 RMD160 051fd20edcf097ea9b07eb9954b316e9cfcb2f83 SHA1 3b62dece4c69392852bff324eca75876b898b49e SHA256 25e5e7e91efa584f4eebb4aa44bf788face8a96efe098f63b31cd7ecd724267e
 EBUILD proj-4.6.0.ebuild 992 RMD160 34627f9cbc90b4eb63fcd0d1e96fd3ddcb6ebdaf SHA1 411ebd642638f45ce248757eb7a0ac5627e664f1 SHA256 77fcac4c3251218a157f7dc60a7ac4cb2aa555087d13af1a139a25580f3a40cb
-EBUILD proj-4.6.1.ebuild 999 RMD160 fced81d6de6a858874faa7eda0b3009570399ac7 SHA1 9baf88c9108aa168e900b3268a9215fac972af4b SHA256 634a486ba2fe0772e80607687ec6ab10e68a657ff6006dd84eab964c50139a0e
-MISC ChangeLog 3683 RMD160 b09fcf18803b19dbc6155649f4a24ded12563d2b SHA1 21bd0909a47dbc275c0de1d400dfbd342fee0493 SHA256 bd88bc997e044da3aea7d13f15dad77d9751be193d399f2e2eb085353fe2fe31
+EBUILD proj-4.6.1.ebuild 1040 RMD160 5f9095a24d13a49b5376af230f724bbac9525b28 SHA1 c396dfcdc121cddee441e449f4b1b1505affc4d5 SHA256 bfeba09de50f4a06c4ac32142f552262e249e5c27b86eb2f4435007e113f334d
+MISC ChangeLog 3894 RMD160 1b18912c575193ec6998a5fba22fb7ec4728ae63 SHA1 f5ff0cf23e331f443f7be7efb187a5d4d01709a8 SHA256 a461d1cbdf1349ca5e05c73970e92be58072badab26e3bc4e22a52c8252aba96
 MISC metadata.xml 442 RMD160 3c26b5b2f96e807ada5c51ac4f2d9f2478e1ddd9 SHA1 3ef6f25969eab83a6b92b38bd8b31253f351286d SHA256 64f19b0331a3d251908e130355c8be99c627c2048e712d52e1c7f0942f49b7de
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() {