Fixed bug #489106. Moved dependency on sys-apps/attr from RDEPEND to DEPEND (bug #489170)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 41 insertions, 5 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index bfd0975df254..d47d86161971 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.192 2013/10/22 08:12:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.193 2013/10/24 06:45:16 polynomial-c Exp $
+
+*tar-1.27-r2 (24 Oct 2013)
+
+  24 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -tar-1.27-r1.ebuild,
+  +tar-1.27-r2.ebuild, +files/tar-1.27-acl_configure_fix.patch:
+  Fixed "acl" USE flag reported by Arfrever Frehtes Taifersar Arahesis in bug
+  #489106. Moved dependency on sys-apps/attr from RDEPEND to DEPEND (bug
+  #489170).
 
 *tar-1.27-r1 (22 Oct 2013)
 
diff --git a/app-arch/tar/files/tar-1.27-acl_configure_fix.patch b/app-arch/tar/files/tar-1.27-acl_configure_fix.patch
new file mode 100644
index 000000000000..840db9aa354c
--- /dev/null
+++ b/app-arch/tar/files/tar-1.27-acl_configure_fix.patch
@@ -0,0 +1,25 @@
+--- tar-1.27/configure.ac	2013-10-05 21:50:52.000000000 +0200
++++ tar-1.27/configure.ac	2013-10-05 21:50:52.000000000 +0200
+@@ -74,7 +74,8 @@
+ AC_ARG_WITH([posix-acls],
+     AS_HELP_STRING([--without-posix-acls],
+                    [do not use POSIX.1e access control lists]),
+-    [with_posix_acls=no])
++    [],
++    [with_posix_acls=yes])
+ if test "x$with_posix_acls" != "xno"; then
+   AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acls=no])
+   for tar_acl_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
+--- tar-1.27/configure	2013-10-05 21:52:03.000000000 +0200
++++ tar-1.27/configure	2013-10-05 21:52:03.000000000 +0200
+@@ -7828,7 +7828,9 @@
+ 
+ # Check whether --with-posix-acls was given.
+ if test "${with_posix_acls+set}" = set; then :
+-  withval=$with_posix_acls; with_posix_acls=no
++  withval=$with_posix_acls;
++else
++  with_posix_acls=yes
+ fi
+ 
+ if test "x$with_posix_acls" != "xno"; then
diff --git a/app-arch/tar/tar-1.27-r1.ebuild b/app-arch/tar/tar-1.27-r2.ebuild
index d8169e38a9f9..c98b258e39c8 100644
--- a/app-arch/tar/tar-1.27-r1.ebuild
+++ b/app-arch/tar/tar-1.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.27-r1.ebuild,v 1.1 2013/10/22 08:12:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.27-r2.ebuild,v 1.1 2013/10/24 06:45:16 polynomial-c Exp $
 
 EAPI="3"
 
@@ -17,12 +17,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="acl minimal nls selinux static userland_GNU xattr"
 
 RDEPEND="acl? ( virtual/acl )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )"
+	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.35 )"
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( sys-apps/attr )"
 
 src_prepare() {
+	EPATCH_OPTS="-Z" \
+	epatch "${FILESDIR}"/${P}-acl_configure_fix.patch
+
 	if ! use userland_GNU ; then
 		sed -i \
 			-e 's:/backup\.sh:/gbackup.sh:' \