commit: 8de67edc769615b94f84558725ee014ce27644b9 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Jan 20 15:59:29 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Jan 20 15:59:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de67edc
dev-libs/apache-arrow: fix deps on dev-libs/re2 Closes: https://bugs.gentoo.org/922197 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-libs/apache-arrow/Manifest | 1 - dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild | 124 --------------------- ...14.0.2.ebuild => apache-arrow-14.0.2-r1.ebuild} | 4 +- 3 files changed, 2 insertions(+), 127 deletions(-) diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest index 8f1aa7a84734..9c697a4871fc 100644 --- a/dev-libs/apache-arrow/Manifest +++ b/dev-libs/apache-arrow/Manifest @@ -1,4 +1,3 @@ -DIST apache-arrow-14.0.1.tar.gz 20968461 BLAKE2B 01a4269f98ba2a4de1d6bc29f43a4e97132f8b7bdb3c3d022e0c0ba498527003e8bec0ea0b054f19ae54749f45fe39675f651f6c9e34e815df5a9b9926512431 SHA512 31d19f0ca80349f63db74bae813256b47907f85725a9bf01ef6f32406e79828ebb4701faedb52696b6a5b3bb89ad4e136485fd5eb35d396dd42147c11d4d2713 DIST apache-arrow-14.0.2.tar.gz 20969982 BLAKE2B 9df119fca564a4140d1143a1ac0614831e4f80846d43439d011b8ca7f5e77461005c96b9430b6dd7ce0ba7496b879a8abc9ffa372e6b455c317abeebb16ae8e4 SHA512 dd6cf6cbb817a48ef5275bb409367e5904526a3c16a17a37ea75101085ea19a71ba6bf936a6f099012e7c528811db1728ef2f14dcb16a1056a22088839280ce0 DIST apache-arrow-arrow-data-d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82 DIST apache-arrow-parquet-data-b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61 diff --git a/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild b/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild deleted file mode 100644 index 83aec0bab61c..000000000000 --- a/dev-libs/apache-arrow/apache-arrow-14.0.1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929 -PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac - -DESCRIPTION="A cross-language development platform for in-memory data." -HOMEPAGE="https://arrow.apache.org/"; -SRC_URI=" - mirror://apache/arrow/arrow-${PV}/${P}.tar.gz - test? ( - https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz - -> ${PN}-parquet-data-${PARQUET_DATA_GIT_HASH}.tar.gz - https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz - -> ${PN}-arrow-data-${ARROW_DATA_GIT_HASH}.tar.gz - ) -" -S="${WORKDIR}/${P}/cpp" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - brotli? ( app-arch/brotli:= ) - bzip2? ( app-arch/bzip2:= ) - compute? ( dev-libs/libutf8proc:= ) - dataset? ( - dev-libs/libutf8proc:= - re2? ( dev-libs/re2:= ) - ) - lz4? ( app-arch/lz4:= ) - parquet? ( - dev-libs/libutf8proc:= - dev-libs/thrift:= - ssl? ( dev-libs/openssl:= ) - ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND} - dev-cpp/xsimd - >=dev-libs/boost-1.81.0 - json? ( dev-libs/rapidjson ) - test? ( - dev-cpp/gflags - dev-cpp/gtest - ) -" - -REQUIRED_USE=" - test? ( - json - parquet? ( zstd ) - ) - ssl? ( json ) -" - -PATCHES=( - "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" - "${FILESDIR}"/${P}-gcc14.patch -) - -src_prepare() { - # use Gentoo CXXFLAGS, specify docdir at src_configure. - sed -i \ - -e '/SetupCxxFlags/d' \ - -e '/set(ARROW_DOC_DIR.*)/d' \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DARROW_BUILD_STATIC=OFF - -DARROW_BUILD_TESTS=$(usex test) - -DARROW_COMPUTE=$(usex compute) - -DARROW_CSV=ON - -DARROW_DATASET=$(usex dataset) - -DARROW_DEPENDENCY_SOURCE=SYSTEM - -DARROW_DOC_DIR=share/doc/${PF} - -DARROW_FILESYSTEM=ON - -DARROW_HDFS=ON - -DARROW_JEMALLOC=OFF - -DARROW_JSON=$(usex json) - -DARROW_PARQUET=$(usex parquet) - -DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl) - -DARROW_USE_CCACHE=OFF - -DARROW_USE_SCCACHE=OFF - -DARROW_WITH_BROTLI=$(usex brotli) - -DARROW_WITH_BZ2=$(usex bzip2) - -DARROW_WITH_LZ4=$(usex lz4) - -DARROW_WITH_RE2=$(usex re2) - -DARROW_WITH_SNAPPY=$(usex snappy) - -DARROW_WITH_ZLIB=$(usex zlib) - -DARROW_WITH_ZSTD=$(usex zstd) - -DCMAKE_CXX_STANDARD=17 - ) - cmake_src_configure -} - -src_test() { - export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data" - export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data" - cmake_src_test -} - -src_install() { - cmake_src_install - if use test; then - cd "${D}"/usr/$(get_libdir) - rm -r cmake/ArrowTesting || die - rm libarrow_testing* || die - rm pkgconfig/arrow-testing.pc || die - fi -} diff --git a/dev-libs/apache-arrow/apache-arrow-14.0.2.ebuild b/dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild similarity index 97% rename from dev-libs/apache-arrow/apache-arrow-14.0.2.ebuild rename to dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild index 25da2a40b44c..100c9b8861c0 100644 --- a/dev-libs/apache-arrow/apache-arrow-14.0.2.ebuild +++ b/dev-libs/apache-arrow/apache-arrow-14.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,6 @@ RDEPEND=" compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= - re2? ( dev-libs/re2:= ) ) lz4? ( app-arch/lz4:= ) parquet? ( @@ -41,6 +40,7 @@ RDEPEND=" dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) + re2? ( dev-libs/re2:= ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
