marked 1.3.1-r1 stable on amd64, ppc and x86. marked 2.3.0-r1 stable on amd64 and x86, added ~ppc to KEYWORDS and introduced support for the examples useflag. marked 2.6.2-r2 stable on amd64 and x86, added ~ppc to KEYWORDS.

(Portage version: 2.0.51.20-r5)

9 files changed, 39 insertions, 127 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 0e3c550a1939..9498667988bd 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.46 2005/04/22 08:54:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.47 2005/05/01 17:34:00 luckyduck Exp $
+
+  01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -xerces-1.3.1.ebuild,
+  xerces-1.3.1-r1.ebuild, -xerces-2.3.0.ebuild, xerces-2.3.0-r1.ebuild,
+  xerces-2.6.2-r2.ebuild:
+  marked 1.3.1-r1 stable on amd64, ppc and x86. marked 2.3.0-r1 stable on
+  amd64 and x86, added ~ppc to KEYWORDS and introduced support for the
+  examples useflag. marked 2.6.2-r2 stable on amd64 and x86, added ~ppc to
+  KEYWORDS.
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> xerces-2.3.0.ebuild:
   stable on amd64
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index e131fed0cf20..166b031168a7 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,18 +1,14 @@
-MD5 7a01d0d7e1579ffec54ca40f82c8cbb3 ChangeLog 7204
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 33fd5cbbb2758a1e423ddcc446a5e4da xerces-1.3.1-r1.ebuild 1235
-MD5 fbfe34351874880123f590756d14adb4 xerces-1.3.1.ebuild 1080
-MD5 b6ce27b9b14146a9aca4fc5d2f1d84a2 xerces-2.3.0-r1.ebuild 1645
-MD5 0736b7bd035e1f1c8ba3871a56b12e96 xerces-2.3.0.ebuild 1135
+MD5 cc661d9cbacebbd6392cd65ecac458a5 xerces-1.3.1-r1.ebuild 1200
+MD5 ffa089808af47622484163bdfbe7391e xerces-2.6.2-r2.ebuild 1868
+MD5 2a77ad4772d6a494c082a12247878d2b xerces-2.3.0-r1.ebuild 1685
 MD5 be18f82f884ae7e8e5aa1e8cf8faf872 xerces-2.6.2-r1.ebuild 1940
-MD5 778831c56cad81140a88d767ded68650 xerces-2.6.2-r2.ebuild 1873
-MD5 ca42d91bb10182d3e1717d14894481c8 files/digest-xerces-1.3.1 143
-MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
-MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0 144
+MD5 70d98f2db85eeb4ee7b555ed498c68f7 ChangeLog 7609
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342
 MD5 37e61d014a2f8f79909f6d0775c1959b files/digest-xerces-2.3.0-r1 71
 MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
 MD5 b0ce49e162a5ad60941af4594c938eda files/digest-xerces-2.6.2-r2 71
+MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
 MD5 a00b411ba35267075fda1f96c4867caf files/xerces-1.3.1-build.xml 1680
 MD5 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684
-MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
-MD5 75b2cfa2eff39aa21e17c8b2ed40b6b6 files/xerces-2.6.2-r2-gentoo.patch 1342
+MD5 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
diff --git a/dev-java/xerces/files/digest-xerces-1.3.1 b/dev-java/xerces/files/digest-xerces-1.3.1
deleted file mode 100644
index dd3ce943ec1e..000000000000
--- a/dev-java/xerces/files/digest-xerces-1.3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9a754a616f61f16123aaa32f32372acf Xerces-J-src.1.3.1.tar.gz 900263
-MD5 b86466cb1c7f57b5bdc5e4da25f031dd Xerces-J-tools.1.3.1.tar.gz 1630918
diff --git a/dev-java/xerces/files/digest-xerces-2.3.0 b/dev-java/xerces/files/digest-xerces-2.3.0
deleted file mode 100644
index 8bf3fa2e2584..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd7e2b41e6f7a4571215a48d2abe9041 Xerces-J-src.2.3.0.tar.gz 1556920
-MD5 4bb1d3b58fe7ec986d110574e5affb6c Xerces-J-tools.2.3.0.tar.gz 3655640
diff --git a/dev-java/xerces/xerces-1.3.1-r1.ebuild b/dev-java/xerces/xerces-1.3.1-r1.ebuild
index eede7572ca62..763acff9ffb0 100644
--- a/dev-java/xerces/xerces-1.3.1-r1.ebuild
+++ b/dev-java/xerces/xerces-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1-r1.ebuild,v 1.3 2005/03/16 18:46:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1-r1.ebuild,v 1.4 2005/05/01 17:34:00 luckyduck Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,7 @@ SRC_URI="http://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-src.${
 
 LICENSE="Apache-1.1"
 SLOT="1.3"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc ~sparc amd64"
 
 DEPEND=">=virtual/jdk-1.3
 	jikes? ( dev-java/jikes )
