| 1 |
commit: 731cc1d0ddef6b5772a2ad2567af2a23f927a631 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 3 12:06:11 2014 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 3 12:06:11 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=731cc1d0 |
| 7 |
|
| 8 |
dev-java/jogl: Bump away from vulnerable version, #330267 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-java/jogl/ChangeLog | 6 +++++- |
| 14 |
.../jogl/{jogl-1.1.1.ebuild => jogl-1.1.1a.ebuild} | 18 +++++++++--------- |
| 15 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog |
| 18 |
index cb34d4a..4b23f79 100644 |
| 19 |
--- a/dev-java/jogl/ChangeLog |
| 20 |
+++ b/dev-java/jogl/ChangeLog |
| 21 |
@@ -1,7 +1,11 @@ |
| 22 |
# ChangeLog for dev-java/jogl |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 03 Jan 2014; Justin Lecher <jlec@g.o> -jogl-1.1.1.ebuild, |
| 28 |
+ +jogl-1.1.1a.ebuild: |
| 29 |
+ Bump away from vulnerable version, #330267 |
| 30 |
+ |
| 31 |
03 Mar 2013; Justin Lecher <jlec@g.o> jogl-2.0_rc8-r1.ebuild, |
| 32 |
metadata.xml: |
| 33 |
Keyworded for ~x86 |
| 34 |
|
| 35 |
diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1a.ebuild |
| 36 |
similarity index 87% |
| 37 |
rename from dev-java/jogl/jogl-1.1.1.ebuild |
| 38 |
rename to dev-java/jogl/jogl-1.1.1a.ebuild |
| 39 |
index dd68032..6e07104 100644 |
| 40 |
--- a/dev-java/jogl/jogl-1.1.1.ebuild |
| 41 |
+++ b/dev-java/jogl/jogl-1.1.1a.ebuild |
| 42 |
@@ -1,8 +1,8 @@ |
| 43 |
-# Copyright 1999-2012 Gentoo Foundation |
| 44 |
+# Copyright 1999-2014 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
# $Header: $ |
| 47 |
|
| 48 |
-EAPI=4 |
| 49 |
+EAPI=5 |
| 50 |
|
| 51 |
WANT_ANT_TASKS="ant-antlr" |
| 52 |
JAVA_PKG_IUSE="cg source doc" |
| 53 |
@@ -11,7 +11,7 @@ inherit eutils java-pkg-2 java-ant-2 |
| 54 |
|
| 55 |
DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API" |
| 56 |
HOMEPAGE="https://jogl.dev.java.net/" |
| 57 |
-SRC_URI="http://download.java.net/media/${PN}/builds/archive/jsr-231-1.1.1/${P}-src.zip" |
| 58 |
+SRC_URI="http://download.java.net/media/${PN}/builds/archive/jsr-231-${PV}/${P}-src.zip" |
| 59 |
|
| 60 |
LICENSE="BSD" |
| 61 |
SLOT="0" |
| 62 |
@@ -21,7 +21,7 @@ IUSE="" |
| 63 |
COMMON_DEPEND=" |
| 64 |
dev-java/ant-core |
| 65 |
>=dev-java/cpptasks-1.0_beta4-r2 |
| 66 |
- =dev-java/gluegen-1* |
| 67 |
+ dev-java/gluegen:0 |
| 68 |
virtual/opengl |
| 69 |
x11-libs/libX11 |
| 70 |
x11-libs/libXxf86vm |
| 71 |
@@ -40,21 +40,21 @@ S="${WORKDIR}/${PN}" |
| 72 |
|
| 73 |
java_prepare() { |
| 74 |
epatch "${FILESDIR}/1.1.0/uncouple-gluegen.patch" |
| 75 |
- cd "${S}/make" |
| 76 |
- mv build.xml build.xml.bak |
| 77 |
+ cd "${S}/make" || die |
| 78 |
+ mv build.xml build.xml.bak || die |
| 79 |
|
| 80 |
sed 's_/usr/X11R6_/usr_g' build.xml.bak > build.xml || die |
| 81 |
sed -i -e 's/suncc/gcc/g' build.xml ../../gluegen/make/gluegen-cpptasks.xml || die |
| 82 |
|
| 83 |
- rm -R "${S}/build/gensrc/classes/javax" |
| 84 |
+ rm -R "${S}/build/gensrc/classes/javax" || die |
| 85 |
|
| 86 |
- cd "${WORKDIR}/gluegen/make/lib" |
| 87 |
+ cd "${WORKDIR}/gluegen/make/lib" || die |
| 88 |
rm -v *.jar || die |
| 89 |
java-pkg_jar-from cpptasks |
| 90 |
} |
| 91 |
|
| 92 |
src_compile() { |
| 93 |
- cd make/ |
| 94 |
+ cd make/ || die |
| 95 |
local antflags="-Dgluegen.prebuild=true" |
| 96 |
antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars --build-only antlr)" |
| 97 |
local gcp="$(java-pkg_getjars ant-core):$(java-config --tools)" |
Archives