dev-java/jogl: version bump

Package-Manager: portage-2.2.18

5 files changed, 147 insertions, 1 deletions

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 11ee69fdd..91f7b8689 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-java/jogl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jogl-2.2.4 (03 Apr 2015)
+
+  03 Apr 2015; Guillaume Horel <guillaume.horel@gmail.com>
+  +files/disable-applet.diff, +files/jogl-2.2.4-notests.patch,
+  +jogl-2.2.4.ebuild:
+  dev-java/jogl: version bump
+
   03 Nov 2014; Justin Lecher <jlec@gentoo.org> jogl-2.0_rc8-r1.ebuild,
   -jogl-2.1.2.ebuild, jogl-2.1.4.ebuild:
   Bump to EAPI=5; drop old
diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest
index 15f2d70ac..d5f796055 100644
--- a/dev-java/jogl/Manifest
+++ b/dev-java/jogl/Manifest
@@ -1,3 +1,4 @@
 DIST jogl-1.1.1a-src.zip 3656870 SHA256 84fa71520fb186ce7a7b2818210a1a3667fcdfb1545e673b3cbe51bac6ba9113 SHA512 6de4273594c3bb4f17a629647a78619ba00d5998fa35cb25ee220e402059647b2c8fd111f1abdada9a78998d1b73052f1b432ed95220d1966e73cb50295b66bf WHIRLPOOL 077abf5829851aa40e5240c59f2f8dbc93fa7e67241109c2e7d435b1043013864788db88a1216ac950e0e80e1393fb8804505fda26a0af1c8ce079ce2644fa45
 DIST jogl-2.1.4.tar.gz 32070918 SHA256 528c89643e532c6649f9243dd0cb0ee75800ab13e4f8d9a830163475dd1d5b0e SHA512 9d9f45676f671b1958352fcb7ddb4db539f19fb330db0146df6ce46167bcebf9c4fdc1a09bce72451a4bf2f4632a69cad2b4dd56df61c78f5e26e85a50918a0b WHIRLPOOL be0e9d4bc81b31a22050795b1b8e7f48c17e7c204c32ef0e47eca9175174f2f80a8ee3c0a024e744f692970b871dae0206ffd39e4f7db44a54a11720a54ed5a3
 DIST jogl-v2.0-rc8.tar.7z 18148821 SHA256 6d2338514b2e6c7ac61c59e0142d95d6b37434eefafecbbc2a8102f23f4f3e93 SHA512 ce335990dac4c868705f9cd041cab2e97050efcd9b6b0a8fa01e070aa7ee2f27162cb96ebbbd5e9f04a1aa9e7661dde6aa0ba1d02565f38fa76a39deeb48a500 WHIRLPOOL e38c1a7d6727f7dd8765d085ce2388afd7070c0625491038e84d26b8e14bb7fdaa5a89e75f742b5c30500cb02a198c5226d5ee743b1347acd31c6e555d281777
