From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3524D158094 for ; Wed, 29 Jun 2022 01:33:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E070E0B66; Wed, 29 Jun 2022 01:33:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4900AE0B66 for ; Wed, 29 Jun 2022 01:33:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 160AD341980 for ; Wed, 29 Jun 2022 01:33:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C7494ED for ; Wed, 29 Jun 2022 01:33:04 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1656465761.6cf3ebd1f2850a1ca5634f403965ca7e14874364.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-java/jogl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-java/jogl/jogl-2.3.2.ebuild X-VCS-Directories: dev-java/jogl/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: 6cf3ebd1f2850a1ca5634f403965ca7e14874364 X-VCS-Branch: dev Date: Wed, 29 Jun 2022 01:33:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fe63dc2-6cc2-4618-be85-2c81fad09ba7 X-Archives-Hash: 090072d2ca3aa159add4676f7e1d9979 commit: 6cf3ebd1f2850a1ca5634f403965ca7e14874364 Author: Alessandro Barbieri gmail com> AuthorDate: Wed Jun 29 01:22:41 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Wed Jun 29 01:22:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6cf3ebd1 dev-java/jogl: fixes Signed-off-by: Alessandro Barbieri gmail.com> dev-java/jogl/jogl-2.3.2.ebuild | 38 ++++++++++++++++++++++++-------------- 1 file 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 849dae946..555e58ea7 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///' 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() {