[gentoo-commits] proj/sci:master commit in: dev-java/jogl/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2012-05-18 17:26 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2012-05-18 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     62c20953bfe3565e26835f2459dee52c3d552fa9
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 17:26:26 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri May 18 17:26:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=62c20953

Fix repoman warning about position off EAPI

(Portage version: 2.2.0_alpha107/git/Linux i686, unsigned Manifest commit)

---
 dev-java/jogl/ChangeLog         |    3 +++
 dev-java/jogl/jogl-1.1.1.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 6c7c720..b451193 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: $
 
+  18 May 2012; Christoph Junghans <ottxor@gentoo.org> jogl-1.1.1.ebuild:
+  Fix repoman warning about position off EAPI
+
 *jogl-1.1.1 (14 May 2012)
 
   14 May 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1.ebuild
index 48daa89..7746a3c 100644
--- a/dev-java/jogl/jogl-1.1.1.ebuild
+++ b/dev-java/jogl/jogl-1.1.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
 WANT_ANT_TASKS="ant-antlr"
 JAVA_PKG_IUSE="cg source doc"
-EAPI="2"
 
 inherit java-pkg-2 java-ant-2
 



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2012-05-22 19:43 Justin Lecher
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Lecher @ 2012-05-22 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     466140cf148b2989f069820b460b0d86797c0bd1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 18:42:31 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 22 18:42:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=466140cf

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)

---
 dev-java/jogl/ChangeLog         |    3 +++
 dev-java/jogl/jogl-1.1.1.ebuild |   26 +++++++++++++++-----------
 dev-java/jogl/metadata.xml      |   11 +++++------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index b451193..123ceed 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 7746a3c..6aaf0c8 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 39ce374..248b6b7 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>
-



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2012-05-29 17:49 Sebastien Fabbro
  0 siblings, 0 replies; 14+ messages in thread
From: Sebastien Fabbro @ 2012-05-29 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     71c383725d74922cda2f242a145933e1a2378279
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue May 29 17:48:50 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May 29 17:48:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=71c38372

dev-java/jogl: adapted gluegen dependency

(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)

---
 dev-java/jogl/ChangeLog         |    3 +++
 dev-java/jogl/jogl-1.1.1.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 123ceed..16f24ca 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: $
 
+  29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> jogl-1.1.1.ebuild:
+  adapted gluegen dependency
+
   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
 

diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1.ebuild
index 6aaf0c8..dd68032 100644
--- a/dev-java/jogl/jogl-1.1.1.ebuild
+++ b/dev-java/jogl/jogl-1.1.1.ebuild
@@ -21,7 +21,7 @@ IUSE=""
 COMMON_DEPEND="
 	dev-java/ant-core
 	>=dev-java/cpptasks-1.0_beta4-r2
-	=dev-java/gluegen-20080421
+	=dev-java/gluegen-1*
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXxf86vm



^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2013-02-03 15:19 Guillaume Horel
  0 siblings, 0 replies; 14+ messages in thread
From: Guillaume Horel @ 2013-02-03 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     749cddbaabe22b0f5ce24b0069a2ac5f2a4f0ecf
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Feb  3 15:16:09 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Feb  3 15:16:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=749cddba

dev-java/jogl import from the java-overlay

---
 dev-java/jogl/ChangeLog              |    8 +++-
 dev-java/jogl/jogl-2.0_rc8-r1.ebuild |  100 ++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 16f24ca..23d3739 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/jogl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jogl-2.0_rc8-r1 (03 Feb 2013)
+
+  03 Feb 2013; Guillaume Horel <guillaume.horel@gmail.com>
+  +jogl-2.0_rc8-r1.ebuild:
+  import jogl:2 from java-overlay
+
   29 May 2012; Sébastien Fabbro <bicatali@gentoo.org> jogl-1.1.1.ebuild:
   adapted gluegen dependency
 

