Version bump, -r1 so that overlay users upgrade too. Tweaked deps, added junit testing, using dolauncher and better docs handling.

(Portage version: 2.1.2_rc2-r5)
 (Unsigned Manifest commit)

9 files changed, 20 insertions, 503 deletions

diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
index 7c0e6c36693c..88b0f2aa608c 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -1,20 +1,18 @@
-AUX pmd-3.1-gentoo.patch 3808 RMD160 d030afe794d04721219b495ef55d862d8714e5fd SHA1 a63e034dbfa4fe9b941dd67ffbe6d5d76b223690 SHA256 768c78e96a4e0d320f011a3c0d554600fb55249440bdfa1fb381900a52dac660
-MD5 a4e38ad08909deab5987c12fe5e59d8d files/pmd-3.1-gentoo.patch 3808
-RMD160 d030afe794d04721219b495ef55d862d8714e5fd files/pmd-3.1-gentoo.patch 3808
-SHA256 768c78e96a4e0d320f011a3c0d554600fb55249440bdfa1fb381900a52dac660 files/pmd-3.1-gentoo.patch 3808
-AUX pmd-3.3-gentoo.patch 3164 RMD160 e542e0a5e2121934c3d482964e6bbfc6e8bae05d SHA1 fef2cb35441b71e6828c0bde7620a192f16da5ec SHA256 d16b810b0e05ddd0e37e2832219ebad62e81fdf5b6ff6101c8a43e331a306d58
-MD5 8933adb7f1d0bf9b912e3dd236dd0005 files/pmd-3.3-gentoo.patch 3164
-RMD160 e542e0a5e2121934c3d482964e6bbfc6e8bae05d files/pmd-3.3-gentoo.patch 3164
-SHA256 d16b810b0e05ddd0e37e2832219ebad62e81fdf5b6ff6101c8a43e331a306d58 files/pmd-3.3-gentoo.patch 3164
 AUX pmd-3.7-gentoo.patch 3218 RMD160 81f6c4fae5d4fa0bc74a52bfc63d3adc670bb003 SHA1 785446441cd1eb90921a25b3aefc21c688bc5ba1 SHA256 1bc5b73bcd759a06b04e0afe350a923dae9ab3a08342fd89f14297c5ca693c54
 MD5 1498d9299e578d6525f173b23ab2fdd9 files/pmd-3.7-gentoo.patch 3218
 RMD160 81f6c4fae5d4fa0bc74a52bfc63d3adc670bb003 files/pmd-3.7-gentoo.patch 3218
 SHA256 1bc5b73bcd759a06b04e0afe350a923dae9ab3a08342fd89f14297c5ca693c54 files/pmd-3.7-gentoo.patch 3218
+AUX pmd-3.8-gentoo.patch 2161 RMD160 4a3215ffd6d77b909d675a8339e5a073110b4838 SHA1 b28752b2e9e16081c0352ab13bfff2a1d59c9656 SHA256 a516f8442ec67be3bc70e72e722e6e57227397190952369ffb228d73e4587c35
+MD5 85c3c950024f17fd456f55602eb69e05 files/pmd-3.8-gentoo.patch 2161
+RMD160 4a3215ffd6d77b909d675a8339e5a073110b4838 files/pmd-3.8-gentoo.patch 2161
+SHA256 a516f8442ec67be3bc70e72e722e6e57227397190952369ffb228d73e4587c35 files/pmd-3.8-gentoo.patch 2161
+AUX pmd-pre 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
+MD5 8095371a200f3962b33ea4e54f4c3f24 files/pmd-pre 171
+RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 files/pmd-pre 171
+SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad files/pmd-pre 171
 DIST pmd-src-1.5.zip 5630923
-DIST pmd-src-3.1.zip 9120718
-DIST pmd-src-3.3.zip 9300101
-DIST pmd-src-3.4.zip 9535887
 DIST pmd-src-3.7.zip 10756798 RMD160 451bace491bc46cd6b3db4a5ac11b48bfa8e3b18 SHA1 10d2fcddd3da81f7e49e0a75fb634c44e2b49910 SHA256 a35de76cd8049fd91b3c4e2031b7b03f849e03e2facba1e32ea1cb27cacdb5ff
