From 6883a4f282fbe6c75e4f528b506649668b00ee43 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 31 May 2018 20:29:33 +0000
Subject: [PATCH] e2fsprogs: bump to 1.44.2, use the libs from util-linux.
 (#2526)

---
 ...s-1.43.9.recipe => e2fsprogs-1.44.2.recipe} | 18 ++++++++++--------
 ...43.9.patchset => e2fsprogs-1.44.2.patchset} | 14 +++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)
 rename sys-fs/e2fsprogs/{e2fsprogs-1.43.9.recipe => e2fsprogs-1.44.2.recipe} (82%)
 rename sys-fs/e2fsprogs/patches/{e2fsprogs-1.43.9.patchset => e2fsprogs-1.44.2.patchset} (92%)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe
similarity index 82%
rename from sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe
rename to sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe
index cf22e76a8..dd079061c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe
@@ -3,12 +3,12 @@ DESCRIPTION="Various tools to manage EXT2,3,4 filesystems (resize, etc)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 COPYRIGHT="2004-2017 Theodore Ts'o"
 LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz"
-CHECKSUM_SHA256="5be0ffc01b9720a3f3ccfc86396016baf1334b98751fefa09e0c63eaffdc3897"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz"
+CHECKSUM_SHA256="e5c05a5ba4a9a1766f4b500ad7ef3220843860bfa64ebdda1b462b23bcb37f68"
 PATCHES="e2fsprogs-$portVersion.patchset"
 
-ARCHITECTURES=""
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 commandSuffix=$secondaryArchSuffix
@@ -25,7 +25,6 @@ GLOBAL_WRITABLE_FILES="
 PROVIDES="
 	e2fsprogs$secondaryArchSuffix = $portVersion
 	cmd:badblocks$commandSuffix
-	cmd:blkid$commandSuffix
 	cmd:chattr$commandSuffix
 	cmd:dumpe2fs$commandSuffix
 	cmd:e2freefrag$commandSuffix
@@ -48,27 +47,29 @@ PROVIDES="
 	cmd:resize2fs$commandSuffix
 	cmd:tune2fs$commandSuffix
 	cmd:uuidd$commandSuffix
-	cmd:uuidgen$commandSuffix
-	lib:libblkid$commandSuffix = 1.0 compat >= 1
 	lib:libcom_err$secondaryArchSuffix = 2.1 compat >= 2
 	lib:libe2p$secondaryArchSuffix = 2.3 compat >= 2
 	lib:libext2fs$secondaryArchSuffix = 2.4 compat >= 2
 	lib:libss$secondaryArchSuffix = 2.0 compat >= 2
-	lib:libuuid$secondaryArchSuffix = 1.2 compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libblkid$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libblkid$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
@@ -79,6 +80,7 @@ BUILD()
 		--bindir="$commandBinDir" \
 		--sbindir="$commandBinDir" \
 		USE=-loop-aes --disable-tls \
+		--disable-libblkid --disable-libuuid \
 		--disable-fsck --disable-debugfs \
 		--enable-elf-shlibs --enable-symlink-build --enable-symlink-install
 	make $jobArgs
diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset b/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset
similarity index 92%
rename from sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset
rename to sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset
index d2fed8c78..dbcf3ceef 100644
--- a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset
+++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset
@@ -5,7 +5,7 @@ Subject: Ugly hacks to get things building on Haiku.
 
 
 diff --git a/configure.ac b/configure.ac
-index 02e546b..3ff4814 100644
+index 7392959..7d44b90 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,7 +101,8 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
@@ -18,7 +18,7 @@ index 02e546b..3ff4814 100644
     AC_SUBST(RDYNAMIC)
  fi
  AC_PROG_CPP
-@@ -1170,7 +1171,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
+@@ -1174,7 +1175,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
  dnl that uses socket() to compile; this is needed for the UUID library
  dnl
  SOCKET_LIB=''
@@ -28,7 +28,7 @@ index 02e546b..3ff4814 100644
  dnl
  dnl See if libmagic exists
 diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
-index cee6a42..f92a38a 100644
+index e43d340..b76c7e8 100644
 --- a/e2fsck/Makefile.in
 +++ b/e2fsck/Makefile.in
 @@ -16,7 +16,7 @@ MANPAGES=	e2fsck.8
@@ -41,7 +41,7 @@ index cee6a42..f92a38a 100644
  	 $(DEPLIBUUID) $(DEPLIBE2P)
  
 diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
-index a179c0d..5980a01 100644
+index 5269650..2c134c8 100644
 --- a/e2fsck/e2fsck.h
 +++ b/e2fsck/e2fsck.h
 @@ -19,9 +19,7 @@
@@ -55,10 +55,10 @@ index a179c0d..5980a01 100644
  #include <setjmp.h>
  #endif
 diff --git a/misc/create_inode.c b/misc/create_inode.c
-index deae05e..2e67e25 100644
+index caa3609..04e5eb5 100644
 --- a/misc/create_inode.c
 +++ b/misc/create_inode.c
-@@ -35,6 +35,11 @@
+@@ -38,6 +38,11 @@
  #include "create_inode.h"
  #include "support/nls-enable.h"
  
@@ -81,7 +81,7 @@ Subject: Extra patches.
 
 
 diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
-index f3956da..ff950f8 100644
+index e2b8051..46c9225 100644
 --- a/lib/blkid/devname.c
 +++ b/lib/blkid/devname.c
 @@ -43,6 +43,8 @@