[gentoo-commits] gentoo-x86 commit in sci-libs/proj: proj-4.8.0.ebuild ChangeLog proj-4.7.0-r1.ebuild

[gentoo-commits] gentoo-x86 commit in sci-libs/proj: proj-4.8.0.ebuild ChangeLog proj-4.7.0-r1.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    12/05/25 07:29:28

  Modified:             proj-4.8.0.ebuild ChangeLog
  Removed:              proj-4.7.0-r1.ebuild
  Log:
  Fix +java build. Resolves bug#413481. Patch by Martin von Gagern. Remove overshadowed.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sci-libs/proj/proj-4.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild?r1=1.2&r2=1.3

Index: proj-4.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proj-4.8.0.ebuild	25 Apr 2012 16:47:26 -0000	1.2
+++ proj-4.8.0.ebuild	25 May 2012 07:29:28 -0000	1.3
@@ -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 @@
 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 @@
 	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
 }
 



1.36                 sci-libs/proj/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/proj/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	25 Apr 2012 16:47:26 -0000	1.35
+++ ChangeLog	25 May 2012 07:29:28 -0000	1.36
@@ -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