From e1dfc19d92560c9d5300566973cfe39978b3ab66 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 16 Oct 2018 17:25:15 +0000
Subject: [PATCH] e2fsprogs: bump to 1.44.4.

---
 ...-1.44.3.recipe => e2fsprogs-1.44.4.recipe} | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
 rename sys-fs/e2fsprogs/{e2fsprogs-1.44.3.recipe => e2fsprogs-1.44.4.recipe} (78%)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.44.4.recipe
similarity index 78%
rename from sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe
rename to sys-fs/e2fsprogs/e2fsprogs-1.44.4.recipe
index db213e9ca..b51f73caa 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.4.recipe
@@ -1,13 +1,13 @@
 SUMMARY="Standard EXT2/EXT3/EXT4 filesystem utilities"
 DESCRIPTION="Various tools to manage EXT2,3,4 filesystems (resize, etc)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-COPYRIGHT="2004-2017 Theodore Ts'o"
+COPYRIGHT="2004-2018 Theodore Ts'o"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz
 	https://sourceforge.mirrorservice.org/e/e2/e2fsprogs/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz
 	https://fossies.org/linux/misc/e2fsprogs-$portVersion.tar.gz"
-CHECKSUM_SHA256="c2ae6d8ce6fb96b55886cf761411fc22ab41976f4f8297fc54c706df442483be"
+CHECKSUM_SHA256="dd707688f0fc353941931c20081f26ec8e54b0bc1ac3f7601f479f9c7675dcb2"
 PATCHES="e2fsprogs-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -75,10 +75,27 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	cat <<EOF >gnuc_prereq.h
+#ifndef __GNUC_PREREQ
+# if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define __GNUC_PREREQ(ma, mi) \\
+    (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
+# else
+#  define __GNUC_PREREQ(ma, mi) 0
+# endif
+#endif
+EOF
+	sed -i -e '$a #include "../gnuc_prereq.h"' lib/config.h.in
+	sed -i -e '1i #include "../../gnuc_prereq.h"' lib/ext2fs/hashmap.h
+}
+
 BUILD()
 {
 	autoconf
 	libdir=`finddir B_COMMON_LIB_DIRECTORY`
+	CPPFLAGS="-include gnuc_prereq.h" \
 	runConfigure --omit-dirs "binDir sbinDir" ./configure \
 		--bindir="$commandBinDir" \
 		--sbindir="$commandBinDir" \
@@ -86,6 +103,11 @@ BUILD()
 		--disable-libblkid --disable-libuuid \
 		--disable-fsck --disable-debugfs \
 		--enable-elf-shlibs --enable-symlink-build --enable-symlink-install
+	sed -i \
+		-e "s| 'CPPFLAGS=-include gnuc_prereq\.h'||g" \
+		-e 's|"-include gnuc_prereq.h"|""|' \
+		-e 's| -include gnuc_prereq.h||g' \
+		config.status
 	make $jobArgs
 }