Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/
Date: Fri, 29 Jul 2016 17:14:48
Message-Id: 1469812466.d749367fa7030bb9f71707d775219d16029255d1.sping@gentoo
1 commit: d749367fa7030bb9f71707d775219d16029255d1
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 29 16:48:05 2016 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 29 17:14:26 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d749367f
7
8 media-gfx/gimp: Fix dep on gdbus-codegen (bug #590006)
9
10 Package-Manager: portage-2.2.28
11
12 media-gfx/gimp/gimp-2.9.2-r2.ebuild | 6 +++++-
13 media-gfx/gimp/gimp-2.9.4.ebuild | 6 +++++-
14 media-gfx/gimp/gimp-9999.ebuild | 2 +-
15 3 files changed, 11 insertions(+), 3 deletions(-)
16
17 diff --git a/media-gfx/gimp/gimp-2.9.2-r2.ebuild b/media-gfx/gimp/gimp-2.9.2-r2.ebuild
18 index 361ecce..3748dca 100644
19 --- a/media-gfx/gimp/gimp-2.9.2-r2.ebuild
20 +++ b/media-gfx/gimp/gimp-2.9.2-r2.ebuild
21 @@ -43,7 +43,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
22 aalib? ( media-libs/aalib )
23 alsa? ( media-libs/alsa-lib )
24 aqua? ( x11-libs/gtk-mac-integration )
25 - dev-util/gdbus-codegen
26 gnome? ( gnome-base/gvfs )
27 webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
28 virtual/jpeg:0
29 @@ -125,6 +124,11 @@ src_prepare() {
30 gnome2_src_prepare
31 }
32
33 +src_configure() {
34 + gnome2_src_configure \
35 + GDBUS_CODEGEN=/bin/false
36 +}
37 +
38 src_compile() {
39 addwrite /dev/nvidiactl # bug #569738
40 addwrite /dev/nvidia0 # bug #569738
41
42 diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild
43 index 4d8622f..6af71f4 100644
44 --- a/media-gfx/gimp/gimp-2.9.4.ebuild
45 +++ b/media-gfx/gimp/gimp-2.9.4.ebuild
46 @@ -44,7 +44,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
47 aalib? ( media-libs/aalib )
48 alsa? ( media-libs/alsa-lib )
49 aqua? ( x11-libs/gtk-mac-integration )
50 - dev-util/gdbus-codegen
51 gnome? ( gnome-base/gvfs )
52 webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
53 virtual/jpeg:0
54 @@ -127,6 +126,11 @@ src_prepare() {
55 gnome2_src_prepare
56 }
57
58 +src_configure() {
59 + gnome2_src_configure \
60 + GDBUS_CODEGEN=/bin/false
61 +}
62 +
63 src_compile() {
64 addwrite /dev/nvidiactl # bug #569738
65 addwrite /dev/nvidia0 # bug #569738
66
67 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
68 index 040199d..6b56289 100644
69 --- a/media-gfx/gimp/gimp-9999.ebuild
70 +++ b/media-gfx/gimp/gimp-9999.ebuild
71 @@ -46,7 +46,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
72 aalib? ( media-libs/aalib )
73 alsa? ( media-libs/alsa-lib )
74 aqua? ( x11-libs/gtk-mac-integration )
75 - dev-util/gdbus-codegen
76 gnome? ( gnome-base/gvfs )
77 webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
78 virtual/jpeg:0
79 @@ -70,6 +69,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
80 postscript? ( app-text/ghostscript-gpl )
81 udev? ( virtual/libgudev:= )"
82 DEPEND="${RDEPEND}
83 + dev-util/gdbus-codegen
84 sys-apps/findutils
85 virtual/pkgconfig
86 >=dev-util/intltool-0.40.1