Fix +java build. Resolves bug#413481. Patch by Martin von Gagern. Remove overshadowed.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 28 insertions, 70 deletions

diff --git a/sci-libs/proj/ChangeLog b/sci-libs/proj/ChangeLog
index fabb401fdbf3..8f80891ed17d 100644
--- a/sci-libs/proj/ChangeLog
+++ b/sci-libs/proj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/proj
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.35 2012/04/25 16:47:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.36 2012/05/25 07:29:28 scarabeus Exp $
+
+  25 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/proj-4.7.0-robinson.patch, -proj-4.7.0-r1.ebuild, proj-4.8.0.ebuild:
+  Fix +java build. Resolves bug#413481. Patch by Martin von Gagern. Remove
+  overshadowed.
 
   25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> proj-4.8.0.ebuild:
   Fixed java automagic dependency
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index bd9509383692..9eba1ed90a7c 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,19 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX proj-4.7.0-robinson.patch 504 RMD160 6f02e1d833f2722094edc68a3fefdd5035facaec SHA1 45a74edb7671d9f744b7e69ac4952329887c5c4d SHA256 3b90d3da62652205d0dc0743f545c15aac0b945d4e996217fbc46ef870a51e93
 DIST proj-4.7.0.tar.gz 684923 RMD160 cd96c09906b99d2ad205cc087e2863910d1124e1 SHA1 bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7 SHA256 fc5440002a496532bfaf423c28bdfaf9e26cc96c84ccefcdefde911efbd98986
+DIST proj-4.8.0-org_proj4_PJ.h 2960 RMD160 ff1e977103fa2767fa3bbd9ec2406530baf9a30f SHA1 e75802dee6562dd2444db7a83677a36bc65be80d SHA256 ed16ebaf2806fbd74392939085db17adfdaa71d45e908cda29fbc7dc3e0a613e
 DIST proj-4.8.0.tar.gz 785279 RMD160 a2a20159b333aeef9f6322ccc97a0a14cc38fe89 SHA1 5c8d6769a791c390c873fef92134bf20bb20e82a SHA256 2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5
 DIST proj-datumgrid-1.5.zip 2250131 RMD160 f5deacd0242557c92c35d43941cd52a7e4096467 SHA1 4429ba1a8c764d5c0e6724d868f6874f452f7440 SHA256 723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db
-EBUILD proj-4.7.0-r1.ebuild 1098 RMD160 24a068b36258453765a8fa6ccb9e26071824ef60 SHA1 80ab9cf7456663e182dbddcb14ac96a68484d2c3 SHA256 e88789230bc7e3fc1ad5728a9f445187eb66615df297cdc0e021420bbbe33a68
 EBUILD proj-4.7.0.ebuild 1093 RMD160 78fcb55c18f0d08603eb552038710c9cde615a77 SHA1 a99a5ff0935fadabb4e153bedfe96431d6a15746 SHA256 bae781a5d0238dfd68789563d317b732d699193a4c4fc36a4affcce50caaaa26
-EBUILD proj-4.8.0.ebuild 1226 RMD160 e95ac55a60bf24546dd3eaf8ace1dc998a12d508 SHA1 980de7e014b690c5f53b8128632ec41350e6c355 SHA256 6fa8bba82d14baf5adbef846b2163179e722d42772094e72fc42e268b245cf6d
-MISC ChangeLog 6676 RMD160 dc0c1c71fcfbf46fa1b14df7166b6720fcc2928f SHA1 bfaa05f2cfb0fef5a5139f969ea6c4e06af6251a SHA256 b35570617c27ad3b1f7c8bc161f899f977aeea56167539ecd02a5da4ba0588fd
+EBUILD proj-4.8.0.ebuild 1396 RMD160 7e33c66f9605e047aa40a6cd7d14b996acb5e9ed SHA1 b5f3a2efa6419274f16640883d428a5f41f44d85 SHA256 b40addce6806ab940f370d87c38a41b190463486b7ad9859f879806a92c035d7
+MISC ChangeLog 6902 RMD160 c4a313f3bfb533b6e54b6b2b523a80118b84a02e SHA1 f3f68cf5b861b7721dce6bfb039f3b41301fff14 SHA256 d4486644abaf92c29a1ca07ebdb335d62e38a161605a22479e8cf7a81584d28c
 MISC metadata.xml 308 RMD160 b819e91cf74eed09b4c4da5587ef7978e948a869 SHA1 2451512e790a4c9e6d52a415ef487c23fbf6dd91 SHA256 52dc566db66dd40f03da6e8d205031c47f169774b04410b1a453b62651f53bc3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk+YKqcACgkQ1ycZbhPLE2DnLgCYuek9N2NWR7cjq62QUiN+ea4D
