Remove prepare, fix deps and optdeps, and more...

* The `sed` command in prepare() does nothing so we remove it.
* Add missing `fuse2` dependency
* Add optdepends, same as official package
* Add missing backup file to backup array
* The script `mk_cmds` alse needs to replace `gawk` to `awk`
* Change homepage URL to https
* .gitignore

3 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cddfcef49a5..023333bcb1b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = e2fsprogs-git
 	pkgdesc = Ext2/3/4 filesystem utilities (git)
-	pkgver = 1.46.5.r8.g8adeabee
+	pkgver = 1.47.0.r14.ge76886f7
 	pkgrel = 1
-	url = http://e2fsprogs.sourceforge.net
+	url = https://e2fsprogs.sourceforge.net
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -13,6 +13,10 @@ pkgbase = e2fsprogs-git
 	makedepends = systemd
 	depends = sh
 	depends = util-linux-libs
+	depends = fuse2
+	optdepends = lvm2: for e2scrub
+	optdepends = util-linux: for e2scrub
+	optdepends = smtp-forwarder: for e2scrub_fail script
 	provides = e2fsprogs
 	provides = fuse2fs
 	provides = libcom_err.so
@@ -21,8 +25,8 @@ pkgbase = e2fsprogs-git
 	provides = libss.so
 	conflicts = e2fsprogs
 	conflicts = fuse2fs
-	options = staticlibs
 	backup = etc/mke2fs.conf
+	backup = etc/e2scrub.conf
 	source = e2fsprogs-git::git+https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
 	source = MIT-LICENSE
 	sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..23267e12e994
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!MIT-LICENSE
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 89f9d11b2d2f..717dfbd8f231 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,25 @@
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname="e2fsprogs-git"
-pkgver=1.46.5.r8.g8adeabee
+pkgver=1.47.0.r14.ge76886f7
 pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities (git)"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
-url="http://e2fsprogs.sourceforge.net"
-depends=('sh' 'util-linux-libs')
+url="https://e2fsprogs.sourceforge.net"
+depends=('sh' 'util-linux-libs' 'fuse2')
 makedepends=('git' 'util-linux' 'systemd')
+optdepends=('lvm2: for e2scrub'
+            'util-linux: for e2scrub'
+            'smtp-forwarder: for e2scrub_fail script')
 conflicts=('e2fsprogs' 'fuse2fs')
 provides=('e2fsprogs' 'fuse2fs'
           'libcom_err.so'
           'libe2p.so'
           'libext2fs.so'
           'libss.so')
-backup=('etc/mke2fs.conf')
-options=('staticlibs')
+backup=('etc/mke2fs.conf'
+        'etc/e2scrub.conf')
 source=("$pkgname::git+https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
         'MIT-LICENSE')
 sha256sums=('SKIP'
@@ -29,17 +32,9 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd $pkgname
-
   git describe --long | sed 's/^v//; s/\([^-]*-g\)/r\1/; s/-/./g'
 }
 
-prepare() {
-  cd $pkgname
-
-  # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in
-}
-
 build() {
   cd $pkgname
 
@@ -70,7 +65,7 @@ package() {
 
   make DESTDIR="$pkgdir" install install-libs
 
-  sed -i 's/^AWK=.*/AWK=awk/' "$pkgdir/usr/bin/compile_et"
+  sed -i 's/^AWK=.*/AWK=awk/' "$pkgdir"/usr/bin/{compile_et,mk_cmds}
 
   # remove references to build directory
   sed -i 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "$pkgdir/usr/bin/mk_cmds"