Version bump.

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

3 files changed, 126 insertions, 1 deletions

diff --git a/dev-java/dbus-java/ChangeLog b/dev-java/dbus-java/ChangeLog
index 85de6c58b5ed..d01adbc1ec8b 100644
--- a/dev-java/dbus-java/ChangeLog
+++ b/dev-java/dbus-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/dbus-java
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.7 2009/01/23 17:55:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.8 2009/04/29 17:53:35 serkan Exp $
+
+*dbus-java-2.6 (29 Apr 2009)
+
+  29 Apr 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/dbus-java-2.6-disconnectfix.patch, +dbus-java-2.6.ebuild:
+  Version bump.
 
   23 Jan 2009; Brent Baude <ranger@gentoo.org> dbus-java-2.5.1.ebuild:
   Marking dbus-java-2.5.1 ppc64 for bug 253054
diff --git a/dev-java/dbus-java/dbus-java-2.6.ebuild b/dev-java/dbus-java/dbus-java-2.6.ebuild
new file mode 100644
index 000000000000..3d3edb54bd0b
--- /dev/null
+++ b/dev-java/dbus-java/dbus-java-2.6.ebuild
@@ -0,0 +1,98 @@
+# 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.6.ebuild,v 1.1 2009/04/29 17:53:35 serkan Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2
+
+DESCRIPTION="Java bindings for the D-Bus messagebus."
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=virtual/jre-1.5
+	>=dev-java/libmatthew-java-0.7-r1"
+
+DEPEND=">=virtual/jdk-1.5
+	app-text/docbook-sgml-utils
+	dev-java/libmatthew-java
+	sys-devel/gettext
+	doc? (
+		dev-tex/tex4ht
+		dev-texlive/texlive-latexextra
+	)"
+
+java_prepare() {
+	epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch"
+	epatch "${FILESDIR}/${P}-disconnectfix.patch"
+}
+
+src_compile() {
+	local debug="disable"
+	use debug && debug="enable"
+	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
+	emake -j1 JCFLAGS="$(java-pkg_javac-args)" \
+		STRIP=echo DEBUG=${debug} JAVAUNIXJARDIR=${libdir} bin || die "emake failed"
+
+	for i in *.sgml; do
+		docbook2man $i || die;
+		mv DBUS-JAVA.1 $(echo $i | sed 's/sgml/1/g') || die;
+	done
+
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	local debug="disable"
+	use debug && debug="enable"
+	for jar in unix debug-${debug}; do
+		java-pkg_register-dependency libmatthew-java ${jar}.jar
+	done
+	java-pkg_newjar lib${P}.jar dbus.jar
+	java-pkg_newjar dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+	java-pkg_newjar dbus-java-bin-${PV}.jar dbus-java-bin.jar
+	local javaargs='-DPid=$$'
+	javaargs="${javaargs} -DVersion=${PV}"
+
+	java-pkg_dolauncher CreateInterface \
+		--main org.freedesktop.dbus.bin.CreateInterface \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusViewer \
+		--main org.freedesktop.dbus.viewer.DBusViewer \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher ListDBus \
+		--main org.freedesktop.dbus.bin.ListDBus \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusDaemon \
+		--main org.freedesktop.dbus.bin.DBusDaemon \
+		--java_args "${javaargs}"
+
+	java-pkg_dolauncher DBusCall \
+		--main org.freedesktop.dbus.bin.Caller \
+		--java_args "${javaargs}"
+
+	doman *.1
+	dodoc INSTALL changelog AUTHORS README || die
+	use source && java-pkg_dosrc org/
+	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/dbus-java-2.6-disconnectfix.patch b/dev-java/dbus-java/files/dbus-java-2.6-disconnectfix.patch
new file mode 100644
index 000000000000..73825676ddb7
--- /dev/null
+++ b/dev-java/dbus-java/files/dbus-java-2.6-disconnectfix.patch
@@ -0,0 +1,21 @@
+diff --git a/org/freedesktop/dbus/Error.java b/org/freedesktop/dbus/Error.java
+index 16e1126..9db1e07 100644
+--- a/org/freedesktop/dbus/Error.java
++++ b/org/freedesktop/dbus/Error.java
+@@ -17,6 +17,7 @@ import java.util.Vector;
+ import org.freedesktop.dbus.exceptions.DBusException;
+ import org.freedesktop.dbus.exceptions.DBusExecutionException;
+ import org.freedesktop.dbus.exceptions.MessageFormatException;
++import org.freedesktop.dbus.exceptions.NotConnected;
+ 
+ import cx.ath.matthew.debug.Debug;
+ 
+@@ -79,6 +80,7 @@ public class Error extends Message
+    @SuppressWarnings("unchecked")
+    private static Class<? extends DBusExecutionException> createExceptionClass(String name)
+    {
++      if (name == "org.freedesktop.DBus.Local.Disconnected") return NotConnected.class;
+       Class<? extends DBusExecutionException> c = null;
+       do {
+          try {
+