Partial fix for #83366.

Package-Manager: portage-2.0.51.16

7 files changed, 170 insertions, 13 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index 37aaece4c6e2..5c5121d8239a 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/libgtk-java
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.4 2004/12/28 12:57:07 axxo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.5 2005/03/02 14:26:20 karltk Exp $
+
+*libgtk-java-2.4.8.1 (02 Mar 2005)
+
+  02 Mar 2005; Karl Trygve Kalleberg <karltk@gentoo.org> metadata.xml,
+  +files/libgtk-java-2.4.8.1_find-jni.patch,
+  +files/libgtk-java-2.4.8.1_fix-TextBuffer.patch,
+  +files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch,
+  +libgtk-java-2.4.8.1.ebuild:
+  New upstream release. Ebuild submitted by Andrew F. Cowie
+  <afcowie@operationaldynamics.com>. Partial fix for #83366.
 
 * libgtk-java-2.4.7.2 (27 Dec 2004)
 
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index ca6c0b7bf88e..ff316cf88346 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,23 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8cb11393c9eb31237b9b1a6ace840f1b libgtk-java-2.4.8.1.ebuild 3346
 MD5 41ccd73b971613a795b578f97a702cbd libgtk-java-2.4.6-r2.ebuild 3043
 MD5 20764715913c1c083549f17b669148ba libgtk-java-2.4.7.2.ebuild 3343
 MD5 fb7e56cb47cba5872442e1bfa7ea4d2d libgtk-java-2.4.6-r1.ebuild 3007
-MD5 1b684f88633a7c8ae35570168e799eed ChangeLog 2900
+MD5 b2b02a03fffd9eda8b99b6d466db4d06 ChangeLog 3309
 MD5 23e70539fce4ef96d51e3043420acb8c metadata.xml 975
 MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r1 70
 MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r2 70
 MD5 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
+MD5 fc26b5e15e1e19216390e328d36237f2 files/libgtk-java-2.4.8.1_find-jni.patch 662
 MD5 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
+MD5 4130379b76854eac4060c133f20a765d files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch 527
 MD5 44a67ac512c028ffef92f3a0ed1bc196 files/digest-libgtk-java-2.4.7.2 72
+MD5 c9b06cd33dfa81082635f38a375da14d files/digest-libgtk-java-2.4.8.1 72
+MD5 40c9acf29309ee98632a536eba5ef6a9 files/libgtk-java-2.4.8.1_fix-TextBuffer.patch 802
 MD5 21907163f2b6597c520b7c1a4da20784 files/libgtk-java-2.4.6_find_jni.patch 369
 MD5 40956547f4eb0b797359f67f6c6910bb files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch 689
 MD5 e8a6ddb689376b8e04d3bc41cca48253 files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch 394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0Vgu/rLF9B432nYRAvXIAKC/F4VayNNoKkhZloz5pAjZHTXIUwCgwUYI
