diff options
author | 2022-06-29 03:22:41 +0200 | |
---|---|---|
committer | 2022-06-29 03:22:41 +0200 | |
commit | 6cf3ebd1f2850a1ca5634f403965ca7e14874364 (patch) | |
tree | 42e5ebb784e1f4688bbb084cda6e272221b8062a /dev-java | |
parent | dev-java/jcuber: fix install phase (diff) | |
download | guru-6cf3ebd1f2850a1ca5634f403965ca7e14874364.tar.gz guru-6cf3ebd1f2850a1ca5634f403965ca7e14874364.tar.bz2 guru-6cf3ebd1f2850a1ca5634f403965ca7e14874364.zip |
dev-java/jogl: fixes
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/jogl/jogl-2.3.2.ebuild | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/dev-java/jogl/jogl-2.3.2.ebuild b/dev-java/jogl/jogl-2.3.2.ebuild index 849dae9465..555e58ea7a 100644 --- a/dev-java/jogl/jogl-2.3.2.ebuild +++ b/dev-java/jogl/jogl-2.3.2.ebuild @@ -3,16 +3,7 @@ EAPI=8 -EANT_BUILD_TARGET="init build.nativewindow build.jogl build.newt build.oculusvr one.dir tag.build" -EANT_BUILD_XML="make/build.xml" -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_ANT_REWRITE_CLASSPATH="yes" -JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml" JAVA_PKG_IUSE="doc source" -WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0" inherit java-pkg-2 java-ant-2 @@ -29,13 +20,13 @@ KEYWORDS="~amd64" 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/gluegen-${PV}:${SLOT} dev-java/swt:3.7 virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm cg? ( media-gfx/nvidia-cg-toolkit ) " RDEPEND=" @@ -46,6 +37,17 @@ DEPEND=" ${CDEPEND} >=virtual/jdk-1.8:* " +BDEPEND="dev-vcs/git" + +EANT_BUILD_TARGET="init build.nativewindow build.jogl build.newt build.oculusvr one.dir tag.build" +EANT_BUILD_XML="make/build.xml" +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_ANT_REWRITE_CLASSPATH="yes" +JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml" +WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0" # upstream has a crude way to call the junit tests, which cause a lot of trouble to pass # our test classpath... @@ -53,8 +55,8 @@ RESTRICT="test" src_prepare() { default - #we keep make/lib/plugin3/plugin3-public.jar - find -name 'make/lib/swt/*.jar' -delete -print || die + rm -r make/lib || die + java-pkg_clean # Empty filesets are never out of date! sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml || die @@ -65,6 +67,14 @@ src_prepare() { 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" + export EANT_EXTRA_ARGS + + #it want a git repo + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die } src_install() { |