commit: 36d365c38a240d902e66c944296e730ab20c21e4 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Feb 3 08:25:07 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu Apr 11 10:01:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d365c3
sci-libs/gdal: gdal-3.8.0-java21.patch also no longer depends on deprecated dev-java/ant-core Bug: https://bugs.gentoo.org/916787 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-libs/gdal/files/gdal-3.8.0-java21.patch | 20 ++++++++++++++++++++ .../gdal/{gdal-3.8.0.ebuild => gdal-3.8.0-r1.ebuild} | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch b/sci-libs/gdal/files/gdal-3.8.0-java21.patch new file mode 100644 index 000000000000..3e924c5206c1 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.8.0-java21.patch @@ -0,0 +1,20 @@ +--- a/swig/java/build.xml ++++ b/swig/java/build.xml +@@ -21,7 +21,7 @@ + <target name="compile" depends="init" description="Compile the source files."> + <mkdir dir="${build_dir}/build/classes"/> + <javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes" +- debug="on" source="7" target="7" ++ debug="on" source="8" target="8" + includeantruntime="false" deprecation="true"> + </javac> + <echo>compilation complete</echo> +@@ -38,7 +38,7 @@ + <target name="compile_tests" depends="archive" description="Compile the tests files."> + <mkdir dir="${build_dir}/build/apps"/> + <javac srcdir="${source_apps}" destdir="${build_dir}/build/apps" +- debug="on" source="7" target="7" ++ debug="on" source="8" target="8" + includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar"> + </javac> + <echo>compilation of tests complete</echo> diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0-r1.ebuild similarity index 99% rename from sci-libs/gdal/gdal-3.8.0.ebuild rename to sci-libs/gdal/gdal-3.8.0-r1.ebuild index 5a47aad92bfa..1a8dd8a1059a 100644 --- a/sci-libs/gdal/gdal-3.8.0.ebuild +++ b/sci-libs/gdal/gdal-3.8.0-r1.ebuild @@ -27,7 +27,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-text/doxygen ) java? ( - dev-java/ant-core + >=dev-java/ant-1.10.14-r3:0 dev-lang/swig ) python? ( @@ -99,6 +99,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( + "${FILESDIR}/gdal-3.8.0-java21.patch" "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch "${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564
