Version bump. Remove old.

svn path=/java-overlay/; revision=7239

11 files changed, 34 insertions, 286 deletions

diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index 786f98c9..c517dcc2 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Nov 2008; Serkan Kaba <serkan@gentoo.org> -pmd-4.0.ebuild,
+  -files/pmd-4.0-build.xml.patch, -files/pmd-4.0-launcher-pre-commands,
+  -pmd-4.1.ebuild, -files/pmd-4.1-build.xml.patch,
+  -files/pmd-4.1-launcher-pre-commands, -pmd-4.2.2.ebuild,
+  -files/pmd-4.2.2-build.xml.patch, -files/pmd-4.2.2-launcher-pre-commands,
+  +pmd-4.2.4.ebuild, +files/pmd-4.2.4-build.xml.patch,
+  +files/pmd-4.2.4-launcher-pre-commands:
+  Version bump. Remove old.
+
   22 Jun 2008; Miroslav Šulc <fordfrog@gentoo.org> +pmd-4.2.2.ebuild,
   +files/pmd-4.2.2-build.xml.patch, +files/pmd-4.2.2-launcher-pre-commands:
   Version bump.
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
index 4def360d..554474ba 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -1,13 +1,7 @@
-AUX pmd-4.0-build.xml.patch 1177 RMD160 f2283e2e3aa47dfd15cfb9e170cccb7993fe020d SHA1 7086ea76ef67056322a363fc305f7562d24ffa52 SHA256 78b5c5b4394dbee501cae3a9d3864f5fc0be084aefe7fe919199ecd0e4955881
-AUX pmd-4.0-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
-AUX pmd-4.1-build.xml.patch 2245 RMD160 60842874380c4152b9459a1fa5f94b686ceabd11 SHA1 3ce5587eab4ad0f2d599e5a80ce01d924ce01d07 SHA256 33d2c11828fe263542c7dd5fd3a74ed4f1392b56fe05a20fef8654df8465d90a
-AUX pmd-4.1-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
-AUX pmd-4.2.2-build.xml.patch 2245 RMD160 60842874380c4152b9459a1fa5f94b686ceabd11 SHA1 3ce5587eab4ad0f2d599e5a80ce01d924ce01d07 SHA256 33d2c11828fe263542c7dd5fd3a74ed4f1392b56fe05a20fef8654df8465d90a
-AUX pmd-4.2.2-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
-DIST pmd-src-4.0.zip 8667351 RMD160 e3a0a59cd0a9d7f4b0f6064e736151c18c8cee6b SHA1 50cb81ab56bdf832f2921a9c00ce375a47acf4e7 SHA256 d23e0debc16860937c4adcd0bf8639b2e8d903d6af635964fe7a6b1adbe5a9b0
-DIST pmd-src-4.1.zip 9044312 RMD160 4202db4f12354b398d8513bff6c2eb4fa7a2ebe9 SHA1 329b100e980c070a12f3e05860052577d6849d45 SHA256 1ef4e631216ffeaf3e3c5bf187092cb211592f120ca642da765a69805aca44db
+AUX pmd-4.2.4-build.xml.patch 2313 RMD160 7fcd4883c6ba45b153b681c7f3d2db255fe19475 SHA1 c7686d05d30b28bf412edbeb6b168085cd5e7d67 SHA256 22672c88dc2af5f12cc59a65a5ea496f1de0493282e82e7e0a68027e853421c8
+AUX pmd-4.2.4-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
 DIST pmd-src-4.2.2.zip 10405146 RMD160 9bce91bc0edf53c857c1f6b276e7e09e05d9a7d4 SHA1 a8290542ce2b1365e2d539cec17f8b042fcd00a7 SHA256 60ef46f3553941c94a012a4dda0f6cc98f43f0c9568957e3d8a476b41ecbab92
