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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C52AB15807B for ; Tue, 5 Nov 2024 02:03:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BE37E07EC; Tue, 5 Nov 2024 02:03:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0472CE07EA for ; Tue, 5 Nov 2024 02:03:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FB65342FE3 for ; Tue, 5 Nov 2024 02:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F6971DF4 for ; Tue, 5 Nov 2024 02:03:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730772158.dda5b8e6883d0c1784cce1d18f9d5a14d3a15479.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-4.10.0.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dda5b8e6883d0c1784cce1d18f9d5a14d3a15479 X-VCS-Branch: master Date: Tue, 5 Nov 2024 02:03:22 +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: 0e80bf09-af39-49fb-9a74-11be3033ea6a X-Archives-Hash: 24d86d50bc8cc1baf4a071df486fb451 commit: dda5b8e6883d0c1784cce1d18f9d5a14d3a15479 Author: Paul Zander gmail com> AuthorDate: Mon Oct 21 11:14:24 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 5 02:02:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda5b8e6 media-libs/opencv: clean up java Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index 29f10a8eb53a..07eb7a2f61dd 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -208,7 +208,6 @@ COMMON_DEPEND=" media-libs/libdc1394:=[${MULTILIB_USEDEP}] sys-libs/libraw1394[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8:* ) jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) jpeg2k? ( jasper? ( media-libs/jasper:= ) @@ -273,6 +272,8 @@ RDEPEND=" ${COMMON_DEPEND} java? ( >=virtual/jre-1.8:* ) " +unset COMMON_DEPEND + BDEPEND=" virtual/pkgconfig cuda? ( dev-util/nvidia-cuda-toolkit:= ) @@ -507,9 +508,9 @@ src_prepare() { java-pkg-opt-2_src_prepare # set encoding so even this cmake build will pick it up. - export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" - export ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)" - export ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)" + ANT_OPTS+=" -Dfile.encoding=iso-8859-1" + ANT_OPTS+=" -Dant.build.javac.source=$(java-pkg_get-source)" + ANT_OPTS+=" -Dant.build.javac.target=$(java-pkg_get-target)" fi }