Version bump, bug #216441. From java-overlay ebuild by serkan.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 141 insertions, 2 deletions

diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index b31af56fbe41..8ccd5277df79 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pmd
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.30 2007/11/02 10:42:27 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.31 2009/05/22 22:21:51 caster Exp $
+
+*pmd-4.2.5 (22 May 2009)
+
+  22 May 2009; Vlastimil Babka <caster@gentoo.org> +pmd-4.2.5.ebuild,
+  +files/pmd-4.2.5-build.xml.patch, +files/pmd-4.2.5-launcher-pre-commands:
+  Version bump, bug #216441. From java-overlay ebuild by serkan.
 
   02 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> -pmd-3.8-r1.ebuild:
   Remove old ebuild.
diff --git a/dev-util/pmd/files/pmd-4.2.5-build.xml.patch b/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
new file mode 100644
index 000000000000..a0f043568625
--- /dev/null
+++ b/dev-util/pmd/files/pmd-4.2.5-build.xml.patch
@@ -0,0 +1,51 @@
+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}" />
+-		<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.">
+@@ -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">
+-		<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"/>
+@@ -211,7 +195,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.5-launcher-pre-commands b/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
new file mode 100644
index 000000000000..b2e48852597d
--- /dev/null
+++ b/dev-util/pmd/files/pmd-4.2.5-launcher-pre-commands
@@ -0,0 +1,6 @@
+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/pmd-4.2.5.ebuild b/dev-util/pmd/pmd-4.2.5.ebuild
new file mode 100644
index 000000000000..3fa9ec53dab2
--- /dev/null
+++ b/dev-util/pmd/pmd-4.2.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-4.2.5.ebuild,v 1.1 2009/05/22 22:21:51 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java source code analyzer."
+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
+	dev-java/jaxen:1.1
+	>=dev-java/junit-4.4:4"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit4
+		dev-java/ant-trax
+	)
+	${COMMON_DEPEND}"
+
+# tests fail
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	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 junit-4
+}
+
+EANT_BUILD_XML="bin/build.xml"
+
+src_test() {
+	# junit does not like collisions
+	rm lib/ant.jar
+	ANT_TASKS="ant-junit4 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/net
+}
+
+pkg_postinst() {
+	elog "Example rulesets can be found under"
+	elog "/usr/share/pmd/rulesets/"
+}