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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     98a9d4a014e49c22ceed4992ea7a23da1fbbd89e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 10:31:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 14:40:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a9d4a0

media-gfx/exiv2: Tarball respun

See also: https://github.com/Exiv2/exiv2/issues/620

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

 media-gfx/exiv2/Manifest                                   |  2 +-
 .../exiv2/{exiv2-0.27.0.ebuild => exiv2-0.27.0-r1.ebuild}  | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 2a0cbfc6029..b8b4960b6b2 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1,2 @@
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
-DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4
+DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c

diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
similarity index 83%
rename from media-gfx/exiv2/exiv2-0.27.0.ebuild
rename to media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
index f59464a6685..4582b1acd6f 100644
--- a/media-gfx/exiv2/exiv2-0.27.0.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
 	inherit git-r3
 else
-	SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz"
+	SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
+S="${S}-Source"
+
 PATCHES=(
 	# pending upstream
 	"${FILESDIR}"/${P}-png-broken-icc-profile.patch
@@ -53,14 +55,6 @@ 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"