Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-java/jogl/
Date: Fri, 25 Sep 2020 07:51:48
Message-Id: 1601020245.50054825d8be1bd5013b96f692cd5a85710a6056.chymera@gentoo
1 commit: 50054825d8be1bd5013b96f692cd5a85710a6056
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Fri Sep 25 07:50:45 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Fri Sep 25 07:50:45 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=50054825
7
8 dev-java/jogl: removed old versions
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 dev-java/jogl/jogl-1.1.1a.ebuild | 79 ------------------------------
14 dev-java/jogl/jogl-2.0_rc8-r1.ebuild | 95 ------------------------------------
15 2 files changed, 174 deletions(-)
16
17 diff --git a/dev-java/jogl/jogl-1.1.1a.ebuild b/dev-java/jogl/jogl-1.1.1a.ebuild
18 deleted file mode 100644
19 index 59e94ddef..000000000
20 --- a/dev-java/jogl/jogl-1.1.1a.ebuild
21 +++ /dev/null
22 @@ -1,79 +0,0 @@
23 -# Copyright 1999-2014 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=5
27 -
28 -WANT_ANT_TASKS="ant-antlr"
29 -JAVA_PKG_IUSE="cg source doc"
30 -
31 -inherit eutils java-pkg-2 java-ant-2
32 -
33 -DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
34 -HOMEPAGE="https://jogl.dev.java.net/"
35 -SRC_URI="http://download.java.net/media/${PN}/builds/archive/jsr-231-${PV}/${P}-src.zip"
36 -
37 -LICENSE="BSD"
38 -SLOT="0"
39 -KEYWORDS="~amd64 ~x86"
40 -IUSE=""
41 -
42 -COMMON_DEPEND="
43 - dev-java/ant-core
44 - >=dev-java/cpptasks-1.0_beta4-r2
45 - dev-java/gluegen:0
46 - virtual/opengl
47 - x11-libs/libX11
48 - x11-libs/libXxf86vm
49 - cg? ( media-gfx/nvidia-cg-toolkit )"
50 -
51 -DEPEND="
52 - app-arch/unzip
53 - >=virtual/jdk-1.4
54 - ${COMMON_DEPEND}"
55 -
56 -RDEPEND="
57 - >=virtual/jre-1.4
58 - ${COMMON_DEPEND}"
59 -
60 -S="${WORKDIR}/${PN}"
61 -
62 -java_prepare() {
63 - epatch "${FILESDIR}/1.1.0/uncouple-gluegen.patch"
64 - cd "${S}/make" || die
65 - mv build.xml build.xml.bak || die
66 -
67 - sed 's_/usr/X11R6_/usr_g' build.xml.bak > build.xml || die
68 - sed -i -e 's/suncc/gcc/g' build.xml ../../gluegen/make/gluegen-cpptasks.xml || die
69 -
70 - rm -R "${S}/build/gensrc/classes/javax" || die
71 -
72 - cd "${WORKDIR}/gluegen/make/lib" || die
73 - rm -v *.jar || die
74 - java-pkg_jar-from cpptasks
75 -}
76 -
77 -src_compile() {
78 - cd make/ || die
79 - local antflags="-Dgluegen.prebuild=true"
80 - antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars --build-only antlr)"
81 - local gcp="$(java-pkg_getjars ant-core):$(java-config --tools)"
82 -
83 - local gluegen="-Dgluegen.jar=$(java-pkg_getjar gluegen gluegen.jar)"
84 - local gluegenrt="-Dgluegen-rt.jar=$(java-pkg_getjar gluegen gluegen-rt.jar)"
85 -
86 - use cg && antflags="${antflags} -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
87 - # -Dbuild.sysclasspath=ignore fails with missing ant dependencies.
88 -
89 - export ANT_OPTS="-Xmx1g"
90 - eant \
91 - -Dgentoo.classpath="${gcp}" \
92 - ${antflags} "${gluegen}" "${gluegenrt}" \
93 - all $(use_doc)
94 -}
95 -
96 -src_install() {
97 - use source && java-pkg_dosrc src/classes/*
98 - java-pkg_doso build/obj/*.so
99 - java-pkg_dojar build/*.jar
100 - use doc && java-pkg_dojavadoc javadoc_public
101 -}
102
103 diff --git a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild b/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
104 deleted file mode 100644
105 index ae3fec701..000000000
106 --- a/dev-java/jogl/jogl-2.0_rc8-r1.ebuild
107 +++ /dev/null
108 @@ -1,95 +0,0 @@
109 -# Copyright 1999-2014 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -
112 -EAPI=5
113 -
114 -JAVA_PKG_IUSE="doc source"
115 -
116 -inherit java-pkg-2 java-ant-2
117 -
118 -MY_PV=v${PV/_/-}
119 -MY_P=${PN}-${MY_PV}
120 -
121 -DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
122 -HOMEPAGE="http://jogamp.org/jogl/www/"
123 -SRC_URI="http://jogamp.org/deployment/${MY_PV}/archive/Sources/${MY_P}.tar.7z"
124 -
125 -LICENSE="BSD"
126 -SLOT="2"
127 -KEYWORDS="~amd64 ~x86"
128 -IUSE="cg"
129 -
130 -COMMON_DEP="
131 - dev-java/ant-core:0
132 - dev-java/ant-junit:0
133 - dev-java/antlr:0
134 - dev-java/cpptasks:0
135 - =dev-java/gluegen-${PV}:${SLOT}
136 - dev-java/junit:4
137 - dev-java/swt:3.7
138 - x11-libs/libX11
139 - x11-libs/libXxf86vm
140 - virtual/opengl
141 - cg? ( media-gfx/nvidia-cg-toolkit )"
142 -RDEPEND="${COMMON_DEP}
143 - >=virtual/jre-1.5"
144 -DEPEND="${COMMON_DEP}
145 - >=virtual/jdk-1.5
146 - app-arch/p7zip
147 - dev-java/ant-antlr:0
148 - dev-java/ant-contrib:0
149 - dev-java/ant-nodeps:0
150 - dev-java/cpptasks:0"
151 -
152 -S=${WORKDIR}/${MY_P}
153 -
154 -src_unpack() {
155 - default
156 - unpack ./${MY_P}.tar
157 -}
158 -
159 -java_prepare() {
160 - find -name '*.jar' -exec rm -v {} + || die
161 -
162 - # Empty filesets are never out of date!
163 - sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die
164 -}
165 -
166 -JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml build-test.xml"
167 -JAVA_ANT_REWRITE_CLASSPATH="yes"
168 -
169 -EANT_BUILD_XML="make/build.xml"
170 -EANT_BUILD_TARGET="all"
171 -EANT_DOC_TARGET="" # FIXME there are a couple javadoc targets, pick one
172 -EANT_GENTOO_CLASSPATH="ant-core,antlr,swt-3.7,ant-junit"
173 -EANT_NEEDS_TOOLS="yes"
174 -EANT_ANT_TASKS="ant-antlr ant-contrib ant-junit ant-nodeps cpptasks"
175 -
176 -src_compile() {
177 - EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true"
178 - EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/"
179 - EANT_EXTRA_ARGS+=" -Dgluegen.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen.jar)"
180 - EANT_EXTRA_ARGS+=" -Dgluegen-rt.jar=$(java-pkg_getjar gluegen-${SLOT} gluegen-rt.jar)"
181 -
182 - # FIXME don't build tests just yet
183 - EANT_EXTRA_ARGS+=" -Djunit.jar=$(java-pkg_getjar --build-only junit-4 junit.jar)"
184 -
185 - use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
186 -
187 - java-pkg-2_src_compile
188 -}
189 -
190 -EANT_TEST_TARGET="junit.run"
191 -# FIXME src_test
192 -
193 -src_install() {
194 - # There are many more
195 - java-pkg_dojar build/jar/*.jar
196 - java-pkg_doso build/lib/*.so
197 -
198 - if use doc; then
199 - #java-pkg_dojavadoc javadoc_public
200 - dodoc -r doc
201 - fi
202 - use source && java-pkg_dosrc src/jogl/classes/*
203 -}