media-gfx/gimp: deny gegl 0.2 for Gimp <2.8_rc1 (bug #411673)

(Portage version: 2.1.10.56/cvs/Linux x86_64)

12 files changed, 37 insertions, 30 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index ab8ea3368111..6faf5be5b49e 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.358 2012/04/12 00:33:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.359 2012/04/12 04:40:01 sping Exp $
+
+  12 Apr 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.6.11-r1.ebuild,
+  gimp-2.6.11-r2.ebuild, gimp-2.6.11-r3.ebuild, gimp-2.6.11-r4.ebuild,
+  gimp-2.6.11-r5.ebuild, gimp-2.6.11-r6.ebuild, gimp-2.6.12.ebuild,
+  gimp-2.7.3.ebuild, gimp-2.7.3-r1.ebuild, gimp-2.7.4.ebuild,
+  gimp-2.7.5.ebuild:
+  Make sure only Gimp 2.8_rc1 is built against gegl 0.2 (bug #411673)
 
 *gimp-2.8.0_rc1 (12 Apr 2012)
 
diff --git a/media-gfx/gimp/gimp-2.6.11-r1.ebuild b/media-gfx/gimp/gimp-2.6.11-r1.ebuild
index b97e27ef4090..45e5e0aa388c 100644
--- a/media-gfx/gimp/gimp-2.6.11-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.10 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.11 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.6.11-r2.ebuild b/media-gfx/gimp/gimp-2.6.11-r2.ebuild
index 00e81837ba8b..d74226f78c6c 100644
--- a/media-gfx/gimp/gimp-2.6.11-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.3 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.4 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.6.11-r3.ebuild b/media-gfx/gimp/gimp-2.6.11-r3.ebuild
index f0abb603f481..e7570e26d508 100644
--- a/media-gfx/gimp/gimp-2.6.11-r3.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r3.ebuild,v 1.2 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r3.ebuild,v 1.3 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.6.11-r4.ebuild b/media-gfx/gimp/gimp-2.6.11-r4.ebuild
index 9608be327ddf..532269dca7bf 100644
--- a/media-gfx/gimp/gimp-2.6.11-r4.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r4.ebuild,v 1.2 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r4.ebuild,v 1.3 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.6.11-r5.ebuild b/media-gfx/gimp/gimp-2.6.11-r5.ebuild
index bfcc02b0c763..d26791f185eb 100644
--- a/media-gfx/gimp/gimp-2.6.11-r5.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild,v 1.8 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r5.ebuild,v 1.9 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1:2
 	dev-libs/libxslt
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.6.11-r6.ebuild b/media-gfx/gimp/gimp-2.6.11-r6.ebuild
index 215e08729666..6f1eda2b8e42 100644
--- a/media-gfx/gimp/gimp-2.6.11-r6.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r6.ebuild,v 1.2 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r6.ebuild,v 1.3 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/libxslt
 	>=media-libs/fontconfig-2.2.0
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	>=x11-libs/gtk+-2.12.5:2
 	x11-libs/libXpm
 	>=x11-libs/pango-1.18.0
diff --git a/media-gfx/gimp/gimp-2.6.12.ebuild b/media-gfx/gimp/gimp-2.6.12.ebuild
index fd79ceec8cb4..bbeccf49b88c 100644
--- a/media-gfx/gimp/gimp-2.6.12.ebuild
+++ b/media-gfx/gimp/gimp-2.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.5 2012/04/05 14:36:17 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.6 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/libxslt
 	>=media-libs/fontconfig-2.2.0
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.0.22
+	>=media-libs/gegl-0.0.22 <media-libs/gegl-0.2
 	>=x11-libs/gtk+-2.12.5:2
 	x11-libs/libXpm
 	>=x11-libs/pango-1.18.0
diff --git a/media-gfx/gimp/gimp-2.7.3-r1.ebuild b/media-gfx/gimp/gimp-2.7.3-r1.ebuild
index cbcec5475ae9..a9df5de09331 100644
--- a/media-gfx/gimp/gimp-2.7.3-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild,v 1.5 2012/01/01 14:04:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3-r1.ebuild,v 1.6 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.28.1:2
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.4
-	>=media-libs/gegl-0.1.6
+	>=media-libs/gegl-0.1.6 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.7.3.ebuild b/media-gfx/gimp/gimp-2.7.3.ebuild
index a80cacfb9f30..f9e9d51ecbe1 100644
--- a/media-gfx/gimp/gimp-2.7.3.ebuild
+++ b/media-gfx/gimp/gimp-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3.ebuild,v 1.3 2011/11/16 10:45:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3.ebuild,v 1.4 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.28.1:2
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.4
-	>=media-libs/gegl-0.1.6
+	>=media-libs/gegl-0.1.6 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.7.4.ebuild b/media-gfx/gimp/gimp-2.7.4.ebuild
index f5f4266755db..3aa377d9c069 100644
--- a/media-gfx/gimp/gimp-2.7.4.ebuild
+++ b/media-gfx/gimp/gimp-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.2 2012/01/02 18:49:04 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.3 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.6
-	>=media-libs/gegl-0.1.8
+	>=media-libs/gegl-0.1.8 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )
diff --git a/media-gfx/gimp/gimp-2.7.5.ebuild b/media-gfx/gimp/gimp-2.7.5.ebuild
index fff91e77689a..2519250dc856 100644
--- a/media-gfx/gimp/gimp-2.7.5.ebuild
+++ b/media-gfx/gimp/gimp-2.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.5.ebuild,v 1.1 2012/03/14 13:01:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.5.ebuild,v 1.2 2012/04/12 04:40:01 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.6
-	>=media-libs/gegl-0.1.8
+	>=media-libs/gegl-0.1.8 <media-libs/gegl-0.2
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( net-misc/curl )