+DIST pmd-src-3.8.zip 11032057 RMD160 193a25fb5e2ab21bc31f52d667c2f9fa8eebd09b SHA1 9b7d0acc2888d1d536078ac952bf2b4804114d49 SHA256 a31247adbf06dd71b6e10231a92d04ca87206f214ee8d1ec59650cf2f108333a
 EBUILD pmd-1.5-r1.ebuild 1082 RMD160 9c26b7a0757379349e45cea50854e5326aac5a22 SHA1 1904fd7fba35021a34ee964ec0703b8e8556abbb SHA256 a530e11ffe48b7b77489d80f5567e6b842667eda7a077faf8191432d40f5a404
 MD5 97ecd204b7dbd454459c623bdf2b27ea pmd-1.5-r1.ebuild 1082
 RMD160 9c26b7a0757379349e45cea50854e5326aac5a22 pmd-1.5-r1.ebuild 1082
@@ -23,26 +21,18 @@ EBUILD pmd-1.5.ebuild 787 RMD160 a8a2f18ddd51ef84f4023b3b461394e4b37d47fd SHA1 4
 MD5 b1e9b3379601c1bddb461c756c8eb25f pmd-1.5.ebuild 787
 RMD160 a8a2f18ddd51ef84f4023b3b461394e4b37d47fd pmd-1.5.ebuild 787
 SHA256 8f505b6dff010e8d127846c25784f3b61bbd47614616a062b11bf2c0baa81553 pmd-1.5.ebuild 787
-EBUILD pmd-3.1.ebuild 1441 RMD160 fb2cbd91e4805b017a947b7710ce05e0f5aa696b SHA1 5e99b732c01647757425241eb29cdae50a235f4d SHA256 beaab115d744470946dac22c10681b849a93e05c5fb1ebfa77cc0551bc1a1539
-MD5 75547d7167b8bb79d578449bd595cea6 pmd-3.1.ebuild 1441
-RMD160 fb2cbd91e4805b017a947b7710ce05e0f5aa696b pmd-3.1.ebuild 1441
-SHA256 beaab115d744470946dac22c10681b849a93e05c5fb1ebfa77cc0551bc1a1539 pmd-3.1.ebuild 1441
-EBUILD pmd-3.3.ebuild 1673 RMD160 49c2ab47c362f9ea91b01e7588ea5c6e2908361b SHA1 9b7a1141e77f7f90f7ca32665da7670946189c92 SHA256 2e2f8df07afe4797a84b1927c64740f6bcf317cc9d85d8470a6cce53fbaf6513
-MD5 9e11061f064f1a222e2aeaa99d381537 pmd-3.3.ebuild 1673
-RMD160 49c2ab47c362f9ea91b01e7588ea5c6e2908361b pmd-3.3.ebuild 1673
-SHA256 2e2f8df07afe4797a84b1927c64740f6bcf317cc9d85d8470a6cce53fbaf6513 pmd-3.3.ebuild 1673
-EBUILD pmd-3.4.ebuild 1678 RMD160 f05b6a462e4a815784b889cf8e1646b36adc675e SHA1 c079af239414c398a61088875cc858d4219d4d65 SHA256 51200243876809296983d589a3ec5900f4bb12c38a086a120c78c8fb124e9bde
-MD5 e4fff6b685af25487a4c303460644e41 pmd-3.4.ebuild 1678
-RMD160 f05b6a462e4a815784b889cf8e1646b36adc675e pmd-3.4.ebuild 1678
-SHA256 51200243876809296983d589a3ec5900f4bb12c38a086a120c78c8fb124e9bde pmd-3.4.ebuild 1678
 EBUILD pmd-3.7.ebuild 1703 RMD160 94d7dab02d34825f6385f0ce74382ef49c077665 SHA1 ab1d02e5ed0daa1b74ecf52e2ab55e2742c927fa SHA256 ca82261777d7a2274e6ffbf218dc55005bc2f2bd435a749657ba9144ebe486a2
 MD5 95c3c3fd605c8a745a4f8972238ba4c8 pmd-3.7.ebuild 1703
 RMD160 94d7dab02d34825f6385f0ce74382ef49c077665 pmd-3.7.ebuild 1703
 SHA256 ca82261777d7a2274e6ffbf218dc55005bc2f2bd435a749657ba9144ebe486a2 pmd-3.7.ebuild 1703
