Revbump that tries to fix flags problems reported in bug #271533. Use virtual/libffi instead of gcc[libffi] as requested in bug #272058. Fix not workin VM selection, bug #272373.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 197 insertions, 1 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 43e3010cfbed..969b35c51749 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.2 2009/05/27 10:57:08 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.3 2009/06/03 19:58:15 caster Exp $
+
+*jffi-0.4.1-r1 (03 Jun 2009)
+*jffi-0.3-r3 (03 Jun 2009)
+
+  03 Jun 2009; Vlastimil Babka <caster@gentoo.org>
+  +files/0.3-makefile-flags.patch, +jffi-0.3-r3.ebuild,
+  +files/0.4.1-makefile-flags.patch, +jffi-0.4.1-r1.ebuild:
+  Revbump that tries to fix flags problems reported in bug #271533. Use
+  virtual/libffi instead of gcc[libffi] as requested in bug #272058. Fix not
+  workin VM selection, bug #272373.
 
 *jffi-0.4.1 (27 May 2009)
 
diff --git a/dev-java/jffi/files/0.3-makefile-flags.patch b/dev-java/jffi/files/0.3-makefile-flags.patch
new file mode 100644
index 000000000000..780e4c5e62cf
--- /dev/null
+++ b/dev-java/jffi/files/0.3-makefile-flags.patch
@@ -0,0 +1,30 @@
+--- jni/GNUmakefile.orig	2009-06-03 21:32:31.000000000 +0200
++++ jni/GNUmakefile	2009-06-03 21:34:56.000000000 +0200
+@@ -43,7 +43,7 @@
+ #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
++WFLAGS = -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+ LDFLAGS += $(SOFLAGS)
+@@ -55,7 +55,7 @@
+ 
+ JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+ IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+ 
+ ifeq ($(OS),mingw32)
+@@ -65,9 +65,6 @@
+   ifneq ($(OS),$(BUILD_OS))
+     CC ?= i386-mingw32-gcc
+     LD ?= i386-mingw32-ld
+-  else
+-    CC = gcc
+-    LD = ld
+   endif
+ endif
+ ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/files/0.4.1-makefile-flags.patch b/dev-java/jffi/files/0.4.1-makefile-flags.patch
new file mode 100644
index 000000000000..11694b26eccc
--- /dev/null
+++ b/dev-java/jffi/files/0.4.1-makefile-flags.patch
@@ -0,0 +1,30 @@
+--- jni/GNUmakefile.orig	2009-06-03 21:52:34.000000000 +0200
++++ jni/GNUmakefile	2009-06-03 21:51:50.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+ ifneq (($OS),darwin)
+-  WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
++  WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef
+ endif
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -54,7 +54,7 @@
+ 
+ JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+ IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include"
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+ 
+ ifeq ($(OS),mingw32)
+@@ -64,9 +64,6 @@
+   ifneq ($(OS),$(BUILD_OS))
+     CC ?= i386-mingw32-gcc
+     LD ?= i386-mingw32-ld
+-  else
+-    CC = gcc
+-    LD = ld
+   endif
+ endif
+ ifneq ($(findstring cygwin,$(BUILD_OS)),)
diff --git a/dev-java/jffi/jffi-0.3-r3.ebuild b/dev-java/jffi/jffi-0.3-r3.ebuild
new file mode 100644
index 000000000000..df0058c76542
--- /dev/null
+++ b/dev-java/jffi/jffi-0.3-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.3-r3.ebuild,v 1.1 2009/06/03 19:58:15 caster Exp $
+
+# Probably best to leave the CFLAGS as they are here. See...
+# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+
+EAPI="2"
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://kenai.com/projects/jffi"
+SRC_URI="mirror://gentoo//${P}.tar.bz2"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	virtual/libffi"
+
+DEPEND=">=virtual/jdk-1.5
+	virtual/libffi
+	test? ( dev-java/ant-junit4 )"
+
+JAVA_PKG_BSFIX_NAME="build-impl.xml"
+
+java_prepare() {
+	# Delete the bundled JARs.
+	find lib -name "*.jar" -delete || die
+	# Delete the bundled libffi
+	rm -rf jni/libffi || die
+
+	# bug #271533 and #272058
+	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
+
+	# bug #272058
+	append-cflags $(pkg-config --cflags-only-I libffi)
+
+	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
+	local arch="${ARCH}"
+	use x86 && arch="i386"
+
+	# Fetch our own prebuilt libffi.
+	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
+
+	ln -snf "/usr/$(get_libdir)/libffi.so" \
+		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
+
+	# Don't include prebuilt files for other archs.
+	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
diff --git a/dev-java/jffi/jffi-0.4.1-r1.ebuild b/dev-java/jffi/jffi-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..125e32c48617
--- /dev/null
+++ b/dev-java/jffi/jffi-0.4.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.4.1-r1.ebuild,v 1.1 2009/06/03 19:58:15 caster Exp $
+
+# Probably best to leave the CFLAGS as they are here. See...
+# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+
+EAPI="2"
+JAVA_PKG_IUSE="source test"
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://kenai.com/projects/jffi"
+SRC_URI="mirror://gentoo//${P}.tar.bz2"
+LICENSE="LGPL-3"
+SLOT="0.4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	virtual/libffi"
+
+DEPEND=">=virtual/jdk-1.5
+	virtual/libffi
+	test? ( dev-java/ant-junit4 )"
+
+JAVA_PKG_BSFIX_NAME="build-impl.xml"
+
+java_prepare() {
+	# Delete the bundled JARs.
+	find lib -name "*.jar" -delete || die
+	# Delete the bundled libffi
+	rm -rf jni/libffi || die
+
+	# bug #271533 and #272058
+	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
+
+	# bug #272058
+	append-cflags $(pkg-config --cflags-only-I libffi)
+
+	# any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
+	local arch="${ARCH}"
+	use x86 && arch="i386"
+
+	# Fetch our own prebuilt libffi.
+	mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
+
+	ln -snf "/usr/$(get_libdir)/libffi.so" \
+		"build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
+
+	# Don't include prebuilt files for other archs.
+	sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}