commit: 45b8c3f13cd57daf17fe0c8d7a5752af43bcc248 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 3 10:05:37 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 3 10:06:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b8c3f1
dev-db/spatialite: fixup freexl dep, require XML We need freexl's XML support for freexl_open_ods but also doesn't make sense to have optional XML in spatialite as then feels like USE="-xml" but with XLS support isn't tested much upstream. Closes: https://bugs.gentoo.org/920326 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{spatialite-5.1.0.ebuild => spatialite-5.1.0-r1.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-db/spatialite/spatialite-5.1.0.ebuild b/dev-db/spatialite/spatialite-5.1.0-r1.ebuild similarity index 84% rename from dev-db/spatialite/spatialite-5.1.0.ebuild rename to dev-db/spatialite/spatialite-5.1.0-r1.ebuild index bf5f79f8f622..a509af0c9b1a 100644 --- a/dev-db/spatialite/spatialite-5.1.0.ebuild +++ b/dev-db/spatialite/spatialite-5.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,17 +14,17 @@ S="${WORKDIR}/${MY_P}" LICENSE="MPL-1.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="+geos iconv +proj rttopo test +xls +xml" +IUSE="+geos iconv +proj rttopo test +xls" # Further poking required RESTRICT="test" RDEPEND=" >=dev-db/sqlite-3.7.5:3[extensions(+)] + dev-libs/libxml2 sys-libs/zlib[minizip] geos? ( >=sci-libs/geos-3.11.0 ) proj? ( sci-libs/proj:= ) - xls? ( >=dev-libs/freexl-2.0.0 ) - xml? ( dev-libs/libxml2 ) + xls? ( >=dev-libs/freexl-2.0.0[xml(+)] ) rttopo? ( sci-geosciences/librttopo ) " DEPEND="${RDEPEND}" @@ -38,6 +38,7 @@ src_configure() { --disable-examples \ --disable-static \ --enable-epsg \ + --enable-libxml2 \ $(use_enable rttopo) \ $(use_enable geos) \ $(use_enable geos geosadvanced) \ @@ -45,8 +46,7 @@ src_configure() { $(use_enable geos geos3110) \ $(use_enable iconv) \ $(use_enable proj) \ - $(use_enable xls freexl) \ - $(use_enable xml libxml2) + $(use_enable xls freexl) } src_install() {
