aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-05-22 20:42:31 +0200
committerJustin Lecher <jlec@gentoo.org>2012-05-22 20:42:31 +0200
commit466140cf148b2989f069820b460b0d86797c0bd1 (patch)
tree7d8811bc7045453ed0ce57ae2c332e95a62637cf /dev-java
parentdev-java/flexdock: Add missing eutils.eclass, bump to EAPI=4, remove unnecess... (diff)
downloadsci-466140cf148b2989f069820b460b0d86797c0bd1.tar.gz
sci-466140cf148b2989f069820b460b0d86797c0bd1.tar.bz2
sci-466140cf148b2989f069820b460b0d86797c0bd1.zip
dev-java/jogl: Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
(Portage version: 2.2.0_alpha107/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jogl/ChangeLog3
-rw-r--r--dev-java/jogl/jogl-1.1.1.ebuild26
-rw-r--r--dev-java/jogl/metadata.xml11
3 files changed, 23 insertions, 17 deletions
diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index b451193f8..123ceedc4 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 May 2012; Justin Lecher <jlec@gentoo.org> jogl-1.1.1.ebuild, metadata.xml:
+ Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
+
18 May 2012; Christoph Junghans <ottxor@gentoo.org> jogl-1.1.1.ebuild:
Fix repoman warning about position off EAPI
diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1.ebuild
index 7746a3c40..6aaf0c818 100644
--- a/dev-java/jogl/jogl-1.1.1.ebuild
+++ b/dev-java/jogl/jogl-1.1.1.ebuild
@@ -2,35 +2,39 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=4
+
WANT_ANT_TASKS="ant-antlr"
JAVA_PKG_IUSE="cg source doc"
-inherit java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
-HOMEPAGE="https://jogl.dev.java.net"
+HOMEPAGE="https://jogl.dev.java.net/"
SRC_URI="http://download.java.net/media/${PN}/builds/archive/jsr-231-1.1.1/${P}-src.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE=""
-COMMON_DEPEND="dev-java/ant-core
+COMMON_DEPEND="
+ dev-java/ant-core
>=dev-java/cpptasks-1.0_beta4-r2
=dev-java/gluegen-20080421
- cg? ( media-gfx/nvidia-cg-toolkit )
virtual/opengl
x11-libs/libX11
- x11-libs/libXxf86vm"
+ x11-libs/libXxf86vm
+ cg? ( media-gfx/nvidia-cg-toolkit )"
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
app-arch/unzip
+ >=virtual/jdk-1.4
${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND="
+ >=virtual/jre-1.4
${COMMON_DEPEND}"
-IUSE=""
S="${WORKDIR}/${PN}"
@@ -39,8 +43,8 @@ java_prepare() {
cd "${S}/make"
mv build.xml build.xml.bak
- sed 's_/usr/X11R6_/usr_g' build.xml.bak > build.xml
- sed -i -e 's/suncc/gcc/g' build.xml ../../gluegen/make/gluegen-cpptasks.xml
+ sed 's_/usr/X11R6_/usr_g' build.xml.bak > build.xml || die
+ sed -i -e 's/suncc/gcc/g' build.xml ../../gluegen/make/gluegen-cpptasks.xml || die
rm -R "${S}/build/gensrc/classes/javax"
diff --git a/dev-java/jogl/metadata.xml b/dev-java/jogl/metadata.xml
index 39ce37492..248b6b7b7 100644
--- a/dev-java/jogl/metadata.xml
+++ b/dev-java/jogl/metadata.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<longdescription lang="en">
+ <herd>java</herd>
+ <longdescription lang="en">
JOGL provides Java with a Binding for the OpenGLĀ® API (JSR-231), and is designed
to provide hardware-supported 3D graphics to applications written in Java.
</longdescription>
-<use>
- <flag name="cg">Enable NVidia Cg binding.</flag>
-</use>
+ <use>
+ <flag name="cg">Enable NVidia Cg binding.</flag>
+ </use>
</pkgmetadata>
-