[gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/

[Andreas Sturmlechner]

commit:     9935e583097e71b23f179681b740c15636d00ac1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 00:01:43 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 00:02:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9935e583

media-gfx/exiv2: Remove Apple filesystem cruft

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/exiv2/exiv2-0.27.0.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild 
b/media-gfx/exiv2/exiv2-0.27.0.ebuild
index c45a92101c2..f59464a6685 100644
--- a/media-gfx/exiv2/exiv2-0.27.0.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0.ebuild
@@ -44,8 +44,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
-S="${S}-Source"
-
 PATCHES=(
        # pending upstream
        "${FILESDIR}"/${P}-png-broken-icc-profile.patch
@@ -55,6 +53,14 @@ pkg_setup() {
        use doc && python-any-r1_pkg_setup
 }
 
+src_unpack() {
+       # FIXME @upstream: MacOS cruft is getting installed, don't let it in...
+       # https://github.com/Exiv2/exiv2/issues/620
+       tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> 
/dev/null ||
+               elog "${my_tar}: tar extract command failed at least partially 
- continuing"
+       mv "${P}-Source" "${S}" || die "Failed to create source dir ${S}"
+}
+
 src_prepare() {
        # FIXME @upstream:
        einfo "Converting doc/cmd.txt to UTF-8"