Version Bump.

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

4 files changed, 154 insertions, 2 deletions

diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog
index db09ead36a57..a10a22531642 100644
--- a/dev-java/jna/ChangeLog
+++ b/dev-java/jna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jna
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.3 2009/10/25 21:37:05 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.4 2009/12/30 11:38:48 ali_bush Exp $
+
+*jna-3.2.4 (30 Dec 2009)
+
+  30 Dec 2009; Alistair Bush <ali_bush@gentoo.org>
+  +files/3.2.4-makefile-flags.patch, +jna-3.2.4.ebuild:
+  Version Bump.
 
   25 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> jna-3.0.3-r1.ebuild:
   Keywording for ppc, bug 270910
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 4459f9da4cd1..4a5a4efe632c 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,5 +1,8 @@
+AUX 3.2.4-makefile-flags.patch 2151 RMD160 430a2e47e7a67283ac7c06c5b9496007d5c5d180 SHA1 278adedeec60b4a78f80f61e1f419eb086211534 SHA256 ba5701ddb20474dec27d39b0d0509f36edda4f6edcc3899e6426726b8d4e2377
 AUX makefile-flags.patch 790 RMD160 cb0f285a09fd0f1feebde3ded9086880dd200656 SHA1 61ab8ec9270cf6af212222ef8bb47872dd32f986 SHA256 060c7d8475c879d94d2d173a4e9a033cbdd26a2db5bc8d724446f8bbab53055c
 DIST jna-3.0.3.tar.bz2 647451 RMD160 3122e06fe47ca053828c4e5a4c02f3d61bab8800 SHA1 a144936d0f5e29279d2091d4d2ad0a8e38e20334 SHA256 c214d0ced142972e64421bdd22a2bb4f841df27cf38519602845f7410d11bc7f
+DIST jna-3.2.4.tar.bz2 191082 RMD160 235304a6c65a6963fcdc9707d8aca4870898309c SHA1 38ee77025c35e0fe0901821a88227fb1acb43c22 SHA256 b6f842e6dcc13b64d26f3ad9e4989aa51276b964fe211a51a2408c3c33c2beb0
 EBUILD jna-3.0.3-r1.ebuild 1637 RMD160 352e8ebf2a33889f476cef5ca35f0734cf3a73d5 SHA1 1f7796a3b1e4171eaffdc886b5492adedc05bfed SHA256 8d29b3bfc442e9ef92fa4bdba2fe39daa0456d2d1f04fdb4ceb452e8a925f591
