commit: 48cd90c55f50a5b34d4eb5d7a3facd73706d0591
Author: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
AuthorDate: Thu Feb 8 04:16:48 2024 +0000
Commit: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
CommitDate: Thu Feb 8 19:13:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=48cd90c5
sys-fs/dwarfs: add 0.9.1, drop 0.7.5
Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com>
sys-fs/dwarfs/Manifest | 2 +-
.../{dwarfs-0.7.5.ebuild => dwarfs-0.9.1.ebuild} | 43 +++++++++++++++-------
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest
index 6233ec225c..d726eeda0b 100644
--- a/sys-fs/dwarfs/Manifest
+++ b/sys-fs/dwarfs/Manifest
@@ -1,2 +1,2 @@
-DIST dwarfs-0.7.5.tar.xz 15110268 BLAKE2B
c40d3fd74d750a3da2073ac75a9ddc6c0bf11e9aeb1c7718f0181b33820e6d5ca09ba25be7d6b7224036e02665115f4d43378b5dfe0975a4eea83eb866cfab01
SHA512
95efa1125470cfdbd7f2841a55516ec14c517019b4e38ba7c0627e7d12904f1313a4bc61637362459be3f366da11754a8091a73b241949269f6425404094813a
DIST dwarfs-0.8.0.tar.xz 15589992 BLAKE2B
17a0be32cc6e77a90fd391274a12492ab57fdf7f36bb1f9815e3ea09d952e13ec64cfb09a1e4cee3169a5276fd9be250c1e01c5d3af2160924ea3f900aed0a32
SHA512
a61dd173705ed17e3de72c80bcecbd1e0c55665971c4249c8f5d9f4dd448c00d05068ff5406991866becfe28e6622b1d3a0a5e9748d2fc61331601a8c0848fb4
+DIST dwarfs-0.9.1.tar.xz 15671744 BLAKE2B
173557540ed62fc6f59a1caf29fd30945ed32b0cbfca4b2a9613c9490d73f52d38c4c2e0ed83a55fcedefea051858d397c5e36689b9eb01e49c9785bd14bdda1
SHA512
39e20b3e25267cd5baea34154747f5bf2e12ddd862c17153e3a386a2a0d3d7ce30b50377b5102fac49980cf33a6fde646e2367d8ef74ef33881569f2a18a75f0
diff --git a/sys-fs/dwarfs/dwarfs-0.7.5.ebuild
b/sys-fs/dwarfs/dwarfs-0.9.1.ebuild
similarity index 82%
rename from sys-fs/dwarfs/dwarfs-0.7.5.ebuild
rename to sys-fs/dwarfs/dwarfs-0.9.1.ebuild
index bda556248d..c4ec376f68 100644
--- a/sys-fs/dwarfs/dwarfs-0.7.5.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.9.1.ebuild
@@ -5,7 +5,7 @@ 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,20 +14,21 @@
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
app-arch/xz-utils
app-arch/zstd
+ dev-cpp/range-v3
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 +48,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
@@ -78,11 +84,15 @@ src_prepare() {
src_configure() {
append-cxxflags "-I/usr/include"
+ filter-ldflags "-Wl,--as-needed"
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 +102,31 @@ 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
+ ricepp/libricepp.so
)
cmake_src_install
