1 |
commit: 80d73aea1bafbcce0f9bad689c32632ab4365585 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 28 15:07:36 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 28 15:31:54 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d73aea |
7 |
|
8 |
dev-libs/c-blosc: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-libs/c-blosc/Manifest | 2 - |
13 |
dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild | 51 ---------------- |
14 |
dev-libs/c-blosc/c-blosc-1.21.2.ebuild | 50 --------------- |
15 |
.../files/c-blosc-1.21.1-gnuinstalldirs.patch | 71 ---------------------- |
16 |
4 files changed, 174 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest |
19 |
index 48f22d4081fb..24d850467100 100644 |
20 |
--- a/dev-libs/c-blosc/Manifest |
21 |
+++ b/dev-libs/c-blosc/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7 |
24 |
-DIST c-blosc-1.21.2.gh.tar.gz 1528949 BLAKE2B fa1702150a8b64bb9b4eb4de963a42c89be8f62f0b53804cb81345abb6be150b4fdbf2c2a8d4f2379301c65de07564608f1e25ee1d9b045747c486ef08740815 SHA512 f976c40834c1c3a0ec5af8dfb36b0b674430053a902b2e4dcac68eec9118f022a7a90aa73447e4d8234ce819088cf19ee574c1a1ca39c2e4f9164d79a95066b6 |
25 |
DIST c-blosc-1.21.3.gh.tar.gz 1532077 BLAKE2B ff8ad36e4e34b245062025c5820655bb52fea40276e88a748253d5079c3b5f8662079f177835ab38aa6e58d87e7849a93d7e1289346fcc53c077ef85b7382462 SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 20cfa09d8a42..000000000000 |
30 |
--- a/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,51 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=8 |
37 |
- |
38 |
-inherit cmake |
39 |
- |
40 |
-DESCRIPTION="Blocking, shuffling and lossless compression library" |
41 |
-HOMEPAGE="https://www.blosc.org/" |
42 |
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="BSD" |
45 |
-SLOT="0/1" |
46 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" |
47 |
-IUSE="+lz4 +snappy test zlib zstd" |
48 |
-RESTRICT="!test? ( test )" |
49 |
- |
50 |
-RDEPEND=" |
51 |
- lz4? ( >=app-arch/lz4-1.7.5:= ) |
52 |
- snappy? ( app-arch/snappy:= ) |
53 |
- zlib? ( sys-libs/zlib:= ) |
54 |
- zstd? ( app-arch/zstd:= )" |
55 |
-DEPEND="${RDEPEND}" |
56 |
- |
57 |
-PATCHES=( |
58 |
- "${FILESDIR}"/${P}-gnuinstalldirs.patch |
59 |
-) |
60 |
- |
61 |
-src_prepare() { |
62 |
- cmake_src_prepare |
63 |
- # remove bundled libs |
64 |
- rm -rf internal-complibs || die |
65 |
-} |
66 |
- |
67 |
-src_configure() { |
68 |
- local mycmakeargs=( |
69 |
- -DBUILD_STATIC=OFF |
70 |
- -DBUILD_TESTS=$(usex test) |
71 |
- -DBUILD_BENCHMARKS=OFF |
72 |
- -DBUILD_FUZZERS=OFF |
73 |
- -DDEACTIVATE_LZ4=$(usex !lz4) |
74 |
- -DDEACTIVATE_SNAPPY=$(usex !snappy) |
75 |
- -DDEACTIVATE_ZLIB=$(usex !zlib) |
76 |
- -DDEACTIVATE_ZSTD=$(usex !zstd) |
77 |
- -DPREFER_EXTERNAL_LZ4=ON |
78 |
- # snappy is always external |
79 |
- -DPREFER_EXTERNAL_ZLIB=ON |
80 |
- -DPREFER_EXTERNAL_ZSTD=ON |
81 |
- ) |
82 |
- cmake_src_configure |
83 |
-} |
84 |
|
85 |
diff --git a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild b/dev-libs/c-blosc/c-blosc-1.21.2.ebuild |
86 |
deleted file mode 100644 |
87 |
index 3a03272014b2..000000000000 |
88 |
--- a/dev-libs/c-blosc/c-blosc-1.21.2.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,50 +0,0 @@ |
91 |
-# Copyright 1999-2022 Gentoo Authors |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
- |
94 |
-EAPI=8 |
95 |
- |
96 |
-inherit cmake |
97 |
- |
98 |
-DESCRIPTION="Blocking, shuffling and lossless compression library" |
99 |
-HOMEPAGE="https://www.blosc.org/" |
100 |
-SRC_URI=" |
101 |
- https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz |
102 |
- -> ${P}.gh.tar.gz |
103 |
-" |
104 |
- |
105 |
-LICENSE="BSD" |
106 |
-SLOT="0/1" |
107 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
108 |
-IUSE="+lz4 +snappy test zlib zstd" |
109 |
-RESTRICT="!test? ( test )" |
110 |
- |
111 |
-DEPEND=" |
112 |
- lz4? ( >=app-arch/lz4-1.7.5:= ) |
113 |
- snappy? ( app-arch/snappy:= ) |
114 |
- zlib? ( sys-libs/zlib:= ) |
115 |
- zstd? ( app-arch/zstd:= ) |
116 |
-" |
117 |
-RDEPEND=" |
118 |
- ${DEPEND} |
119 |
-" |
120 |
- |
121 |
-src_configure() { |
122 |
- # remove bundled libs (just in case) |
123 |
- rm -rf internal-complibs || die |
124 |
- |
125 |
- local mycmakeargs=( |
126 |
- -DBUILD_STATIC=OFF |
127 |
- -DBUILD_TESTS=$(usex test) |
128 |
- -DBUILD_BENCHMARKS=OFF |
129 |
- -DBUILD_FUZZERS=OFF |
130 |
- -DDEACTIVATE_LZ4=$(usex !lz4) |
131 |
- -DDEACTIVATE_SNAPPY=$(usex !snappy) |
132 |
- -DDEACTIVATE_ZLIB=$(usex !zlib) |
133 |
- -DDEACTIVATE_ZSTD=$(usex !zstd) |
134 |
- -DPREFER_EXTERNAL_LZ4=ON |
135 |
- # snappy is always external |
136 |
- -DPREFER_EXTERNAL_ZLIB=ON |
137 |
- -DPREFER_EXTERNAL_ZSTD=ON |
138 |
- ) |
139 |
- cmake_src_configure |
140 |
-} |
141 |
|
142 |
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 |
143 |
deleted file mode 100644 |
144 |
index d90a2fc50cee..000000000000 |
145 |
--- a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch |
146 |
+++ /dev/null |
147 |
@@ -1,71 +0,0 @@ |
148 |
-https://github.com/Blosc/c-blosc/commit/5a2907c75ee1e43be90f58f2be7f8c856004a3bf |
149 |
- |
150 |
-From 5a2907c75ee1e43be90f58f2be7f8c856004a3bf Mon Sep 17 00:00:00 2001 |
151 |
-From: =?UTF-8?q?H=C3=A5vard=20Flaget=20Aasen?= <haavard_aasen@×××××.no> |
152 |
-Date: Sun, 5 Dec 2021 07:52:54 +0100 |
153 |
-Subject: [PATCH] CMake: Use GNUInstallDirs when installing files. |
154 |
- |
155 |
---- a/CMakeLists.txt |
156 |
-+++ b/CMakeLists.txt |
157 |
-@@ -122,7 +122,7 @@ option(PREFER_EXTERNAL_ZSTD |
158 |
- "Find and use external Zstd library instead of included sources." OFF) |
159 |
- |
160 |
- set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") |
161 |
-- |
162 |
-+include(GNUInstallDirs) |
163 |
- |
164 |
- if(NOT DEACTIVATE_LZ4) |
165 |
- if(PREFER_EXTERNAL_LZ4) |
166 |
-@@ -342,7 +342,7 @@ if (BLOSC_INSTALL) |
167 |
- "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc" |
168 |
- @ONLY) |
169 |
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc" |
170 |
-- DESTINATION lib/pkgconfig COMPONENT DEV) |
171 |
-+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV) |
172 |
- |
173 |
- configure_file( |
174 |
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" |
175 |
---- a/blosc.pc.in |
176 |
-+++ b/blosc.pc.in |
177 |
-@@ -1,8 +1,8 @@ |
178 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
179 |
- exec_prefix=${prefix} |
180 |
--libdir=${exec_prefix}/lib |
181 |
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
182 |
- sharedlibdir=${libdir} |
183 |
--includedir=${prefix}/include |
184 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ |
185 |
- |
186 |
- Name: blosc |
187 |
- Description: A blocking, shuffling and lossless compression library |
188 |
---- a/blosc/CMakeLists.txt |
189 |
-+++ b/blosc/CMakeLists.txt |
190 |
-@@ -61,8 +61,6 @@ if(COMPILER_SUPPORT_AVX2) |
191 |
- endif(COMPILER_SUPPORT_AVX2) |
192 |
- set(SOURCES ${SOURCES} shuffle.c) |
193 |
- |
194 |
--# library install directory |
195 |
--set(lib_dir lib${LIB_SUFFIX}) |
196 |
- set(version_string ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH}) |
197 |
- |
198 |
- set(CMAKE_THREAD_PREFER_PTHREAD TRUE) # pre 3.1 |
199 |
-@@ -219,11 +217,15 @@ endif(BUILD_STATIC) |
200 |
- |
201 |
- # install |
202 |
- if(BLOSC_INSTALL) |
203 |
-- install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV) |
204 |
-+ install(FILES blosc.h blosc-export.h |
205 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV) |
206 |
- if(BUILD_SHARED) |
207 |
-- install(TARGETS blosc_shared LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT LIB) |
208 |
-+ install(TARGETS blosc_shared |
209 |
-+ LIBRARY COMPONENT LIB |
210 |
-+ ARCHIVE COMPONENT DEV |
211 |
-+ RUNTIME COMPONENT LIB) |
212 |
- endif(BUILD_SHARED) |
213 |
- if(BUILD_STATIC) |
214 |
-- install(TARGETS blosc_static LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT DEV) |
215 |
-+ install(TARGETS blosc_static COMPONENT DEV) |
216 |
- endif(BUILD_STATIC) |
217 |
- endif(BLOSC_INSTALL) |
218 |
- |