summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2010-01-11 22:04:16 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2010-01-11 22:04:16 +0000
commit353326995e3e6dd80b05f1b81c70ec7ba10474d0 (patch)
tree8475ebfa2489653e13dfa4b402ca0e2aba74b367
parentstable ppc64, bug 289327 (diff)
downloadgentoo-2-353326995e3e6dd80b05f1b81c70ec7ba10474d0.tar.gz
gentoo-2-353326995e3e6dd80b05f1b81c70ec7ba10474d0.tar.bz2
gentoo-2-353326995e3e6dd80b05f1b81c70ec7ba10474d0.zip
Add patch to fix test suite. Thanks to andreas.schuerch@nativenet.ch for pointing out the upstream commit. Reported in bug #254325.
(Portage version: 2.2_rc61/cvs/Linux i686)
-rw-r--r--dev-java/commons-betwixt/ChangeLog9
-rw-r--r--dev-java/commons-betwixt/commons-betwixt-0.8.ebuild10
-rw-r--r--dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch16
3 files changed, 30 insertions, 5 deletions
diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 0e924cb936b5..55b5fd0459bd 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/commons-betwixt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.20 2009/03/18 14:59:06 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.21 2010/01/11 22:04:15 betelgeuse Exp $
+
+ 11 Jan 2010; Petteri Räty <betelgeuse@gentoo.org>
+ commons-betwixt-0.8.ebuild, +files/commons-betwixt-0.8-test-dtd.patch:
+ Add patch to fix test suite. Thanks to andreas.schuerch@nativenet.ch for
+ pointing out the upstream commit. Reported in bug #254325.
18 Mar 2009; Brent Baude <ranger@gentoo.org> commons-betwixt-0.8.ebuild:
stable ppc, bug 254325
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
index 39ffcc0e871d..748be30214c5 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.4 2009/03/18 14:59:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.5 2010/01/11 22:04:15 betelgeuse Exp $
-EAPI=1
+EAPI=2
JAVA_PKG_IUSE="doc test source"
inherit java-pkg-2 eutils java-ant-2
@@ -36,6 +36,10 @@ JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-digester,commons-logging"
EANT_BUILD_TARGET="init jar"
+java_prepare() {
+ epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch"
+}
+
src_test() {
java-pkg_jar-from --into target/lib xerces-2,junit
ANT_TASKS="ant-junit" eant test -DJunit.present=true
diff --git a/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
new file mode 100644
index 000000000000..221874bd4995
--- /dev/null
+++ b/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
@@ -0,0 +1,16 @@
+--- commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml 2006-12-21 23:14:19.000000000 +0100
++++ commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml.new 2010-01-11 21:48:59.000000000 +0100
+@@ -15,10 +15,12 @@
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
++
++<!--
+ <!DOCTYPE rss PUBLIC
+ "-//Netscape Communications//DTD RSS 0.91//EN"
+ "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+-
++-->
+ <rss version="0.91">
+
+ <channel>