[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/

[Sam James]

commit:     dda5b8e6883d0c1784cce1d18f9d5a14d3a15479
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 11:14:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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
 }