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

Package-Manager: portage-2.0.51.19

6 files changed, 131 insertions, 5 deletions

diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index ca60a33766ec..b853908cd2f3 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 1920322b7e7f90d04b39df535a4e56cf java-gnome-0.8.3.ebuild 1718
+MD5 88862360c3114c1b120b67b920588025 java-gnome-2.8.3.ebuild 3670
 MD5 dc04448f7107a94272809bab3ee30f54 java-gnome-2.8.2-r3.ebuild 3681
 MD5 a913b8618deea9bc78baa4068d631c09 java-gnome-2.6.0.1-r1.ebuild 2769
 MD5 87db35b4683d2c78db7d7adb8e6b926e java-gnome-2.6.0.1.ebuild 2702
-MD5 8e97f9815f403bf5be8235fe1bc98c2f ChangeLog 4906
+MD5 73f16320ecfbf1642fd2001a2ea3d088 ChangeLog 5174
 MD5 c690ad784a76f64ea8a11d1cdddd055c metadata.xml 1094
 MD5 f7abd70c5ed0df68df8aef1f19d38a10 java-gnome-2.8.2-r2.ebuild 3674
 MD5 95eae7ebf2d8a9d2443cb7f138aab94b files/java-gnome-0.8.3-gentoo.diff 3998
@@ -12,3 +16,11 @@ MD5 3b0e994589f54485c4c6f43618005bc7 files/gentoo-java-gnome-2.6.0.1.patch 3574
 MD5 a26e989caf78aa69cbd7e1572f1f6d35 files/digest-java-gnome-2.6.0.1 72
 MD5 a26e989caf78aa69cbd7e1572f1f6d35 files/digest-java-gnome-2.6.0.1-r1 72
 MD5 d0548db82a1916704411084a9a019f05 files/digest-java-gnome-0.8.3 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-gnome-2.8.3 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCM0Mj06ebR+OMO78RAlnmAJ0fHTN56lNKV30dGwFWngSG9DazswCcDLP1
+fWMJ5GuFzCOtscOhgJl1l/s=
+=M4kd
+-----END PGP SIGNATURE-----
diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index 8aed17864935..84c62e088690 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/libgconf-java
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.4 2004/12/28 12:55:12 axxo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.5 2005/03/12 19:25:34 luckyduck Exp $
+
+*libgconf-java-2.8.3.1 (12 Mar 2005)
+
+  12 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch,
+  +libgconf-java-2.8.3.1.ebuild:
+  new upstream version, partially closes #83366. added ~amd64 to KEYWORDS.
+  ebuilds and patches contributed by Andrew Cowie
+  <andrew@operationaldynamics.com>.
 
   28 Dec 2004; Thomas Matthijs <axxo@gentoo.org> libgconf-java-2.8.2.ebuild:
   make it find jni.h
diff --git a/dev-java/libgconf-java/files/digest-libgconf-java-2.8.3.1 b/dev-java/libgconf-java/files/digest-libgconf-java-2.8.3.1
new file mode 100644
index 000000000000..a04272ef5151
--- /dev/null
+++ b/dev-java/libgconf-java/files/digest-libgconf-java-2.8.3.1
@@ -0,0 +1 @@
+MD5 0536a0433b0fffbbabcdb6ad5c59ea93 libgconf-java-2.8.3.1.tar.bz2 233574
diff --git a/dev-java/libgconf-java/files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch b/dev-java/libgconf-java/files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch
new file mode 100644
index 000000000000..6e5d7080a469
--- /dev/null
+++ b/dev-java/libgconf-java/files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch
@@ -0,0 +1,12 @@
+diff -Nuar libgconf-java-2.8.3.1-ORIG/configure libgconf-java-2.8.3.1-WORK/configure
+--- libgconf-java-2.8.3.1-ORIG/configure	2005-02-12 13:03:15.000000000 +1100
++++ libgconf-java-2.8.3.1-WORK/configure	2005-02-24 17:34:16.000000000 +1100
+@@ -19563,7 +19563,7 @@
+ apiversion="2.8"
+ VERSION="2.8.3.1"
+ 
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gconf${apiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/${PN}-${SLOT}/lib/gconf${apiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+ 
+ 
diff --git a/dev-java/libgconf-java/libgconf-java-2.8.2.ebuild b/dev-java/libgconf-java/libgconf-java-2.8.2.ebuild
index 7971dbf554b5..67f4adca65e4 100644
--- a/dev-java/libgconf-java/libgconf-java-2.8.2.ebuild
+++ b/dev-java/libgconf-java/libgconf-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/libgconf-java/libgconf-java-2.8.2.ebuild,v 1.2 2004/12/28 12:55:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.2.ebuild,v 1.3 2005/03/12 19:25:34 luckyduck Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries,
diff --git a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
new file mode 100644
index 000000000000..9bda0a24a319
--- /dev/null
+++ b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.1 2005/03/12 19:25:34 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 GConf (allows GNOME/GTK applications writen in Java to store configuration information in gconf)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=gnome-base/gconf-2.8.0
+	>=dev-java/libgtk-java-2.4.8.1
+	>=virtual/jre-1.2"
+
+#	It's not clear whether gnome is a gconf dependency or not.
+#	>=dev-java/libgnome-java-2.8.2-r1
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match gconf's apiversion
+#
+SLOT="2.8"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch
+}
+
+src_compile() {
+	local conf
+
+	use gcj	|| conf="${conf} --without-gcj-compile"
+
+	cd ${S}
+
+	./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/libgconf${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/libgconf${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/libgconf-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/gconf${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}