Fix test failure reported Markus Meier <maekke@gentoo.org> in bug #253054.

(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 62 insertions, 4 deletions

diff --git a/dev-java/dbus-java/ChangeLog b/dev-java/dbus-java/ChangeLog
index 0f56c524cf9d..9f8dfbda2b2c 100644
--- a/dev-java/dbus-java/ChangeLog
+++ b/dev-java/dbus-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dbus-java
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.4 2008/11/28 05:18:29 serkan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.5 2009/01/08 18:07:41 serkan Exp $
+
+  08 Jan 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/TestSignalInterface2-2.5.1.java, dbus-java-2.5.1.ebuild:
+  Fix test failure reported Markus Meier <maekke@gentoo.org> in bug #253054.
 
 *dbus-java-2.5.1 (28 Nov 2008)
 
diff --git a/dev-java/dbus-java/dbus-java-2.5.1.ebuild b/dev-java/dbus-java/dbus-java-2.5.1.ebuild
index ddceba281375..171cf29193fa 100644
--- a/dev-java/dbus-java/dbus-java-2.5.1.ebuild
+++ b/dev-java/dbus-java/dbus-java-2.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.5.1.ebuild,v 1.1 2008/11/28 05:18:29 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.5.1.ebuild,v 1.2 2009/01/08 18:07:41 serkan Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2
@@ -30,6 +30,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
 	epatch "${FILESDIR}/${P}-jarfixes.patch"
+	cp -v "${FILESDIR}"/TestSignalInterface2-${PV}.java org/freedesktop/dbus/test/TestSignalInterface2.java || die "cp failed"
 }
 
 src_compile() {
@@ -87,3 +88,11 @@ src_install() {
 	use doc && java-pkg_dojavadoc doc/api
 	use doc && java-pkg_dohtml doc/dbus-java/*
 }
+
+src_test() {
+	local debug="disable"
+	use debug && debug="enable"
+	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+	emake -j1 JCFLAGS="$(java-pkg_javac-args) -encoding UTF-8" \
+		DEBUG=${debug} JAVAUNIXJARDIR=${libdir} JAVAUNIXLIBDIR=/usr/lib/libmatthew-java check || die "emake check failed"
+}
diff --git a/dev-java/dbus-java/files/TestSignalInterface2-2.5.1.java b/dev-java/dbus-java/files/TestSignalInterface2-2.5.1.java
new file mode 100644
index 000000000000..d5c9ac521c4e
--- /dev/null
+++ b/dev-java/dbus-java/files/TestSignalInterface2-2.5.1.java
@@ -0,0 +1,45 @@
+/*
+   D-Bus Java Implementation
+   Copyright (c) 2005-2006 Matthew Johnson
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of either the GNU Lesser General Public License Version 2 or the
+   Academic Free Licence Version 2.1.
+
+   Full licence texts are included in the COPYING file with this program.
+*/
+package org.freedesktop.dbus.test;
+
+import org.freedesktop.DBus.Description;
+import org.freedesktop.dbus.DBusInterface;
+import org.freedesktop.dbus.DBusInterfaceName;
+import org.freedesktop.dbus.DBusMemberName;
+import org.freedesktop.dbus.DBusSignal;
+import org.freedesktop.dbus.UInt32;
+import org.freedesktop.dbus.exceptions.DBusException;
+
+import java.util.List;
+
+/**
+ * A sample signal with two parameters
+ */
+@Description("Test interface containing signals")
+@DBusInterfaceName("some.other.interface.Name")
+public interface TestSignalInterface2 extends DBusInterface
+{
+   @Description("Test basic signal")
+   public static class TestRenamedSignal extends DBusSignal
+   {
+      public final String value;
+      public final UInt32 number;
+      /**
+       * Create a signal.
+       */
+      public TestRenamedSignal(String path, String value, UInt32 number) throws DBusException
+      {
+         super(path, value, number);
+         this.value = value;
+         this.number = number;
+      }
+   }
+}