diff options
| -rw-r--r-- | sci-libs/proj/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/proj/Manifest | 10 | ||||
| -rw-r--r-- | sci-libs/proj/proj-4.8.0.ebuild | 17 |
3 files changed, 21 insertions, 11 deletions
diff --git a/sci-libs/proj/ChangeLog b/sci-libs/proj/ChangeLog index 66a26abd1a83..fabb401fdbf3 100644 --- a/sci-libs/proj/ChangeLog +++ b/sci-libs/proj/ChangeLog @@ -1,6 +1,9 @@ # 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.34 2012/04/25 04:41:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.35 2012/04/25 16:47:26 bicatali Exp $ + + 25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> proj-4.8.0.ebuild: + Fixed java automagic dependency *proj-4.8.0 (25 Apr 2012) diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest index d280367d60e3..bd9509383692 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -7,13 +7,13 @@ DIST proj-4.8.0.tar.gz 785279 RMD160 a2a20159b333aeef9f6322ccc97a0a14cc38fe89 SH 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 1022 RMD160 cfeb4c6add69c2787a2044803d0bed37d667ae70 SHA1 b7a09fece9f6ed9b220b94a548f166fcf8f44025 SHA256 88e0232535fbd4241f88986c655d93cfcbafd01f7c5a30f15cf35d96f9b5446f -MISC ChangeLog 6567 RMD160 d39b12668b3a4cbdd47b9892f43db8a9921d5600 SHA1 f18c3e6b33a41aad077f2fc7f88a7967ea764bb8 SHA256 0156f7a70740ab9ba4acde864c8d7da51b22d5d77c6e7105a54e526845e7afd9 +EBUILD proj-4.8.0.ebuild 1226 RMD160 e95ac55a60bf24546dd3eaf8ace1dc998a12d508 SHA1 980de7e014b690c5f53b8128632ec41350e6c355 SHA256 6fa8bba82d14baf5adbef846b2163179e722d42772094e72fc42e268b245cf6d +MISC ChangeLog 6676 RMD160 dc0c1c71fcfbf46fa1b14df7166b6720fcc2928f SHA1 bfaa05f2cfb0fef5a5139f969ea6c4e06af6251a SHA256 b35570617c27ad3b1f7c8bc161f899f977aeea56167539ecd02a5da4ba0588fd MISC metadata.xml 308 RMD160 b819e91cf74eed09b4c4da5587ef7978e948a869 SHA1 2451512e790a4c9e6d52a415ef487c23fbf6dd91 SHA256 52dc566db66dd40f03da6e8d205031c47f169774b04410b1a453b62651f53bc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk+XgHAACgkQ1ycZbhPLE2CmzgCeLvLJ2gs5Th/kr+rpsTkM3pMa -iV0An1p2Jlly5NYd3E/SaPxSPQXrgVbZ -=xyF9 +iEUEARECAAYFAk+YKqcACgkQ1ycZbhPLE2DnLgCYuek9N2NWR7cjq62QUiN+ea4D +0gCfXqOCi19483tX/Dt8d804ONBj3S8= +=TB+x -----END PGP SIGNATURE----- diff --git a/sci-libs/proj/proj-4.8.0.ebuild b/sci-libs/proj/proj-4.8.0.ebuild index 3d810cda0c23..72d0f34936fb 100644 --- a/sci-libs/proj/proj-4.8.0.ebuild +++ b/sci-libs/proj/proj-4.8.0.ebuild @@ -1,10 +1,10 @@ # 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.1 2012/04/25 04:41:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.8.0.ebuild,v 1.2 2012/04/25 16:47:26 bicatali Exp $ EAPI=4 -inherit eutils +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/" @@ -14,10 +14,11 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz 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" +IUSE="java static-libs" RDEPEND="" -DEPEND="app-arch/unzip" +DEPEND="app-arch/unzip + java? ( >=virtual/jdk-1.5 )" src_unpack() { unpack ${P}.tar.gz @@ -27,7 +28,13 @@ src_unpack() { } src_configure() { - econf $(use_enable static-libs static) + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + fi + econf \ + $(use_enable static-libs static) \ + $(use_with java jni) } src_install() { |