Updates from Andrew, partial fix for #87978.

Package-Manager: portage-2.0.51.19

6 files changed, 106 insertions, 14 deletions

diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index d8b4c14f323a..f01499648923 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/libgconf-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.6 2005/03/31 18:34:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.7 2005/05/01 16:32:37 karltk Exp $
+
+*libgconf-java-2.10.1 (01 May 2005)
+
+  01 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/libgconf-java-2.10.0_fix-install-dir.patch,
+  libgconf-java-2.8.3.1.ebuild, +libgconf-java-2.10.1.ebuild:
+  Updates from Andrew Cowie <andrew@operationaldynamics.com>, partial fix for
+  #87978.
 
   31 Mar 2005; Thomas Matthijs <axxo@gentoo.org>
   libgconf-java-2.8.3.1.ebuild:
diff --git a/dev-java/libgconf-java/Manifest b/dev-java/libgconf-java/Manifest
index 79970eeb3062..afdf7c9c5ba6 100644
--- a/dev-java/libgconf-java/Manifest
+++ b/dev-java/libgconf-java/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 86aa5165e23181f48792bc0839c75cd0 ChangeLog 1209
+MD5 4149ae05ee1e2c082c1a877c5f0b06be ChangeLog 1509
 MD5 f39b14065c28ae93e38cd4be361f9e7d libgconf-java-2.8.2.ebuild 3388
 MD5 2e1952c33e5bcce8813dec9d43203e29 metadata.xml 1042
-MD5 ebe9465a3c20bb057c5726f8885f77d3 libgconf-java-2.8.3.1.ebuild 2912
+MD5 04cd846335df9297e3a2400757c0dab3 libgconf-java-2.10.1.ebuild 2279
+MD5 cba5c94bb2ef8da0af2584d970526f2e libgconf-java-2.8.3.1.ebuild 2915
 MD5 f68363dbf78345af0bea956d309d2f66 files/digest-libgconf-java-2.8.2 71
 MD5 073d974cdf39c3e94b0da21e0b2e9231 files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 03c4b5ccb943b51e5259e5046ff30719 files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994
+MD5 00133abfc0fddd7799314a248ebeb6c9 files/digest-libgconf-java-2.10.1 73
+MD5 4028a5325b5787c89a1eceddb66bc437 files/libgconf-java-2.10.0_fix-install-dir.patch 420
 MD5 fa4698389381ae96bb70cc672750fe57 files/digest-libgconf-java-2.8.3.1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCTELL/rLF9B432nYRAivVAJ97b8ycOEQz16qjG/ba2hPftsFrWgCgp8dy
-jPXN9PnLSUJzfWvLgTPNiIA=
-=T7wM
------END PGP SIGNATURE-----
diff --git a/dev-java/libgconf-java/files/digest-libgconf-java-2.10.1 b/dev-java/libgconf-java/files/digest-libgconf-java-2.10.1
new file mode 100644
index 000000000000..a943d309c2c6
--- /dev/null
+++ b/dev-java/libgconf-java/files/digest-libgconf-java-2.10.1
@@ -0,0 +1 @@
+MD5 73efb6effd65e1fe1b949adb8c70d5db libgconf-java-2.10.1.tar.bz2 232533
diff --git a/dev-java/libgconf-java/files/libgconf-java-2.10.0_fix-install-dir.patch b/dev-java/libgconf-java/files/libgconf-java-2.10.0_fix-install-dir.patch
new file mode 100644
index 000000000000..c45768f4f94e
--- /dev/null
+++ b/dev-java/libgconf-java/files/libgconf-java-2.10.0_fix-install-dir.patch
@@ -0,0 +1,11 @@
+--- libgconf-java-2.10.0/Makefile.in	2005-03-06 17:05:12.000000000 -0500
++++ fixed/Makefile.in	2005-04-04 00:42:45.000000000 -0400
+@@ -1066,7 +1066,7 @@
+ @BUILD_JAVADOC_TRUE@	touch doc-stamp
+ 
+ install-data-hook:
+-	cd $(DESTDIR)$(datadir)/java && \
++	cd $(DESTDIR)$(jardir) && \
+ 		mv -f gconf$(apiversion).jar gconf$(apiversion)-$(VERSION).jar && \
+ 		$(LN_S) gconf$(apiversion)-$(VERSION).jar gconf$(apiversion).jar
+ 
diff --git a/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
new file mode 100644
index 000000000000..8751ea22a6c3
--- /dev/null
+++ b/dev-java/libgconf-java/libgconf-java-2.10.1.ebuild
@@ -0,0 +1,78 @@
+# 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.10.1.ebuild,v 1.1 2005/05/01 16:32:37 karltk 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.10.0
+	>=dev-java/libgtk-java-2.6.2
+	>=dev-java/libgnome-java-2.10.1
+	>=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match gconf's apiversion
+#
+SLOT="2.10"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/libgconf-java-2.10.0_fix-install-dir.patch
+
+	sed -i \
+		-e "s:/share/${PN}/:/share/${PN}-${SLOT}/:" \
+		-e "s:/share/java/:/share/${PN}-${SLOT}/lib/:" \
+		configure || die "sed configure error"
+}
+
+src_compile() {
+	local conf
+
+	use gcj	|| conf="${conf} --without-gcj-compile"
+
+	cd ${S}
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--with-jardir=/usr/share/${PN}-${SLOT}/lib \
+			${conf} || die "./configure failed"
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+
+	mkdir ${D}/usr/share/${PN}-${SLOT}/src
+	cd ${S}/src/java
+	find . -name '*.java' | xargs zip ${D}/usr/share/${PN}-${SLOT}/src/libgconf-java-${PV}.src.zip
+
+	# 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
+}
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
index 7b7dcda7f6b2..9e305c5895fd 100644
--- a/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/03/31 18:34:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.8.3.1.ebuild,v 1.3 2005/05/01 16:32:37 karltk Exp $
 
 #
 # WARNING: Because java-gnome is a set of bindings to native GNOME libraries, 
@@ -52,6 +52,7 @@ src_compile() {
 		--host=${CHOST} \
 		--prefix=/usr \
 			${conf} || die "./configure failed"
+
 	make INCLUDES="-I${JDK_HOME}/include -I${JDK_HOME}/include/linux/" || die
 }