added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h & familiy, #72128

4 files changed, 45 insertions, 18 deletions

diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index b4e35f9a9bbf..aeea8433e5a1 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2004/11/16 18:40:33 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.2 2004/11/29 15:35:33 axxo Exp $
+
+  29 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/libgtk-java-2.4.6_find_jni.patch, libgtk-java-2.4.6-r1.ebuild:
+  added a patch to set JAVA_INCLUDES when not using gcj, so it can find jni.h
+  & familiy, #72128
 
 *libgtk-java-2.4.6-r1 (16 Nov 2004)
 
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index eb510a9be07e..7f8b1bcd1e26 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -1,8 +1,19 @@
-MD5 0073e5a4a07082a3f913fa979908d257 libgtk-java-2.4.6-r1.ebuild 3030
-MD5 00fa5784ce4d5b24275535839ca35137 ChangeLog 1096
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f238bbfcec2bfc89580dc1cc6ad94395 libgtk-java-2.4.6-r1.ebuild 3032
+MD5 a11849b054a6577b3080e13d8942c868 ChangeLog 1314
 MD5 23e70539fce4ef96d51e3043420acb8c metadata.xml 975
 MD5 d5868ac77f6fa3fcf16ec100095cb0af files/digest-libgtk-java-2.4.6-r1 70
 MD5 1defc6f20e4684f13955e28a28e47e1f files/libgtk-java-2.4.6_install-doc.patch 740
 MD5 1f2599c8fd250432f6e6b43d598e75db files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch 2013
+MD5 3908afed50f45b1040e7ba630f94fff7 files/libgtk-java-2.4.6_find_jni.patch 367
 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)
+
+iD8DBQFBq0II/rLF9B432nYRAuhHAJ4ziu2HcT4NeVOY9StkVw0ZQyotOQCfTQ2t
+CuJZpMK93uDw5IDfvB2VlrY=
+=6o1K
+-----END PGP SIGNATURE-----
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.6_find_jni.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.6_find_jni.patch
new file mode 100644
index 000000000000..1eb01682fe74
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.6_find_jni.patch
@@ -0,0 +1,12 @@
+--- libgtk-java-2.4.6-orig/src/Makefile.in      2004-11-29 16:24:35.767668160 +0100
++++ libgtk-java-2.4.6/src/Makefile.in   2004-11-29 16:24:58.704181280 +0100
+@@ -39,7 +39,7 @@
+ JAR = @JAR@
+ 
+ # If you need to change this line please let us know
+-JAVA_INCLUDES =
++JAVA_INCLUDES = -I@JDK_HOME@/include -I@JDK_HOME@/include/linux/
+ 
+ # Set C related stuff
+ CC = @CC@
+
diff --git a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild b/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
index a7faef8bb077..b05e73ea66f3 100644
--- a/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 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.6-r1.ebuild,v 1.1 2004/11/16 18:40:33 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.4.6-r1.ebuild,v 1.2 2004/11/29 15:35:33 axxo 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 
+# 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 DOESN NOT WORK.
-# 
+#
 
 inherit eutils gnome.org
 
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.4
 		>=virtual/jre-1.2"
 
 #
-# Unfortunately we need to run autogen to do the variable substitutions, so 
+# Unfortunately we need to run autogen to do the variable substitutions, so
 # regardless of whether or not there is an upstream ./configure [at time of
 # writing there isn't] we need to recreate it
 #
@@ -42,10 +42,11 @@ IUSE="gcj"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_install-doc.patch
-	epatch ${FILESDIR}/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
+	epatch ${FILESDIR}/${P}_gcj-autoconf-macro-fix.patch
+	epatch ${FILESDIR}/${P}_gentoo-PN-SLOT.patch
+	epatch ${FILESDIR}/${P}_install-doc.patch
+	epatch ${FILESDIR}/${P}_no-docbook-autoconf-macro.patch
+	use gcj || epatch ${FILESDIR}/${P}_find_jni.patch
 }
 
 src_compile() {
@@ -53,10 +54,8 @@ src_compile() {
 
 	use gcj	|| conf="${conf} --without-gcj-compile"
 
-	cd ${S}
-
 	#
-	# Ordinarily, moving things around post `make install` would do 
+	# 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.
 	#
@@ -71,14 +70,14 @@ src_compile() {
 }
 
 src_install() {
-	make prefix=${D}/usr install || die
+	make prefix=${D}/usr install || die "make install failed"
 
 	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 
+	# 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
@@ -89,7 +88,7 @@ src_install() {
 	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 
+	# again, with dojar misbehaving, better do to this manually for the
 	# time being.
 
 	echo "DESCRIPTION=${DESCRIPTION}" \