Fix compiling with jcommon-1.0.8. It has two jars instead of one so need to use java...

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index fd9e9970010270937e479c44942e9b7f70bdfcf6..f448b5cd0d8b0140c904fd6559823199c90d3987 100644 (file)
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jfreechart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.20 2007/02/18 18:11:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.21 2007/04/26 20:01:51 betelgeuse Exp $
+
+  26 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jfreechart-1.0.4.ebuild:
+  Fix compiling with jcommon-1.0.8. It has two jars instead of one so need to
+  use java-pkg_getjar instead of java-pkg_getjars.
 
   18 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jfreechart-1.0.2.ebuild, -jfreechart-1.0.3.ebuild:

diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index 64d8cfa490abc6a9e14aafdc736bfb9e2996fad4..22aa421911c1f2787fd1c4d9c190816fb5e6c0d1 100644 (file)
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -19,14 +19,14 @@ EBUILD jfreechart-0.9.21.ebuild 1203 RMD160 4cc8a37bbac33aad7a09c8c068d0a7b8e5e9
 MD5 3f9d1ed8dd52240fe141b2f1ba989114 jfreechart-0.9.21.ebuild 1203
 RMD160 4cc8a37bbac33aad7a09c8c068d0a7b8e5e9e94f jfreechart-0.9.21.ebuild 1203
 SHA256 5d0c176501307f3d831401fb0e53b671d3c1207ef77f7a57c7a85813b24dfcf2 jfreechart-0.9.21.ebuild 1203
-EBUILD jfreechart-1.0.4.ebuild 1998 RMD160 8a6ac4c3bb002b80047d8e036d0598443c7748a6 SHA1 525cd4a28ef8f814c9d6b4a68a5f891fab470b79 SHA256 f1cdc55c3cbb3214ae100be4ef3789decc6d2feb0d644fc641cba7414763a252
-MD5 5a442430289fa9a836b4266ab3f2173b jfreechart-1.0.4.ebuild 1998
-RMD160 8a6ac4c3bb002b80047d8e036d0598443c7748a6 jfreechart-1.0.4.ebuild 1998
-SHA256 f1cdc55c3cbb3214ae100be4ef3789decc6d2feb0d644fc641cba7414763a252 jfreechart-1.0.4.ebuild 1998
-MISC ChangeLog 3338 RMD160 e9b6d917d4bb14f7730b15f0b76c6f0e2b29fa60 SHA1 070e8cb017ba55b39903baf4db6273043a5135f0 SHA256 de0a654a5dab8958b0d6edd64553c7f182b8bc6c66b5277fed14942be0a2023b
-MD5 ac97db89e241ef8a47c92ed90240b3dc ChangeLog 3338
-RMD160 e9b6d917d4bb14f7730b15f0b76c6f0e2b29fa60 ChangeLog 3338
-SHA256 de0a654a5dab8958b0d6edd64553c7f182b8bc6c66b5277fed14942be0a2023b ChangeLog 3338
+EBUILD jfreechart-1.0.4.ebuild 2011 RMD160 6fae5e05621b0a7a39b3804fb09f5f1389b73ee1 SHA1 83f44382105855ed388f3f85865b3d147dcb5fd0 SHA256 e367a519531af107a64587646e78193e7aafbcdd3438bc3db3ff1e70c883c020
+MD5 256ea20b95c6823583a7ede19dcef1fe jfreechart-1.0.4.ebuild 2011
+RMD160 6fae5e05621b0a7a39b3804fb09f5f1389b73ee1 jfreechart-1.0.4.ebuild 2011
+SHA256 e367a519531af107a64587646e78193e7aafbcdd3438bc3db3ff1e70c883c020 jfreechart-1.0.4.ebuild 2011
+MISC ChangeLog 3548 RMD160 df81efb3d589347b37936175f3319fa64452057f SHA1 6c597c8e7e1f4b769103d029cfbaade1d01b2343 SHA256 e1c4f8843f85624feef04f161f835077cb7e8b3027abb62a036a301350ec1898
+MD5 887f8bac1bc140dc3905779a24cacd17 ChangeLog 3548
+RMD160 df81efb3d589347b37936175f3319fa64452057f ChangeLog 3548
+SHA256 e1c4f8843f85624feef04f161f835077cb7e8b3027abb62a036a301350ec1898 ChangeLog 3548
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -41,9 +41,9 @@ MD5 a9e81ae7d39624dfa4908a8f0ddee47f files/digest-jfreechart-1.0.4 253
 RMD160 d8b15c757aff4fefdbff89e8d76eff4ba440b8b0 files/digest-jfreechart-1.0.4 253
 SHA256 69445d2185787def0ceaf7877c1afe5d4c2488be525008a7a270a693f55c4b37 files/digest-jfreechart-1.0.4 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF2JYocxLzpIGCsLQRAuPNAJ9y5164zioDGDCxw1+ibAeWpr59PgCeLunG
-ZTxMGayTmL7yURCU6Z8fito=
-=cL+X
+iD8DBQFGMQUwcxLzpIGCsLQRAo7JAJ4yR2XyZDWj1U+pzISrxMdmVPEOWgCdGmr4
+FZ+/ov/BTmwjsvpQZM50IrI=
+=MvOB
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jfreechart/jfreechart-1.0.4.ebuild b/dev-java/jfreechart/jfreechart-1.0.4.ebuild
index b7fa3b0ce4e1c61b97b251bec547bfa713c393d4..1b255366f70057a849b23602c4584b6afca38d80 100644 (file)
--- a/dev-java/jfreechart/jfreechart-1.0.4.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.4.ebuild,v 1.1 2007/02/09 23:51:12 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.4.ebuild,v 1.2 2007/04/26 20:01:51 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -59,7 +59,7 @@ src_install() {
 get_jars() {
        local antflags="
                -Ditext.jar=$(java-pkg_getjars itext) \
-               -Djcommon.jar=$(java-pkg_getjars jcommon-1.0) \
+               -Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
                -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
        use test && antflags="${antflags} \
                -Djunit.jar=$(java-pkg_getjars --build-only junit)"