commit:     1070f871662ac888cbe769ea3f1e2337f3652e1b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue May 30 03:37:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 30 03:37:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1070f871

sci-libs/gdal: move jdk dependency from BDEPEND to BDEPEND

Closes: https://bugs.gentoo.org/857816
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/gdal/gdal-3.7.0.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 8e85dac1b17e..7c62bbd95436 100644
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
        java? (
                dev-java/ant-core
                dev-lang/swig
-               >=virtual/jdk-1.8:*
        )
        python? (
                dev-lang/swig
@@ -60,6 +59,9 @@ DEPEND="
        gml? ( >=dev-libs/xerces-c-3.1 )
        heif? ( media-libs/libheif:= )
        hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+       java? (
+               >=virtual/jdk-1.8:*
+       )
        jpeg? ( media-libs/libjpeg-turbo:= )
        jpeg2k? ( media-libs/openjpeg:2= )
        lzma? ( || (
@@ -212,9 +214,6 @@ src_configure() {
                # Bindings
                -DBUILD_PYTHON_BINDINGS=$(usex python)
                -DBUILD_JAVA_BINDINGS=$(usex java)
-               $(usev java 
-DJAVA_AWT_LIBRARY=/etc/java-config-2/current-system-vm/lib)
-               $(usev java 
-DJAVA_JVM_LIBRARY=/etc/java-config-2/current-system-vm/lib)
-               $(usev java 
-DJAVA_INCLUDE_PATH=/etc/java-config-2/current-system-vm/include)
                # bug #845369
                -DBUILD_CSHARP_BINDINGS=OFF
 

Reply via email to