[gentoo-commits] gentoo-x86 commit in dev-java/jna: jna-3.4.0-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in dev-java/jna: jna-3.4.0-r1.ebuild ChangeLog

[Ralph Sennhauser (sera)]

sera        12/05/13 09:41:50

  Modified:             ChangeLog
  Added:                jna-3.4.0-r1.ebuild
  Log:
  Respect CC. #413277
  Register optional dependency emul-linux-x86-jna for use with 32bit JVMs. #313209
  Cleanup.
  
  (Portage version: 2.1.10.58/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 dev-java/jna/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	7 May 2012 06:26:01 -0000	1.17
+++ ChangeLog	13 May 2012 09:41:50 -0000	1.18
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jna
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.17 2012/05/07 06:26:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jna/ChangeLog,v 1.18 2012/05/13 09:41:50 sera Exp $
+
+*jna-3.4.0-r1 (13 May 2012)
+
+  13 May 2012; Ralph Sennhauser <sera@gentoo.org> +jna-3.4.0-r1.ebuild,
+  +files/jna-3.4.0-makefile-flags.patch:
+  Respect CC. #413277
+  Register optional dependency emul-linux-x86-jna for use with 32bit JVMs.
+  #313209
+  Cleanup.
 
   07 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> jna-3.4.0.ebuild:
   x86 stable wrt bug #413157



1.1                  dev-java/jna/jna-3.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/jna-3.4.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jna/jna-3.4.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: jna-3.4.0-r1.ebuild
===================================================================
# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/05/13 09:41:50 sera Exp $

EAPI="4"

JAVA_PKG_IUSE="doc source test"

inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot

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"
REQUIRED_USE="test? ( awt nio-buffers )"

COMMON_DEP="
	virtual/libffi"
RDEPEND="${COMMON_DEP}
	>=virtual/jre-1.6"
DEPEND="${COMMON_DEP}
	>=virtual/jdk-1.6
	dev-java/ant-nodeps:0
	virtual/pkgconfig
	test? (
		dev-java/ant-junit:0
		dev-java/ant-trax:0
	)"

java_prepare() {
	# delete bundled jars and copy of libffi
	find -name "*.jar" -exec rm -v {} + || die
	rm -r native/libffi || die

	epatch "${FILESDIR}/${PV}-build.xml.patch"
	# respect CFLAGS, don't inhibit warnings, honour CC
	epatch "${FILESDIR}/${P}-makefile-flags.patch"
	tc-export CC

	# Build to same directory on 64-bit archs.
	mkdir build || die
	ln -snf build build-d64 || die

	if ! use awt ; then
		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
	fi

	if ! use nio-buffers ; then
		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
	fi
}

EANT_BUILD_TARGET="jar contrib-jars"
EANT_ANT_TASKS="ant-nodeps"
EANT_EXTRA_ARGS="-Ddynlink.native=true"

EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
src_test() {
	local sysprops=""

	# crashes vm (segfault)
	sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die

	# crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
	sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die

	sysprops+=" -Djava.awt.headless=true"
	sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount

	mkdir -p lib || die
	java-pkg_jar-from --into lib --build-only junit

	# need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
	# survive the junit task.
	_JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
}

src_install() {
	java-pkg_dojar build/${PN}.jar
	java-pkg_dojar contrib/platform/dist/platform.jar
	java-pkg_doso build/native/libjnidispatch.so

	java-pkg_register-optional-dependency emul-linux-x86-jna #313209

	use source && java-pkg_dosrc src/com
	use doc && java-pkg_dojavadoc doc/javadoc
}