[gentoo-commits] repo/gentoo:master commit in: sys-apps/acl/files/, sys-apps/acl/

[Lars Wendler]

commit:     d09fc86f54e411052bd377e5dcc239be011be8a5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 14:14:27 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 14:18:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09fc86f

sys-apps/acl: Revbump to fix compilation with >=sys-apps/attr-2.4.48

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/acl/acl-2.2.52-r2.ebuild                |  65 ++++++++
 sys-apps/acl/files/acl-2.2.52-xattr_header.patch | 201 +++++++++++++++++++++++
 2 files changed, 266 insertions(+)

diff --git a/sys-apps/acl/acl-2.2.52-r2.ebuild b/sys-apps/acl/acl-2.2.52-r2.ebuild
new file mode 100644
index 00000000000..4bc0d2945f1
--- /dev/null
+++ b/sys-apps/acl/acl-2.2.52-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool ltprune toolchain-funcs multilib-minimal
+
+DESCRIPTION="access control list utilities, libraries and headers"
+HOMEPAGE="https://savannah.nongnu.org/projects/acl"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="
+	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-xattr_header.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
+		include/builddefs.in \
+		|| die
+	strip-linguas po
+	elibtoolize #580792
+
+	# same as https://savannah.nongnu.org/bugs/index.php?39736
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-shared $(use_enable static-libs static)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable nls gettext)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DIST_ROOT="${D}" install install-dev install-lib
+
+	# move shared libs to /
+	gen_usr_ldscript -a acl
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files --all
+}

diff --git a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch b/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
new file mode 100644
index 00000000000..f48709ae480
--- /dev/null
+++ b/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
@@ -0,0 +1,201 @@
+Backported from:
+http://git.savannah.nongnu.org/cgit/acl.git/commit/?id=79f563779b9b9ba89cc2352d70e3cdf27acff513
+
+--- acl-2.2.52/configure
++++ acl-2.2.52/configure
+@@ -12416,26 +12416,6 @@
+     fi
+ 
+ 
+- for ac_header in attr/xattr.h
+-do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+-if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_ATTR_XATTR_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
+-        echo
+-        echo 'FATAL ERROR: attr/xattr.h does not exist.'
+-        echo 'Install the extended attributes (attr) development package.'
+-        echo 'Alternatively, run "make install-dev" from the attr source.'
+-        exit 1
+-    fi
+-
+  for ac_header in attr/error_context.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "attr/error_context.h" "ac_cv_header_attr_error_context_h" "$ac_includes_default"
+--- acl-2.2.52/libacl/acl_delete_def_file.c
++++ acl-2.2.52/libacl/acl_delete_def_file.c
+@@ -20,11 +20,11 @@
+ */
+ 
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "byteorder.h"
+ #include "acl_ea.h"
+ #include "config.h"
+-
++#include "libacl.h"
+ 
+ /* 23.4.8 */
+ int
+--- acl-2.2.52/libacl/acl_extended_fd.c
++++ acl-2.2.52/libacl/acl_extended_fd.c
+@@ -20,13 +20,12 @@
+ */
+ 
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ 
+ #include "byteorder.h"
+ #include "acl_ea.h"
+ 
+-
+ int
+ acl_extended_fd(int fd)
+ {
+--- acl-2.2.52/libacl/__acl_extended_file.c
++++ acl-2.2.52/libacl/__acl_extended_file.c
+@@ -20,14 +20,13 @@
+ */
+ 
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ 
+ #include "byteorder.h"
+ #include "acl_ea.h"
+ #include "__acl_extended_file.h"
+ 
+-
+ int
+ __acl_extended_file(const char *path_p,
+ 		    ssize_t (*fun)(const char *, const char *,
+--- acl-2.2.52/libacl/acl_extended_file.c
++++ acl-2.2.52/libacl/acl_extended_file.c
+@@ -20,7 +20,7 @@
+ */
+ 
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ 
+ #include "__acl_extended_file.h"
+--- acl-2.2.52/libacl/acl_extended_file_nofollow.c
++++ acl-2.2.52/libacl/acl_extended_file_nofollow.c
+@@ -20,7 +20,7 @@
+ */
+ 
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ 
+ #include "__acl_extended_file.h"
+--- acl-2.2.52/libacl/acl_get_fd.c
++++ acl-2.2.52/libacl/acl_get_fd.c
+@@ -23,7 +23,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <acl/libacl.h>
+ #include "libacl.h"
+ #include "__acl_from_xattr.h"
+@@ -31,7 +31,6 @@
+ #include "byteorder.h"
+ #include "acl_ea.h"
+ 
+-
+ /* 23.4.15 */
+ acl_t
+ acl_get_fd(int fd)
+--- acl-2.2.52/libacl/acl_get_file.c
++++ acl-2.2.52/libacl/acl_get_file.c
+@@ -23,7 +23,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdio.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <acl/libacl.h>
+ #include "libacl.h"
+ #include "__acl_from_xattr.h"
+@@ -31,7 +31,6 @@
+ #include "byteorder.h"
+ #include "acl_ea.h"
+ 
+-
+ /* 23.4.16 */
+ acl_t
+ acl_get_file(const char *path_p, acl_type_t type)
+--- acl-2.2.52/libacl/acl_set_fd.c
++++ acl-2.2.52/libacl/acl_set_fd.c
+@@ -20,7 +20,7 @@
+ */
+ 
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ #include "__acl_to_xattr.h"
+ 
+--- acl-2.2.52/libacl/acl_set_file.c
++++ acl-2.2.52/libacl/acl_set_file.c
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "libacl.h"
+ #include "__acl_to_xattr.h"
+ 
+--- acl-2.2.52/libacl/libacl.h
++++ acl-2.2.52/libacl/libacl.h
+@@ -17,8 +17,13 @@
+ 
+ #include <errno.h>
+ #include <sys/acl.h>
++#include <errno.h>
+ #include "libobj.h"
+ 
++#ifndef ENOATTR
++# define ENOATTR ENODATA
++#endif
++
+ typedef unsigned int permset_t;
+ 
+ #define ACL_PERM_NONE		(0x0000)
+--- acl-2.2.52/m4/package_attrdev.m4
++++ acl-2.2.52/m4/package_attrdev.m4
+@@ -12,17 +12,6 @@
+ dnl
+ dnl You should have received a copy of the GNU General Public License
+ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
+-  [ AC_CHECK_HEADERS([attr/xattr.h])
+-    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
+-        echo
+-        echo 'FATAL ERROR: attr/xattr.h does not exist.'
+-        echo 'Install the extended attributes (attr) development package.'
+-        echo 'Alternatively, run "make install-dev" from the attr source.'
+-        exit 1
+-    fi
+-  ])
+-
+ AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
+   [ AC_CHECK_HEADERS([attr/error_context.h])
+     if test "$ac_cv_header_attr_error_context_h" != "yes"; then