-EBUILD pmd-4.0.ebuild 2052 RMD160 a7fd06335cbb8a643b1739ca9978e01a6a83e195 SHA1 f79c3fa8dba8cc1ab813ce387235914c50db958d SHA256 f8ae32e7df1e49bf41ce42c49bcbcc7bf3335f4b9958c15abc51d589a0a390dc
-EBUILD pmd-4.1.ebuild 2226 RMD160 209a52dd2e601bda2e7cf13d2d6cefe7415798d2 SHA1 41a416f7e18e700de7bba9bbbe46e4d9e6ae65e7 SHA256 c12df123692ae5fa4f8198fa42c5c934b1db467162437c50792ae4e75ce2bcf2
-EBUILD pmd-4.2.2.ebuild 2224 RMD160 e3e1473528827f1690ba48dae384392f7271c2f4 SHA1 beb9c4472a6b5677d057e67c372ada1c0755d8c4 SHA256 2d1625102ecb8ace4f538a45b2aeb009931d9b01cfd358c92bff02002a2347f0
-MISC ChangeLog 774 RMD160 8377cd48c83b465a9263747f4d3f60f1da04761b SHA1 b5a8bf64f7cc1e08c92700593fd017a2fe85c90c SHA256 4ca779131a67ad9bc5e90cf700728df69f2c6bc6fe18adfdc9ef92db58a49333
+DIST pmd-src-4.2.4.zip 10773707 RMD160 1bc89168e09246918e3bb797d0327e5e5c2466de SHA1 4b64d03e725561eceb337c01096b3319b6f680d1 SHA256 e623490c0654b914e2ed4cc45dcc8106d9c013dfdc8fd069e8619f6b0e8eb403
+EBUILD pmd-4.2.2.ebuild 2239 RMD160 9d32c5810ce6d412929fe5666b4e38e81f8e12fc SHA1 dcd83e0ba626130f2c7d694dd5b16620e52f303e SHA256 2e3f7eda71fd58eb83cdd85c984066598788673f0d06900160695b6c05a90d98
+EBUILD pmd-4.2.4.ebuild 2031 RMD160 f6098de1b40c7a2b6b6052fecaf237b46b4132c0 SHA1 d14142c4d2781ca843b16612e59f33be78b6b2cc SHA256 69157955e02a971776983ffc645445af9760355b8b2c4c35acc40e5b0281c137
+MISC ChangeLog 1222 RMD160 6178f76e668de1b4dc220bcbbac670e426471741 SHA1 cd61f5f1879bd6cd2108c060d447c261ec4e7dbb SHA256 9e58189d22dfaee4c0df56da48af34743dab084c48dc890056e989f3acc915eb
diff --git a/dev-util/pmd/files/pmd-4.0-build.xml.patch b/dev-util/pmd/files/pmd-4.0-build.xml.patch
deleted file mode 100644
index e3da1b5e..00000000
--- a/dev-util/pmd/files/pmd-4.0-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- build.xml.original	2007-07-29 02:07:36.000000000 +0200
-+++ build.xml	2007-07-29 02:22:57.000000000 +0200
-@@ -17,10 +17,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-1.1.jar" />
--			<include name="asm-3.0.jar" />
--		</fileset>
-+		<fileset dir="${dir.lib}" includes="*.jar"/>
- 	</path>
- 
- 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -66,7 +63,6 @@
- 		<jar jarfile="${dir.lib}/pmd-${version}.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-1.1.jar asm-3.0.jar" />
- 			</manifest>
- 		</jar>
- 	</target>
-@@ -178,7 +174,7 @@
-             <istrue value="${outputTestResultsToFile}"/>
-         </condition>
- 
--        <junit printsummary="yes" haltonfailure="no" forkmode="perBatch">
-+        <junit printsummary="yes" haltonfailure="yes" forkmode="perBatch">
- 			<classpath>
- 				<path refid="dependencies.path" />
- 			</classpath>
diff --git a/dev-util/pmd/files/pmd-4.1-launcher-pre-commands b/dev-util/pmd/files/pmd-4.1-launcher-pre-commands
deleted file mode 100644
index b2e48852..00000000
--- a/dev-util/pmd/files/pmd-4.1-launcher-pre-commands
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -z "$3" ]; then
-    script=`basename $0`
-    echo "Usage:"
-    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-    exit 1
-fi
diff --git a/dev-util/pmd/files/pmd-4.2.2-build.xml.patch b/dev-util/pmd/files/pmd-4.2.2-build.xml.patch
deleted file mode 100644
index f909d2ab..00000000
--- a/dev-util/pmd/files/pmd-4.2.2-build.xml.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- build.xml.original	2007-11-25 16:27:02.000000000 +0100
-+++ build.xml	2007-11-25 16:38:10.000000000 +0100
-@@ -21,11 +21,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-${jaxen.version}.jar" />
--			<include name="asm-${asm.version}.jar" />
--			<include name="junit-${junit.version}.jar" />
--		</fileset>
-+		<fileset dir="${dir.lib}" includes="*.jar"/>
- 	</path>
- 
- 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -72,22 +68,10 @@
- 		<jar jarfile="${dir.lib}/pmd-${version}.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-${jaxen.version}.jar asm-${asm.version}.jar" />
- 			</manifest>
- 		</jar>
- 	</target>
- 
--	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
--		<classpath>
--			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
--			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
--			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
--			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
--			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
--			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
--		</classpath>
--	</taskdef>
--
- 	<target name="weavejunit" depends="jar">
- 		<path id="retroweaverclasspath">
- 			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-@@ -197,7 +181,7 @@
- 	<target name="test-execute" description="Runs the unit tests">
- 		<delete dir="${test.outputdir}" />
- 		<mkdir dir="${test.outputdir}/xml"/>
--		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="no" jvm="${test.jvm}" forkmode="perBatch"
-+		<junit printsummary="${test.printsummary}" showoutput="no" filtertrace="yes" haltonfailure="yes" jvm="${test.jvm}" forkmode="perBatch"
- 			failureProperty="test.failure" 
- 		>
- 			<sysproperty key="pmd.regress" value="${test.regression}"/>
diff --git a/dev-util/pmd/files/pmd-4.2.2-launcher-pre-commands b/dev-util/pmd/files/pmd-4.2.2-launcher-pre-commands
deleted file mode 100644
index b2e48852..00000000
--- a/dev-util/pmd/files/pmd-4.2.2-launcher-pre-commands
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -z "$3" ]; then
-    script=`basename $0`
-    echo "Usage:"
-    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
-    exit 1
-fi
diff --git a/dev-util/pmd/files/pmd-4.1-build.xml.patch b/dev-util/pmd/files/pmd-4.2.4-build.xml.patch
index f909d2ab..a0f04356 100644
--- a/dev-util/pmd/files/pmd-4.1-build.xml.patch
+++ b/dev-util/pmd/files/pmd-4.2.4-build.xml.patch
@@ -1,6 +1,7 @@
---- build.xml.original	2007-11-25 16:27:02.000000000 +0100
-+++ build.xml	2007-11-25 16:38:10.000000000 +0100
-@@ -21,11 +21,7 @@
+diff -Nur pmd-4.2.4/bin/build.xml pmd-4.2.4_patched/bin/build.xml
+--- pmd-4.2.4/bin/build.xml	2008-08-31 15:32:20.000000000 +0300
++++ pmd-4.2.4_patched/bin/build.xml	2008-11-23 08:15:09.000000000 +0200
+@@ -22,11 +22,7 @@
  
  	<path id="dependencies.path">
  		<pathelement location="${dir.build}" />
