Version bump.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

3 files changed, 127 insertions, 1 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 4d6dea3229a4..9fde9342a62b 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2009/10/25 21:43:47 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.6 2009/12/30 06:36:19 ali_bush Exp $
+
+*jffi-0.6.0.2 (30 Dec 2009)
+
+  30 Dec 2009; Alistair Bush <ali_bush@gentoo.org>
+  +files/0.6.0.2-makefile-flags.patch, +jffi-0.6.0.2.ebuild:
+  Version Bump
 
   25 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> jffi-0.3-r3.ebuild,
   jffi-0.5.ebuild:
diff --git a/dev-java/jffi/files/0.6.0.2-makefile-flags.patch b/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
new file mode 100644
index 000000000000..08f51acb4280
--- /dev/null
+++ b/dev-java/jffi/files/0.6.0.2-makefile-flags.patch
@@ -0,0 +1,52 @@
+--- jni/GNUmakefile.orig	2009-12-30 18:59:22.000000000 +1300
++++ jni/GNUmakefile	2009-12-30 19:02:10.000000000 +1300
+@@ -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 = -Wno-unused -Wno-parentheses -Wundef
+ endif
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -54,8 +54,8 @@
+ STRIP = strip -S
+ 
+ JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+-IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)"/include
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
++IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I"$(JFFI_SRC_DIR)"
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+ 
+ ifeq ($(OS),cross-mingw32)
+@@ -147,11 +147,11 @@
+ endif
+ 
+ LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT)
+-FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
+-	--with-pic=yes --disable-dependency-tracking
+-ifdef CONFIGURE_HOST
+-	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
+-endif
++#FFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
++#	--with-pic=yes --disable-dependency-tracking
++#ifdef CONFIGURE_HOST
++#	FFI_CONFIGURE += --host=$(CONFIGURE_HOST)
++#endif
+ all:	$(LIBJFFI)
+ 
+ debug:
+@@ -211,12 +211,6 @@
+ else
+ $(LIBFFI):		
+ 	@mkdir -p $(LIBFFI_BUILD_DIR)
+-	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
+-	    echo "Configuring libffi for $(PLATFORM)"; \
+-	    cd $(LIBFFI_BUILD_DIR) && env CC="$(FFI_CC)" LD="$(FFI_LD)" CFLAGS="$(FFI_CFLAGS)" \
+-		$(FFI_CONFIGURE) > /dev/null; \
+-	fi
+-	$(MAKE) -C $(LIBFFI_BUILD_DIR)
+ endif
+ clean::
+ 	# nothing to do - ant will delete the build dir
diff --git a/dev-java/jffi/jffi-0.6.0.2.ebuild b/dev-java/jffi/jffi-0.6.0.2.ebuild
new file mode 100644
index 000000000000..286883d98a83
--- /dev/null
+++ b/dev-java/jffi/jffi-0.6.0.2.ebuild
@@ -0,0 +1,68 @@
+# 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.6.0.2.ebuild,v 1.1 2009/12/30 06:36:19 ali_bush 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"
+WANT_ANT_TASKS="ant-nodeps"
+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 ~ppc ~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=""
+	use x86 && arch="i386"
+	use amd64 && arch="x86_64"
+	use ppc && arch="ppc"
+
+	# 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
+	sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
+	sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}