media-libs/gegl: Fix babl dependency (bug #411703)

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 20 insertions, 12 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index fb7b27912ccb..05e5f6ac855b 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.67 2012/04/11 23:34:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.68 2012/04/14 00:46:10 sping Exp $
+
+  14 Apr 2012; Sebastian Pipping <sping@gentoo.org> gegl-0.1.6.ebuild,
+  gegl-0.1.8.ebuild:
+  Make sure gegl <0.1.10 cannot be used with babl >=0.1.8 (bug #411703)
+
+  14 Apr 2012; Sebastian Pipping <sping@gentoo.org> gegl-0.1.6.ebuild,
+  gegl-0.1.8.ebuild:
+  Make sure gegl <0.1.10 cannot be used with babl >=0.1.8
 
 *gegl-0.2.0 (11 Apr 2012)
 
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7549d1dff537..3d7807f3c26b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -8,15 +8,15 @@ AUX replace-imgconvert-by-swsscale.patch 2154 RMD160 fcf0e6c524a3e2071e474bdb62c
 DIST gegl-0.1.6.tar.bz2 4118465 RMD160 8b7bf74fe769cee289b336b5d815b370aa3a125d SHA1 27bedcfd077da7a6913b82966dbec904b22c121d SHA256 a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1
 DIST gegl-0.1.8.tar.bz2 5532682 RMD160 5ebd7663285a57205661868452e650ba41b9df7f SHA1 3d4d902580f5c5122b01b5188b6b5da03089ecac SHA256 106b9574b6d5fb282683794f7a7f090a1a3f4a388890e592b202827a4ca76f75
 DIST gegl-0.2.0.tar.bz2 7502040 RMD160 cc10365cff27dd42b002bf305f82de54d8c158fa SHA1 764cc66cb3c7b261b8fc18a6268a0e264a91d573 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426
-EBUILD gegl-0.1.6.ebuild 2725 RMD160 e1ea6defa04b11c9388fc7168d3869eec37d919a SHA1 912946b2509e66fae6ccd7bafd2e83bc5b8f7780 SHA256 f1f28067bc1b5d149cc1672d4492ae8cbec25e8044b13d8b2ec1df8c3b008dfc
-EBUILD gegl-0.1.8.ebuild 3175 RMD160 505f059863877c9ac142eefaab322a5712d706e8 SHA1 70f2b647731135431691029cb7fc3b8b6e0fac3f SHA256 20bbdf338166b3ae6da292452637a859701b317abe5c5a247986b9809c3f1af1
+EBUILD gegl-0.1.6.ebuild 2743 RMD160 564534a8319d52d099c0c6a9c32d4685c308e69b SHA1 9c8eeae80e6515f9cb3302eb5ee192a9cd2d67e0 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884
+EBUILD gegl-0.1.8.ebuild 3215 RMD160 f571bcaa123be17fffa4cef8f76003c0dfa0c7e6 SHA1 fac8054ad567be98b2396a635acdabe9fd8f93ff SHA256 7f0716d0a1ae0742c5bb989e7682b3c70222932e31d9a42a2e0fe36ebbd331b7
 EBUILD gegl-0.2.0.ebuild 3006 RMD160 b04c473d18e21cde5ecd52f6af4695c09be8ab02 SHA1 e82e9d7b0e641fd0ebf5e0c4595dcc848681d9e8 SHA256 31cfa4d0b008514ce988e6f331a4cbcee48a165858365f997f04671b8b3b156d
-MISC ChangeLog 9068 RMD160 10ba0f0ac1bec2760bd3ca7a99f16a5c58d9092f SHA1 92f7d70e2d49ce4079b0c8bd0a40eb0a335c5b06 SHA256 84837a7634291d4cbdfe5ef44083e478eefc8fad2ec2db87030c8f00ea127416
+MISC ChangeLog 9384 RMD160 89412f7b8b615d8ec1e33e09e14a4c58603c62f8 SHA1 af6f99129d926ac3265398edc6486bde6ce54c4d SHA256 3274524ff9594ee0896dca211311d3197989130ee8b4b5b2166d1790be6d3ecb
 MISC metadata.xml 546 RMD160 4e82c297f300d5d81ad31b0d2fe22795d5524f07 SHA1 21d66fb7eac01b8b307889c60ae27d66f51a05eb SHA256 88e6627c76d098d9a94925379e0a39c2a509858c614c9513ac05e62f15cb649e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+GFPYACgkQsAvGakAaFgDsywCfR+w42Sf9Sm+5jGR5Fxcz/7Ye
-JGkAnRXi0NcLwyX8oMwhj/deRgAh1Y47
-=/aq8
+iEYEARECAAYFAk+IyMcACgkQsAvGakAaFgAxhgCdEXVRvCt1hA5N/HJnwCC8qDok
+KcYAoIa894Py3DzAAHi1izZfWzQzN1HX
+=dV9X
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/gegl-0.1.6.ebuild b/media-libs/gegl/gegl-0.1.6.ebuild
index 80feecf80dd1..12ce412138b8 100644
--- a/media-libs/gegl/gegl-0.1.6.ebuild
+++ b/media-libs/gegl/gegl-0.1.6.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-libs/gegl/gegl-0.1.6.ebuild,v 1.19 2011/05/20 20:20:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.6.ebuild,v 1.20 2012/04/14 00:46:10 sping Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc
 
 IUSE="cairo debug exif ffmpeg graphviz jpeg jpeg2k lua mmx openexr png raw sdl sse svg umfpack v4l"
 
-DEPEND=">=media-libs/babl-0.1.4
+DEPEND=">=media-libs/babl-0.1.4 <media-libs/babl-0.1.8
 	dev-libs/glib:2
 	x11-libs/gtk+:2
 	x11-libs/gdk-pixbuf:2
diff --git a/media-libs/gegl/gegl-0.1.8.ebuild b/media-libs/gegl/gegl-0.1.8.ebuild
index 69f5f681470f..36230894e516 100644
--- a/media-libs/gegl/gegl-0.1.8.ebuild
+++ b/media-libs/gegl/gegl-0.1.8.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-libs/gegl/gegl-0.1.8.ebuild,v 1.9 2012/04/11 23:34:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.8.ebuild,v 1.10 2012/04/14 00:46:10 sping Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ IUSE="cairo debug exif ffmpeg graphviz introspection jpeg jpeg2k lensfun lua mmx
 
 VALASLOT="0.14"
 
-RDEPEND=">=media-libs/babl-0.1.6[introspection?]
+RDEPEND=">=media-libs/babl-0.1.6[introspection?] <media-libs/babl-0.1.8[introspection?]
 	>=dev-libs/glib-2.28:2
 	>=x11-libs/gdk-pixbuf-2.18:2
 	x11-libs/pango