# 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.8 2011/07/18 07:37:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.9 2011/12/13 17:05:49 fordfrog Exp $
+
+*jna-3.3.0 (13 Dec 2011)
+
+ 13 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ +files/3.3.0-build.xml.patch, +files/3.3.0-makefile-flags.patch,
+ +jna-3.3.0.ebuild:
+ Version bump
18 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> jna-3.2.4.ebuild:
ppc stable wrt #311105
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 3.2.4-makefile-flags.patch 2151 RMD160 430a2e47e7a67283ac7c06c5b9496007d5c5d180 SHA1 278adedeec60b4a78f80f61e1f419eb086211534 SHA256 ba5701ddb20474dec27d39b0d0509f36edda4f6edcc3899e6426726b8d4e2377
AUX 3.2.7-build.xml.patch 1180 RMD160 cb1f424f57b5889d2b8f10c6323539ceba1c67f1 SHA1 5ab392163bc0aba15a28c9e04c6422bb3198d7a9 SHA256 4b56d9bcc80d032dde9f66458e0cade95e5f961d04cc8b7efa49ebb714b393dd
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 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
DIST jna-3.2.7-platform-build.xml 3537 RMD160 1b8a25ff10224f549c27312ab57ef0776b75cab9 SHA1 c4822c6ed5e58cf28c42a80fadae874ad9d6567c SHA256 a85d1740901e4b396fc6ea48c8c3c08585fb454c1da6596f4fe3fc00ba33af9e
DIST jna-3.2.7-platform-project.properties 1827 RMD160 ebe94fc4d3da81b56b5a4eefa971ede649176b0b SHA1 26c0333be130f69e1ae3757fe18ee9cdfa8613fa SHA256 3bd336986d201e403449fcf45edb40ce0fcca24935bd941e9784f6e88ca884c7
DIST jna-3.2.7-src.zip 621124 RMD160 4bec8639ebce5b9dc14ad71d1fc0af55dd0ee5b5 SHA1 73fb5db51dbb5e0b01ca9df30232a522ff3da26d SHA256 2b32ed48744ffa1d0887c66af74ae9b6c3bfe9023933543a0e2e2ae052dff376
+DIST jna-3.3.0-platform-build-impl.xml 27075 RMD160 a034e6cf81bf0911042ce7b625df7e60542616d5 SHA1 ee36a0fa4ced5e893b78e6687bd39833ab9aee40 SHA256 5d87cfab24ed464cb56f95e2761b66c10df9e33d16f4c94f0bb3f80f4bdfff94
+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
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
-MISC ChangeLog 1480 RMD160 21da611c1c70b53ffdb2b8ba1e9e4cc8764a2379 SHA1 9f16b0bd79df27c2d6c6b140f6a06592c4a54eec SHA256 f59a81a59a97cd84f5047ffbb7f844d4fd5414bc24461ba69871339fe49eddb6
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQEIAAYFAk4j4q0ACgkQIiMqcbOVdxTTuwP+I1vqOXXSFjewBdVwZ3Xen3cp
-xNT3BfLn14rlYynMpQeBFTYC1QsRsdDQfyHbcmBHjG4Zohx8IPxMbS19JnAxmJa8
-WUgiyGaIMk//ijZfFrvGS3aUuZBJXGfbOYoxXBV9aEl80KocOE9WtoZteY0+/IJu
-Wfkbc+bFnngZZmS4ACQ=
-=NHGM
------END PGP SIGNATURE-----
--- /dev/null
+--- 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 -->
--- /dev/null
+--- native/Makefile.orig 2011-01-25 16:42:02.341745978 +0100
++++ native/Makefile 2011-01-25 16:45:57.500174283 +0100
+@@ -67,10 +66,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) \
+ -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)
+@@ -109,7 +108,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 +128,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 +143,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 +190,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 \
--- /dev/null
+# 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.3.0.ebuild,v 1.1 2011/12/13 17:05:49 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://jna.dev.java.net/"
+SRC_URI="http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/dist/src.zip?rev=1212 -> ${P}-src.zip
+ http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/build.xml?raw=true -> ${P}-platform-build.xml
+ http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/nbproject/build-impl.xml?raw=true -> ${P}-platform-build-impl.xml
+ http://java.net/projects/jna/sources/svn/content/tags/${PV}/jnalib/contrib/platform/nbproject/project.properties?rev=1212 -> ${P}-platform-project.properties"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+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"
+
+src_unpack() {
+ unpack ${P}-src.zip
+ mkdir -p contrib/platform/nbproject || die
+ cp "${DISTDIR}"/${P}-platform-build.xml contrib/platform/build.xml || die
+ cp "${DISTDIR}"/${P}-platform-build-impl.xml contrib/platform/nbproject/build-impl.xml || die
+ cp "${DISTDIR}"/${P}-platform-project.properties contrib/platform/nbproject/project.properties || die
+}
+
+java_prepare() {
+ # 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
+}
+
+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
+}