commit: ebc2b67143935606a55ee1bdbe90dcce40aff91c Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Nov 3 08:16:32 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 08:16:32 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ebc2b671
dev-java/jogl: Bump to EAPI=5; drop old Package-Manager: portage-2.2.14 --- dev-java/jogl/ChangeLog | 4 ++ dev-java/jogl/jogl-2.0_rc8-r1.ebuild | 6 +-- dev-java/jogl/jogl-2.1.2.ebuild | 100 ----------------------------------- dev-java/jogl/jogl-2.1.4.ebuild | 3 +- 4 files changed, 7 insertions(+), 106 deletions(-) diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog index 931648e..11ee69f 100644 --- a/dev-java/jogl/ChangeLog +++ b/dev-java/jogl/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Nov 2014; Justin Lecher <[email protected]> jogl-2.0_rc8-r1.ebuild, + -jogl-2.1.2.ebuild, jogl-2.1.4.ebuild: + Bump to EAPI=5; drop old + *jogl-2.1.4 (12 Feb 2014) 12 Feb 2014; Guillaume Horel <[email protected]> +jogl-2.1.4.ebuild, diff --git a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild index 97d4979..cdeb816 100644 --- a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild +++ b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild @@ -2,11 +2,7 @@ # 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=4 +EAPI=5 JAVA_PKG_IUSE="doc source" diff --git a/dev-java/jogl/jogl-2.1.2.ebuild b/dev-java/jogl/jogl-2.1.2.ebuild deleted file mode 100644 index d938f83..0000000 --- a/dev-java/jogl/jogl-2.1.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 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 - -JAVA_PKG_IUSE="doc source" - -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.1" -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 -} - -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 - 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/* -} diff --git a/dev-java/jogl/jogl-2.1.4.ebuild b/dev-java/jogl/jogl-2.1.4.ebuild index 56fab7a..40b3ef3 100644 --- a/dev-java/jogl/jogl-2.1.4.ebuild +++ b/dev-java/jogl/jogl-2.1.4.ebuild @@ -21,7 +21,8 @@ SLOT="2.1" KEYWORDS="~amd64 ~x86" IUSE="cg" -CDEPEND="=dev-java/gluegen-${PV}:${SLOT} +CDEPEND=" + =dev-java/gluegen-${PV}:${SLOT} dev-java/antlr:0 dev-java/ant-core:0 x11-libs/libX11
