Fix inconsistency in JDK versions that caused the build to fail and migrated to EAPI...

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/dev-java/jgrapht/ChangeLog b/dev-java/jgrapht/ChangeLog
index 3a96de542202f70e8afe8804d1506cd7314f6e34..05e50465d239b07ee7b5736346405d02be1c99e2 100644 (file)
--- a/dev-java/jgrapht/ChangeLog
+++ b/dev-java/jgrapht/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgrapht
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.2 2010/01/16 21:00:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.3 2010/05/09 23:11:08 betelgeuse Exp $
+
+  09 May 2010; Petteri Räty <betelgeuse@gentoo.org> jgrapht-0.7.3.ebuild:
+  Fix inconsistency in JDK versions that caused the build to fail and
+  migrated to EAPI 2. Fixes bug #317813.
 
   16 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> jgrapht-0.7.3.ebuild:
   Keyword ~x86.

diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
index 88ab34baf9a513ff2a1172635400f0a6c9a4580f..42db0d4bb925eb3d07ec420cc8e1d63a263862f3 100644 (file)
--- a/dev-java/jgrapht/Manifest
+++ b/dev-java/jgrapht/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST jgrapht-0.7.3.tar.gz 1139550 RMD160 2f5c1078fd0d56b7797309684feb3cdea846a960 SHA1 d4d9b3995bce37616077130d1262c1c6c0be8e0e SHA256 9b7911e69ba4c28417aa160baa9556259dd8849aa756787c229cb44d58878af3
-EBUILD jgrapht-0.7.3.ebuild 1156 RMD160 bb55c0fbccfeb1e81fbd2833a2ce2fbd37e92791 SHA1 ca16c6422a0c9f6f28829ab8f8b1adea467b936f SHA256 721e5851d768fa59afe8cf5f519ac3e8479ec3849fb67d6f61219a96b146fbc8
-MISC ChangeLog 579 RMD160 b23a00ff3564dfa0ad80a21f3c593c68c41546de SHA1 060fbe5b63470096a1f190e17a38453818ac2e6a SHA256 c668c42b5ca562f40fac2e1c8ceace3a828a4059b56424cdf9ae00c8a3aa83c1
+EBUILD jgrapht-0.7.3.ebuild 1176 RMD160 147be884f3ef96e97a1bef08de695bdfc2a502c7 SHA1 99e87b7c15a436e4033bd33b5331c16d4648b126 SHA256 a437aaafa3f5cccbf3f2652c156653c9b895858d3f8c481237e71fee61d49543
+MISC ChangeLog 766 RMD160 35d2a24b03f4adc522ca7dbeecad6ae9381b6397 SHA1 b6d9e3ffb4154e0b36ab4e3b71181d2c2b667407 SHA256 818106be08260fb803394b6471daf59b4abc0dd36c344597e3321e72fc63aada
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktSKQEACgkQcxLzpIGCsLROxQCdEMJ0pRNjauHkDMTPSuONwk5u
-Qh8AoJhuu/lTzrbp5ynLp5wmz46hU9Hq
-=vwzA
+iEYEARECAAYFAkvnQTEACgkQcxLzpIGCsLRtVgCcDRPKLFbHYrJZ1ujuWNpFQmuA
+RtQAniMhEAMikfgj5w80o1gT3h/cV+1u
+=4P7X
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jgrapht/jgrapht-0.7.3.ebuild b/dev-java/jgrapht/jgrapht-0.7.3.ebuild
index 9b0fe6715bde858102b57be1ab8d0b8bbc9c982f..2ed0473835d1bf26afef695057304c42acbc72e5 100644 (file)
--- a/dev-java/jgrapht/jgrapht-0.7.3.ebuild
+++ b/dev-java/jgrapht/jgrapht-0.7.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/jgrapht-0.7.3.ebuild,v 1.2 2010/01/16 21:00:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/jgrapht-0.7.3.ebuild,v 1.3 2010/05/09 23:11:08 betelgeuse Exp $
 
-EAPI="1"
+EAPI="2"
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -15,8 +15,8 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE="test"
 
-CDEPEND="dev-java/touchgraph-graphlayout
-       dev-java/jgraph"
+CDEPEND="dev-java/touchgraph-graphlayout:0
+       dev-java/jgraph:0"
 
 DEPEND="${CDEPEND}
        >=virtual/jdk-1.5
@@ -24,15 +24,15 @@ DEPEND="${CDEPEND}
                dev-java/xmlunit:1 )"
 
 RDEPEND="${CDEPEND}
-       >=virtual/jre-1.4"
+       >=virtual/jre-1.5"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph"
 EANT_DOC_TARGET="javadoc"
 
-src_unpack() {
-       unpack ${A}
+java_prepare() {
        rm -rf "${S}/lib" || die
+       rm -v "${S}"/*.jar || die
 }
 
 src_install() {