From 547624bfcfd063cea4c9b7bbabe508a086140f83 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 5 Jul 2017 13:59:00 +0200
Subject: [PATCH] sys-fs/reiserfsprogs: Don't include sys/acl.h (bug #585978).

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 .../files/reiserfsprogs-3.6.25-no_acl.patch    | 12 ++++++++++++
 .../reiserfsprogs/reiserfsprogs-3.6.25.ebuild  | 18 ++++++++++++++----
 .../reiserfsprogs/reiserfsprogs-3.6.26.ebuild  |  7 ++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch

diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch
new file mode 100644
index 0000000000000..6a3768154cbc4
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/585978
+
+--- a/reiserfscore/xattr.c
++++ b/reiserfscore/xattr.c
+@@ -1,7 +1,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include <sys/acl.h>
+ #include "reiserfs_lib.h"
+ 
+ static inline unsigned short from32to16(unsigned int x)
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
index 04cc6a0dd0207..e5bc6dfa2031e 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
@@ -15,13 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
 src_configure() {
 	append-flags -std=gnu89 #427300
-	econf \
-		--bindir="${EPREFIX}/bin" \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--sbindir="${EPREFIX}/sbin" \
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--sbindir="${EPREFIX}/sbin"
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
index 0704720cc9494..d6725dee34eed 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
@@ -15,13 +15,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+)
+
 src_prepare() {
+	epatch "${PATCHES[@]}"
 	eautoreconf
 }
 
 src_configure() {
 	append-flags -std=gnu89 #427300
-	myeconfargs=(
+	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
 		--libdir="${EPREFIX}/$(get_libdir)"
 		--sbindir="${EPREFIX}/sbin"