-Nvi4oL6BoqEUBnwHNxc/h68=
-=uA1T
------END PGP SIGNATURE-----
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.8.1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.8.1
new file mode 100644
index 000000000000..4bf7e5d44d10
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.8.1
@@ -0,0 +1 @@
+MD5 10126163272672dd3cc1c261ba9f524e libgtk-java-2.4.8.1.tar.bz2 746672
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_find-jni.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_find-jni.patch
new file mode 100644
index 000000000000..6b2932e33c40
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_find-jni.patch
@@ -0,0 +1,12 @@
+diff -Nuar libgtk-java-2.4.8.1-ORIG/Makefile.in libgtk-java-2.4.8.1-WORK/Makefile.in
+--- libgtk-java-2.4.8.1-ORIG/Makefile.in	2005-02-12 11:52:04.000000000 +1100
++++ libgtk-java-2.4.8.1-WORK/Makefile.in	2005-02-26 20:18:44.000000000 +1100
+@@ -1407,7 +1407,7 @@
+ @BUILD_GCJ_TRUE@am_libgtkjni_la_rpath = -rpath $(libdir)
+ exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(example_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I${JDK_HOME}/include -I${JDK_HOME}/include/linux/
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_fix-TextBuffer.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_fix-TextBuffer.patch
new file mode 100644
index 000000000000..d684b06c7301
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_fix-TextBuffer.patch
@@ -0,0 +1,16 @@
+--- libgtk-java-2.4.8.1/src/jni/org_gnu_gtk_TextBuffer.c	2005-01-31 13:15:32.000000000 +1100
++++ cvs/gnome2/java-gnome-2.8/libgtk-java/src/jni/org_gnu_gtk_TextBuffer.c	2005-02-25 02:57:45.000000000 +1100
+@@ -68,11 +68,11 @@
+  * Method:    gtk_text_buffer_get_tag_table
+  * Signature: (I)I
+  */
+-JNIEXPORT jint JNICALL Java_org_gnu_gtk_TextBuffer_gtk_1text_1buffer_1get_1tag_1table (JNIEnv *env, jclass cls, jobject buffer) 
++JNIEXPORT jobject JNICALL Java_org_gnu_gtk_TextBuffer_gtk_1text_1buffer_1get_1tag_1table (JNIEnv *env, jclass cls, jobject buffer) 
+ {
+     GtkTextBuffer *buffer_g = 
+         (GtkTextBuffer*)getPointerFromHandle(env, buffer);
+-    return (jint)gtk_text_buffer_get_tag_table (buffer_g);
++    return getHandleFromPointer(env, gtk_text_buffer_get_tag_table (buffer_g));
+ }
+ 
+ /*
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch
new file mode 100644
index 000000000000..452fb25a4197
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch
@@ -0,0 +1,14 @@
+--- libgtk-java-2.4.8.1-ORIG/configure	2005-02-12 11:52:07.000000000 +1100
++++ libgtk-java-2.4.8.1-WORK/configure	2005-02-24 15:09:31.000000000 +1100
+@@ -19806,9 +19806,9 @@
+ gtkapiversion="2.4"
+ 
+ 
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gtk${gtkapiversion}-${VERSION}.jar
++INSTALLED_CLASSPATH=\${prefix}/share/${PN}-${SLOT}/lib/gtk${gtkapiversion}-${VERSION}.jar
+ INSTALLED_JNI_DIR=\${prefix}/lib/
+-INSTALLED_MACRO_DIR=\${prefix}/share/libgtk-java/macros/
++INSTALLED_MACRO_DIR=\${prefix}/share/${PN}-${SLOT}/macros/
+ 
+ 
+ 
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild
new file mode 100644
index 000000000000..29a89775552d
--- /dev/null
+++ b/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.8.1.ebuild,v 1.1 2005/03/02 14:26:20 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 GTK libraries (allow GTK applications to be written in Java)"
+HOMEPAGE="http://java-gnome.sourceforge.net/"
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=virtual/jre-1.2"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.2
+	app-arch/zip"
+
+#
+# Critical that this match gtkapiversion
+#
+SLOT="2.4"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~ppc"
+IUSE="gcj"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# I know it's better to use ${P}, but I don't feel like duplicating 
+	# the patch files for every bloody point release. I'll copy them at 
+	# major version releases.
+
+	epatch ${FILESDIR}/libgtk-java-2.4.8.1_gentoo-PN-SLOT.patch
+
+	# Fixed in MAINT_2_8 per my request; this patch will not be needed in 
+	# libgtk-java-2.4.9
+	epatch ${FILESDIR}/libgtk-java-2.4.8.1_fix-TextBuffer.patch
+
+	# getting rid of the docbook dependency probably needs redoing since
+	# java-gnome switched to automake. [per fitzsim at Red Hat, it may no 
+	# longer be an issue]
+	#epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
+	#epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
+
+	use gcj || epatch ${FILESDIR}/libgtk-java-2.4.8.1_find-jni.patch
+
+	# Rediculous glitch from upstream's packaging.
+	rm -f ${S}/config.cache
+}
+
+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.
+	#
+	# NOTE: THIS RELIES ON PORTAGE PASSING $PN AND $SLOT IN THE ENVIRONMENT
+	#
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+			${conf} || die "./configure failed"
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr install || die
+
+	mv ${D}/usr/share/doc/libgtk${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/libgtk-java-${PV}.src.zip *
+
+	# again, with dojar misbehaving, better do to this manually for the 
+	# time being.
+
+	echo "DESCRIPTION=${DESCRIPTION}" \
+		>  ${D}/usr/share/${PN}-${SLOT}/package.env
+
+	echo "CLASSPATH=/usr/share/${PN}-${SLOT}/lib/gtk${SLOT}.jar" \
+		>> ${D}/usr/share/${PN}-${SLOT}/package.env
+}