dev-java/jna: version bump

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

6 files changed, 183 insertions, 3 deletions

diff --git a/dev-java/jna/ChangeLog b/dev-java/jna/ChangeLog
index 29b92d08a244..907320a5dfce 100644
--- a/dev-java/jna/ChangeLog
+++ b/dev-java/jna/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jna
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.9 2011/12/13 17:05:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.10 2011/12/25 14:23:57 fordfrog Exp $
+
+*jna-3.4.0 (25 Dec 2011)
+
+  25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/3.4.0-build.xml.patch, +jna-3.4.0.ebuild,
+  +files/3.4.0-makefile-flags.patch, metadata.xml:
+  Version bump. Added new USE flags, awt and nio-buffers. awt USE flag should
+  require X USE flag on used JDK/JRE but we do not have this flag on virtuals
+  yet.
 
 *jna-3.3.0 (13 Dec 2011)
 
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 82ec836c68f8..e3c5db77c091 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -3,6 +3,8 @@ AUX 3.2.7-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 S
 AUX 3.2.7-makefile-flags.patch 2046 RMD160 1699d60b8ab5848d298c49035cfbfcb88fb7ada0 SHA1 cb820a4cf865d254c6e4fedb7df4d5679a29b620 SHA256 87486291112b6cf4c344b1d7701f6990a2e7cfd76eb1120bfcbe429a9edb634c
 AUX 3.3.0-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
 AUX 3.3.0-makefile-flags.patch 2046 RMD160 1699d60b8ab5848d298c49035cfbfcb88fb7ada0 SHA1 cb820a4cf865d254c6e4fedb7df4d5679a29b620 SHA256 87486291112b6cf4c344b1d7701f6990a2e7cfd76eb1120bfcbe429a9edb634c
+AUX 3.4.0-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
+AUX 3.4.0-makefile-flags.patch 1900 RMD160 d85e956afe76d99cd9c34fdf347580298a2076e6 SHA1 f3f81407590ec160014f29ac98e48145534f57c9 SHA256 b54b196749ae9589e315ce12a8c93fd9bbf42581211ff6b5f5cea2a089dbf124
 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
@@ -14,9 +16,11 @@ DIST jna-3.3.0-platform-build-impl.xml 27075 RMD160 a034e6cf81bf0911042ce7b625df
 DIST jna-3.3.0-platform-build.xml 3902 RMD160 445121b9ad42be2f6372199f600478a0abc09dba SHA1 92930acc9d44b21f3e4bdfaabd19b009b3f07e69 SHA256 01e7c5a8cd13886728934e373c81057dcbd8ab4bc1f7c871cc26a3885638c24c
 DIST jna-3.3.0-platform-project.properties 1827 RMD160 ebe94fc4d3da81b56b5a4eefa971ede649176b0b SHA1 26c0333be130f69e1ae3757fe18ee9cdfa8613fa SHA256 3bd336986d201e403449fcf45edb40ce0fcca24935bd941e9784f6e88ca884c7
 DIST jna-3.3.0-src.zip 3601757 RMD160 d74011365c66a845225e32c1aa036e24e2e5537a SHA1 6c7ea3ed093670a70fe3523a5dd3f9c6d26c1c0e SHA256 636fe580521ecd812eadfca68311e5563551486ddac8db2d98deebcd57a1e7db
+DIST jna-3.4.0-src.tar.gz 34547165 RMD160 789f7198fb70fae6aaea87bedec087017cc6e296 SHA1 60ae10b3831e7ea628c0eda111f9165cbce5a805 SHA256 bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14
 EBUILD jna-3.0.3-r1.ebuild 1637 RMD160 352e8ebf2a33889f476cef5ca35f0734cf3a73d5 SHA1 1f7796a3b1e4171eaffdc886b5492adedc05bfed SHA256 8d29b3bfc442e9ef92fa4bdba2fe39daa0456d2d1f04fdb4ceb452e8a925f591
 EBUILD jna-3.2.4.ebuild 1918 RMD160 835a2bfbc3c9486e3d51926150db1e693e536660 SHA1 6c9996eb2cc4cd29a8d7a3fe16dc94755a5b20d9 SHA256 36dafd4bdcef8bf2a74fe32330e48fdc96f8e7ff4a72e7bfeff43f5fc61717c3
 EBUILD jna-3.2.7.ebuild 2557 RMD160 4069f95db790abe471d45ee48b8b03ca9b724f71 SHA1 04e45c4a3a2370e9f5cfd16b638a128ad8c33ca4 SHA256 e509a5d04b13e53b0b09cc54185075bf4991687ba96867b13546fea2a6d781d9
 EBUILD jna-3.3.0.ebuild 2564 RMD160 1a2fd566a41f94899bea52763736a688a7bd3e3f SHA1 b53f83fb985f9d106a6a59e4b486ebead6bbb667 SHA256 ec85fe828c4375e93e6ccaf224889f8985680c736cd1c1088ddaf4891d23b787