+DIST jogl-v2.2.4.tar.7z 33454202 SHA256 39d53fc4c4c3f8e3a5287646bc10457cfaa6fcc88f07c0b0c7817a95cb1f282b SHA512 c5e2a3460a9060de77e17afc0701bcddf5f396d7bc0da09d8e1d24b21203b648a17b8f3dd27848cf967a49d04aaf9a0b7b485103c5015b363aa4b8eaadafbb87 WHIRLPOOL fde00fb2047d1da3030fad20c33fc82b98c2af56999898254d51767035e54eae775997502ff4ee8e50483b825ee8971d445acb56bf90d6e3775ee350e287a030
diff --git a/dev-java/jogl/files/disable-applet.diff b/dev-java/jogl/files/disable-applet.diff
new file mode 100644
index 000000000..ecbd82a7a
--- /dev/null
+++ b/dev-java/jogl/files/disable-applet.diff
@@ -0,0 +1,22 @@
+Index: libjogl2-java-2.1.4/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.4.orig/make/build-newt.xml	2014-02-27 23:21:42.000000000 +0100
++++ libjogl2-java-2.1.4/make/build-newt.xml	2014-02-27 23:32:11.638399263 +0100
+@@ -100,7 +100,7 @@
+         <!-- partitioning -->
+ 
+         <property name="java.part.core"
+-                  value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
++                  value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
+ 
+         <property name="java.part.opengl"
+                   value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/>
+@@ -236,7 +236,7 @@
+       -->
+     <target name="java.compile.javase">
+         <javac destdir="${classes}"
+-               excludes="${java.excludes.all} ${java.part.driver.android}"
++               excludes="${java.excludes.all} ${java.part.driver.android} com/jogamp/newt/util/applet/*"
+                fork="yes"
+                includeAntRuntime="false"
+                memoryMaximumSize="${javac.memorymax}"
diff --git a/dev-java/jogl/files/jogl-2.2.4-notests.patch b/dev-java/jogl/files/jogl-2.2.4-notests.patch
new file mode 100644
index 000000000..8d24e57c9
--- /dev/null
+++ b/dev-java/jogl/files/jogl-2.2.4-notests.patch
@@ -0,0 +1,12 @@
+diff -urN jogl-v2.2.4.orig/make/build.xml jogl-v2.2.4/make/build.xml
+--- jogl-v2.2.4.orig/make/build.xml	2015-04-03 10:09:28.730409643 -0400
++++ jogl-v2.2.4/make/build.xml	2015-04-03 10:10:57.040418430 -0400
+@@ -8,7 +8,7 @@
+        - Main build target.
+       -->
+ 
+-    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
++    <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build" />
+ 
+     <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
+ 
diff --git a/dev-java/jogl/jogl-2.2.4.ebuild b/dev-java/jogl/jogl-2.2.4.ebuild
new file mode 100644
index 000000000..9455a6bbb
--- /dev/null
+++ b/dev-java/jogl/jogl-2.2.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+###############################################################################
+# WARNING: don't add to main tree without fixing QA issues first!
+###############################################################################
+
+EAPI=5
+
+RESTRICT="test"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=v${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
+HOMEPAGE="http://jogamp.org/jogl/www/"
+SRC_URI="http://jogamp.org/deployment/${MY_PV}/archive/Sources/${MY_P}.tar.7z"
+
+LICENSE="BSD"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+COMMON_DEP="
+	dev-java/ant-core:0
+	dev-java/ant-junit:0
+	dev-java/antlr:0
+	dev-java/cpptasks:0
+	=dev-java/gluegen-${PV}:${SLOT}
+	dev-java/junit:4
+	dev-java/swt:3.7
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	virtual/opengl
+	cg? ( media-gfx/nvidia-cg-toolkit )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/p7zip
+	dev-java/ant-antlr:0
+	dev-java/ant-contrib:0
+	dev-java/ant-nodeps:0
+	dev-java/cpptasks:0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+	unpack ./${MY_P}.tar
+}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	# Empty filesets are never out of date!
+	sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die
+	epatch "${FILESDIR}/disable-applet.diff" \
+		"${FILESDIR}/${P}-notests.patch"
+}
+
+JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml build-test.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_XML="make/build.xml"
+EANT_BUILD_TARGET="all"
+EANT_DOC_TARGET="" # FIXME there are a couple javadoc targets, pick one
+EANT_GENTOO_CLASSPATH="ant-core,antlr,swt-3.7,ant-junit"
+EANT_NEEDS_TOOLS="yes"
+EANT_ANT_TASKS="ant-antlr ant-contrib ant-junit ant-nodeps cpptasks"
+
+src_compile() {
+	EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true"
+	EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/"
+	EANT_EXTRA_ARGS+=" -Dgluegen.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen.jar)"
+	EANT_EXTRA_ARGS+=" -Dgluegen-rt.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen-rt.jar)"
+
+	# FIXME don't build tests just yet
+	use test & EANT_EXTRA_ARGS+=" -Djunit.jar=$(java-pkg_getjar --build-only junit-4 junit.jar)"
+
+	use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
+
+	java-pkg-2_src_compile
+}
+
+EANT_TEST_TARGET="junit.run"
+# FIXME src_test
+
+src_install() {
+	# There are many more
+	java-pkg_dojar build/jar/*.jar
+	java-pkg_doso build/lib/*.so
+
+	if use doc; then
+		#java-pkg_dojavadoc javadoc_public
+		dodoc -r doc
+	fi
+	use source && java-pkg_dosrc src/jogl/classes/*
+}