aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2014-02-12 00:36:31 -0500
committerGuillaume Horel <guillaume.horel@gmail.com>2014-02-12 00:45:17 -0500
commit4a85aca138e6353af4696e72b8eacf59e8b126c5 (patch)
tree3f8f12eb6bdc28888c89e678d1bcadbce2e6853b /dev-java
parentvirtual/lapack: Add missing inherite from multilib.eclass, thanks dev-zero sp... (diff)
downloadsci-4a85aca138e6353af4696e72b8eacf59e8b126c5.tar.gz
sci-4a85aca138e6353af4696e72b8eacf59e8b126c5.tar.bz2
sci-4a85aca138e6353af4696e72b8eacf59e8b126c5.zip
dev-java/jogl: dev-java/jogl version bump
Package-Manager: portage-2.2.8-r1
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jogl/ChangeLog6
-rw-r--r--dev-java/jogl/Manifest2
-rw-r--r--dev-java/jogl/jogl-2.1.4.ebuild (renamed from dev-java/jogl/jogl-2.1.4_rc1.ebuild)18
3 files changed, 15 insertions, 11 deletions
diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index c6bec368e..931648e98 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jogl-2.1.4 (12 Feb 2014)
+
+ 12 Feb 2014; Guillaume Horel <guillaume.horel@gmail.com> +jogl-2.1.4.ebuild,
+ -jogl-2.1.4_rc1.ebuild:
+ dev-java/jogl: dev-java/jogl version bump
+
*jogl-2.1.4_rc1 (07 Jan 2014)
07 Jan 2014; Johann Schmitz <ercpe@gentoo.org> +jogl-2.1.4_rc1.ebuild:
diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest
index 4bb980955..13b612ce1 100644
--- a/dev-java/jogl/Manifest
+++ b/dev-java/jogl/Manifest
@@ -1,4 +1,4 @@
DIST jogl-1.1.1a-src.zip 3656870 SHA256 84fa71520fb186ce7a7b2818210a1a3667fcdfb1545e673b3cbe51bac6ba9113 SHA512 6de4273594c3bb4f17a629647a78619ba00d5998fa35cb25ee220e402059647b2c8fd111f1abdada9a78998d1b73052f1b432ed95220d1966e73cb50295b66bf WHIRLPOOL 077abf5829851aa40e5240c59f2f8dbc93fa7e67241109c2e7d435b1043013864788db88a1216ac950e0e80e1393fb8804505fda26a0af1c8ce079ce2644fa45
-DIST jogl-2.1.4_rc1.tar.gz 31981577 SHA256 835986407c60f1dd9c95200496138270c00d461bb56edff6c3e91cb5343289f1 SHA512 9befb5b0f0ad1a1ef5060e72c960d03d063b91ec27cf283d3f7d16434bb573602389dcbc84d16aae177d74601d52e5a512e4599b1edf35480129b8435bbda971 WHIRLPOOL 3e3cc6a33321f957c1f2fa6a1090a49def5b884d6839822d9d0f4612ae53c188771b2ee5c7b787271e25708a91fe574882d10b20605382f15ec95a7723ff0dbb
+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.1.4_rc1.ebuild b/dev-java/jogl/jogl-2.1.4.ebuild
index 793a947a1..56fab7ab0 100644
--- a/dev-java/jogl/jogl-2.1.4_rc1.ebuild
+++ b/dev-java/jogl/jogl-2.1.4.ebuild
@@ -9,12 +9,12 @@ WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
inherit java-pkg-2 java-ant-2
-MY_PV="${PV/_rc/_rc0}"
-MY_P="${PN}-${MY_PV}"
+#MY_PV="${PV/_rc/_rc0}"
+#MY_P="${PN}-${MY_PV}"
DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
HOMEPAGE="http://jogamp.org/jogl/www/"
-SRC_URI="https://github.com/sgothel/jogl/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/sgothel/jogl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="2.1"
@@ -39,8 +39,6 @@ DEPEND="${CDEPEND}
# our test classpath...
RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml"
JAVA_ANT_REWRITE_CLASSPATH="yes"
EANT_BUILD_XML="make/build.xml"
@@ -51,10 +49,11 @@ EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}/*.jar:${S}/build/nativewindow/*.ja
EANT_NEEDS_TOOLS="yes"
java_prepare() {
- find -name '*.jar' -exec rm -v {} + || die
+ #we keep make/lib/plugin3/puglin3-public.jar
+ find -name 'make/lib/swt/*.jar' -delete -print || die
# Empty filesets are never out of date!
- sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die
+ sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die
EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true"
EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/"
@@ -65,9 +64,8 @@ java_prepare() {
}
src_install() {
- java-pkg_dojar build/jogl/*.jar
- java-pkg_dojar build/nativewindow/*.jar
- java-pkg_doso build/nativewindow/obj/*.so
+ java-pkg_dojar build/jar/*.jar
+ java-pkg_doso build/lib/*.so
use doc && dodoc -r doc
use source && java-pkg_dosrc src/jogl/classes/*