commit: 80d73aea1bafbcce0f9bad689c32632ab4365585 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Dec 28 15:07:36 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Dec 28 15:31:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d73aea
dev-libs/c-blosc: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/c-blosc/Manifest | 2 - dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild | 51 ---------------- dev-libs/c-blosc/c-blosc-1.21.2.ebuild | 50 --------------- .../files/c-blosc-1.21.1-gnuinstalldirs.patch | 71 ---------------------- 4 files changed, 174 deletions(-) diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index 48f22d4081fb..24d850467100 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1,3 +1 @@ -DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7 -DIST c-blosc-1.21.2.gh.tar.gz 1528949 BLAKE2B fa1702150a8b64bb9b4eb4de963a42c89be8f62f0b53804cb81345abb6be150b4fdbf2c2a8d4f2379301c65de07564608f1e25ee1d9b045747c486ef08740815 SHA512 f976c40834c1c3a0ec5af8dfb36b0b674430053a902b2e4dcac68eec9118f022a7a90aa73447e4d8234ce819088cf19ee574c1a1ca39c2e4f9164d79a95066b6 DIST c-blosc-1.21.3.gh.tar.gz 1532077 BLAKE2B ff8ad36e4e34b245062025c5820655bb52fea40276e88a748253d5079c3b5f8662079f177835ab38aa6e58d87e7849a93d7e1289346fcc53c077ef85b7382462 SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91 diff --git a/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild deleted file mode 100644 index 20cfa09d8a42..000000000000 --- a/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE="https://www.blosc.org/"; -SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+lz4 +snappy test zlib zstd" -RESTRICT="!test? ( test )" - -RDEPEND=" - lz4? ( >=app-arch/lz4-1.7.5:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gnuinstalldirs.patch -) - -src_prepare() { - cmake_src_prepare - # remove bundled libs - rm -rf internal-complibs || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_LZ4=$(usex !lz4) - -DDEACTIVATE_SNAPPY=$(usex !snappy) - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - # snappy is always external - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - ) - cmake_src_configure -} diff --git a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild b/dev-libs/c-blosc/c-blosc-1.21.2.ebuild deleted file mode 100644 index 3a03272014b2..000000000000 --- a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE="https://www.blosc.org/"; -SRC_URI=" - https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+lz4 +snappy test zlib zstd" -RESTRICT="!test? ( test )" - -DEPEND=" - lz4? ( >=app-arch/lz4-1.7.5:= ) - snappy? ( app-arch/snappy:= ) - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_LZ4=$(usex !lz4) - -DDEACTIVATE_SNAPPY=$(usex !snappy) - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - # snappy is always external - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - ) - cmake_src_configure -} diff --git a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch b/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch deleted file mode 100644 index d90a2fc50cee..000000000000 --- a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://github.com/Blosc/c-blosc/commit/5a2907c75ee1e43be90f58f2be7f8c856004a3bf - -From 5a2907c75ee1e43be90f58f2be7f8c856004a3bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?H=C3=A5vard=20Flaget=20Aasen?= <[email protected]> -Date: Sun, 5 Dec 2021 07:52:54 +0100 -Subject: [PATCH] CMake: Use GNUInstallDirs when installing files. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -122,7 +122,7 @@ option(PREFER_EXTERNAL_ZSTD - "Find and use external Zstd library instead of included sources." OFF) - - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") -- -+include(GNUInstallDirs) - - if(NOT DEACTIVATE_LZ4) - if(PREFER_EXTERNAL_LZ4) -@@ -342,7 +342,7 @@ if (BLOSC_INSTALL) - "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc" - @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc" -- DESTINATION lib/pkgconfig COMPONENT DEV) -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV) - - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" ---- a/blosc.pc.in -+++ b/blosc.pc.in -@@ -1,8 +1,8 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${exec_prefix}/lib -+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sharedlibdir=${libdir} --includedir=${prefix}/include -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - - Name: blosc - Description: A blocking, shuffling and lossless compression library ---- a/blosc/CMakeLists.txt -+++ b/blosc/CMakeLists.txt -@@ -61,8 +61,6 @@ if(COMPILER_SUPPORT_AVX2) - endif(COMPILER_SUPPORT_AVX2) - set(SOURCES ${SOURCES} shuffle.c) - --# library install directory --set(lib_dir lib${LIB_SUFFIX}) - set(version_string ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH}) - - set(CMAKE_THREAD_PREFER_PTHREAD TRUE) # pre 3.1 -@@ -219,11 +217,15 @@ endif(BUILD_STATIC) - - # install - if(BLOSC_INSTALL) -- install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV) -+ install(FILES blosc.h blosc-export.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV) - if(BUILD_SHARED) -- install(TARGETS blosc_shared LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT LIB) -+ install(TARGETS blosc_shared -+ LIBRARY COMPONENT LIB -+ ARCHIVE COMPONENT DEV -+ RUNTIME COMPONENT LIB) - endif(BUILD_SHARED) - if(BUILD_STATIC) -- install(TARGETS blosc_static LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT DEV) -+ install(TARGETS blosc_static COMPONENT DEV) - endif(BUILD_STATIC) - endif(BLOSC_INSTALL) -