-0gCfXqOCi19483tX/Dt8d804ONBj3S8=
-=TB+x
+iQIcBAEBAgAGBQJPvzUEAAoJEOSiRoyO7jvocsMP/ArcSkfqqx3b8+TLKPjf0Fzd
+NUUAYgMpbUEEHtfYvCP6cea7tIUQlXPJ+3Wpm1ODnsreUmg4dzqosby0wC8Ndp4r
+g5rdVV0oqbTk+fu8qgBrf/8U0LxcJDcWMPjEculxlePjgNxQGInzk8RA/mpMJapt
+70J9HgZf7JypQlIxJekFgdes7NjzMS+1nbXNTX3JN4diHsXzOycw67+8V8hVjTNE
+qB1AjLIGRFCI8ajHnH9xcn7IZdq2XTIoOw5QX+gL8KCM9F1eiAYkfZIkAL7iiFm6
+WwOfHhvk1pb2YnC7j3tWC3KgQCA1/oNjhYGGvqPxVFI7rKxYVKZuOZV6fqnK2zpY
+2cYrDSKZmDk0ZNXi/Vw0FUS2VMqVXysObE0gYIdHeVqekkyjx+l8s0YwZMCXo2gl
+/1r31WxMJU+NAX+N6o64RSxYJLfQbpkHpjyMG80iJ7YX4NAK1yziXidkwVB5mQ+M
++PIBMOBxhQlqCIc/USwM9Gw1SAWRXviziMfphrC49wtZCSsNAJLMSjwqlyTECfMX
+Mmk0DJbrGpcf7z7QK1YEUr0yx68KMjq1KqBSJMMr9fRMB6/gL1+G5iszoJqxWKm1
+gG08CAlpmS2EYQ9xueEXfuxVAgmtrPSyLlT8/utLD6I3nsp3Kisn+YaumxfTK0GP
+wFRISeH0GFtRTZR6LcqU
+=50Sg
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/proj/files/proj-4.7.0-robinson.patch b/sci-libs/proj/files/proj-4.7.0-robinson.patch
deleted file mode 100644
index 85759c6e4807..000000000000
--- a/sci-libs/proj/files/proj-4.7.0-robinson.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/PJ_robin.c.orig	2009-01-26 18:17:46.000000000 +0100
-+++ src/PJ_robin.c	2011-12-12 11:45:28.515779709 +0100
-@@ -35,7 +35,7 @@
- 0.31,	0.0124108,	3.73349e-06,	-1.1779e-06,
- 0.372,	0.0123598,	-1.3935e-05,	4.39588e-06,
- 0.434,	0.0125501,	5.20034e-05,	-1.00051e-05,
--0.4968,	0.0123198,	-9.80735e-05,	9.22397e-06,
-+0.4958,	0.0123198,	-9.80735e-05,	9.22397e-06,
- 0.5571,	0.0120308,	4.02857e-05,	-5.2901e-06,
- 0.6176,	0.0120369,	-3.90662e-05,	7.36117e-07,
- 0.6769,	0.0117015,	-2.80246e-05,	-8.54283e-07,
-
diff --git a/sci-libs/proj/proj-4.7.0-r1.ebuild b/sci-libs/proj/proj-4.7.0-r1.ebuild
deleted file mode 100644
index bf00eba95886..000000000000
--- a/sci-libs/proj/proj-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.7.0-r1.ebuild,v 1.2 2012/02/06 18:51:31 jlec Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
-HOMEPAGE="http://trac.osgeo.org/proj/"
-SRC_URI="
-	ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${P}.tar.gz || die
-	cd "${S}"/nad || die
-	mv README README.NAD || die
-	unpack ${PN}-datumgrid-1.5.zip || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-robinson.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	cd nad
-	dodoc README.{NAD,NADUS}
-	insinto /usr/share/proj
-	insopts -m 755
-	doins test27 test83
-	insopts -m 644
-	doins pj_out27.dist pj_out83.dist
-}
diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild
index 72d0f34936fb..6619019ec620 100644
--- a/sci-libs/proj/proj-4.8.0.ebuild
+++ b/sci-libs/proj/proj-4.8.0.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/sci-libs/proj/proj-4.8.0.ebuild,v 1.2 2012/04/25 16:47:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild,v 1.3 2012/05/25 07:29:28 scarabeus Exp $
 
 EAPI=4
 
@@ -9,7 +9,9 @@ inherit eutils java-pkg-opt-2 flag-o-matic
 DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
 HOMEPAGE="http://trac.osgeo.org/proj/"
 SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
-	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip"
+	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
+	http://trac.osgeo.org/proj/export/2190/tags/${PV}/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,6 +26,7 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"/nad || die
 	mv README README.NAD || die
+	cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
 	unpack ${PN}-datumgrid-1.5.zip
 }