added a patch that enables generation of the complete api documentation. issue was discovered by Andrew Cowie <andrew@operationaldynamics.com>

Package-Manager: portage-2.0.51.19

4 files changed, 34 insertions, 19 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 4253d600f1ae..a62a3579da08 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
 # 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.42 2005/03/16 18:46:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.43 2005/03/21 23:38:35 luckyduck Exp $
+
+  22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xerces-2.6.2-r2.ebuild:
+  added a patch that enables generation of the complete api documentation. issue
+  was discovered by Andrew Cowie <andrew@operationaldynamics.com>
 
   16 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xerces-1.3.1-r1.ebuild,
   xerces-2.3.0-r1.ebuild, xerces-2.6.2-r2.ebuild:
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 5d3baceeaab1..61f32bdcf0d6 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 MD5 0de86c0b931a1eacf510ba9690d84a4a xerces-2.3.0.ebuild 1140
 MD5 33fd5cbbb2758a1e423ddcc446a5e4da xerces-1.3.1-r1.ebuild 1235
-MD5 145bfbda3f15e1e00aa956dae440f8fd xerces-2.6.2-r2.ebuild 1884
+MD5 778831c56cad81140a88d767ded68650 xerces-2.6.2-r2.ebuild 1873
 MD5 f1d4483a52cd9d4ec730672d37c10370 xerces-2.3.0-r1.ebuild 1622
 MD5 fbfe34351874880123f590756d14adb4 xerces-1.3.1.ebuild 1080
 MD5 be18f82f884ae7e8e5aa1e8cf8faf872 xerces-2.6.2-r1.ebuild 1940
-MD5 aebc43639417f6f407ed7c61ade8deb5 ChangeLog 6655
+MD5 42fb9f9a4846dfca4956b80dbfea4c5f ChangeLog 6879
 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 b0ae8698b0ae0ee1e309b38ba1f81141 files/digest-xerces-1.3.1-r1 70
@@ -21,7 +22,7 @@ MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0 144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCOH7x06ebR+OMO78RApNCAJwPhIISkhuHqQjyeyDTksJfJ2IyqACeKfLn
-U2ZVhxw0BJCAlqL0QjnX3XM=
-=ocGF
+iD8DBQFCP1sB06ebR+OMO78RAoTvAKCVy3TewjNLTm6kr3250Ajr54KC/ACfZUjj
+cMY8IYEfIX42jJqcRvrOSqw=
+=Clsy
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xerces/files/xerces-2.6.2-javadoc.patch b/dev-java/xerces/files/xerces-2.6.2-javadoc.patch
new file mode 100644
index 000000000000..d46d0cebd400
--- /dev/null
+++ b/dev-java/xerces/files/xerces-2.6.2-javadoc.patch
@@ -0,0 +1,17 @@
+--- build.xml.orig	2005-03-22 00:07:10.000000000 +0100
++++ build.xml	2005-03-22 00:35:19.392906216 +0100
+@@ -422,6 +422,14 @@
+       windowtitle='Other Classes' doctitle='Other Classes'
+       bottom='${copyright}'
+       />
++    
++    <javadoc packagenames='org.*'
++      locale='en_US'
++      sourcepath='${src.dir}/dom3' destdir='${build.dir}/docs/javadocs/api'
++      author='true' version='true'
++      windowtitle='Other Classes' doctitle='Other Classes'
++      bottom='${copyright}'
++      />
+   </target>
+ 
+   <!-- =================================================================== -->
diff --git a/dev-java/xerces/xerces-2.6.2-r2.ebuild b/dev-java/xerces/xerces-2.6.2-r2.ebuild
index 51a9b47568f8..b1c9b88222f3 100644
--- a/dev-java/xerces/xerces-2.6.2-r2.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r2.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-2.6.2-r2.ebuild,v 1.2 2005/03/16 18:46:04 luckyduck Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PF}-gentoo.patch
+	epatch ${FILESDIR}/${P}-javadoc.patch
 
 	mkdir ${S}/tools
 	cd ${S}/tools
@@ -47,12 +48,8 @@ src_unpack() {
 
 src_compile() {
 	local antflags="jars sampjar"
-	if use doc ; then
-		antflags="${antflags} javadocs"
-	fi
-	if use jikes; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
+	use doc && antflags="${antflags} javadocs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	sh build.sh ${antflags} || die "Compile failed."
 }
 
@@ -62,14 +59,10 @@ src_install() {
 	dodoc TODO STATUS README ISSUES LICENSE
 	java-pkg_dohtml Readme.html
 
-	if use doc ; then
-		java-pkg_dohtml -r build/docs/javadocs
-	fi
+	use doc && java-pkg_dohtml -r build/docs/javadocs
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
 		cp -r samples/* ${D}/usr/share/doc/${PF}/examples
 	fi
-	if use source; then
-		java-pkg_dosrc ${S}/src/*
-	fi
+	use source && java-pkg_dosrc ${S}/src/*
 }