Revbump to add patch where jdictrayapi does not work on amd64, even tho it has been marked stable.

(Portage version: 2.1.3.15)

4 files changed, 86 insertions, 1 deletions

diff --git a/dev-java/jdictrayapi/ChangeLog b/dev-java/jdictrayapi/ChangeLog
index 4cb58abefe0d..218b73558ef4 100644
--- a/dev-java/jdictrayapi/ChangeLog
+++ b/dev-java/jdictrayapi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jdictrayapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.13 2007/09/28 22:54:08 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.14 2007/10/20 11:37:24 ali_bush Exp $
+
+*jdictrayapi-0.9.1-r3 (20 Oct 2007)
+
+  20 Oct 2007; <alistair@gentoo.org> +files/fix-ctray-libarch.patch,
+  +jdictrayapi-0.9.1-r3.ebuild:
+  Revbump to add patch where jdictrayapi does not work on amd64, even tho it
+  has been marked stable.
 
   28 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   jdictrayapi-0.9.1-r2.ebuild:
diff --git a/dev-java/jdictrayapi/files/digest-jdictrayapi-0.9.1-r3 b/dev-java/jdictrayapi/files/digest-jdictrayapi-0.9.1-r3
new file mode 100644
index 000000000000..7729f899f895
--- /dev/null
+++ b/dev-java/jdictrayapi/files/digest-jdictrayapi-0.9.1-r3
@@ -0,0 +1,3 @@
+MD5 0153e414413ddf4bea8cc9b8a4d81bb9 jdic-0.9.1-src.zip 946706
+RMD160 29193141fc0c2f4592bfa41fac7f73795d189e6d jdic-0.9.1-src.zip 946706
+SHA256 2b455c657c815650dd42b9a08714d561419b8da423009c710f046aadbe83e69b jdic-0.9.1-src.zip 946706
diff --git a/dev-java/jdictrayapi/files/fix-ctray-libarch.patch b/dev-java/jdictrayapi/files/fix-ctray-libarch.patch
new file mode 100644
index 000000000000..c3e25031e60a
--- /dev/null
+++ b/dev-java/jdictrayapi/files/fix-ctray-libarch.patch
@@ -0,0 +1,23 @@
+--- src/unix/native/jni/Tray.c	2007-10-20 21:57:59.000000000 +1300
++++ src/unix/native/jni/Tray.c	2007-10-21 00:19:25.000000000 +1300
+@@ -73,9 +73,9 @@
+  */
+ static void *awtHandle = NULL;
+ 
+-#ifdef __linux__
+-#define LIBARCH  "i386"
+-#else
++#ifdef __x86_64
++#define LIBARCH "amd64"
++#endif
+ #ifdef __i386
+ #define LIBARCH "i386"
+ #endif
+@@ -85,7 +85,6 @@
+ #ifdef __sparcv9
+ #define LIBARCH "sparcv9"
+ #endif
+-#endif
+ 
+ #define REFLECT_VOID_FUNCTION(name, arglist, paramlist)			\
+ typedef name##_type arglist;						\
diff --git a/dev-java/jdictrayapi/jdictrayapi-0.9.1-r3.ebuild b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..bbfd86280657
--- /dev/null
+++ b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/jdictrayapi-0.9.1-r3.ebuild,v 1.1 2007/10/20 11:37:24 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="jdic"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="The JDesktop Integration Components (JDIC) tray icon API"
+HOMEPAGE="https://jdic.dev.java.net/"
+SRC_URI="https://jdic.dev.java.net/files/documents/880/16466/${MY_P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_P}-src/${MY_PN}"
+
+#Patch takes care of it
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/0.8.7-gentoo.patch"
+	epatch "${FILESDIR}/fix-ctray-libarch.patch"
+	find -type d -name CVS -exec rm -r {} \; >/dev/null 2>&1
+}
+
+src_compile() {
+	eant buildunixjar buildunixjni_tray $(use_doc docs)
+}
+
+src_install() {
+	cd "${S}/dist/linux"
+	java-pkg_dojar jdic.jar
+	java-pkg_doso libtray.so
+	use doc && java-pkg_dojavadoc "${S}/../docs"
+	use source && java-pkg_dosrc "${S}/src/share/classes/*" "${S}/src/unix/classes/*"
+	if use examples; then
+		dodir "/usr/share/doc/${PF}/examples"
+		cp -r "${S}/demo/Tray/*" "${D}/usr/share/doc/${PF}/examples/"
+	fi
+}