summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-05-25 07:29:28 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-05-25 07:29:28 +0000
commit668940e7637fd5042d077340e9ae1ab7a008c12d (patch)
tree3127c5d380f1a927845ddbac40b053a5b3f1e898 /sci-libs/proj
parentVersion bump to 2.8.0 final. Point rc1's SRC_URI at Gentoo mirrors since the ... (diff)
downloadgentoo-2-668940e7637fd5042d077340e9ae1ab7a008c12d.tar.gz
gentoo-2-668940e7637fd5042d077340e9ae1ab7a008c12d.tar.bz2
gentoo-2-668940e7637fd5042d077340e9ae1ab7a008c12d.zip
Fix +java build. Resolves bug#413481. Patch by Martin von Gagern. Remove overshadowed.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/proj')
-rw-r--r--sci-libs/proj/ChangeLog7
-rw-r--r--sci-libs/proj/files/proj-4.7.0-robinson.patch12
-rw-r--r--sci-libs/proj/proj-4.7.0-r1.ebuild47
-rw-r--r--sci-libs/proj/proj-4.8.0.ebuild7
4 files changed, 11 insertions, 62 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/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
}