From 33b7ac2595ee4b0da2687e327778ad71c1dd51e3 Mon Sep 17 00:00:00 2001
From: Petteri Räty <betelgeuse@gentoo.org>
Date: Mon, 26 Jan 2009 15:08:12 +0000
Subject: Fix use source (reported in bug #255649) and use
 EANT_GENTOO_CLASSPATH. (Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo
 i686)

---
 dev-java/xmlgraphics-commons/ChangeLog                     |  8 ++++++--
 .../xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild   | 14 ++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'dev-java')

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/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
 }
-- 
cgit v1.2.3-65-gdbad