Fixed to use xml-apis.jar from xml-commons instead of xerces. Part of fixing bug #82561.

Package-Manager: portage-2.0.53

4 files changed, 17 insertions, 10 deletions

diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index fdb8b6ac87d1..9401d1451901 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/pmd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.11 2005/12/11 16:53:06 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.12 2005/12/11 18:34:09 betelgeuse Exp $
+
+  11 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  files/pmd-3.3-gentoo.patch, pmd-3.3.ebuild:
+  Fixed to use xml-apis.jar from xml-commons instead of xerces.
+  Part of fixing bug #82561.
 
   11 Dec 2005; Joshua Nichols <nichoj@gentoo.org> pmd-3.1.ebuild,
   pmd-3.3.ebuild:
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
index e14a1e7e1510..81933bbd0e44 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 92720f70d5a17e9915e8d2352053dee6 ChangeLog 1680
+MD5 dc024b6c6048f3fea1d72684ce14988d ChangeLog 1877
 MD5 f4fd6e2650f6d50125b3e546a7c0a54b files/digest-pmd-1.5 61
 MD5 f4fd6e2650f6d50125b3e546a7c0a54b files/digest-pmd-1.5-r1 61
 MD5 9cd4c2c64ebddf354fb7475e86887505 files/digest-pmd-3.1 61
 MD5 e810cb5e40dfcc3ba21c05d7ba29d54b files/digest-pmd-3.3 61
 MD5 a4e38ad08909deab5987c12fe5e59d8d files/pmd-3.1-gentoo.patch 3808
-MD5 becc4704fc6c51da372aff190ab06b78 files/pmd-3.3-gentoo.patch 3140
+MD5 8933adb7f1d0bf9b912e3dd236dd0005 files/pmd-3.3-gentoo.patch 3164
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 b131da5bb636d0aa455f681cad502d75 pmd-1.5-r1.ebuild 1092
 MD5 de5629bb3e4f74880b7481c1db6d1d2f pmd-1.5.ebuild 790
 MD5 c350d228faedf2333f206d7199e88222 pmd-3.1.ebuild 1448
-MD5 c7bb6545cf7611cb55ea13b406f20f9e pmd-3.3.ebuild 1627
+MD5 82d721c9d2e2aa35c109aa97f9eb2fcb pmd-3.3.ebuild 1684
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDnFnindWRXhKOboURAiOGAJsHHAUcvJvlAo1YyPKrJe9jygNyLwCg52L/
-rTyri+Q+D1IXk3N0ThINbDQ=
-=BrFy
+iD8DBQFDnHEvQiJ/wx066S4RAle7AKCKAaVDL1PGdq0UTl4ie0vWppDquACfcm/d
+cf5eJ7kkfK5jWVUP2PzCG1U=
+=hQ3X
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pmd/files/pmd-3.3-gentoo.patch b/dev-util/pmd/files/pmd-3.3-gentoo.patch
index 22f535a06ca8..ab206b2796b9 100644
--- a/dev-util/pmd/files/pmd-3.3-gentoo.patch
+++ b/dev-util/pmd/files/pmd-3.3-gentoo.patch
@@ -32,7 +32,7 @@ diff -ru pmd-3.3/bin/designer.sh pmd-3.3-patched/bin/designer.sh
  
 -SCRIPT_DIR=`dirname $0`
 -CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
++cp=$(java-config -p xerces-2,saxpath,jaxen,pmd,xml-commons)
  
 -cd "$SCRIPT_DIR/../lib"
 -LIB_DIR=`pwd -P`
@@ -85,7 +85,7 @@ diff -ru pmd-3.3/bin/pmd.sh pmd-3.3-patched/bin/pmd.sh
  
 -SCRIPT_DIR=`dirname $0`
 -CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
++cp=$(java-config -p xerces-2,saxpath,jaxen,pmd,xml-commons)
  
 -cd "$SCRIPT_DIR/../lib"
 -LIB_DIR=`pwd -P`
diff --git a/dev-util/pmd/pmd-3.3.ebuild b/dev-util/pmd/pmd-3.3.ebuild
index 24e566478b0d..86c3cb820a59 100644
--- a/dev-util/pmd/pmd-3.3.ebuild
+++ b/dev-util/pmd/pmd-3.3.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-util/pmd/pmd-3.3.ebuild,v 1.2 2005/12/11 16:53:06 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.3.ebuild,v 1.3 2005/12/11 18:34:10 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -16,6 +16,7 @@ IUSE="doc jikes source"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/jaxen-1.0*
 	dev-java/saxpath
+	dev-java/xml-commons
 	>=dev-java/xerces-2.6"
 DEPEND=">=virtual/jdk-1.3
 	${RDEPEND}
@@ -35,6 +36,7 @@ src_unpack() {
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from jaxen
 	java-pkg_jar-from xerces-2 xercesImpl.jar
+	java-pkg_jar-from xml-commons
 }
 
 src_compile() {