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/gimp/
Date: Sat, 26 Feb 2022 12:08:56
Message-Id: 1645877327.4d513aa8b598fe82aaedefc4d122920a3e7cb766.soap@gentoo
1 commit: 4d513aa8b598fe82aaedefc4d122920a3e7cb766
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 26 12:08:47 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 26 12:08:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d513aa8
7
8 media-gfx/gimp: fix broken vala_src_prepare
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 media-gfx/gimp/gimp-2.99.10.ebuild | 4 ++--
13 media-gfx/gimp/gimp-9999.ebuild | 4 ++--
14 2 files changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/media-gfx/gimp/gimp-2.99.10.ebuild b/media-gfx/gimp/gimp-2.99.10.ebuild
17 index d21a53c727cf..75e77fab2cd0 100644
18 --- a/media-gfx/gimp/gimp-2.99.10.ebuild
19 +++ b/media-gfx/gimp/gimp-2.99.10.ebuild
20 @@ -130,8 +130,6 @@ src_prepare() {
21
22 gnome2_src_prepare # calls eautoreconf
23
24 - use vala && vala_src_prepare
25 -
26 sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
27 fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
28
29 @@ -155,6 +153,8 @@ _adjust_sandbox() {
30 src_configure() {
31 _adjust_sandbox
32
33 + use vala && vala_setup
34 +
35 local myconf=(
36 GEGL="${EPREFIX}"/usr/bin/gegl-0.4
37 GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
38
39 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
40 index df02f6ead41d..28a370966ece 100644
41 --- a/media-gfx/gimp/gimp-9999.ebuild
42 +++ b/media-gfx/gimp/gimp-9999.ebuild
43 @@ -131,8 +131,6 @@ src_prepare() {
44
45 gnome2_src_prepare # calls eautoreconf
46
47 - use vala && vala_src_prepare
48 -
49 sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
50 fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
51
52 @@ -156,6 +154,8 @@ _adjust_sandbox() {
53 src_configure() {
54 _adjust_sandbox
55
56 + use vala && vala_setup
57 +
58 local myconf=(
59 GEGL="${EPREFIX}"/usr/bin/gegl-0.4
60 GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen