diff options
author | Justin Lecher <jlec@gentoo.org> | 2014-11-03 09:16:32 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2014-11-03 09:16:32 +0100 |
commit | ebc2b67143935606a55ee1bdbe90dcce40aff91c (patch) | |
tree | 473597a958a66a7ab4435f7065a0d29b16a83ada | |
parent | dev-java/gluegen: Bump to EAPI=5; drop old (diff) | |
download | sci-ebc2b67143935606a55ee1bdbe90dcce40aff91c.tar.gz sci-ebc2b67143935606a55ee1bdbe90dcce40aff91c.tar.bz2 sci-ebc2b67143935606a55ee1bdbe90dcce40aff91c.zip |
dev-java/jogl: Bump to EAPI=5; drop old
Package-Manager: portage-2.2.14
-rw-r--r-- | dev-java/jogl/ChangeLog | 4 | ||||
-rw-r--r-- | dev-java/jogl/Manifest | 1 | ||||
-rw-r--r-- | dev-java/jogl/jogl-2.0_rc8-r1.ebuild | 6 | ||||
-rw-r--r-- | dev-java/jogl/jogl-2.1.2.ebuild | 100 | ||||
-rw-r--r-- | dev-java/jogl/jogl-2.1.4.ebuild | 3 |
5 files changed, 7 insertions, 107 deletions
diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog index 931648e98..11ee69fdd 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 <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 + *jogl-2.1.4 (12 Feb 2014) 12 Feb 2014; Guillaume Horel <guillaume.horel@gmail.com> +jogl-2.1.4.ebuild, diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest index 13b612ce1..15f2d70ac 100644 --- a/dev-java/jogl/Manifest +++ b/dev-java/jogl/Manifest @@ -1,4 +1,3 @@ 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.1.2.tar.7z 21363248 SHA256 10f53b860e67ee02e6290d71e1d6c763df0ff372ea57d5464efd81f2a516a975 SHA512 8afd4328fbe941a95282a2d71be9dd0accb3cc027aa42226722cdc22924c289bf3ffcacec7f0ccf95080ae64093b79bab291b4e1c8fea1bd605435ce256ee1ee WHIRLPOOL 081126c44dfb1e4e1fa03913f100960c36e69e6b7f7fdbb65600ed96754bb5ff58670211afe26ad5b9760a30f18b96b5c7f6eef4f760307632b688cc693011c9 diff --git a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild index 97d497913..cdeb81614 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 d938f83a8..000000000 --- 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 56fab7ab0..40b3ef345 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 |