Version bump.

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

4 files changed, 131 insertions, 2 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/Manifest b/dev-java/jffi/Manifest
index 8269c5396d7a..01cbe176ee1b 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,11 +1,14 @@
 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
+AUX 0.6.0.2-makefile-flags.patch 1818 RMD160 8a2abc05364c2cc6adf95d6c1fad15f706c13151 SHA1 0b9c0b5a53281c283286bcc3734319b65cfe870e SHA256 29c50591f0b656184c94862fa262b273176c61c1aec40cbf5cf79c6c36fa894a
 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
+DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
 EBUILD jffi-0.3-r3.ebuild 1779 RMD160 f11a5bded4536d18b77c10e00c081c2c67f2adab SHA1 19d1815c73d8ec2d646d512b7f4369ae6765809a SHA256 763f7639e5b1281e8290527041fbd2a7b976c8b67e1fee7541374357c1607ee2
 EBUILD jffi-0.4.1-r1.ebuild 1777 RMD160 86304a4ecc381c93ce69f3637d5851f235495495 SHA1 0579de8e7652ef059f4ae7bbd554806eef145f82 SHA256 12f7c09953d81efff5041b938e00736377abca31be7ac0185681d4330370f9af
 EBUILD jffi-0.5.ebuild 1913 RMD160 8555ffdbf72373d885001389dac9b77eb3931c26 SHA1 34af0d22de01374ce4f92aa0569fa328fd2ae356 SHA256 74b30b41dfa1f0f8f73393184e950a8e6601506cfd65ec23917c3cb3f4f579b6
-MISC ChangeLog 1214 RMD160 2ab0e0f4a671a26da81c4a0d3adc22494e7c1d5c SHA1 2af7282f8fa350b554325a2cc0999314c9b21d2c SHA256 5c475ffe192b116e2752a1788442728fd391ba410fb726b5f5fd02d7d20f8db4
+EBUILD jffi-0.6.0.2.ebuild 2001 RMD160 c451d40cb93da4761e01dd34089ba7ed8bba0f1f SHA1 25fa3f3a1cb9a3b73d283272c7023a62f767544c SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646
+MISC ChangeLog 1372 RMD160 09b2ceed981b0a93d8eb4f538c79cae6ae28b333 SHA1 ef27b08779117dcc975dba0674f24b40dbbb218c SHA256 73c9a8fe730801cfc82db9f1592f5a20a28a4a3170cf636aef18045d988c9763
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
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)"
+}