| 1 |
commit: 14336c40363bacaee85fe71b867d81b2ffdcf9e1 |
| 2 |
Author: Denis Reva <denis7774 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 6 05:54:37 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Sat Feb 6 05:54:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14336c40 |
| 7 |
|
| 8 |
sys-fs/dwarfs: cleaning up things |
| 9 |
|
| 10 |
Added fuse2 use flag for those who want optional fuse2 |
| 11 |
bindings |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 14 |
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com> |
| 15 |
|
| 16 |
.../{dwarfs-0.3.1-r1.ebuild => dwarfs-0.3.1-r2.ebuild} | 18 ++++++++++++------ |
| 17 |
sys-fs/dwarfs/metadata.xml | 3 +++ |
| 18 |
2 files changed, 15 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild |
| 21 |
similarity index 85% |
| 22 |
rename from sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild |
| 23 |
rename to sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild |
| 24 |
index 4dcf6a8e..d3be4941 100644 |
| 25 |
--- a/sys-fs/dwarfs/dwarfs-0.3.1-r1.ebuild |
| 26 |
+++ b/sys-fs/dwarfs/dwarfs-0.3.1-r2.ebuild |
| 27 |
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}.tar |
| 28 |
LICENSE="GPL-3" |
| 29 |
SLOT="0" |
| 30 |
KEYWORDS="~amd64 ~arm64 ~x86" |
| 31 |
-IUSE="python +jemalloc" |
| 32 |
+IUSE="python +jemalloc fuse2" |
| 33 |
|
| 34 |
#test IUSE disabled because there is no googletest in portage tree |
| 35 |
#-DWITH_TESTS=$(usex test ON OFF) |
| 36 |
@@ -38,6 +38,7 @@ RDEPEND="dev-libs/boost[context,threads,python?] |
| 37 |
dev-cpp/gflags |
| 38 |
dev-cpp/glog[gflags] |
| 39 |
sys-fs/fuse:3 |
| 40 |
+ fuse2? ( sys-fs/fuse:0 ) |
| 41 |
sys-libs/binutils-libs |
| 42 |
sys-libs/zlib |
| 43 |
sys-libs/libunwind |
| 44 |
@@ -52,8 +53,8 @@ CHECKREQS_DISK_BUILD="768M" |
| 45 |
|
| 46 |
DOCS=( "README.md" "CHANGES.md" "TODO" ) |
| 47 |
|
| 48 |
-CMAKE_IN_SOURCE_BUILD=true |
| 49 |
-CMAKE_WARN_UNUSED_CLI=no |
| 50 |
+CMAKE_IN_SOURCE_BUILD=1 |
| 51 |
+CMAKE_WARN_UNUSED_CLI=0 |
| 52 |
|
| 53 |
QA_SONAME="${D}/usr/lib64/libdwarfs.so ${D}/usr/lib64/libxxhash.so" |
| 54 |
|
| 55 |
@@ -78,6 +79,14 @@ src_install(){ |
| 56 |
cmake_src_install |
| 57 |
dolib.so libmetadata_thrift.so libthrift_light.so |
| 58 |
dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so |
| 59 |
+ if ! use fuse2; then |
| 60 |
+ rm "${D}"/usr/sbin/dwarfs2 |
| 61 |
+ rm "${D}"/usr/sbin/mount.dwarfs2 |
| 62 |
+ else |
| 63 |
+ ewarn "If you have both sys-fs/fuse:2 and sys-fs/fuse:3 installed" |
| 64 |
+ ewarn "Dwarfs will install /sbin/dwarfs for fuse3 and /sbin/dwarfs2 for fuse2" |
| 65 |
+ ewarn "See https://github.com/mhx/dwarfs/issues/32" |
| 66 |
+ fi |
| 67 |
} |
| 68 |
|
| 69 |
pkg_postinst(){ |
| 70 |
@@ -91,7 +100,4 @@ pkg_postinst(){ |
| 71 |
elog "${HOMEPAGE}" |
| 72 |
elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" |
| 73 |
elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" |
| 74 |
- ewarn "If you have both sys-fs/fuse:2 and sys-fs/fuse:3 installed" |
| 75 |
- ewarn "Dwarfs will install /sbin/dwarfs for fuse3 and /sbin/dwarfs2 for fuse2" |
| 76 |
- ewarn "See https://github.com/mhx/dwarfs/issues/32" |
| 77 |
} |
| 78 |
|
| 79 |
diff --git a/sys-fs/dwarfs/metadata.xml b/sys-fs/dwarfs/metadata.xml |
| 80 |
index 17e2efa0..f3f1fbff 100644 |
| 81 |
--- a/sys-fs/dwarfs/metadata.xml |
| 82 |
+++ b/sys-fs/dwarfs/metadata.xml |
| 83 |
@@ -16,4 +16,7 @@ |
| 84 |
* Highly multi-threaded implementation. Both the file system creation tool as well as the FUSE driver are able to make good use of the many cores of your system. |
| 85 |
* Optional experimental Lua support to provide custom filtering and ordering functionality. |
| 86 |
</longdescription> |
| 87 |
+ <use> |
| 88 |
+ <flag name="fuse2">Install optional fuse2 bindings in addition to fuse3.</flag> |
| 89 |
+ </use> |
| 90 |
</pkgmetadata> |
Archives