diff --git a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
new file mode 100644
index 0000000..fb6d64e
--- /dev/null
+++ b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 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=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/*
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2013-10-28  4:29 Guillaume Horel
  0 siblings, 0 replies; 14+ messages in thread
From: Guillaume Horel @ 2013-10-28  4:29 UTC (permalink / raw
  To: gentoo-commits

commit:     0df449c2d4a03dd1c8da5492440291df4c7d9d44
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 13:00:21 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Oct 28 04:17:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0df449c2

dev-java/jogl version bump

---
 dev-java/jogl/jogl-2.0.2.ebuild | 100 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/dev-java/jogl/jogl-2.0.2.ebuild b/dev-java/jogl/jogl-2.0.2.ebuild
new file mode 100644
index 0000000..bfa2b0e
--- /dev/null
+++ b/dev-java/jogl/jogl-2.0.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 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"
+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/*
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2013-11-16 17:00 Guillaume Horel
  0 siblings, 0 replies; 14+ messages in thread
From: Guillaume Horel @ 2013-11-16 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     55ba3bf617211a4447ad333048653ad02d134454
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sat Nov 16 16:55:11 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sat Nov 16 16:55:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55ba3bf6

dev-java/jogl version bump and new slot

---
 dev-java/jogl/{jogl-2.0.2.ebuild => jogl-2.1.2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jogl/jogl-2.0.2.ebuild b/dev-java/jogl/jogl-2.1.2.ebuild
similarity index 98%
rename from dev-java/jogl/jogl-2.0.2.ebuild
rename to dev-java/jogl/jogl-2.1.2.ebuild
index bfa2b0e..fe8421b 100644
--- a/dev-java/jogl/jogl-2.0.2.ebuild
+++ b/dev-java/jogl/jogl-2.1.2.ebuild
@@ -20,8 +20,8 @@ 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"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
 IUSE="cg"
 
 COMMON_DEP="


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2014-01-03 12:06 Justin Lecher
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Lecher @ 2014-01-03 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     731cc1d0ddef6b5772a2ad2567af2a23f927a631
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 12:06:11 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 12:06:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=731cc1d0

dev-java/jogl: Bump away from vulnerable version, #330267

Package-Manager: portage-2.2.7

---
 dev-java/jogl/ChangeLog                                |  6 +++++-
 .../jogl/{jogl-1.1.1.ebuild => jogl-1.1.1a.ebuild}     | 18 +++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index cb34d4a..4b23f79 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-java/jogl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jan 2014; Justin Lecher <jlec@gentoo.org> -jogl-1.1.1.ebuild,
+  +jogl-1.1.1a.ebuild:
+  Bump away from vulnerable version, #330267
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> jogl-2.0_rc8-r1.ebuild,
   metadata.xml:
   Keyworded for ~x86

diff --git a/dev-java/jogl/jogl-1.1.1.ebuild b/dev-java/jogl/jogl-1.1.1a.ebuild
similarity index 87%
rename from dev-java/jogl/jogl-1.1.1.ebuild
rename to dev-java/jogl/jogl-1.1.1a.ebuild
index dd68032..6e07104 100644
--- a/dev-java/jogl/jogl-1.1.1.ebuild
+++ b/dev-java/jogl/jogl-1.1.1a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 WANT_ANT_TASKS="ant-antlr"
 JAVA_PKG_IUSE="cg source doc"
@@ -11,7 +11,7 @@ inherit eutils 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"
+SRC_URI="http://download.java.net/media/${PN}/builds/archive/jsr-231-${PV}/${P}-src.zip"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,7 +21,7 @@ IUSE=""
 COMMON_DEPEND="
 	dev-java/ant-core
 	>=dev-java/cpptasks-1.0_beta4-r2
-	=dev-java/gluegen-1*
+	dev-java/gluegen:0
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXxf86vm
@@ -40,21 +40,21 @@ S="${WORKDIR}/${PN}"
 
 java_prepare() {
 	epatch "${FILESDIR}/1.1.0/uncouple-gluegen.patch"
-	cd "${S}/make"
-	mv build.xml build.xml.bak
+	cd "${S}/make" || die
+	mv build.xml build.xml.bak || die
 
 	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"
+	rm -R "${S}/build/gensrc/classes/javax" || die
 
-	cd "${WORKDIR}/gluegen/make/lib"
+	cd "${WORKDIR}/gluegen/make/lib" || die
 	rm -v *.jar || die
 	java-pkg_jar-from cpptasks
 }
 
 src_compile() {
-	cd make/
+	cd make/ || die
 	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)"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2014-01-08 11:20 Justin Lecher
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Lecher @ 2014-01-08 11:20 UTC (permalink / raw
  To: gentoo-commits

commit:     712760fba6e39b082a7707007fae7fac98fc40ca
Author:     Johann Schmitz <johann <AT> j-schmitz <DOT> net>
AuthorDate: Tue Jan  7 17:34:38 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 17:34:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=712760fb

Version bump of jogl

Package-Manager: portage-2.2.7

---
 dev-java/jogl/ChangeLog             |  6 ++-
 dev-java/jogl/jogl-2.1.4_rc1.ebuild | 74 +++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 4b23f79..c6bec36 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jogl-2.1.4_rc1 (07 Jan 2014)
+
+  07 Jan 2014; Johann Schmitz <ercpe@gentoo.org> +jogl-2.1.4_rc1.ebuild:
+  Version bump of jogl
+
   03 Jan 2014; Justin Lecher <jlec@gentoo.org> -jogl-1.1.1.ebuild,
   +jogl-1.1.1a.ebuild:
   Bump away from vulnerable version, #330267
@@ -31,4 +36,3 @@
   +files/1.1.0/fix-solaris-compiler.patch, +files/1.1.0/uncouple-gluegen.patch,
   +jogl-1.1.1.ebuild, +metadata.xml:
   import from the java overlay
-

diff --git a/dev-java/jogl/jogl-2.1.4_rc1.ebuild b/dev-java/jogl/jogl-2.1.4_rc1.ebuild
new file mode 100644
index 0000000..793a947
--- /dev/null
+++ b/dev-java/jogl/jogl-2.1.4_rc1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+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}"
+
+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"
+
+LICENSE="BSD"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+CDEPEND="=dev-java/gluegen-${PV}:${SLOT}
+	dev-java/antlr:0
+	dev-java/ant-core:0
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	dev-java/swt:3.7
+	virtual/opengl
+	cg? ( media-gfx/nvidia-cg-toolkit )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+# upstream has a crude way to call the junit tests, which cause a lot of trouble to pass
+# 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"
+EANT_BUILD_TARGET="init build.nativewindow build.jogl build.newt one.dir tag.build"
+EANT_DOC_TARGET=""
+EANT_GENTOO_CLASSPATH="gluegen-${SLOT},antlr,ant-core,swt-3.7"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}/*.jar:${S}/build/nativewindow/*.jar"
+EANT_NEEDS_TOOLS="yes"
+
+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
+
+	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)"
+
+	use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
+}
+
+src_install() {
+	java-pkg_dojar build/jogl/*.jar
+	java-pkg_dojar build/nativewindow/*.jar
+	java-pkg_doso build/nativewindow/obj/*.so
+
+	use doc && dodoc -r doc
+	use source && java-pkg_dosrc src/jogl/classes/*
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2014-02-12  5:48 Guillaume Horel
  0 siblings, 0 replies; 14+ messages in thread
From: Guillaume Horel @ 2014-02-12  5:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4a85aca138e6353af4696e72b8eacf59e8b126c5
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Feb 12 05:36:31 2014 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Feb 12 05:45:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a85aca1

dev-java/jogl: dev-java/jogl version bump

Package-Manager: portage-2.2.8-r1

---
 dev-java/jogl/ChangeLog                                |  6 ++++++
 .../jogl/{jogl-2.1.4_rc1.ebuild => jogl-2.1.4.ebuild}  | 18 ++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index c6bec36..931648e 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/jogl-2.1.4_rc1.ebuild b/dev-java/jogl/jogl-2.1.4.ebuild
similarity index 81%
rename from dev-java/jogl/jogl-2.1.4_rc1.ebuild
rename to dev-java/jogl/jogl-2.1.4.ebuild
index 793a947..56fab7a 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/*


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2014-11-05  7:24 Justin Lecher
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Lecher @ 2014-11-05  7:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ebc2b67143935606a55ee1bdbe90dcce40aff91c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 08:16:32 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 08:16:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ebc2b671

dev-java/jogl: Bump to EAPI=5; drop old

Package-Manager: portage-2.2.14

---
 dev-java/jogl/ChangeLog              |   4 ++
 dev-java/jogl/jogl-2.0_rc8-r1.ebuild |   6 +--
 dev-java/jogl/jogl-2.1.2.ebuild      | 100 -----------------------------------
 dev-java/jogl/jogl-2.1.4.ebuild      |   3 +-
 4 files changed, 7 insertions(+), 106 deletions(-)

diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 931648e..11ee69f 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/jogl-2.0_rc8-r1.ebuild b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
index 97d4979..cdeb816 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 d938f83..0000000
--- 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 56fab7a..40b3ef3 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


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2020-09-25  7:51 Horea Christian
  0 siblings, 0 replies; 14+ messages in thread
From: Horea Christian @ 2020-09-25  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     50054825d8be1bd5013b96f692cd5a85710a6056
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Sep 25 07:50:45 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Sep 25 07:50:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=50054825

dev-java/jogl: removed old versions

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 dev-java/jogl/jogl-1.1.1a.ebuild     | 79 ------------------------------
 dev-java/jogl/jogl-2.0_rc8-r1.ebuild | 95 ------------------------------------
 2 files changed, 174 deletions(-)

diff --git a/dev-java/jogl/jogl-1.1.1a.ebuild b/dev-java/jogl/jogl-1.1.1a.ebuild
deleted file mode 100644
index 59e94ddef..000000000
--- a/dev-java/jogl/jogl-1.1.1a.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="cg source doc"
-
-inherit eutils 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-${PV}/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-java/ant-core
-	>=dev-java/cpptasks-1.0_beta4-r2
-	dev-java/gluegen:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	cg? ( media-gfx/nvidia-cg-toolkit )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.4
-	${COMMON_DEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}/1.1.0/uncouple-gluegen.patch"
-	cd "${S}/make" || die
-	mv build.xml build.xml.bak || die
-
-	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" || die
-
-	cd "${WORKDIR}/gluegen/make/lib" || die
-	rm -v *.jar || die
-	java-pkg_jar-from cpptasks
-}
-
-src_compile() {
-	cd make/ || die
-	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 ae3fec701..000000000
--- a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-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/*
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2021-01-13 21:06 Andrew Ammerlaan
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2021-01-13 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2b67435879ee579932c797e79cb950db7a673d2b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 13 20:57:26 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 13 20:57:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2b674358

dev-java/jogl: use https for homepage

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/jogl/jogl-2.1.4.ebuild | 4 ++--
 dev-java/jogl/jogl-2.2.4.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/jogl/jogl-2.1.4.ebuild b/dev-java/jogl/jogl-2.1.4.ebuild
index 8811c0a32..b8bb557db 100644
--- a/dev-java/jogl/jogl-2.1.4.ebuild
+++ b/dev-java/jogl/jogl-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ inherit java-pkg-2 java-ant-2
 #MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
-HOMEPAGE="http://jogamp.org/jogl/www/"
+HOMEPAGE="https://jogamp.org/jogl/www/"
 SRC_URI="https://github.com/sgothel/jogl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/dev-java/jogl/jogl-2.2.4.ebuild b/dev-java/jogl/jogl-2.2.4.ebuild
index 3af40058d..64c55a8eb 100644
--- a/dev-java/jogl/jogl-2.2.4.ebuild
+++ b/dev-java/jogl/jogl-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
-HOMEPAGE="http://jogamp.org/jogl/www/"
+HOMEPAGE="https://jogamp.org/jogl/www/"
 SRC_URI="https://github.com/sgothel/jogl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2021-03-03 12:05 Andrew Ammerlaan
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2021-03-03 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c937fcae2d3f3b1e8e0b004bbdc55ff8a0c6df27
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar  3 12:04:14 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar  3 12:04:14 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c937fcae

dev-java/jogl: EAPI bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/jogl/jogl-2.2.4.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/jogl/jogl-2.2.4.ebuild b/dev-java/jogl/jogl-2.2.4.ebuild
index 64c55a8eb..9d2345b53 100644
--- a/dev-java/jogl/jogl-2.2.4.ebuild
+++ b/dev-java/jogl/jogl-2.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
@@ -45,7 +45,8 @@ EANT_GENTOO_CLASSPATH="gluegen-${SLOT},antlr,ant-core,swt-3.7"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}/*.jar:${S}/build/nativewindow/*.jar"
 EANT_NEEDS_TOOLS="yes"
 
-java_prepare() {
+src_prepare() {
+	default
 	#we keep make/lib/plugin3/puglin3-public.jar
 	find -name 'make/lib/swt/*.jar' -delete -print || die
 


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
@ 2021-03-03 12:05 Andrew Ammerlaan
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Ammerlaan @ 2021-03-03 12:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8e6696b5ebde5400016a53e49ce0f658b51efad5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar  3 12:04:44 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar  3 12:04:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8e6696b5

dev-java/jogl: drop old

scilab only works with 2.2.4 anyway

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/jogl/jogl-2.1.4.ebuild | 72 -----------------------------------------
 1 file changed, 72 deletions(-)

diff --git a/dev-java/jogl/jogl-2.1.4.ebuild b/dev-java/jogl/jogl-2.1.4.ebuild
deleted file mode 100644
index b8bb557db..000000000
--- a/dev-java/jogl/jogl-2.1.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-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}"
-
-DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
-HOMEPAGE="https://jogamp.org/jogl/www/"
-SRC_URI="https://github.com/sgothel/jogl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cg"
-
-CDEPEND="
-	~dev-java/gluegen-${PV}:${SLOT}
-	dev-java/antlr:0
-	dev-java/ant-core:0
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	dev-java/swt:3.7
-	virtual/opengl
-	cg? ( media-gfx/nvidia-cg-toolkit )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-# upstream has a crude way to call the junit tests, which cause a lot of trouble to pass
-# our test classpath...
-RESTRICT="test"
-
-JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="make/build.xml"
-EANT_BUILD_TARGET="init build.nativewindow build.jogl build.newt one.dir tag.build"
-EANT_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="gluegen-${SLOT},antlr,ant-core,swt-3.7"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}/*.jar:${S}/build/nativewindow/*.jar"
-EANT_NEEDS_TOOLS="yes"
-
-java_prepare() {
-	#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
-
-	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)"
-
-	use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
-}
-
-src_install() {
-	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/*
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-03-03 12:05 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-08 11:20 [gentoo-commits] proj/sci:master commit in: dev-java/jogl/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2021-03-03 12:05 Andrew Ammerlaan
2021-03-03 12:05 Andrew Ammerlaan
2021-01-13 21:06 Andrew Ammerlaan
2020-09-25  7:51 Horea Christian
2014-11-05  7:24 Justin Lecher
2014-02-12  5:48 Guillaume Horel
2014-01-03 12:06 Justin Lecher
2013-11-16 17:00 Guillaume Horel
2013-10-28  4:29 Guillaume Horel
2013-02-03 15:19 Guillaume Horel
2012-05-29 17:49 Sebastien Fabbro
2012-05-22 19:43 Justin Lecher
2012-05-18 17:26 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox