sys-fs/reiserfsprogs: Don't include sys/acl.h (bug #585978).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

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 (file)
index 0000000..6a37681
--- /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 04cc6a0dd02075dd7249898424097c46d33556ab..e5bc6dfa2031edd8c2f50f8af94849baa61a2f7a 100644 (file)
--- 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 0704720cc9494437060b57897db97a571ecd1b0b..d6725dee34eed8946bfae73cb7185d73abce0966 100644 (file)
--- 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"