-MISC ChangeLog 2587 RMD160 e3ee1901002f466591d497e4e23b386472cf3821 SHA1 872719bb34e8469fa92370868f499c3e80bf5200 SHA256 1d30dfa178751b380ca96b809e59ac128e21d631c53f3b5e3090b69d9cae6ffb
-MD5 b0b32cb8a62b89501a7d453fb76ba9d2 ChangeLog 2587
-RMD160 e3ee1901002f466591d497e4e23b386472cf3821 ChangeLog 2587
-SHA256 1d30dfa178751b380ca96b809e59ac128e21d631c53f3b5e3090b69d9cae6ffb ChangeLog 2587
+EBUILD pmd-3.8-r1.ebuild 1994 RMD160 df9647c2f2f9928bebc332efae04d3f137a428fc SHA1 d87d271b1537c257cdb15b6c34d5edcf858efea6 SHA256 07e7969b3dedf8f0ce6edb97633ada1945cded868bf79349d5c0b37e13391ab4
+MD5 23c0f28cef7b3c9783a98ecee7a972a9 pmd-3.8-r1.ebuild 1994
+RMD160 df9647c2f2f9928bebc332efae04d3f137a428fc pmd-3.8-r1.ebuild 1994
+SHA256 07e7969b3dedf8f0ce6edb97633ada1945cded868bf79349d5c0b37e13391ab4 pmd-3.8-r1.ebuild 1994
+MISC ChangeLog 2981 RMD160 b2b1dd4af3acde4eb6e1ace0a4ee03145c97ef6e SHA1 cc03792e539b7c2029d9cae8761e0065733008a7 SHA256 db5c7aabca98da7ab934ced498e65c299a4760242bd06541a769d97afe453609
+MD5 729b949c6fd29a6955e9ae4462212388 ChangeLog 2981
+RMD160 b2b1dd4af3acde4eb6e1ace0a4ee03145c97ef6e ChangeLog 2981
+SHA256 db5c7aabca98da7ab934ced498e65c299a4760242bd06541a769d97afe453609 ChangeLog 2981
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -53,15 +43,9 @@ SHA256 8a8e700bc66ba1a18a6b0deedfd133ef27924ec7203da8fd65a7009528e6b9c1 files/di
 MD5 f4fd6e2650f6d50125b3e546a7c0a54b files/digest-pmd-1.5-r1 61
 RMD160 250e56fece88d76b20ed5612c859e3858f386e2a files/digest-pmd-1.5-r1 61
 SHA256 8a8e700bc66ba1a18a6b0deedfd133ef27924ec7203da8fd65a7009528e6b9c1 files/digest-pmd-1.5-r1 61
-MD5 9cd4c2c64ebddf354fb7475e86887505 files/digest-pmd-3.1 61
-RMD160 9136d4c3e3901ee56e6bbf218fecc9abcc52b22d files/digest-pmd-3.1 61
-SHA256 51e07848cf1fb94d8ef1920a372e3e17fe55b373e0f1089bd0e9d03bc30d7aa8 files/digest-pmd-3.1 61
-MD5 e810cb5e40dfcc3ba21c05d7ba29d54b files/digest-pmd-3.3 61
-RMD160 9b244226ac7b4de9c600e0bda4879cbf1a81f96e files/digest-pmd-3.3 61
-SHA256 39c93fb77f0d1bbdf72ee648c6bf91f5e32f33a8a78e5d7bf5cb4f703f003fac files/digest-pmd-3.3 61
-MD5 2f550f3dcd71f7a9725a06ca89c5e810 files/digest-pmd-3.4 61
-RMD160 adfde55f4ddc3d987fe223b8c1e1dbe06a6d5ece files/digest-pmd-3.4 61
-SHA256 94db0a929bbd5ac4ed9397eb43918a9e3d5dbc6924d41a5f3e0234b3a6b5982f files/digest-pmd-3.4 61
 MD5 986caf9c023760e573426f6872b3b960 files/digest-pmd-3.7 232
 RMD160 38f94f5e085a62da05b4174c45e9067ec8312566 files/digest-pmd-3.7 232
 SHA256 b32514fcbc8fda0b0020c041c43046a848d52eaa3df4bdad01375363ceaec196 files/digest-pmd-3.7 232
