Migrate to split-ant wrt xjavac, and cleanup.

(Portage version: 2.1.2-r9)

7 files changed, 98 insertions, 40 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 21717c2994d6..de81e51199df 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.73 2007/01/09 13:24:38 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.74 2007/02/12 00:51:34 caster Exp $
+
+*xerces-2.7.1-r3 (12 Feb 2007)
+*xerces-2.3.0-r3 (12 Feb 2007)
+
+  12 Feb 2007; Vlastimil Babka <caster@gentoo.org> +xerces-2.3.0-r3.ebuild,
+  xerces-2.6.2-r4.ebuild, -xerces-2.7.1.ebuild, +xerces-2.7.1-r3.ebuild,
+  xerces-2.8.1.ebuild:
+  Migrate to split-ant wrt xjavac, and cleanup.
 
   09 Jan 2007; Steve Dibb <beandog@gentoo.org> xerces-2.7.1-r2.ebuild:
   amd64 stable, bug 157023
diff --git a/dev-java/xerces/files/digest-xerces-2.3.0-r3 b/dev-java/xerces/files/digest-xerces-2.3.0-r3
new file mode 100644
index 000000000000..5984e52fb0a3
--- /dev/null
+++ b/dev-java/xerces/files/digest-xerces-2.3.0-r3
@@ -0,0 +1,3 @@
+MD5 fd7e2b41e6f7a4571215a48d2abe9041 Xerces-J-src.2.3.0.tar.gz 1556920
+RMD160 2340aa6f27c9f0616951d8ef0c2d96e168a359b7 Xerces-J-src.2.3.0.tar.gz 1556920
+SHA256 a3b9a6939c0959ea29fe2df13dbb9dcdf679ae1125d2f8488bd4bd6fff6737fe Xerces-J-src.2.3.0.tar.gz 1556920
diff --git a/dev-java/xerces/files/digest-xerces-2.7.1 b/dev-java/xerces/files/digest-xerces-2.7.1-r3
index ea327fc24a0d..ea327fc24a0d 100644
--- a/dev-java/xerces/files/digest-xerces-2.7.1
+++ b/dev-java/xerces/files/digest-xerces-2.7.1-r3
diff --git a/dev-java/xerces/xerces-2.3.0-r3.ebuild b/dev-java/xerces/xerces-2.3.0-r3.ebuild
new file mode 100644
index 000000000000..9676e62f71c6
--- /dev/null
+++ b/dev-java/xerces/xerces-2.3.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r3.ebuild,v 1.1 2007/02/12 00:51:34 caster Exp $
+
+WANT_SPLIT_ANT=true
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="http://xml.apache.org/dist/xerces-j/Xerces-J-src.${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/xml-commons-1.0_beta2"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/xjavac-20041208-r1
+	${RDEPEND}"
+
+S=${WORKDIR}/xerces-${PV//./_}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	mkdir ${S}/tools && cd ${S}/tools
+	java-pkg_jar-from xml-commons xml-apis.jar
+}
+
+src_compile() {
+	ANT_TASKS="xjavac-1" eant ${antflags} jar $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar build/xercesImpl.jar
+
+	dodoc TODO STATUS README ISSUES
+	dohtml Readme.html
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -a samples/* ${D}/usr/share/doc/${PF}
+	fi
+	use source && java-pkg_dosrc ${S}/src/*
+}
diff --git a/dev-java/xerces/xerces-2.6.2-r4.ebuild b/dev-java/xerces/xerces-2.6.2-r4.ebuild
index b852b7fa0dd6..d35466330b5e 100644
--- a/dev-java/xerces/xerces-2.6.2-r4.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r4.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r4.ebuild,v 1.1 2006/12/03 03:04:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r4.ebuild,v 1.2 2007/02/12 00:51:34 caster Exp $
 
+WANT_SPLIT_ANT=true
+JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2 eutils
 
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
@@ -11,16 +13,14 @@ SRC_URI="http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="2.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc examples source"
+IUSE=""
 
 CDEPEND=">=dev-java/xml-commons-1.0_beta2
 	>=dev-java/xml-commons-resolver-1.1"
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5.2
 	>=dev-java/xjavac-20041208
-	source? ( app-arch/zip )
 	${CDEPEND}"
 
 S="${WORKDIR}/xerces-${PV//./_}"
@@ -39,7 +39,7 @@ src_unpack() {
 }
 
 src_compile() {
-	eant -lib "$(java-pkg_getjars --build-only xjavac-1)" jar $(use_doc javadocs)
+	ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs)
 }
 
 src_install() {
diff --git a/dev-java/xerces/xerces-2.7.1.ebuild b/dev-java/xerces/xerces-2.7.1-r3.ebuild
index c1c2d22e1617..7f03630ec34f 100644
--- a/dev-java/xerces/xerces-2.7.1.ebuild
+++ b/dev-java/xerces/xerces-2.7.1-r3.ebuild
@@ -1,63 +1,58 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.7.1.ebuild,v 1.6 2006/09/28 02:47:57 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.7.1-r3.ebuild,v 1.1 2007/02/12 00:51:34 caster Exp $
 
-inherit java-pkg eutils
+WANT_SPLIT_ANT=true
+JAVA_PKG_IUSE="doc examples source"
+inherit  eutils versionator java-pkg-2 java-ant-2
 
-MY_PN="Xerces-J"
+DIST_PN="Xerces-J"
+SRC_PV="$(replace_all_version_separators _ )"
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
 HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/xml/${PN}-j/${MY_PN}-src.${PV}.tar.gz"
+SRC_URI="mirror://apache/xml/${PN}-j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples source"
 
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/ant-core-1.5.2
 	=dev-java/xml-commons-external-1.3*
-	>=dev-java/xml-commons-resolver-1.1
-	>=dev-java/xjavac-20041208"
+	>=dev-java/xml-commons-resolver-1.1"
 DEPEND=">=virtual/jdk-1.4
-	source? ( app-arch/zip )
+	>=dev-java/xjavac-20041208
 	${RDEPEND}"
 
-S="${WORKDIR}/${PN}-${PV//./_}"
+S="${WORKDIR}/${PN}-${SRC_PV}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.patch
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-gentoo.patch
 	epatch ${FILESDIR}/${P}-no_dom3.patch
 
 	mkdir tools && cd tools
-	rm -f *.jar
 	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
 	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
-
-	mkdir ${S}/tools/bin
-	cd ${S}/tools/bin
-	java-pkg_jar-from xjavac-1
 }
 
 src_compile() {
-	local antflags="jars"
-	use doc && antflags="${antflags} javadocs"
-	ant ${antflags} || die "Compile failed."
+	ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs)
 }
 
 src_install() {
-	java-pkg_dojar build/x*.jar
+	java-pkg_dojar build/xercesImpl.jar
 
 	dodoc TODO STATUS README ISSUES
-	java-pkg_dohtml Readme.html
+	dohtml Readme.html
 
-	use doc && java-pkg_dohtml -r build/docs/javadocs
+	use doc && java-pkg_dojavadoc build/docs/javadocs
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
 		cp -r samples/* ${D}/usr/share/doc/${PF}/examples
 	fi
-	use source && java-pkg_dosrc ${S}/src/*
+
+	use source && java-pkg_dosrc ${S}/src/org
 }
diff --git a/dev-java/xerces/xerces-2.8.1.ebuild b/dev-java/xerces/xerces-2.8.1.ebuild
index 758f47422946..92de0dd588c4 100644
--- a/dev-java/xerces/xerces-2.8.1.ebuild
+++ b/dev-java/xerces/xerces-2.8.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.8.1.ebuild,v 1.2 2006/12/07 22:48:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.8.1.ebuild,v 1.3 2007/02/12 00:51:34 caster Exp $
 
+WANT_SPLIT_ANT=true
+JAVA_PKG_IUSE="doc examples source"
 inherit eutils versionator java-pkg-2 java-ant-2
 
 DIST_PN="Xerces-J"
@@ -13,15 +15,13 @@ SRC_URI="mirror://apache/xml/${PN}-j/${DIST_PN}-src.${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="doc examples source"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/xml-commons-external-1.3*
 	>=dev-java/xml-commons-resolver-1.1"
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6.5-r14
 	>=dev-java/xjavac-20041208-r4
-	source? ( app-arch/zip )
 	${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${SRC_PV}"
@@ -42,16 +42,16 @@ src_compile() {
 	# known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
 	# ommiting them causes non-fatal errors in javadocs generation
 	# need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
-	eant -lib "$(java-pkg_getjars --build-only xjavac-1)" jar $(use_doc javadocs)
+	ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs)
 }
 
 src_install() {
 	java-pkg_dojar build/xercesImpl.jar
 
 	dodoc TODO STATUS README ISSUES
-	java-pkg_dohtml Readme.html
+	dohtml Readme.html
 
-	use doc && java-pkg_dohtml -r build/docs/javadocs
+	use doc && java-pkg_dojavadoc build/docs/javadocs
 	if use examples; then
 		dodir "/usr/share/doc/${PF}/examples"
 		cp -r samples/* "${D}/usr/share/doc/${PF}/examples"