@@ -13,13 +14,16 @@
  	</path>
  
  	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -72,22 +68,10 @@
- 		<jar jarfile="${dir.lib}/pmd-${version}.jar" includes="net/sourceforge/pmd/**/**,test/net/sourceforge/pmd/testframework/**/**,rulesets/**" basedir="${dir.build}">
+@@ -76,7 +72,6 @@
+ 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
  			<manifest>
  				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
 -				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
  			</manifest>
  		</jar>
+ 
+@@ -86,17 +81,6 @@
+ 			basedir="${dir.build}" />
  	</target>
  
 -	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
@@ -36,7 +40,7 @@
  	<target name="weavejunit" depends="jar">
  		<path id="retroweaverclasspath">
  			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-@@ -197,7 +181,7 @@
+@@ -211,7 +195,7 @@
  	<target name="test-execute" description="Runs the unit tests">
  		<delete dir="${test.outputdir}" />
  		<mkdir dir="${test.outputdir}/xml"/>
diff --git a/dev-util/pmd/files/pmd-4.0-launcher-pre-commands b/dev-util/pmd/files/pmd-4.2.4-launcher-pre-commands
index b2e48852..b2e48852 100644
--- a/dev-util/pmd/files/pmd-4.0-launcher-pre-commands
+++ b/dev-util/pmd/files/pmd-4.2.4-launcher-pre-commands
diff --git a/dev-util/pmd/pmd-4.1.ebuild b/dev-util/pmd/pmd-4.1.ebuild
deleted file mode 100644
index 095b9e00..00000000
--- a/dev-util/pmd/pmd-4.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.9.ebuild,v 1.2 2007/05/24 13:38:03 flameeyes Exp $
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-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 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/ant-core
-	>=dev-java/asm-3.0
-	>=dev-java/jaxen-1.1_beta10"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-# NOTE: they include regression tests in the main jar so junit is needed on the cp even for src_compile
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	>=dev-java/junit-4.4
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/hamcrest
-	)
-	${COMMON_DEPEND}"
-
-pkg_setup() {
-	use test && ewarn "Please note that tests currently fail"
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack "${A}"
-
-	# We patch build.xml to include all jars in lib dir
-	cd "${S}/bin"
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd "${S}"
-	find -name "*.jar" | xargs rm -v
-
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from jaxen-1.1 jaxen.jar
-	java-pkg_jar-from --build-only junit-4
-	use test && java-pkg_jar-from --build-only hamcrest
-}
-
-EANT_BUILD_XML="bin/build.xml"
-
-src_test() {
-	ANT_TASKS="ant-junit ant-trax" eant -f bin/build.xml test -DoutputTestResultsToFile=true
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-	java-pkg_register-ant-task
-
-	# Create launchers and copy rulesets
-	java-pkg_dolauncher ${PN} --main net.sourceforge.pmd.PMD --java_args "-Xmx512m" \
-		-pre "${FILESDIR}"/${P}-launcher-pre-commands
-	java-pkg_dolauncher ${PN}-designer --main net.sourceforge.pmd.util.designer.Designer
-	cp -r rulesets "${D}"/usr/share/${PN}
-	mkdir "${D}"/usr/share/${PN}/etc
-	cp -r etc/xslt "${D}"/usr/share/${PN}/etc/
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "Example rulesets can be found under"
-	elog "/usr/share/pmd/rulesets/"
-}
diff --git a/dev-util/pmd/pmd-4.2.2.ebuild b/dev-util/pmd/pmd-4.2.2.ebuild
deleted file mode 100644
index 92b23d22..00000000
--- a/dev-util/pmd/pmd-4.2.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.9.ebuild,v 1.2 2007/05/24 13:38:03 flameeyes Exp $
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-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 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/ant-core
-	>=dev-java/asm-3.0
-	>=dev-java/jaxen-1.1_beta10"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-# NOTE: they include regression tests in the main jar so junit is needed on the cp even for src_compile
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	>=dev-java/junit-4.4
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		dev-java/hamcrest
-	)
-	${COMMON_DEPEND}"
-
-pkg_setup() {
-	use test && ewarn "Please note that tests currently fail"
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# We patch build.xml to include all jars in lib dir
-	cd "${S}/bin"
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd "${S}"
-	find -name "*.jar" | xargs rm -v
-
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from jaxen-1.1 jaxen.jar
-	java-pkg_jar-from --build-only junit-4
-	use test && java-pkg_jar-from --build-only hamcrest
-}
-
-EANT_BUILD_XML="bin/build.xml"
-
-src_test() {
-	ANT_TASKS="ant-junit ant-trax" eant -f bin/build.xml test -DoutputTestResultsToFile=true
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-	java-pkg_register-ant-task
-
-	# Create launchers and copy rulesets
-	java-pkg_dolauncher ${PN} --main net.sourceforge.pmd.PMD --java_args "-Xmx512m" \
-		-pre "${FILESDIR}"/${P}-launcher-pre-commands
-	java-pkg_dolauncher ${PN}-designer --main net.sourceforge.pmd.util.designer.Designer
-	cp -r rulesets "${D}"/usr/share/${PN}
-	mkdir "${D}"/usr/share/${PN}/etc
-	cp -r etc/xslt "${D}"/usr/share/${PN}/etc/
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "Example rulesets can be found under"
-	elog "/usr/share/pmd/rulesets/"
-}
diff --git a/dev-util/pmd/pmd-4.0.ebuild b/dev-util/pmd/pmd-4.2.4.ebuild
index 0281d04a..3f4732bd 100644
--- a/dev-util/pmd/pmd-4.0.ebuild
+++ b/dev-util/pmd/pmd-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.9.ebuild,v 1.2 2007/05/24 13:38:03 flameeyes Exp $
 
