Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/aaphoto/
Date: Sat, 14 May 2022 21:30:40
Message-Id: 1652563808.740814e3d0b1c589d7c715e53132df733401ab2e.soap@gentoo
1 commit: 740814e3d0b1c589d7c715e53132df733401ab2e
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:08 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740814e3
7
8 media-gfx/aaphoto: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 .../{aaphoto-0.45.ebuild => aaphoto-0.45-r1.ebuild} | 20 +++++++++-----------
13 1 file changed, 9 insertions(+), 11 deletions(-)
14
15 diff --git a/media-gfx/aaphoto/aaphoto-0.45.ebuild b/media-gfx/aaphoto/aaphoto-0.45-r1.ebuild
16 similarity index 50%
17 rename from media-gfx/aaphoto/aaphoto-0.45.ebuild
18 rename to media-gfx/aaphoto/aaphoto-0.45-r1.ebuild
19 index c9839cf9f3f4..f7310d13b0c0 100644
20 --- a/media-gfx/aaphoto/aaphoto-0.45.ebuild
21 +++ b/media-gfx/aaphoto/aaphoto-0.45-r1.ebuild
22 @@ -1,7 +1,7 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2022 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=6
28 +EAPI=8
29
30 inherit toolchain-funcs
31
32 @@ -14,16 +14,14 @@ SLOT="0"
33 KEYWORDS="amd64 x86"
34
35 RDEPEND="
36 - media-libs/libpng:0=
37 - sys-libs/zlib
38 - virtual/jpeg:0"
39 + media-libs/libjpeg-turbo:=
40 + media-libs/libpng:="
41 DEPEND="${RDEPEND}"
42
43 +pkg_pretend() {
44 + [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
45 +}
46 +
47 pkg_setup() {
48 - if [[ ${MERGE_TYPE} != binary ]]; then
49 - [[ $(gcc-major-version) -lt 4 ]] || \
50 - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 2 ]] ) \
51 - && die "Sorry, but gcc 4.2 or higher is required"
52 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
53 - fi
54 + [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
55 }