4 files changed, 6 insertions, 117 deletions
diff --git a/dev-java/xmlunit/ChangeLog b/dev-java/xmlunit/ChangeLog
index 40e79a5008d5..7b166a622b96 100644
--- a/dev-java/xmlunit/ChangeLog
+++ b/dev-java/xmlunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xmlunit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.19 2009/12/28 08:47:41 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/ChangeLog,v 1.20 2010/04/05 23:52:25 caster Exp $
+
+  05 Apr 2010; Vlastimil Babka <caster@gentoo.org> -xmlunit-1.0-r2.ebuild,
+  -files/xmlunit-1.0-gentoo.patch, -files/xmlunit-1.0-r2-build.xml.patch:
+  Remove old.
 
   28 Dec 2009; Joseph Jezak <josejx@gentoo.org> xmlunit-1.3.ebuild:
   Marked ppc stable.
diff --git a/dev-java/xmlunit/files/xmlunit-1.0-gentoo.patch b/dev-java/xmlunit/files/xmlunit-1.0-gentoo.patch
deleted file mode 100644
index 12fdf3c65155..000000000000
--- a/dev-java/xmlunit/files/xmlunit-1.0-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -uprN xmlunit.orig/build.xml xmlunit/build.xml
---- xmlunit.orig/build.xml	2005-03-16 17:52:33.874787320 +0100
-+++ xmlunit/build.xml	2005-03-16 17:52:59.151944608 +0100
-@@ -25,7 +25,7 @@
- 
-   <target name="compile" depends="init">
-     <mkdir dir="${out.dir}"/>
--    <javac srcdir="${src.dir}/java:${test.dir}/java" destdir="${out.dir}" debug="on" target="1.2">
-+    <javac srcdir="${src.dir}/java:${test.dir}/java" destdir="${out.dir}" debug="off" source="1.3" target="1.3">
-       <classpath>
-         <pathelement location="${xmlxsl.lib}"/>
-         <pathelement location="${junit.lib}"/>
-@@ -96,7 +96,7 @@
-   </target>
- 
-   <target name="jar" depends="clean,setDistVersion,compile">
--    <jar jarfile="${lib.dir}/xmlunit${xmlunit.version}.jar"
-+    <jar jarfile="${lib.dir}/xmlunit.jar"
-        basedir="${out.dir}"
-        excludes="**/test_*.class"
-     />
-@@ -138,4 +138,4 @@
-     <delete file="${dist.name}-src.tar" />
-   </target>
- 
--</project>
-+  </project>
diff --git a/dev-java/xmlunit/files/xmlunit-1.0-r2-build.xml.patch b/dev-java/xmlunit/files/xmlunit-1.0-r2-build.xml.patch
deleted file mode 100644
index c3875cd15d1d..000000000000
--- a/dev-java/xmlunit/files/xmlunit-1.0-r2-build.xml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- build.xml.original	2007-01-30 14:55:01.000000000 +0100
-+++ build.xml	2007-01-30 20:12:02.000000000 +0100
-@@ -34,9 +34,9 @@
-     </javac>
-   </target>
- 
--  <target name="test" depends="clean,compile">
-+  <target name="test" depends="compile">
-     <mkdir dir="${test.report.dir}"/>
--    <junit printsummary="yes" haltonfailure="no" fork="yes">
-+    <junit printsummary="yes" haltonfailure="yes" fork="yes">
-       <sysproperty key="basedir" value="${basedir}"/>
-       <sysproperty key="user.dir" value="${basedir}"/>
-       <!--
-@@ -78,7 +78,6 @@
-     <mkdir dir="${docs.dir}"/>
-     <delete includeEmptyDirs="true" dir="${docs.dir}/org"/>
-     <javadoc destdir="${docs.dir}"
--      overview="${src.dir}/java/overview.html"
-       windowtitle="XMLUnit Documentation"
-       footer="&lt;p&gt;&lt;a href=&quot;http://xmlunit.sourceforge.net/&quot;&gt;XMLUnit&lt;/a&gt; is hosted by sourceforge.net&lt;/p&gt;">
-       <group title="XMLUnit v${xmlunit.version}"
diff --git a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild b/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
deleted file mode 100644
index db30d34dddc7..000000000000
--- a/dev-java/xmlunit/xmlunit-1.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.0-r2.ebuild,v 1.8 2009/11/17 16:55:02 caster Exp $
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML."
-SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip"
-HOMEPAGE="http://xmlunit.sourceforge.net/"
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-# We depend on jdk-1.4 as tests fail with jdk > 1.4
-# see http://sourceforge.net/tracker/index.php?func=detail&aid=1614984&group_id=23187&atid=377768
-# Also docs cannot be built with jdk > 1.5
-CDEPEND="=dev-java/junit-3*"
-DEPEND="
-	app-arch/unzip
-	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-# tests fail with 1.5 JDK
-RESTRICT="test"
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PVR}-build.xml.patch"
-	rm -v "${S}/lib/"*.jar || die
-
-	java-ant_rewrite-classpath
-}
-
-EANT_DOC_TARGET="docs"
-EANT_GENTOO_CLASSPATH="junit"
-
-src_test() {
-	if use test; then
-		ANT_TASKS="ant-junit ant-trax" eant test
-	else
-		echo "USE=test not enabled, skipping tests."
-	fi
-}
-
-src_install() {
-	java-pkg_newjar lib/${PN}${PV}.jar
-
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
-	elog "Please note that ${PN} has some problems with JDKs > 1.4. For details see:"
-	elog "http://sourceforge.net/tracker/index.php?func=detail&aid=1614984&group_id=23187&atid=377768"
-}