commit: 7335188173e00b70c873246fbd8b4fab5db2891e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 15:15:12 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 15:15:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=73351881
dev-java/jogl: Removing from overlay. Fixes bug 330267.
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jogl/Manifest | 2 -
.../jogl/files/1.1.0/fix-solaris-compiler.patch | 41 ---------
dev-java/jogl/files/1.1.0/uncouple-gluegen.patch | 32 -------
dev-java/jogl/jogl-1.1.1.ebuild | 77 ----------------
dev-java/jogl/jogl-2.0_rc8-r1.ebuild | 100 ---------------------
dev-java/jogl/metadata.xml | 13 ---
6 files changed, 265 deletions(-)
diff --git a/dev-java/jogl/Manifest b/dev-java/jogl/Manifest
deleted file mode 100644
index 1fb39e9..0000000
--- a/dev-java/jogl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jogl-1.1.1-src.zip 3638019 SHA256
dbd34718f15e6f45deb2d96bc328c3d54aa2f3a2160a4593997506c837d859a0
-DIST jogl-v2.0-rc8.tar.7z 18148821 SHA256
6d2338514b2e6c7ac61c59e0142d95d6b37434eefafecbbc2a8102f23f4f3e93
diff --git a/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch
b/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch
deleted file mode 100644
index 6d77bc3..0000000
--- a/dev-java/jogl/files/1.1.0/fix-solaris-compiler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur gluegen.orig/make/gluegen-cpptasks.xml
gluegen/make/gluegen-cpptasks.xml
---- gluegen.orig/make/gluegen-cpptasks.xml 2007-03-14 23:09:20.000000000
+1300
-+++ gluegen/make/gluegen-cpptasks.xml 2007-03-14 23:09:40.000000000 +1300
-@@ -397,16 +397,16 @@
- <compilerarg value="-fPIC"/>
- </compiler>
-
-- <compiler id="compiler.cfg.solaris" name="suncc">
-+ <compiler id="compiler.cfg.solaris" name="gcc">
- </compiler>
-
-- <compiler id="compiler.cfg.solaris.sparcv9" name="suncc">
-+ <compiler id="compiler.cfg.solaris.sparcv9" name="gcc">
- <compilerarg value="-fast" />
- <compilerarg value="-xchip=ultra" />
- <compilerarg value="-xarch=v9a" />
- </compiler>
-
-- <compiler id="compiler.cfg.solaris.amd64" name="suncc">
-+ <compiler id="compiler.cfg.solaris.amd64" name="gcc">
- <compilerarg value="-fast" />
- <compilerarg value="-xchip=opteron" />
- <compilerarg value="-xarch=amd64" />
-@@ -492,14 +492,14 @@
- <linker id="linker.cfg.linux.amd64" name="gcc">
- </linker>
-
-- <linker id="linker.cfg.solaris" name="suncc">
-+ <linker id="linker.cfg.solaris" name="gcc">
- </linker>
-
-- <linker id="linker.cfg.solaris.sparcv9" name="suncc">
-+ <linker id="linker.cfg.solaris.sparcv9" name="gcc">
- <linkerarg value="-xarch=v9a" />
- </linker>
-
-- <linker id="linker.cfg.solaris.amd64" name="suncc">
-+ <linker id="linker.cfg.solaris.amd64" name="gcc">
- <linkerarg value="-xarch=amd64" />
- </linker>
-
diff --git a/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch
b/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch
deleted file mode 100644
index a508c61..0000000
--- a/dev-java/jogl/files/1.1.0/uncouple-gluegen.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur jogl.orig/make/build.xml jogl/make/build.xml
---- jogl.orig/make/build.xml 2007-02-13 17:45:16.000000000 +1300
-+++ jogl/make/build.xml 2007-03-14 22:55:50.000000000 +1300
-@@ -127,7 +127,18 @@
- <property name="gluegen.build.xml"
value="${gluegen.make.dir}/build.xml" />
- <property name="gluegen.jar" value="../../gluegen/build/gluegen.jar"
/>
- <property name="gluegen-rt.jar"
value="../../gluegen/build/gluegen-rt.jar" />
--
-+ <!-- This property is used to skip building gluegen if the jar files
-+ - are already available on the system and have been overridden
-+ - by the user. The purpose is to allow linux distro's to uncouple
-+ - gluegen from jogl.
-+ -->
-+ <condition property="gluegen.prebuilt" >
-+ <and>
-+ <available file="${gluegen.jar}" />
-+ <available file="${gluegen-rt.jar}" />
-+ </and>
-+ </condition>
-+
- <!-- Names of directories relative to the project root.
- Some of these are used in FileMappers later for dependence
information
- and need exact string matching, which is why they use
file.separator
-@@ -479,7 +490,7 @@
- <!--
- - Build GlueGen
- -->
-- <target name="build.gluegen" depends="init">
-+ <target name="build.gluegen" depends="init" unless="gluegen.prebuilt">
- <!-- Run the GlueGen build to ensure that the GlueGen ANT task
- - has been built. -->
- <!-- FIXME: remove passing down of antlr.jar when gluegen.properties
is on all
diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1.ebuild
deleted file mode 100644
index 149d2f5..0000000
--- a/dev-java/jogl/jogl-1.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="cg source doc"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
-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=""
-
-COMMON_DEPEND="dev-java/ant-core
- >=dev-java/cpptasks-1.0_beta4-r2
- =dev-java/gluegen-1_p20080421
- cg? ( media-gfx/nvidia-cg-toolkit )
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
- epatch "${FILESDIR}/1.1.0/uncouple-gluegen.patch"
- 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
-
- rm -R "${S}/build/gensrc/classes/javax"
-
- cd "${WORKDIR}/gluegen/make/lib"
- rm -v *.jar || die
- java-pkg_jar-from cpptasks
-}
-
-src_compile() {
- cd make/
- local antflags="-Dgluegen.prebuild=true"
- antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars --build-only
antlr)"
- local gcp="$(java-pkg_getjars ant-core):$(java-config --tools)"
-
- local gluegen="-Dgluegen.jar=$(java-pkg_getjar gluegen gluegen.jar)"
- local gluegenrt="-Dgluegen-rt.jar=$(java-pkg_getjar gluegen
gluegen-rt.jar)"
-
- use cg && antflags="${antflags} -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
- # -Dbuild.sysclasspath=ignore fails with missing ant dependencies.
-
- export ANT_OPTS="-Xmx1g"
- eant \
- -Dgentoo.classpath="${gcp}" \
- ${antflags} "${gluegen}" "${gluegenrt}" \
- all $(use_doc)
-}
-
-src_install() {
- use source && java-pkg_dosrc src/classes/*
- java-pkg_doso build/obj/*.so
- java-pkg_dojar build/*.jar
- use doc && java-pkg_dojavadoc javadoc_public
-}
diff --git a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
deleted file mode 100644
index 27c237f..0000000
--- a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-###############################################################################
-# WARNING: don't add to main tree without fixing QA issues first!
-###############################################################################
-
-EAPI=4
-
-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"
-KEYWORDS="~amd64"
-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/metadata.xml b/dev-java/jogl/metadata.xml
deleted file mode 100644
index 39ce374..0000000
--- a/dev-java/jogl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<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>
-</pkgmetadata>
-
