Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/
Date: Thu, 03 Jan 2019 14:40:44
Message-Id: 1546526408.98a9d4a014e49c22ceed4992ea7a23da1fbbd89e.asturm@gentoo
1 commit: 98a9d4a014e49c22ceed4992ea7a23da1fbbd89e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 3 10:31:10 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 3 14:40:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a9d4a0
7
8 media-gfx/exiv2: Tarball respun
9
10 See also: https://github.com/Exiv2/exiv2/issues/620
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13 Package-Manager: Portage-2.3.51, Repoman-2.3.11
14
15 media-gfx/exiv2/Manifest | 2 +-
16 .../exiv2/{exiv2-0.27.0.ebuild => exiv2-0.27.0-r1.ebuild} | 14 ++++----------
17 2 files changed, 5 insertions(+), 11 deletions(-)
18
19 diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
20 index 2a0cbfc6029..b8b4960b6b2 100644
21 --- a/media-gfx/exiv2/Manifest
22 +++ b/media-gfx/exiv2/Manifest
23 @@ -1,2 +1,2 @@
24 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
25 -DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4
26 +DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
27
28 diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
29 similarity index 83%
30 rename from media-gfx/exiv2/exiv2-0.27.0.ebuild
31 rename to media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
32 index f59464a6685..4582b1acd6f 100644
33 --- a/media-gfx/exiv2/exiv2-0.27.0.ebuild
34 +++ b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 +# Copyright 1999-2019 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=7
41 @@ -7,7 +7,7 @@ if [[ ${PV} = *9999 ]]; then
42 EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
43 inherit git-r3
44 else
45 - SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz"
46 + SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
47 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"
48 fi
49
50 @@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
51
52 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
53
54 +S="${S}-Source"
55 +
56 PATCHES=(
57 # pending upstream
58 "${FILESDIR}"/${P}-png-broken-icc-profile.patch
59 @@ -53,14 +55,6 @@ pkg_setup() {
60 use doc && python-any-r1_pkg_setup
61 }
62
63 -src_unpack() {
64 - # FIXME @upstream: MacOS cruft is getting installed, don't let it in...
65 - # https://github.com/Exiv2/exiv2/issues/620
66 - tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null ||
67 - elog "${my_tar}: tar extract command failed at least partially - continuing"
68 - mv "${P}-Source" "${S}" || die "Failed to create source dir ${S}"
69 -}
70 -
71 src_prepare() {
72 # FIXME @upstream:
73 einfo "Converting doc/cmd.txt to UTF-8"