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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 146 insertions, 3 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/Manifest b/dev-util/pmd/Manifest
index d149cdc6cadc..1e5f37fc40b0 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -2,8 +2,12 @@ AUX pmd-3.7-gentoo.patch 3218 RMD160 81f6c4fae5d4fa0bc74a52bfc63d3adc670bb003 SH
 AUX pmd-3.8-gentoo.patch 2161 RMD160 4a3215ffd6d77b909d675a8339e5a073110b4838 SHA1 b28752b2e9e16081c0352ab13bfff2a1d59c9656 SHA256 a516f8442ec67be3bc70e72e722e6e57227397190952369ffb228d73e4587c35
 AUX pmd-3.9-build.xml.patch 1290 RMD160 3e60f7ce094e51099f289bccb98d6eb81e3a2cf1 SHA1 446c9a06a9493cf5ba7125d20102857c6a000af8 SHA256 c807ac8ee0d2be4531615f51101273718764a7b3721790148c2cd9f6631dc6c3
 AUX pmd-3.9-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
+AUX pmd-4.2.5-build.xml.patch 2313 RMD160 7fcd4883c6ba45b153b681c7f3d2db255fe19475 SHA1 c7686d05d30b28bf412edbeb6b168085cd5e7d67 SHA256 22672c88dc2af5f12cc59a65a5ea496f1de0493282e82e7e0a68027e853421c8
+AUX pmd-4.2.5-launcher-pre-commands 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
 AUX pmd-pre 171 RMD160 79aef0939954c457f7ec6bbbf7355eb7f2835626 SHA1 9462f785caaa2f36ce29cfb0e72636b1a24ba95a SHA256 d2e683d5512b7d102d595d6ef3a757bd21891f3257303506026e85f99bd2e8ad
 DIST pmd-src-3.9.zip 11177126 RMD160 99ce682812694220576b5d5d06148f87860937ec SHA1 fb294d6fc7c02caede26f24af28dbdb30a2c928e SHA256 a24c7f6aa748d0f61f897008abe45b1e5ebaa89795f53274533682ff181cd96e
+DIST pmd-src-4.2.5.zip 10801078 RMD160 7207a9fd75fc2d8dd5e220466e7f49a7e008b346 SHA1 343a21f6ca0a051428c781a418871ea1dc337daa SHA256 d3a8c181a59ea1cedb1896ba3c14e076bfe34ead602a2546a4028a857b881cb4
 EBUILD pmd-3.9.ebuild 2220 RMD160 573c6f88d9794ddb1da70f04f3e911c6db60ec4a SHA1 4b5ad22a96ae6358951724a4d0b461befb043713 SHA256 04936ca7e8b364bbb4e9692c5cf4f08a8bdb4dfe9ba15754727efd5ef586e934
-MISC ChangeLog 4614 RMD160 f070844f2f8eb94bc213f1b10589d421247e62d7 SHA1 878b4e5ac09792caf81df5568262dba1db659d4d SHA256 f8bffcf5e6f64389f2ce06181cb0bad06de6248b5e9ddae7a9e585a36ee7823c
+EBUILD pmd-4.2.5.ebuild 1833 RMD160 e9e64f240eee5ce3dd66ce3d46f1c6d3d7a05794 SHA1 5bcb54de5b9e2f0133317fa05d19570ab3683e78 SHA256 a856e7a00d98b1c66277fb3cfd3bfd95358a39bf80ef2e1a98b63642724b9b32
+MISC ChangeLog 4848 RMD160 69cceddba9f616225f6bfad11248b4438758522f SHA1 1fe9a51d983f4f2914c242a50eb217ff0455d5f6 SHA256 e698f529a51398d6529e2050f224e87c47340d31b2b29be5851dfdee087de9e4
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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/"
+}