Fix use source (reported in bug #255649) and use EANT_GENTOO_CLASSPATH.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

3 files changed, 17 insertions, 15 deletions

diff --git a/dev-java/xmlgraphics-commons/ChangeLog b/dev-java/xmlgraphics-commons/ChangeLog
index 17a4640f3ec9..84cb80b820d0 100644
--- a/dev-java/xmlgraphics-commons/ChangeLog
+++ b/dev-java/xmlgraphics-commons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmlgraphics-commons
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.14 2008/12/20 20:20:29 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.15 2009/01/26 15:08:12 betelgeuse Exp $
+
+  26 Jan 2009; Petteri Räty <betelgeuse@gentoo.org>
+  xmlgraphics-commons-1.3.1.ebuild:
+  Fix use source (reported in bug #255649) and use EANT_GENTOO_CLASSPATH.
 
 *xmlgraphics-commons-1.3.1 (20 Dec 2008)
 
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 16e60dbb88e5..1359f9d4b66c 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST xmlgraphics-commons-1.2-src.tar.gz 430083 RMD160 d04f39242d95f9fd3ef307d8c483bcec35bdc2dd SHA1 0c16d6bc28eee8419bd9cb1e4645f699bd10c9f3 SHA256 1588fe182e62d3f3cf7c2acb7d0989b7134b94c95580256e4fe1b9c5e3a38663
 DIST xmlgraphics-commons-1.3.1-src.tar.gz 751502 RMD160 1bd32470860a9fdcde2141a1238bd7694a614146 SHA1 6254909e109cdb4d005e958aa10adf17bcc4ecd1 SHA256 1dd2acfe892af34196d5365addd8e106dd355a2b4bead5f44feea4edcfc452b1
 EBUILD xmlgraphics-commons-1.2.ebuild 2173 RMD160 352367f4c040121b19f1f8a6a2b24c48f3041b6e SHA1 783af57aac51e2f9916212b966691aae17b3d26d SHA256 f8cfd8821ae89196fb3fc301deb840dd69d30f57346be148f1ba68f260fac284
-EBUILD xmlgraphics-commons-1.3.1.ebuild 2123 RMD160 6c5973c60752c4ccaf1cc34500ed339129083959 SHA1 817527e567c7c3ced1b3d7ab7742dcb013072409 SHA256 7c294ad221721f3e98c125db7fb5f4d41d34b9d6d03ac7cb22cef92f0cbaa223
-MISC ChangeLog 2101 RMD160 ba96bce229cb965ced4d013674a2d5d84c9d8aa1 SHA1 2f0099909a04487f34cb146b3898e8e7390b4ab6 SHA256 5a062fc4cefa956e6b40a120d2e8366040ef28bd355420304e4f198c5fc23524
+EBUILD xmlgraphics-commons-1.3.1.ebuild 2118 RMD160 ff5e9af6b56cf2ba360bab64e88915f61d175188 SHA1 77123fe67c4bc977a607a19a384434b0031f0833 SHA256 60c7c1775daffdcd13814c1fd679411794e0131b16ab88bfbdcbed4dbfdbdc69
+MISC ChangeLog 2265 RMD160 db01d9877abec1681637ac488199be1a4ef1c56b SHA1 a545d337db1792405d7e38fd4712a16c3fa633f8 SHA256 960589030a1e158ce18efd0276f24340ca7bb5d8647171594f78563cbb81a763
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklNU5YACgkQcxLzpIGCsLR/EgCgkfVLbuA7VDf8i1kv8/mSW782
-kYgAniyRqRR4fzJuZDLzWcg33Zqadac1
-=A2cV
+iEYEARECAAYFAkl90h8ACgkQcxLzpIGCsLTflgCeKeJAUSW23aXVmcyoRGTQpld2
+Lw0AniN0YKR1Tsxz2alrkej5h1g0VyFm
+=D4oe
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
index ac9a5d3ce5ce..0b253c4b927c 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.1 2008/12/20 20:20:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.2 2009/01/26 15:08:12 betelgeuse Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source test"
@@ -44,18 +44,16 @@ pkg_setup() {
 }
 
 JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cd ${S}/lib || die
-	rm -v *.jar || die
-
-	java-pkg_jarfrom commons-io-1
-	java-pkg_jarfrom commons-logging
+	rm -v "${S}"/lib/*.jar || die
 }
 
+EANT_GENTOO_CLASSPATH="commons-io-1,commons-logging"
 EANT_EXTRA_ARGS="-Djdk14.present=true"
 EANT_BUILD_TARGET="jar-main"
 EANT_DOC_TARGET="javadocs"
@@ -72,6 +70,6 @@ src_test() {
 
 src_install(){
 	java-pkg_newjar build/${P}.jar
-	use source && java-pkg_dosrc src/java/org src/java-1.4/org
+	use source && java-pkg_dosrc src/java/org
 	use doc && java-pkg_dojavadoc build/javadocs
 }