Remove old.

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

7 files changed, 7 insertions, 298 deletions

diff --git a/dev-util/pmd/ChangeLog b/dev-util/pmd/ChangeLog
index 1a512d3b43eb..21ff2076ea8d 100644
--- a/dev-util/pmd/ChangeLog
+++ b/dev-util/pmd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pmd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.33 2009/07/19 14:12:57 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/ChangeLog,v 1.34 2009/11/05 18:04:04 caster Exp $
+
+  05 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/pmd-3.7-gentoo.patch, -files/pmd-3.8-gentoo.patch, -pmd-3.9.ebuild,
+  -files/pmd-3.9-build.xml.patch, -files/pmd-3.9-launcher-pre-commands,
+  -files/pmd-pre:
+  Remove old.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> pmd-4.2.5.ebuild:
   ppc stable #275078
diff --git a/dev-util/pmd/files/pmd-3.7-gentoo.patch b/dev-util/pmd/files/pmd-3.7-gentoo.patch
deleted file mode 100644
index df69782d037e..000000000000
--- a/dev-util/pmd/files/pmd-3.7-gentoo.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -ru pmd-3.7.orig/bin/build.xml pmd-3.7/bin/build.xml
---- pmd-3.7.orig/bin/build.xml	2006-09-25 01:17:08.000000000 +0200
-+++ pmd-3.7/bin/build.xml	2006-09-25 01:29:36.000000000 +0200
-@@ -12,12 +12,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-1.1-beta-7.jar" />
--			<include name="jakarta-oro-2.0.8.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.">
-@@ -62,7 +57,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-beta-7.jar jakarta-oro-2.0.8.jar" />
- 			</manifest>
- 		</jar>
- 	</target>
-diff -ru pmd-3.7.orig/bin/designer.sh pmd-3.7/bin/designer.sh
---- pmd-3.7.orig/bin/designer.sh	2006-09-25 01:17:08.000000000 +0200
-+++ pmd-3.7/bin/designer.sh	2006-09-25 01:27:59.000000000 +0200
-@@ -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.7.orig/bin/pmd.sh pmd-3.7/bin/pmd.sh
---- pmd-3.7.orig/bin/pmd.sh	2006-09-25 01:17:08.000000000 +0200
-+++ pmd-3.7/bin/pmd.sh	2006-09-25 01:27:44.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,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/files/pmd-3.8-gentoo.patch b/dev-util/pmd/files/pmd-3.8-gentoo.patch
deleted file mode 100644
index 6a61ca0925ec..000000000000
--- a/dev-util/pmd/files/pmd-3.8-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- bin/build.xml	2006-12-07 17:11:47.000000000 +0100
-+++ bin/build.xml	2006-12-07 17:17:13.000000000 +0100
-@@ -12,12 +12,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-1.1-beta-10.jar" />
--			<include name="jakarta-oro-2.0.8.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.">
-@@ -28,7 +23,7 @@
- 
- 	<target name="compile" description="Compiles the code">
- 		<mkdir dir="${dir.build}" />
--		<javac deprecation="false" debug="true" optimize="false" srcdir="${dir.src}:${dir.regress}" destdir="${dir.build}">
-+		<javac deprecation="false" debug="true" optimize="false" srcdir="${dir.src}" destdir="${dir.build}">
- 			<classpath>
- 				<path refid="dependencies.path" />
- 			</classpath>
-@@ -60,7 +55,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-beta-10.jar jakarta-oro-2.0.8.jar" />
- 			</manifest>
- 		</jar>
- 	</target>
-@@ -87,7 +81,16 @@
- 		<fail unless="junit.available" message="Could find JUnit... please place a junit.jar file in the CLASSPATH." />
- 	</target>
- 
--	<target name="test" depends="requires-junit,compile,copy" description="Runs the unit tests">
-+	<target name="compile-tests" description="Compiles the test cases">
-+		<mkdir dir="${dir.build}" />
-+		<javac deprecation="false" debug="true" optimize="false" srcdir="${dir.regress}" destdir="${dir.build}">
-+			<classpath>
-+				<path refid="dependencies.path" />
-+			</classpath>
-+		</javac>
-+	</target>
-+
-+	<target name="test" depends="requires-junit,compile-tests,copy" description="Runs the unit tests">
- 		<junit printsummary="yes" haltonfailure="no" forkmode="perBatch">
- 			<classpath>
- 				<path refid="dependencies.path" />
diff --git a/dev-util/pmd/files/pmd-3.9-build.xml.patch b/dev-util/pmd/files/pmd-3.9-build.xml.patch
deleted file mode 100644
index 5ece46caff73..000000000000
--- a/dev-util/pmd/files/pmd-3.9-build.xml.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- bin/build.xml.original	2007-01-14 11:15:09.000000000 +0100
-+++ bin/build.xml	2007-01-14 13:37:41.000000000 +0100
-@@ -15,11 +15,7 @@
- 
- 	<path id="dependencies.path">
- 		<pathelement location="${dir.build}" />
--		<fileset dir="${dir.lib}">
--			<include name="jaxen-1.1-beta-10.jar" />
--			<include name="asm-3.0.jar" />     
--			<include name="backport-util-concurrent.jar" />     
--		</fileset>
-+		<fileset dir="${dir.lib}" includes="*.jar"/>
- 	</path>
- 
- 	<target name="delete" description="Deletes the build directory and the pmd-x.x jar file.">
-@@ -67,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-beta-10.jar asm-3.0.jar backport-util-concurrent.jar" />
- 			</manifest>
- 		</jar>
- 	</target>
-@@ -99,7 +94,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-3.9-launcher-pre-commands b/dev-util/pmd/files/pmd-3.9-launcher-pre-commands
deleted file mode 100644
index b2e48852597d..000000000000
--- a/dev-util/pmd/files/pmd-3.9-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-pre b/dev-util/pmd/files/pmd-pre
deleted file mode 100644
index b2e48852597d..000000000000
--- a/dev-util/pmd/files/pmd-pre
+++ /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/pmd-3.9.ebuild b/dev-util/pmd/pmd-3.9.ebuild
deleted file mode 100644
index 656231bb6d1e..000000000000
--- a/dev-util/pmd/pmd-3.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-3.9.ebuild,v 1.6 2009/10/12 18:58:30 ssuominen Exp $
-
-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.0
-	>=dev-java/backport-util-concurrent-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
-
-# Fails unit tests with sun-jdk-1.6
-DEPEND="
-	app-arch/unzip
-	=dev-java/junit-3.8*
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-		=virtual/jdk-1.5*
-	)
-	!test? ( >=virtual/jdk-1.5 )
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	# We patch build.xml to include all jars in lib dir
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-3.9-build.xml.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar || die
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from asm-3 asm.jar
-	java-pkg_jar-from backport-util-concurrent
-	java-pkg_jar-from jaxen-1.1 jaxen.jar
-	java-pkg_jar-from --build-only junit
-}
-
-EANT_BUILD_XML="bin/build.xml"
-
-src_test() {
-	# fails with sun-jdk-1.6
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1690135&group_id=56262&atid=479921
-	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}
-
-	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/"
-}