-MISC ChangeLog 1660 RMD160 bbf981a11853ed724210333fb834a5481ce7fc57 SHA1 4c2dd0ec8009dfbb0b17466c941b6aec83d8759d SHA256 e459e2960f0886b3c0fb2ccbd46b6b40dc23c68a6ddd6b86b4ea87163d607b0b
-MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
+EBUILD jna-3.4.0.ebuild 2046 RMD160 712abd1bf58611c64596c76f1652277b9d4fc359 SHA1 82c93ba2e539befc4bed0c68067ffcb10394d3ba SHA256 251f4b79d18662b4d1b3bbca7726e63f06273b2f12b14a4b2537310debcab689
+MISC ChangeLog 2005 RMD160 7c90e58d858d4e477f295d9248c9c16df59dbb25 SHA1 3a27a08efc2ff13ce3b3043c163f4f71af423c8b SHA256 5c300d9195e503a0562008859e3cce746909942692c0828d7bba2ab0486c30c3
+MISC metadata.xml 295 RMD160 d7fc5e14f5b91d3271a001c1219c101b385253e0 SHA1 1882aa6897108b0bcb4ef1810ee6bf0c7ca42054 SHA256 7aeccd89219646978f39ce1d46b40051eb950e1452bd225e7dd8e2fe5267c8a2
diff --git a/dev-java/jna/files/3.4.0-build.xml.patch b/dev-java/jna/files/3.4.0-build.xml.patch
new file mode 100644
index 000000000000..c907b592b040
--- /dev/null
+++ b/dev-java/jna/files/3.4.0-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig	2011-01-25 17:33:24.750473340 +0100
++++ build.xml	2011-01-25 17:07:14.657410373 +0100
+@@ -176,7 +176,9 @@
+     <path id="test.runpath">
+       <pathelement path="${build}/${jar}"/>
+       <pathelement path="${test.classes}"/>
++      <!--
+       <pathelement path="lib/clover.jar"/>
++      -->
+       <path refid="test.libs"/>
+     </path>
+   </target>
+@@ -433,13 +435,17 @@
+     <copy todir="${build}/jws" file="${build}/${jar}"/>
+     <copy todir="${build}/jws" file="${build}/${testjar}"/>
+     <copy todir="${build}/jws" file="lib/junit.jar"/>
++    <!--
+     <copy todir="${build}/jws" file="lib/clover.jar"/>
++    -->
+     <jar jarfile="${build}/jws/jnidispatch.jar">
+       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+     </jar>
++    <!--
+     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
+-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
++      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
+     </signjar>
++    -->
+   </target>
+ 	
+   <!-- When running tests from an IDE, be sure to set jna.library.path -->
diff --git a/dev-java/jna/files/3.4.0-makefile-flags.patch b/dev-java/jna/files/3.4.0-makefile-flags.patch
new file mode 100644
index 000000000000..90d96e00f1ce
--- /dev/null
+++ b/dev-java/jna/files/3.4.0-makefile-flags.patch
@@ -0,0 +1,53 @@
+diff --git a/native/Makefile b/native/Makefile
+index 75246a8..7bdcf04 100644
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -83,10 +83,10 @@ CFLAGS_EXTRA=
+ 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) \
+        -DJNA_JNI_VERSION='"$(JNA_JNI_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)
+@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
+ CDEFINES=-DPSAPI_VERSION=1
+ 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
+@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
+ ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+ PCFLAGS+=-fPIC
+ CDEFINES+=-DHAVE_PROTECTION
+-LDFLAGS+=-Wl,-soname,$@
++LDFLAGS+= -Wl,-soname,$(shell basename $@)
+ endif
+ 
+ ifneq (,$(findstring bsd,$(OS)))
+ 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
+ 
+@@ -239,7 +239,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 ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
+   -current_version $(JNA_JNI_VERSION) \
+   -mmacosx-version-min=10.3 \
diff --git a/dev-java/jna/jna-3.4.0.ebuild b/dev-java/jna/jna-3.4.0.ebuild
new file mode 100644
index 000000000000..d6c6818bf9d3
--- /dev/null
+++ b/dev-java/jna/jna-3.4.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/jna-3.4.0.ebuild,v 1.1 2011/12/25 14:23:57 fordfrog Exp $
+
+EAPI="4"
+
+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://github.com/twall/jna#readme"
+SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}-src.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+awt +nio-buffers"
+S="${WORKDIR}/twall-jna-3e5b84f"
+
+RDEPEND="virtual/libffi
+	>=virtual/jre-1.6"
+
+DEPEND="virtual/libffi
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jar contrib-jars"
+
+java_prepare() {
+	# delete bundled jars
+	find -name "*.jar" | xargs rm -v
+
+	# respect CFLAGS, don't inhibit warnings, honour CC
+	# fix build.xml file
+	epatch "${FILESDIR}/${PV}-makefile-flags.patch" "${FILESDIR}/${PV}-build.xml.patch"
+
+	# 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
+
+	if ! use awt ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" "${S}"/native/Makefile || die
+	fi
+
+	if ! use nio-buffers ; then
+		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" "${S}"/native/Makefile || die
+	fi
+}
+
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dojar contrib/platform/dist/platform.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
+}
diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index 604e0a4238bb..bbc35db34a3f 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<use>
+		<flag name='awt'>Enables support for Java AWT</flag>
+		<flag name='nio-buffers'>Enables support for NIO buffers</flag>
+	</use>
 </pkgmetadata>