From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C1E6139083 for ; Wed, 5 Jul 2017 11:59:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BDA3214007; Wed, 5 Jul 2017 11:59:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44B2D214007 for ; Wed, 5 Jul 2017 11:59:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEF8933BE61 for ; Wed, 5 Jul 2017 11:59:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 652A82FA for ; Wed, 5 Jul 2017 11:59:32 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1499255968.547624bfcfd063cea4c9b7bbabe508a086140f83.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/reiserfsprogs/files/, sys-fs/reiserfsprogs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild X-VCS-Directories: sys-fs/reiserfsprogs/ sys-fs/reiserfsprogs/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 547624bfcfd063cea4c9b7bbabe508a086140f83 X-VCS-Branch: master Date: Wed, 5 Jul 2017 11:59:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5c0dac04-8c9b-4b19-8441-27b86263fc61 X-Archives-Hash: bfd071e8619a3f88acba7c3770b6fcac commit: 547624bfcfd063cea4c9b7bbabe508a086140f83 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 5 11:59:00 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 5 11:59:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547624bf 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 ++++++++++++ sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild | 18 ++++++++++++++---- sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild | 7 ++++++- 3 files changed, 32 insertions(+), 5 deletions(-) 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 00000000000..6a3768154cb --- /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 + #include + #include +-#include + #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 04cc6a0dd02..e5bc6dfa203 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 0704720cc94..d6725dee34e 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"