commit: 37a81e55db1a1afb3d2ef0f85fd2414a5640508a
Author: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 23 10:45:36 2024 +0000
Commit: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
CommitDate: Tue Jan 23 10:46:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37a81e55
sys-fs/dwarfs: add 0.8.0, drop 0.7.4-r3
Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com>
sys-fs/dwarfs/Manifest | 2 +-
...{dwarfs-0.7.4-r3.ebuild => dwarfs-0.8.0.ebuild} | 42 ++++++++++++++--------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest
index afc7b5de72..6233ec225c 100644
--- a/sys-fs/dwarfs/Manifest
+++ b/sys-fs/dwarfs/Manifest
@@ -1,2 +1,2 @@
-DIST dwarfs-0.7.4.tar.xz 15112544 BLAKE2B
904c5f089589630ac10441ec86feb3a4df30ad901a809e93942970fbc32f05499d6996f73769d3ada10e7aa224ec71a50144d9d605d5df852c86116efc82c090
SHA512
b78e0544ea04200089efd970250417ace6a354ba3090f7f8cbe4b901c5575f752968d1720cdd6e35109920f1e363cf3b70d777a46addd2214c2f5fdf83f90e19
DIST dwarfs-0.7.5.tar.xz 15110268 BLAKE2B
c40d3fd74d750a3da2073ac75a9ddc6c0bf11e9aeb1c7718f0181b33820e6d5ca09ba25be7d6b7224036e02665115f4d43378b5dfe0975a4eea83eb866cfab01
SHA512
95efa1125470cfdbd7f2841a55516ec14c517019b4e38ba7c0627e7d12904f1313a4bc61637362459be3f366da11754a8091a73b241949269f6425404094813a
+DIST dwarfs-0.8.0.tar.xz 15589992 BLAKE2B
17a0be32cc6e77a90fd391274a12492ab57fdf7f36bb1f9815e3ea09d952e13ec64cfb09a1e4cee3169a5276fd9be250c1e01c5d3af2160924ea3f900aed0a32
SHA512
a61dd173705ed17e3de72c80bcecbd1e0c55665971c4249c8f5d9f4dd448c00d05068ff5406991866becfe28e6622b1d3a0a5e9748d2fc61331601a8c0848fb4
diff --git a/sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild
b/sys-fs/dwarfs/dwarfs-0.8.0.ebuild
similarity index 82%
rename from sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild
rename to sys-fs/dwarfs/dwarfs-0.8.0.ebuild
index 5bcbf93151..6ccbc57b15 100644
--- a/sys-fs/dwarfs/dwarfs-0.7.4-r3.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.8.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit check-reqs cmake flag-o-matic python-single-r1
+inherit check-reqs cmake flag-o-matic python-any-r1
DESCRIPTION="A fast very high compression read-only FUSE file system"
HOMEPAGE="https://github.com/mhx/dwarfs";
@@ -14,11 +14,10 @@
SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz";
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="python +jemalloc test man"
+IUSE="+jemalloc test man"
S="${WORKDIR}/dwarfs-${PV}"
RDEPEND="
- ${PYTHON_DEPS}
app-arch/libarchive
app-arch/lz4
app-arch/snappy
@@ -27,7 +26,8 @@ RDEPEND="
dev-cpp/gflags
dev-cpp/glog[gflags]
dev-cpp/parallel-hashmap:=
- dev-libs/boost[context,python?]
+ dev-libs/boost[context]
+ dev-libs/date
dev-libs/double-conversion
dev-libs/libevent
dev-libs/libfmt
@@ -47,22 +47,27 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
+ ${PYTHON_DEPS}
dev-util/patchelf
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
man? ( app-text/ronn-ng )
test? ( dev-cpp/gtest )
+ $(python_gen_any_dep 'dev-python/mistletoe[${PYTHON_USEDEP}]')
"
DOCS=( "README.md" "CHANGES.md" "TODO" )
RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
CHECKREQS_DISK_BUILD="1300M"
CMAKE_IN_SOURCE_BUILD=1
CMAKE_WARN_UNUSED_CLI=0
+python_check_deps() {
+ python_has_version -b "dev-python/mistletoe[${PYTHON_USEDEP}]"
+}
+
src_prepare() {
rm -r zstd xxHash parallel-hashmap || die
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt ||
die
@@ -80,9 +85,12 @@ src_configure() {
append-cxxflags "-I/usr/include"
append-ldflags $(no-as-needed)
+ # FIXME: Requires dev-cpp/gtest to be built with -fchar8_t or
-std=c++20.
+ # This is unfortunately too aggressive:
+ # append-cxxflags "-fno-char8_t"
+
mycmakeargs=(
-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
- -DWITH_PYTHON=$(usex python ON OFF)
-DWITH_TESTS=$(usex test ON OFF)
-DWITH_MAN_PAGES=$(usex man ON OFF)
-DPREFER_SYSTEM_ZSTD=ON
@@ -92,26 +100,30 @@ src_configure() {
-DWITH_LEGACY_FUSE=OFF
-DDISABLE_CCACHE=ON # Use FEATURES=ccache
)
- use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
cmake_src_configure
}
src_install() {
local libs=(
+ folly/libfolly.so
+ folly/libfolly.so.0.58.0-dev
+ libcompression_thrift.so
libdwarfs.so
+ libdwarfs_categorizer.so
+ libdwarfs_compression.so
+ libdwarfs_compression_metadata.so
libdwarfs_main.so
libdwarfs_tool.so
- libdwarfs_compression.so
- libthrift_light.so
- libmetadata_thrift.so
- libmkdwarfs_main.so
libdwarfsbench_main.so
libdwarfsck_main.so
- libdwarfsextract_main.so
libdwarfsck_main.so
libdwarfsextract_main.so
- folly/libfolly.so
- folly/libfolly.so.0.58.0-dev
+ libdwarfsextract_main.so
+ libfeatures_thrift.so
+ libhistory_thrift.so
+ libmetadata_thrift.so
+ libmkdwarfs_main.so
+ libthrift_light.so
)
cmake_src_install
