new upstream version, partially closes #83366. added ~amd64 to KEYWORDS. ebuilds and patched contributed by Andrew Cowie <andrew@operationaldynamics.com>.

(Portage version: 2.0.51.19)

7 files changed, 129 insertions, 18 deletions

diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index 9f1e3e30f35c..fbbb7b8875c9 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/libgnome-java
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.4 2004/12/28 12:56:34 axxo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.5 2005/03/12 19:08:55 luckyduck Exp $
+
+*libgnome-java-2.8.3.1 (12 Mar 2005)
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch,
+  libgnome-java-2.8.2-r1.ebuild, +libgnome-java-2.8.3.1.ebuild:
+  new upstream version, partially closes #83366. added ~amd64 to KEYWORDS.
+  ebuilds and patched contributed by Andrew Cowie
+  <andrew@operationaldynamics.com>.
 
 * libgnome-java-2.8.2-r1 (17 Nov 2004)
 
diff --git a/dev-java/libgnome-java/Manifest b/dev-java/libgnome-java/Manifest
index eb4dc00a0ec2..bfabd48f9a4e 100644
--- a/dev-java/libgnome-java/Manifest
+++ b/dev-java/libgnome-java/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5f62756e1424061e0e74e6d0324f1bd4 libgnome-java-2.8.2-r1.ebuild 3337
+MD5 70f0c533e5bfdbab289c857965debc39 libgnome-java-2.8.2-r1.ebuild 3344
+MD5 738d8b85d86436cb7f91dafc9c1a4fd5 libgnome-java-2.8.3.1.ebuild 2852
 MD5 ba35c6a80340b7d2aedfd74dcdd0ebfb libgnome-java-2.8.2.ebuild 3209
 MD5 e969690277e5a63b62410bc7d0067218 ChangeLog 1262
 MD5 de0a216d1797f18db9dc83e5aedee360 metadata.xml 1002
 MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2-r1 72
+MD5 efea40cf1a5eb3c48001cde4ead5c123 files/digest-libgnome-java-2.8.3.1 74
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
 MD5 a8a8cdd7ec44ae7402032003fe1bb7ab files/digest-libgnome-java-2.8.2 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0VgQ/rLF9B432nYRAptoAKCrvQhfQiF1TUG2Td2Z+zRdz60qSgCgxp1T
-HdeyCG0mu2NNZ7vbckYSQGc=
-=oxCg
------END PGP SIGNATURE-----
+MD5 d8bbcf350e68bf0a42c37ecbef32c8dd files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
diff --git a/dev-java/libgnome-java/files/digest-libgnome-java-2.8.3.1 b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.3.1
new file mode 100644
index 000000000000..3385e77ebaff
--- /dev/null
+++ b/dev-java/libgnome-java/files/digest-libgnome-java-2.8.3.1
@@ -0,0 +1 @@
+MD5 0ebae50999508b8cdea0e59b4bca869f libgnome-java-2.8.3.1.tar.bz2 351818
diff --git a/dev-java/libgnome-java/files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch b/dev-java/libgnome-java/files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch
new file mode 100644
index 000000000000..9f3a58795431
--- /dev/null
+++ b/dev-java/libgnome-java/files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch
@@ -0,0 +1,12 @@
+diff -Nuar libgnome-java-2.8.3.1-ORIG/configure libgnome-java-2.8.3.1-WORK/configure
+--- libgnome-java-2.8.3.1-ORIG/configure	2005-02-12 12:34:10.000000000 +1100
++++ libgnome-java-2.8.3.1-WORK/configure	2005-02-24 16:35:22.000000000 +1100
+@@ -19563,7 +19563,7 @@
+ apiversion="2.8"
+ VERSION="2.8.3.1"
+ 
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gnome${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/${PN}-${SLOT}/lib/gnome${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ 
+ 
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
index a2898b3dbf7a..df7d7b9e79e6 100644
--- a/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
+++ b/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild,v 1.1 2004/12/28 12:56:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2-r1.ebuild,v 1.2 2005/03/12 19:08:55 luckyduck Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 #
 SLOT="2.8"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="gcj"
 
 src_unpack() {
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
index 24016688c545..40b83cfed73a 100644
--- a/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
+++ b/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild,v 1.2 2004/12/28 12:56:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.2.ebuild,v 1.3 2005/03/12 19:08:55 luckyduck Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
diff --git a/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
new file mode 100644
index 000000000000..311026103c19
--- /dev/null
+++ b/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.8.3.1.ebuild,v 1.1 2005/03/12 19:08:55 luckyduck Exp $
+
+#
+# WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
+# it has, like any GNOME project, a massive autoconf setup, and unlike many 
+# other java libraries, it has its own [necessary] `make install` step.
+# As a result, this ebuild is VERY sensitive to the internal layout of the
+# upstream project. Because these issues are currently evolving upstream,
+# simply version bumping this ebuild is not likely to work but FAILURES WILL
+# BE VERY SUBTLE IF IT DOES NOT WORK.
+# 
+
+inherit eutils gnome.org
+
+DESCRIPTION="Java bindings for the core GNOME libraries (allow GNOME/GTK applications to be written in Java)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=gnome-base/libgnome-2.8.0
+	>=gnome-base/libgnomeui-2.8.0
+	>=dev-java/libgtk-java-2.4.8.1
+	>=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match the gnome apiversion
+#
+SLOT="2.8"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch
+}
+
+src_compile() {
+	local conf
+
+	use gcj	|| conf="${conf} --without-gcj-compile"
+
+	cd ${S}
+
+	#
+	# Ordinarily, moving things around post `make install` would do 
+	# the trick, but there are paths hard coded in .pc files and in the
+	# `make install` step itself that need to be influenced.
+	#
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die
+}
+
+src_install() {
+	# workaround Makefile bug not creating necessary parent directories
+	mkdir -p ${D}/usr/lib
+	mkdir -p ${D}/usr/share/java
+	mkdir -p ${D}/usr/lib/pkgconfig
+	mkdir -p ${D}/usr/share/doc/libgnome${SLOT}-java
+
+	make prefix=${D}/usr install || die
+
+	# actually, at time of writing, there were no DOCUMENTS, but leave it here...
+	mv ${D}/usr/share/doc/libgnome${SLOT}-java ${D}/usr/share/doc/${PF}
+
+	# the upstream install scatters things around a bit. The following cleans
+	# that up to make it policy compliant.
+
+	# I originally tried java-pkg_dojar here, but it has a few glitches 
+	# like not copying symlinks as symlinks which makes a mess.
+
+	dodir /usr/share/${PN}-${SLOT}/lib
+	mv ${D}/usr/share/java/*.jar ${D}/usr/share/${PN}-${SLOT}/lib
+	rm -rf ${D}/usr/share/java
+
+	mkdir ${D}/usr/share/${PN}-${SLOT}/src
+	cd ${S}/src/java
+	zip -r ${D}/usr/share/${PN}-${SLOT}/src/libgnome-java-${PV}.src.zip *
+
+	# again, with dojar misbehaving, better do to this manually for the 
+	# time being. Yes, this is bad hard coding, but what in this ebuild isn't?
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gnome${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}