summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-01-20 10:33:44 +0100
committerFabian Groffen <grobian@gentoo.org>2018-01-20 10:33:55 +0100
commit599592c4514b585e7a7400586a95c224ce32efee (patch)
treed6740c1810f227952f608229d06a56e8da3b8a07 /app-arch
parentwww-client/vivaldi: Version 1.13.1008.44_p1. (diff)
downloadgentoo-599592c4514b585e7a7400586a95c224ce32efee.tar.gz
gentoo-599592c4514b585e7a7400586a95c224ce32efee.tar.bz2
gentoo-599592c4514b585e7a7400586a95c224ce32efee.zip
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
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/xar/files/xar-1.8-safe_dirname.patch16
-rw-r--r--app-arch/xar/xar-1.8.ebuild11
2 files changed, 21 insertions, 6 deletions
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
index 000000000000..eb2f5f071bb2
--- /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 b9e8a69274a8..5da3f33af2f6 100644
--- 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} \