Version Bump

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 106 insertions, 2 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 969b35c51749..1afd875b811a 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.3 2009/06/03 19:58:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.4 2009/08/07 09:40:27 ali_bush Exp $
+
+*jffi-0.5 (07 Aug 2009)
+
+  07 Aug 2009; Alistair Bush <ali_bush@gentoo.org>
+  +files/0.5-makefile-flags.patch, +jffi-0.5.ebuild:
+  Version Bump.
 
 *jffi-0.4.1-r1 (03 Jun 2009)
 *jffi-0.3-r3 (03 Jun 2009)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index dc9a779c09bf..f0390019aa57 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,8 +1,11 @@
 AUX 0.3-makefile-flags.patch 1081 RMD160 8882e26ed7d63ffe960e4a1b58c756fbade234c9 SHA1 67b95d1e1d87f429a70a59b416a52663b6ccb647 SHA256 1ad484484c226704c5d4f70c027fe2124cb63ec9721ab09ab239080b5b027840
 AUX 0.4.1-makefile-flags.patch 1004 RMD160 3e0494367fab8c4f05dfa51d3627c256bda7801d SHA1 8cdb06a1940372ea9c2d07a97bc7647f83872d15 SHA256 da66a889fa0500c1242a40cf7568b61943171d60586498cd16026081a89530bd
+AUX 0.5-makefile-flags.patch 1004 RMD160 e68949234cafde1e14a70f2a8ef394eb126bb53a SHA1 f74745b3dc41aec31732e9e70fbed0eaa4559bd9 SHA256 b8ac57a9d7474dc31d154edcfd9a081297afbb49a3b1b5c35ae60f4b1b6e0ad1
 DIST jffi-0.3.tar.bz2 1399294 RMD160 0bf761dae280e1201a971799cc1d1813657d05b7 SHA1 dafbbe968c9be0bc4fcb94618779d67cc1e65389 SHA256 5d3ee453e632824e09c102cf6d56f839de36b85a7882b7426f9f25e8c2d176c4
 DIST jffi-0.4.1.tar.bz2 1555550 RMD160 a4b516416784b61fd8543c907a5f60b199a59d57 SHA1 40c5bb0a35a93b9faef6c30bbbe3eb68845b4632 SHA256 9051fdfcd8e95e6205d189103f6dc357683cb8c9bbbab564f94fa8d99f7a80af
+DIST jffi-0.5.tar.bz2 1569955 RMD160 0e46731f1a2f639021e18b1d27a35e1ce7bf1e16 SHA1 00db1e1501551a1d940359ef4b0bb7bcc093a4d2 SHA256 4967ee8178edb0f19a598ce7532df1d34542a67f5a3b368cb751662d8520bd9f
 EBUILD jffi-0.3-r3.ebuild 1773 RMD160 908bf12f413e805fa92888f5d260bebe8b173b18 SHA1 12c0fa7c9c5f0dae06f569d6a5c79d93bcd8b21b SHA256 669f26feba32b249637636d6ba7945cd05597ba3c54c25a9cb167aea9f4f8772
 EBUILD jffi-0.4.1-r1.ebuild 1777 RMD160 86304a4ecc381c93ce69f3637d5851f235495495 SHA1 0579de8e7652ef059f4ae7bbd554806eef145f82 SHA256 12f7c09953d81efff5041b938e00736377abca31be7ac0185681d4330370f9af
-MISC ChangeLog 943 RMD160 788445ae66195f69f53f6eb147282c757b4273b5 SHA1 59cb53c23ec13e80466835abb0872582dada8809 SHA256 da02facf311572f8748ae332cdfee887d29d2d2a51d3779e9847c7336827edcd
+EBUILD jffi-0.5.ebuild 1909 RMD160 2c00770012e5356cd00b294c71defb0ab5a47922 SHA1 6141359d0d6cd801e2b069e74af55a933d865a8a SHA256 db90c9cc248db8c1d4815daa15b237c8eff7771b0fc7150d2a025ce7d66ea9be
+MISC ChangeLog 1091 RMD160 ce42c1b53bfa635da9a995aead822b521f1f55ac SHA1 e00323aa3dc6d859c0d6488d70990a4bc68097d0 SHA256 ff02fd052163945c58f18df7ab383e4e480cf22abb33ea96faf4f93a435cebc5
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
diff --git a/dev-java/jffi/files/0.5-makefile-flags.patch b/dev-java/jffi/files/0.5-makefile-flags.patch
new file mode 100644
index 000000000000..712ec3d0c33e
--- /dev/null
+++ b/dev-java/jffi/files/0.5-makefile-flags.patch
@@ -0,0 +1,30 @@
+--- jni/GNUmakefile.orig	2009-08-07 07:44:41.000000000 +1200
++++ jni/GNUmakefile	2009-08-07 07:47:59.000000000 +1200
+@@ -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.5.ebuild b/dev-java/jffi/jffi-0.5.ebuild
new file mode 100644
index 000000000000..3e94ce7e6fe2
--- /dev/null
+++ b/dev-java/jffi/jffi-0.5.ebuild
@@ -0,0 +1,65 @@
+# 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.5.ebuild,v 1.1 2009/08/07 09:40:27 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"
+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
+	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" eant test \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}