gentoo auto-resync : 22:11:2022 - 07:05:54

3 files changed, 77 insertions, 1 deletions

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 61b5b795ec71..e61b0329d3e3 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,3 +1,4 @@
+AUX c-blosc-1.21.1-gnuinstalldirs.patch 2608 BLAKE2B 03e7d073c0f16a651569b21167d43ba405924848c0f5e653154f13473b916d02f5a1d2cafaa3f8d195f7ba6adac378b382893ffe522058d23f9aac112fff9279 SHA512 95865129f6c2a042ad1367873c1d5c165766c9628fe0237609f741def95f44290cf99ad03ea567cca7bd2fcdf727261f4d8ae8fce5bdf96dd1450b0f59196508
 DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7
-EBUILD c-blosc-1.21.1.ebuild 1157 BLAKE2B 7c58afa8f3c9b0f3ac557aabf6840f4a0718fc009682bc2d550936a7a002380b4f07a2651fba191e59afd38216045a1fc0c2d8e8431469eb16c3f15ef1364cbe SHA512 60b4d0cf1efe2516864905b8120dca6b197c1df382d4aa9a6fbacf9a0d06de02756d3cbd012f58061bef08d95db58a47577df04bcd76b03bdcbe6a9ffd27b3d9
+EBUILD c-blosc-1.21.1-r1.ebuild 1211 BLAKE2B e2fa8b2b50bee2d28cbfa3c123aa7e1bdb1e406cbb38c080605ecc0f7808182807bad4b84e16ac6e70a35b6e9222d1af3fb1a0affac2c895cda17e6ce18c92ce SHA512 cfb8b5f517b9a535392cb7d3f321a2950b4924feda1b80a8757dd2ba38ebd751f43bd5c43e57ee8591022f73e2e6dcfc87a0c5571b0618dbd030a23daf7d0cbf
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
index c0b7e51199f0..7ff161dd1390 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
@@ -22,6 +22,10 @@ RDEPEND="
 	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gnuinstalldirs.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# remove bundled libs
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
new file mode 100644
index 000000000000..d90a2fc50cee
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch
@@ -0,0 +1,71 @@
+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?= <haavard_aasen@yahoo.no>
+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)
+