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

[Sebastian Pipping]

commit:     d749367fa7030bb9f71707d775219d16029255d1
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 16:48:05 2016 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 17:14:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d749367f

media-gfx/gimp: Fix dep on gdbus-codegen (bug #590006)

Package-Manager: portage-2.2.28

 media-gfx/gimp/gimp-2.9.2-r2.ebuild | 6 +++++-
 media-gfx/gimp/gimp-2.9.4.ebuild    | 6 +++++-
 media-gfx/gimp/gimp-9999.ebuild     | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/media-gfx/gimp/gimp-2.9.2-r2.ebuild 
b/media-gfx/gimp/gimp-2.9.2-r2.ebuild
index 361ecce..3748dca 100644
--- a/media-gfx/gimp/gimp-2.9.2-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.9.2-r2.ebuild
@@ -43,7 +43,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
        aqua? ( x11-libs/gtk-mac-integration )
-       dev-util/gdbus-codegen
        gnome? ( gnome-base/gvfs )
        webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
        virtual/jpeg:0
@@ -125,6 +124,11 @@ src_prepare() {
        gnome2_src_prepare
 }
 
+src_configure() {
+       gnome2_src_configure \
+                       GDBUS_CODEGEN=/bin/false
+}
+
 src_compile() {
        addwrite /dev/nvidiactl  # bug #569738
        addwrite /dev/nvidia0  # bug #569738

diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild
index 4d8622f..6af71f4 100644
--- a/media-gfx/gimp/gimp-2.9.4.ebuild
+++ b/media-gfx/gimp/gimp-2.9.4.ebuild
@@ -44,7 +44,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
        aqua? ( x11-libs/gtk-mac-integration )
-       dev-util/gdbus-codegen
        gnome? ( gnome-base/gvfs )
        webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
        virtual/jpeg:0
@@ -127,6 +126,11 @@ src_prepare() {
        gnome2_src_prepare
 }
 
+src_configure() {
+       gnome2_src_configure \
+                       GDBUS_CODEGEN=/bin/false
+}
+
 src_compile() {
        addwrite /dev/nvidiactl  # bug #569738
        addwrite /dev/nvidia0  # bug #569738

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 040199d..6b56289 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -46,7 +46,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
        aalib? ( media-libs/aalib )
        alsa? ( media-libs/alsa-lib )
        aqua? ( x11-libs/gtk-mac-integration )
-       dev-util/gdbus-codegen
        gnome? ( gnome-base/gvfs )
        webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
        virtual/jpeg:0
@@ -70,6 +69,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
        postscript? ( app-text/ghostscript-gpl )
        udev? ( virtual/libgudev:= )"
 DEPEND="${RDEPEND}
+       dev-util/gdbus-codegen
        sys-apps/findutils
        virtual/pkgconfig
        >=dev-util/intltool-0.40.1