@@ -38,12 +38,8 @@ src_compile() {
 src_install () {
 	java-pkg_dojar dist/${PN}.jar
 
-	dodoc LICENSE README STATUS
+	dodoc README STATUS
 	java-pkg_dohtml Readme.html
-	if use doc; then
-		java-pkg_dohtml -r docs/*
-	fi
-	if use source; then
-		java-pkg_dosrc ${S}/src/*
-	fi
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc ${S}/src/*
 }
diff --git a/dev-java/xerces/xerces-1.3.1.ebuild b/dev-java/xerces/xerces-1.3.1.ebuild
deleted file mode 100644
index 41a5905a0a28..000000000000
--- a/dev-java/xerces/xerces-1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-1.3.1.ebuild,v 1.4 2005/01/15 13:20:08 luckyduck Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}/xerces-${PV//./_}
-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://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-src.${PV}.tar.gz
-	http://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-tools.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="1.3"
-KEYWORDS="x86 ~ppc ~sparc"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE="doc"
-
-
-src_unpack() {
-	unpack ${A}
-	mv tmp/xml-xerces/java/tools ${S}
-}
-
-src_compile() {
-	make jars || die "failed to compile"
-	if use doc; then
-		make docs || die "failed to create docs"
-	fi
-}
-
-src_install () {
-	java-pkg_dojar bin/x*.jar
-	dodoc LICENSE README STATUS
-	dohtml Readme.html
-
-	if use doc; then
-		java-pkg_dohtml -r docs/html/*
-	fi
-}
diff --git a/dev-java/xerces/xerces-2.3.0-r1.ebuild b/dev-java/xerces/xerces-2.3.0-r1.ebuild
index ea58d344d2e5..f07f38dfedcb 100644
--- a/dev-java/xerces/xerces-2.3.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.3.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.9 2005/03/23 18:22:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r1.ebuild,v 1.10 2005/05/01 17:34:00 luckyduck Exp $
 
 inherit java-pkg eutils
 
-S=${WORKDIR}/xerces-${PV//./_}
 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="~x86 ~amd64 ~sparc"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
+IUSE="doc examples jikes source"
 
 DEPEND=">=virtual/jdk-1.3
 	jikes? ( dev-java/jikes )
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xalan-2.5.2
 	dev-java/xjavac
 	>=dev-java/xml-commons-1.0_beta2"
-IUSE="doc jikes source"
+S=${WORKDIR}/xerces-${PV//./_}
 
 src_unpack() {
 	unpack ${A}
@@ -48,15 +48,16 @@ src_compile() {
 
 src_install () {
 	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES
-	dohtml Readme.html
+
+	dodoc TODO STATUS README ISSUES
+	java-pkg_dohtml Readme.html
 
 	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp -a samples ${D}/usr/share/doc/${PF}
 		java-pkg_dohtml -r build/docs/javadocs
 	fi
-	if use source; then
-		java-pkg_dosrc ${S}/src/*
+	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.3.0.ebuild b/dev-java/xerces/xerces-2.3.0.ebuild
deleted file mode 100644
index 73b3ecfa9148..000000000000
--- a/dev-java/xerces/xerces-2.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.15 2005/04/22 08:54:45 blubb Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}/xerces-${PV//./_}
-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
-	http://xml.apache.org/dist/xerces-j/Xerces-J-tools.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.3"
-KEYWORDS="x86 ~ppc ~sparc amd64"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-IUSE="doc"
-
-src_unpack() {
-	unpack ${A}
-	mv tools ${S}
-}
-
-src_compile() {
-	sh build.sh jars || die "failed to compile"
-	if use doc; then
-		sh build.sh javadocs || die "failed to create javadoc"
-	fi
-}
-
-src_install () {
-	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES
-	dohtml Readme.html
-
-	if use doc; then
-		dodir /usr/share/doc/${PF}
-		cp -a samples ${D}/usr/share/doc/${PF}
-		java-pkg_dohtml -r build/docs/javadocs
-	fi
-}
diff --git a/dev-java/xerces/xerces-2.6.2-r2.ebuild b/dev-java/xerces/xerces-2.6.2-r2.ebuild
index b1c9b88222f3..a3354344dccb 100644
--- a/dev-java/xerces/xerces-2.6.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r2.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.3 2005/03/21 23:38:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r2.ebuild,v 1.4 2005/05/01 17:34:00 luckyduck Exp $
 
 inherit java-pkg eutils
 
-IUSE="doc jikes examples source"
-
-S=${WORKDIR}/xerces-${PV//./_}
 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/xerces-j/Xerces-J-src.${PV}.tar.gz"
+
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
+IUSE="doc jikes examples source"
 
 DEPEND=">=virtual/jdk-1.3
 	jikes? ( >=dev-java/jikes-1.21 )
@@ -23,6 +22,7 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xml-commons-1.0_beta2
 	>=dev-java/xml-commons-resolver-1.1
 	>=dev-java/xjavac-20041208"
+S=${WORKDIR}/xerces-${PV//./_}
 
 src_unpack() {
 	unpack ${A}
@@ -56,7 +56,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/x*.jar
 
-	dodoc TODO STATUS README ISSUES LICENSE
+	dodoc TODO STATUS README ISSUES
 	java-pkg_dohtml Readme.html
 
 	use doc && java-pkg_dohtml -r build/docs/javadocs