+MD5 d5f6a452c2ec1401145d694638da92b2 files/digest-pmd-3.8-r1 232
+RMD160 e4c9a6c4db7733468de411273ac9cb007e1b9789 files/digest-pmd-3.8-r1 232
+SHA256 60563fa6630060312d0a0aead57179b48ba2f2d89b53c385438364a431be8476 files/digest-pmd-3.8-r1 232
diff --git a/dev-util/pmd/files/digest-pmd-3.1 b/dev-util/pmd/files/digest-pmd-3.1
deleted file mode 100644
index 44067fa49372..000000000000
--- a/dev-util/pmd/files/digest-pmd-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cf5b78874eb74b9947a4d62cd21c722 pmd-src-3.1.zip 9120718
diff --git a/dev-util/pmd/files/digest-pmd-3.3 b/dev-util/pmd/files/digest-pmd-3.3
deleted file mode 100644
index 8ca73b669ad0..000000000000
--- a/dev-util/pmd/files/digest-pmd-3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b09b0ac9548e82aa4368c31c5111580d pmd-src-3.3.zip 9300101
diff --git a/dev-util/pmd/files/digest-pmd-3.4 b/dev-util/pmd/files/digest-pmd-3.4
deleted file mode 100644
index 49a5fb749e66..000000000000
--- a/dev-util/pmd/files/digest-pmd-3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b5709ad6eb37639e948c4604eb00871 pmd-src-3.4.zip 9535887
diff --git a/dev-util/pmd/files/pmd-3.1-gentoo.patch b/dev-util/pmd/files/pmd-3.1-gentoo.patch
deleted file mode 100644
index 96fc02f1e21c..000000000000
--- a/dev-util/pmd/files/pmd-3.1-gentoo.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -u bin.orig/build.xml bin/build.xml
---- bin.orig/build.xml	2005-05-20 19:49:46.000000000 +0200
-+++ bin/build.xml	2005-05-20 20:25:51.000000000 +0200
-@@ -1,20 +1,16 @@
- <project name="pmd" default="compile" basedir="../">
- 
--<property name="dir.lib" value="lib\"/>
--<property name="dir.src" value="src\"/>
--<property name="dir.build" value="build\"/>
--<property name="dir.rulesets" value="rulesets\"/>
--<property name="dir.regress" value="regress\"/>
-+	<property name="dir.lib" value="lib/"/>
-+	<property name="dir.src" value="src/"/>
-+	<property name="dir.build" value="build/"/>
-+	<property name="dir.rulesets" value="rulesets/"/>
-+	<property name="dir.regress" value="regress/"/>
- <property name="version" value="3.1"/>
- <property name="jnlp_staging_area" value="/home/tom/misc/importscrubberjnlp/"/>
- 
- <path id="dependencies.path">
--    <pathelement location="${dir.build}"/>
-     <fileset dir="${dir.lib}">
--        <include name="jaxen-core-1.0-fcs.jar"/>
--        <include name="saxpath-1.0-fcs.jar"/>
--        <include name="xercesImpl-2.6.2.jar"/>
--        <include name="xmlParserAPIs-2.6.2.jar"/>
-+	    <include name="**/*.jar"/>
-     </fileset>
- </path>
- 
-@@ -54,12 +50,11 @@
- 
- <target name="jar" depends="copy,compile" description="Jars up the classes and rulesets">
-     <jar
--        jarfile="${dir.lib}\pmd-${version}.jar"
-+        jarfile="${dir.lib}\pmd.jar"
-         includes="net/sourceforge/pmd/**/**,test/net/sourceforge/pmd/testframework/**/**,rulesets/**"
-         basedir="${dir.build}">
-         <manifest>
-             <attribute name="Main-Class" value="net.sourceforge.pmd.PMD"/>
--            <attribute name="Class-Path" value="jaxen-core-1.0-fcs.jar saxpath-1.0-fcs.jar"/>
-         </manifest>
-     </jar>  
- </target>
-diff -u bin.orig/designer.sh bin/designer.sh
---- bin.orig/designer.sh	2005-05-20 19:49:46.000000000 +0200
-+++ bin/designer.sh	2005-05-20 20:41:53.000000000 +0200
-@@ -1,34 +1,11 @@
- #!/bin/bash
- 
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
- 
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
--classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
--    classpath=$classpath:$jarfile
--done
--
--
--FILE=$1
-+FILE=${1}
- shift
--FORMAT=$1
-+FORMAT=${1}
- shift
--RULESETFILES="$@"
--
--# echo "CLASSPATH: $classpath"
-+RULESETFILES="${@}"
- 
--java -cp $classpath net.sourceforge.pmd.util.designer.Designer
-+java -cp ${cp} net.sourceforge.pmd.util.designer.Designer
-diff -u bin.orig/pmd.sh bin/pmd.sh
---- bin.orig/pmd.sh	2005-05-20 19:49:46.000000000 +0200
-+++ bin/pmd.sh	2005-05-20 20:41:47.000000000 +0200
-@@ -1,41 +1,20 @@
- #!/bin/bash
- 
--if [ -z "$3" ]; then
--    script=`basename $0`
-+if [ -z "${3}" ]; then
-+    script=$(basename $0)
-     echo "Usage:"
--    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-+    echo "    ${script} <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-     exit 1
- fi
- 
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
- 
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
--classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
--    classpath=$classpath:$jarfile
--done
--
--
--FILE=$1
-+FILE=${1}
- shift
--FORMAT=$1
-+FORMAT=${1}
- shift
--RULESETFILES="$@"
-+RULESETFILES="${@}"
- 
- # echo "CLASSPATH: $classpath"
- 
--java -cp $classpath net.sourceforge.pmd.PMD $FILE $FORMAT $RULESETFILES
-+java -cp ${cp} net.sourceforge.pmd.PMD ${FILE} ${FORMAT} ${RULESETFILES}
diff --git a/dev-util/pmd/files/pmd-3.3-gentoo.patch b/dev-util/pmd/files/pmd-3.3-gentoo.patch
deleted file mode 100644
index ab206b2796b9..000000000000
--- a/dev-util/pmd/files/pmd-3.3-gentoo.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -ru pmd-3.3/bin/build.xml pmd-3.3-patched/bin/build.xml
---- pmd-3.3/bin/build.xml	2005-09-15 18:38:26.000000000 -0400
-+++ pmd-3.3-patched/bin/build.xml	2005-12-05 22:12:51.000000000 -0500
-@@ -10,11 +10,7 @@
- 
- <path id="dependencies.path">
-     <pathelement location="${dir.build}"/>
--    <fileset dir="${dir.lib}">
--        <include name="jaxen-1.1-beta-7.jar"/>
--        <include name="xercesImpl-2.6.2.jar"/>
--        <include name="xmlParserAPIs-2.6.2.jar"/>
--    </fileset>
-+    <fileset dir="${dir.lib}" includes="*.jar"/>
- </path>
- 
- <target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -60,7 +56,6 @@
-         basedir="${dir.build}">
-         <manifest>
-             <attribute name="Main-Class" value="net.sourceforge.pmd.PMD"/>
--            <attribute name="Class-Path" value="jaxen-1.1-beta-7.jar"/>
-         </manifest>
-     </jar>
- </target>
-Only in pmd-3.3-patched/bin: build.xml.orig
-Only in pmd-3.3-patched/bin: build.xml.rej
-diff -ru pmd-3.3/bin/designer.sh pmd-3.3-patched/bin/designer.sh
---- pmd-3.3/bin/designer.sh	2005-01-28 11:13:49.000000000 -0500
-+++ pmd-3.3-patched/bin/designer.sh	2005-12-05 22:12:51.000000000 -0500
-@@ -1,34 +1,11 @@
- #!/bin/bash
- 
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd,xml-commons)
- 
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
--classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
--    classpath=$classpath:$jarfile
--done
--
--
--FILE=$1
-+FILE=${1}
- shift
--FORMAT=$1
-+FORMAT=${1}
- shift
--RULESETFILES="$@"
--
--# echo "CLASSPATH: $classpath"
-+RULESETFILES="${@}"
- 
--java -cp $classpath net.sourceforge.pmd.util.designer.Designer
-+java -cp ${cp} net.sourceforge.pmd.util.designer.Designer
-diff -ru pmd-3.3/bin/pmd.sh pmd-3.3-patched/bin/pmd.sh
---- pmd-3.3/bin/pmd.sh	2005-01-28 11:13:49.000000000 -0500
-+++ pmd-3.3-patched/bin/pmd.sh	2005-12-05 22:12:51.000000000 -0500
-@@ -1,41 +1,20 @@
- #!/bin/bash
- 
--if [ -z "$3" ]; then
--    script=`basename $0`
-+if [ -z "${3}" ]; then
-+    script=$(basename $0)
-     echo "Usage:"
--    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-+    echo "    ${script} <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-     exit 1
- fi
- 
--SCRIPT_DIR=`dirname $0`
--CWD="$PWD"
-+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd,xml-commons)
- 
--cd "$SCRIPT_DIR/../lib"
--LIB_DIR=`pwd -P`
--
--classpath=$CLASSPATH
--
--build_dir="$SCRIPT_DIR/../build"
--
--if [ -d "$build_dir" ]; then
--    cd "$build_dir"
--    build_dir=`pwd -P`
--    classpath=$classpath:$build_dir
--fi
--
--cd "$CWD"
--
--for jarfile in `ls $LIB_DIR/*.jar`; do
--    classpath=$classpath:$jarfile
--done
--
--
--FILE=$1
-+FILE=${1}
- shift
--FORMAT=$1
-+FORMAT=${1}
- shift
--RULESETFILES="$@"
-+RULESETFILES="${@}"
- 
- # echo "CLASSPATH: $classpath"
- 
--java -cp $classpath net.sourceforge.pmd.PMD $FILE $FORMAT $RULESETFILES
-+exec $(java-config --java) -cp ${cp} net.sourceforge.pmd.PMD ${FILE} ${FORMAT} ${RULESETFILES}
diff --git a/dev-util/pmd/pmd-3.1.ebuild b/dev-util/pmd/pmd-3.1.ebuild
deleted file mode 100644
index 4d10ac187a15..000000000000
--- a/dev-util/pmd/pmd-3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.1.ebuild,v 1.6 2006/11/30 16:06:11 caster Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="PMD is a Java source code analyzer. It finds unused variables, empty catch blocks, unnecessary object creation and so forth."
-HOMEPAGE="http://pmd.sourceforge.net"
-SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
-
-LICENSE="pmd"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc jikes source"
-
-RDEPEND=">=virtual/jre-1.3
-	=dev-java/jaxen-1.0*
-	dev-java/junit
-	dev-java/saxpath
-	>=dev-java/xerces-2.7"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	cd ${S}/lib/
-	rm -f *.jar
-	java-pkg_jar-from saxpath
-	java-pkg_jar-from jaxen
-	java-pkg_jar-from xerces-2
-}
-
-src_compile() {
-	cd ${S}/bin
-
-	local antflags="dist"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	newbin bin/pmd.sh pmd
-	newbin bin/designer.sh pmd-designer
-	cp -r rulesets ${D}/usr/share/${PN}
-
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Various example rulesets can be found under"
-	einfo "/usr/share/pmd/rulesets/"
-	einfo ""
-}
diff --git a/dev-util/pmd/pmd-3.3.ebuild b/dev-util/pmd/pmd-3.3.ebuild
deleted file mode 100644
index f08c0aacc431..000000000000
--- a/dev-util/pmd/pmd-3.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 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.5 2006/11/30 16:06:11 caster Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="A Java source code analyzer. It finds unused variables, empty catch blocks, unnecessary object creation and so forth."
-HOMEPAGE="http://pmd.sourceforge.net"
-SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
-
-LICENSE="pmd"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-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.7"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	cd ${S}/lib/
-	rm -f *.jar
-	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() {
-	cd ${S}/bin
-
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	dodir /usr/share/ant-core/lib/
-	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/ant-${PN}.jar
-
-	newbin bin/${PN}.sh ${PN}
-	newbin bin/designer.sh ${PN}-designer
-	cp -r rulesets ${D}/usr/share/${PN}
-
-	use doc && java-pkg_dohtml -r docs/api
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Example rulesets can be found under"
-	einfo "/usr/share/pmd/rulesets/"
-	einfo ""
-}
diff --git a/dev-util/pmd/pmd-3.4.ebuild b/dev-util/pmd/pmd-3.4.ebuild
deleted file mode 100644
index 07b4d8571cf7..000000000000
--- a/dev-util/pmd/pmd-3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.4.ebuild,v 1.3 2006/11/30 16:06:11 caster Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="A Java source code analyzer. It finds unused variables, empty catch blocks, unnecessary object creation and so forth."
-HOMEPAGE="http://pmd.sourceforge.net"
-SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
-
-LICENSE="pmd"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-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.7"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.3-gentoo.patch
-
-	cd ${S}/lib/
-	rm -f *.jar
-	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() {
-	cd ${S}/bin
-
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags} || die "died on ant"
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	dodir /usr/share/ant-core/lib/
-	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/ant-${PN}.jar
-
-	newbin bin/${PN}.sh ${PN}
-	newbin bin/designer.sh ${PN}-designer
-	cp -r rulesets ${D}/usr/share/${PN}
-
-	use doc && java-pkg_dohtml -r docs/api
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Example rulesets can be found under"
-	einfo "/usr/share/pmd/rulesets/"
-	einfo ""
-}