app-arch/xar: convert sed to path, add virtual/acl dep, bug #645054

Closes: https://bugs.gentoo.org/645054
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-arch/xar/files/xar-1.8-safe_dirname.patch b/app-arch/xar/files/xar-1.8-safe_dirname.patch
new file mode 100644 (file)
index 0000000..eb2f5f0
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8-safe_dirname.patch
@@ -0,0 +1,16 @@
+linuxattr: fix missing symbol safe_dirname
+
+This one was probably missed when they did a global rename to xar_
+prefixed variants.
+
+--- a/lib/linuxattr.c
++++ b/lib/linuxattr.c
+@@ -223,7 +223,7 @@
+       if( statfs(file, &sfs) != 0 ) {
+               char *tmp, *bname;
+               tmp = strdup(file);
+-              bname = safe_dirname(tmp);
++              bname = xar_safe_dirname(tmp);
+               statfs(bname, &sfs);
+               free(tmp);
+               free(bname);

diff --git a/app-arch/xar/xar-1.8.ebuild b/app-arch/xar/xar-1.8.ebuild
index b9e8a69274a8d61c45005d81e664ba4a688f1c59..5da3f33af2f664864ed030c5b52299c7fb5141c0 100644 (file)
--- a/app-arch/xar/xar-1.8.ebuild
+++ b/app-arch/xar/xar-1.8.ebuild
@@ -16,6 +16,7 @@ IUSE="libressl kernel_Darwin"
 
 DEPEND="
        !kernel_Darwin? (
+               virtual/acl
                !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
                libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
        )
@@ -25,15 +26,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.6.1-ext2.patch )
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.6.1-ext2.patch
+       "${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+)
 
 S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
 
-src_prepare() {
-       default
-       sed -i -e 's/safe_dirname/xar_safe_dirname/' lib/linuxattr.c || die
-}
-
 multilib_src_configure() {
        use kernel_Darwin || append-libs $(pkg-config --libs openssl)
        ECONF_SOURCE=${S} \