@@ -22,24 +22,24 @@ COMMON_DEPEND="
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEPEND}"
 
-# NOTE: they include regression tests in the main jar so junit is needed on the cp even for src_compile
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
-	>=dev-java/junit-4
+	>=dev-java/junit-4.4
 	test? (
 		dev-java/ant-junit
 		dev-java/ant-trax
+		dev-java/hamcrest
 	)
 	${COMMON_DEPEND}"
 
+RESTRICT="test"
+
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 
 	# We patch build.xml to include all jars in lib dir
-	cd "${S}/bin"
+	cd "${S}" || die
 	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	cd "${S}"
 	find -name "*.jar" | xargs rm -v
 
 	cd "${S}/lib"
@@ -47,6 +47,7 @@ src_unpack() {
 	java-pkg_jar-from asm-3 asm.jar
 	java-pkg_jar-from jaxen-1.1 jaxen.jar
 	java-pkg_jar-from --build-only junit-4
+	use test && java-pkg_jar-from --build-only hamcrest
 }
 
 EANT_BUILD_XML="bin/build.xml"
@@ -68,7 +69,7 @@ src_install() {
 	cp -r etc/xslt "${D}"/usr/share/${PN}/etc/
 
 	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/*
+	use source && java-pkg_dosrc src/net
 }
 
 pkg_postinst() {