Version Bump.

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

4 files changed, 168 insertions, 12 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 61d80a3ffb76..758637f9ee08 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.10 2010/01/31 16:32:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.11 2010/03/12 22:42:12 ali_bush Exp $
+
+*jffi-1.0.0 (11 Mar 2010)
+
+  11 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +jffi-1.0.0.ebuild,
+  +files/jffi-1.0.0-makefile.patch:
+  Version Bump.
 
 *jffi-0.7_pre20100131 (31 Jan 2010)
 
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index d30d8df2d8bc..692fc7877d34 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 AUX jffi-0.7-makefile-flags.patch 6079 RMD160 80ac08701b4d675746a635c821ba0f53c9c56f38 SHA1 b29666fa499e9f6bf7ac5b7551895a0968f60b9c SHA256 cbe88df14f6cc99367e1d5140483d4f6c0b3f057e6a8a7e6a1d15eea91f89105
+AUX jffi-1.0.0-makefile.patch 3196 RMD160 ed9ff4ca88b326c46e4b089e5f1c51fff5e65583 SHA1 71f37c938454f6d309c90338a102ca3030a5bd36 SHA256 51d5299b057924f37727baf34cf4ba8915fe967e5ad1a60e673d6c241c6c4740
 DIST jffi-0.3.tar.bz2 1399294 RMD160 0bf761dae280e1201a971799cc1d1813657d05b7 SHA1 dafbbe968c9be0bc4fcb94618779d67cc1e65389 SHA256 5d3ee453e632824e09c102cf6d56f839de36b85a7882b7426f9f25e8c2d176c4
 DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
+DIST jffi-1.0.0.tar.gz 1627422 RMD160 0b20a343239b8480e1b6ee787288862b02a4f575 SHA1 fa7d9c3ca58afea36e9ef643f882c828e7ce96d0 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e
 DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f6ea466ce2 SHA1 b58cd19600acf6ea8a2adf04b1f1d72b7f84bce5 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a
 EBUILD jffi-0.3-r3.ebuild 1779 RMD160 f11a5bded4536d18b77c10e00c081c2c67f2adab SHA1 19d1815c73d8ec2d646d512b7f4369ae6765809a SHA256 763f7639e5b1281e8290527041fbd2a7b976c8b67e1fee7541374357c1607ee2
 EBUILD jffi-0.6.0.2-r1.ebuild 2141 RMD160 adf9806e42fe085a749aed6648fa119bdf5f6e2d SHA1 ce17b7146d6b1098106bc7a9e14d0527187c3530 SHA256 e6fa781e9156c8e8466af23430281863bc6107fe6a0dbbd647e031030b530084
 EBUILD jffi-0.6.0.2.ebuild 2001 RMD160 c451d40cb93da4761e01dd34089ba7ed8bba0f1f SHA1 25fa3f3a1cb9a3b73d283272c7023a62f767544c SHA256 df3c5514815568d8a62b2107cca68ed859b490469ec1d37573040fb6a62d0646
 EBUILD jffi-0.7_pre20100131.ebuild 2522 RMD160 c56f2129e7787fa4048b1820068a24962eb12b77 SHA1 82391a8da3233dab77d4cb78a5033575f18480b5 SHA256 4a8ebe9cc1798a108b4af14197f871c49b3f38ba60f37c8a5b7f8e103f462776