-MISC ChangeLog 705 RMD160 6c6e0e04ae9d60770002277dfc7c0d2d67512e98 SHA1 1868134e82066ab5105b07588e7bda1c8fe878c0 SHA256 cbad1b452847cfb2ce750e955c4d8f2039603b81cdc4869c9b356710a5693af2
+EBUILD jna-3.2.4.ebuild 1919 RMD160 ca1ec8bbe92659bce31358656e0b535a9eaafd11 SHA1 0151138468c3156d30e17860e5b4e9889267ca61 SHA256 32b6de1b5c5a0a63ede920cf3fcd09738ad0ccc9c8c9be8f90ba6bd2388324b3
+MISC ChangeLog 856 RMD160 9bc31ef33a2388851dd348ee7710a129ab0df256 SHA1 4aad07049a857c07ca7982e40a7d1b5b005573be SHA256 14e81f3b50725e1f9aac37b269cca67cc11c03ba45a8dd5f6806ac9eaa35bc3a
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
diff --git a/dev-java/jna/files/3.2.4-makefile-flags.patch b/dev-java/jna/files/3.2.4-makefile-flags.patch
new file mode 100644
index 000000000000..7690ebe55138
--- /dev/null
+++ b/dev-java/jna/files/3.2.4-makefile-flags.patch
@@ -0,0 +1,68 @@
+--- native/Makefile.orig	2009-12-30 20:13:34.000000000 +1300
++++ native/Makefile	2009-12-30 20:21:39.000000000 +1300
+@@ -54,7 +54,6 @@
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
+ LD=gcc
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -67,10 +65,10 @@
+ COUT=-o $@
+ CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+ CDEFINES=-D_REENTRANT
+-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
++PCFLAGS=-Wall -Wno-unused -Wno-parentheses
++CFLAGS+=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+        -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
+-LDFLAGS=-o $@ -shared 
++LDFLAGS+= -o $@ -shared 
+ ifeq ($(DYNAMIC_LIBFFI),true)
+ CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
+ LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
+@@ -109,7 +107,7 @@
+ ifneq ($(MINGW),)
+ CC = $(MINGW) -m64 -mno-cygwin
+ LD = $(CC)
+-LDFLAGS=-o $@ -shared
++LDFLAGS+= -o $@ -shared
+ LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
+ FFI_CONFIG += --host=x86_64-pc-mingw32
+ else
+@@ -129,14 +127,14 @@
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CDEFINES+=-DHAVE_PROTECTION
+-LDFLAGS+=-Wl,-soname,$@
++LDFLAGS+= -Wl,-soname,$(shell basename $@)
+ endif
+ 
+ ifeq ($(OS),freebsd)
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CINCLUDES+=-I/usr/X11R6/include
+-LDFLAGS=-o $@ -shared 
++LDFLAGS+=-o $@ -shared 
+ CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+ endif
+ 
+@@ -144,7 +142,7 @@
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CINCLUDES+=-I/usr/X11R6/include
+-LDFLAGS=-o $@ -shared 
++LDFLAGS+= -o $@ -shared 
+ CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+ endif
+ 
+@@ -191,7 +189,7 @@
+ endif
+ PCFLAGS+=$(ISYSROOT) -x objective-c
+ CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
+-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
++LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
+   -compatibility_version $(shell echo ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
+   -current_version $(VERSION) \
+   -mmacosx-version-min=10.3 \
diff --git a/dev-java/jna/jna-3.2.4.ebuild b/dev-java/jna/jna-3.2.4.ebuild
new file mode 100644
index 000000000000..bb4990d40d06
--- /dev/null
+++ b/dev-java/jna/jna-3.2.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.2.4.ebuild,v 1.1 2009/12/30 11:38:48 ali_bush Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="test doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://jna.dev.java.net/"
+# repack and mirror
+#SRC_URI="http://jna.dev.java.net/source/browse/*checkout*/jna/tags/${PV}/jnalib/dist/src.zip"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libffi
+	>=virtual/jre-1.4"
+
+DEPEND="virtual/libffi
+	!test? ( >=virtual/jdk-1.4 )
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+		>=virtual/jdk-1.5
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	# remove bundled libffi
+	rm -rf native/libffi || die
+
+	# respect CFLAGS, don't inhibit warnings, honour CC
+	epatch "${FILESDIR}/${PV}-makefile-flags.patch"
+
+	sed -i -e '/profiler-build-impl.xml/d' build.xml || die
+	sed -i -e '/clover.jar"/d' build.xml || die
+	sed -i -e 's:,clover.jar::' build.xml || die
+	sed -i -e '/signjar/d' build.xml || die
+
+	# Fetch our own prebuilt libffi.
+	mkdir -p build/native/libffi/.libs || die
+	ln -snf "/usr/$(get_libdir)/libffi.so" \
+		build/native/libffi/.libs/libffi_convenience.a || die
+
+	# Build to same directory on 64-bit archs.
+	ln -snf build build-d64 || die
+}
+
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_doso build/native/libjnidispatch.so
+	use source && java-pkg_dosrc src/com
+	use doc && java-pkg_dojavadoc doc/javadoc
+}
+
+src_test() {
+	unset DISPLAY
+
+	mkdir -p lib
+	java-pkg_jar-from --into lib --build-only junit
+
+	ANT_TASKS="ant-junit ant-nodeps ant-trax" \
+		ANT_OPTS="-Djava.awt.headless=true" eant \
+		${EANT_EXTRA_ARGS} test
+}