From 65c55a4ebc6fbbc16e7b2d6e5723ef25b557aa08 Mon Sep 17 00:00:00 2001
From: Sean Anderson <seanga2@gmail.com>
Date: Fri, 15 Oct 2021 22:47:26 -0400
Subject: [PATCH] Package fuse2fs

e2fsprogs contains the program fuse2fs which allows one to mount ext2
filesystems (and ext3/4 without journaling) as a regular user. This is
very helpful when populating ext filesystems. To avoid adding a fuse
dependency on e2fsprogs (which is installed on a large proportion of
arch systems), fuse2fs is split from the rest of the package.
---
 trunk/PKGBUILD | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index e5b79979..a6bf634b 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -1,23 +1,18 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Sean Anderson <seanga2@gmail.com>
 
-pkgname=e2fsprogs
+pkgname=('e2fsprogs' 'fuse2fs')
+pkgbase=e2fsprogs
 pkgver=1.46.4
 pkgrel=1
-pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
-depends=('sh' 'util-linux-libs')
 makedepends=('systemd' 'util-linux')
-provides=('libcom_err.so'
-          'libe2p.so'
-          'libext2fs.so'
-          'libss.so')
-backup=('etc/mke2fs.conf')
 options=('staticlibs')
 validpgpkeys=('3AB057B7E78D945C8C5591FBD36F769BC11804F0') # Theodore Ts'o <tytso@mit.edu>
-source=("https://www.kernel.org/pub/linux/kernel/people/tytso/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/kernel/people/tytso/${pkgbase}/v${pkgver}/${pkgbase}-${pkgver}.tar."{xz,sign}
         'MIT-LICENSE')
 sha256sums=('b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713'
             'SKIP'
@@ -25,14 +20,14 @@ sha256sums=('b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713'
 
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Remove unnecessary init.d directory
   sed -i '/init\.d/s|^|#|' misc/Makefile.in
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure \
       --prefix=/usr \
@@ -52,12 +47,24 @@ build() {
   make -C po update-gmo
 }
 
-package() {
+package_e2fsprogs() {
+  pkgdesc="Ext2/3/4 filesystem utilities"
+  depends=('sh' 'util-linux-libs')
+  provides=('libcom_err.so'
+            'libe2p.so'
+            'libext2fs.so'
+            'libss.so')
+  backup=('etc/mke2fs.conf')
+
   unset MAKEFLAGS
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install install-libs
 
+  # remove fuse2fs which will be packaged separately
+  rm "${pkgdir}/usr/bin/fuse2fs"
+  rm "${pkgdir}/usr/share/man/man1/fuse2fs.1"
+
   sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
 
   # remove references to build directory
@@ -71,3 +78,16 @@ package() {
   install -Dm644 "${srcdir}/MIT-LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
 }
+
+package_fuse2fs() {
+  pkgdesc="Ext2/3/4 filesystem driver for FUSE"
+  depends=('fuse' 'e2fsprogs')
+
+  unset MAKEFLAGS
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -Dm755 "misc/fuse2fs" "${pkgdir}/usr/bin/fuse2fs"
+  install -Dm644 "misc/fuse2fs.1" "${pkgdir}/usr/share/man/man1/fuse2fs.1"
+  install -Dm644 "${srcdir}/MIT-LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
+}
-- 
2.33.0