-MISC ChangeLog 2114 RMD160 cd69fb21bb5f1ccf398e34f1daee228f9debef08 SHA1 5ff10edad7951c050e3c3245cc20b1f02c8b8dcf SHA256 f3d28e563f2fb3a7ce3951fd2b9782a65611ab9f85975c233b966c5b0b62e4a8
+EBUILD jffi-1.0.0.ebuild 2146 RMD160 bd3ed1c7d5140e3f61e81be2bf14dcb7aad1584a SHA1 ccba10cc1ee41fd9a3c28c09d3eca6f0b01764ba SHA256 911f6b7c3f3e66513c9ed4d87dd5f51c771b132e9eab98a06cbd743c99351a7c
+MISC ChangeLog 2264 RMD160 1f0568a0165e215f4ffd88f7dbc7eb142d5eb4a2 SHA1 7101fa81f402f3030d1b6c987d7788fc5e0b91fa SHA256 6a046780855ddfee782cf1a7f51e2267d356d62e6d2ea34783bfc4506fb3e454
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktlsJEACgkQAiZjviIA2XiVZACg1LuMKlPlqN6sbpTGiwtdjSaE
-NPUAoKreTwZ8B9Ljhzgj8DJ0jnq9mjQn
-=X7JX
------END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/jffi-1.0.0-makefile.patch b/dev-java/jffi/files/jffi-1.0.0-makefile.patch
new file mode 100644
index 000000000000..11ca2ed68530
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.0.0-makefile.patch
@@ -0,0 +1,82 @@
+--- jni/GNUmakefile	2010-03-12 12:06:39.000000000 +1300
++++ jni/GNUmakefile	2010-03-12 12:13:44.000000000 +1300
+@@ -65,7 +65,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 = -W -Wall -Wno-unused -Wno-parentheses -Wundef
+ endif
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -78,9 +78,9 @@
+ 
+ JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
+ IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
+-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+ CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
+-CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
++CXXFLAGS += $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+ 
+ ifeq ($(OS), win64)
+   override CPU = x86_64
+@@ -258,58 +258,6 @@
+ 	@mkdir -p $(@D)
+ 	$(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+-
+-ifeq ($(OS), darwin)
+-build_ffi = \
+-	mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \
+-	(if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \
+-	    echo "Configuring libffi for $(1)"; \
+-	    cd $(BUILD_DIR)/libffi-darwin-$(1) && \
+-	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \
+-		$(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
+-	fi); \
+-	env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1)
+-	
+-$(LIBFFI):
+-	@mkdir -p $(@D)
+-	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done
+-	
+-	# Assemble into a FAT (i386, x86_64, ppc) library
+-	@mkdir -p $(BUILD_DIR)/libffi/.libs
+-	@env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \
+-	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a)
+-	@mkdir -p $(LIBFFI_BUILD_DIR)/include
+-	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
+-	@( \
+-		printf "#if defined(__i386__)\n"; \
+-		printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \
+-		printf "#elif defined(__x86_64__)\n"; \
+-		printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\
+-		printf "#elif defined(__ppc__)\n"; \
+-		printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\
+-		printf "#endif\n";\
+-	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
+-	@( \
+-		printf "#if defined(__i386__)\n"; \
+-		printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \
+-		printf "#elif defined(__x86_64__)\n"; \
+-		printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\
+-		printf "#elif defined(__ppc__)\n"; \
+-		printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\
+-		printf "#endif\n";\
+-	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
+-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)" \
+-		$(LIBFFI_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-1.0.0.ebuild b/dev-java/jffi/jffi-1.0.0.ebuild
new file mode 100644
index 000000000000..614fce2d9be0
--- /dev/null
+++ b/dev-java/jffi/jffi-1.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.0.ebuild,v 1.1 2010/03/12 22:42:12 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 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://github.com/wmeissner/jffi"
+
+SRC_URI="mirrors://gentoo/${P}.tar.gz"
+
+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
+	dev-util/pkgconfig
+	test? ( dev-java/ant-junit4 )"
+
+JAVA_PKG_BSFIX_NAME="build-impl.xml custom-build.xml"
+JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
+
+java_prepare() {
+	# Delete the bundled JARs.
+	find lib archive -name "*.jar" -delete || die
+	# Delete the bundled libffi
+	rm -rf jni/libffi || die
+
+	epatch "${FILESDIR}/${P}-makefile.patch"
+
+	# 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"
+
+	# 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
+}
+
+EANT_EXTRA_ARGS="-Duse.system.libffi=1"
+
+src_install() {
+	mkdir -p "${T}"/com/kenai/jffi
+	cat - > "${T}"/com/kenai/jffi/boot.properties <<EOF
+jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+EOF
+
+	pushd "${T}" &>/dev/null
+	jar -uf "${S}"/dist/${PN}.jar com
+	popd
+
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
+		"${EANT_EXTRA_ARGS}" \
+		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}