Version bump (bug #112654).

Package-Manager: portage-2.0.53_rc7

5 files changed, 210 insertions, 11 deletions

diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index 9fabb6222189..b1dd02713738 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2005/05/20 18:48:34 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.10 2005/12/06 03:50:13 nichoj Exp $
+
+*pmd-3.3 (06 Dec 2005)
+
+  06 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/pmd-3.3-gentoo.patch, +pmd-3.3.ebuild:
+  Version bump (bug #112654).
 
 *pmd-3.1 (20 May 2005)
 
diff --git a/dev-util/pmd/Manifest b/dev-util/pmd/Manifest
index 98c8c76ea186..48fb1329ea35 100644
--- a/dev-util/pmd/Manifest
+++ b/dev-util/pmd/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 501caf5c892ae6feed82b0f05193c3ff pmd-3.1.ebuild 1446
-MD5 b131da5bb636d0aa455f681cad502d75 pmd-1.5-r1.ebuild 1092
-MD5 7faad7f167c57f6ac51df35d38fc2e56 ChangeLog 1415
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 de5629bb3e4f74880b7481c1db6d1d2f pmd-1.5.ebuild 790
+MD5 7cdbba1b23abfac78bfbd177190a9b6f ChangeLog 1566
 MD5 f4fd6e2650f6d50125b3e546a7c0a54b files/digest-pmd-1.5 61
-MD5 9cd4c2c64ebddf354fb7475e86887505 files/digest-pmd-3.1 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 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 b131da5bb636d0aa455f681cad502d75 pmd-1.5-r1.ebuild 1092
+MD5 de5629bb3e4f74880b7481c1db6d1d2f pmd-1.5.ebuild 790
+MD5 501caf5c892ae6feed82b0f05193c3ff pmd-3.1.ebuild 1446
+MD5 a23566982203a6b2d43d8268e9c15ac1 pmd-3.3.ebuild 1627
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC3D4T/rLF9B432nYRAhweAKCnOxuVNkh4DC/Kf362MPLnnzOqbwCglMEJ
-PdywtGOTy4njsMt8sVZgh5E=
-=vdnn
+iD8DBQFDlQqIndWRXhKOboURAn8UAJ45rUu5isRMlk+3SbD0r9PEgfEHlQCg7Y64
+6108oWtdNYsDcR7AfmzFCj0=
+=la5Z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pmd/files/digest-pmd-3.3 b/dev-util/pmd/files/digest-pmd-3.3
new file mode 100644
index 000000000000..8ca73b669ad0
--- /dev/null
+++ b/dev-util/pmd/files/digest-pmd-3.3
@@ -0,0 +1 @@
+MD5 b09b0ac9548e82aa4368c31c5111580d pmd-src-3.3.zip 9300101
diff --git a/dev-util/pmd/files/pmd-3.3-gentoo.patch b/dev-util/pmd/files/pmd-3.3-gentoo.patch
new file mode 100644
index 000000000000..22f535a06ca8
--- /dev/null
+++ b/dev-util/pmd/files/pmd-3.3-gentoo.patch
@@ -0,0 +1,122 @@
+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)
+ 
+-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)
+ 
+-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.3.ebuild b/dev-util/pmd/pmd-3.3.ebuild
new file mode 100644
index 000000000000..b5f08d7b4d80
--- /dev/null
+++ b/dev-util/pmd/pmd-3.3.ebuild
@@ -0,0 +1,67 @@
+# 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.1 2005/12/06 03:50:13 nichoj 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 ~sparc ~x86"
+IUSE="doc jikes source"
+
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/jaxen-1.0*
+	dev-java/saxpath
+	=dev-java/xerces-2.6*"
+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
+}
+
+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 ""
+}