[gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/

[Sebastian Pipping]

commit:     7bba43869d7320d317ff94d56eb8fe54b74a00c1
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 11:39:45 2015 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 23:03:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bba4386

media-libs/gegl: version bump to 0.3.2

Add tiff support. USE=svg depend on cairo as found in build system.

Package-Manager: portage-2.2.25
RepoMan-Options: --force

 media-libs/gegl/Manifest                           |  1 +
 .../gegl/{gegl-9999.ebuild => gegl-0.3.2.ebuild}   | 29 +++++++++++-----------
 media-libs/gegl/gegl-9999.ebuild                   | 29 +++++++++++-----------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c9bb6ef..85500bb 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,2 +1,3 @@
 DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
 DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 WHIRLPOOL 4827d6e40025c36d4ef869b5856f4def1e93cc195757f430cfd2980742ce6b37c79833283d17ec51e93b569a144548aaf7021854b9bcdb241b90049b1321a99b
+DIST gegl-0.3.2.tar.bz2 5325146 SHA256 b82f6e07e977dd7c2b6e671e9e029614840a66f0ca58defb22c0b05ed3ea485c SHA512 207d23a62cc447b0f6837e1901410114a63fe1a1b92a08d3c92941bfb461d04e320e02332e013ce26383641fdf1011fb4d3f4b6ce0370030c3fe770a49634a51 WHIRLPOOL 74105180350a621e9f445bcc0040f712f8129792199c4e9be086008854866d0bf4b369dd7f5c96acb2ac4454d34cff7ed4edf4460bc5e632109d1ed294e330eb

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.3.2.ebuild
similarity index 90%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.3.2.ebuild
index 59a46cd..4fca26c 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.3.2.ebuild
@@ -27,13 +27,16 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
-REQUIRED_IUSE="vala? ( introspection )"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_IUSE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
 	dev-libs/json-glib
-	>=media-libs/babl-0.1.12
+	>=media-libs/babl-0.1.14
 	sys-libs/zlib
 	>=x11-libs/gdk-pixbuf-2.18:2
 	x11-libs/pango
@@ -50,9 +53,10 @@ RDEPEND="
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
-	raw? ( =media-libs/libopenraw-0.0.9 )
+	raw? ( >=media-libs/libraw-0.15.4 )
 	sdl? ( media-libs/libsdl )
 	svg? ( >=gnome-base/librsvg-2.14:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( media-libs/libwebp )
@@ -88,15 +92,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	# commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
-	# for the new CIE conversions
-	sed -e '/test-image-compare/d' \
-		-i tests/simple/Makefile.am || die
-
-	# Skip broken test with >=dev-python/pygobject-3.14
-	sed -e '/test_buffer/ i\    @unittest.skip("broken")\' \
-		-i tests/python/test-gegl-format.py || die
-
 	epatch_user
 	eautoreconf
 
@@ -126,6 +121,9 @@ src_configure() {
 	#  - There are two checks for dot, one controllable by --with(out)-graphviz
 	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 	#
+	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
+	#    is enabled
+	#
 	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
 	# https://bugs.gentoo.org/show_bug.cgi?id=451136
 	#
@@ -145,17 +143,20 @@ src_configure() {
 		$(use_with cairo pangocairo) \
 		--without-exiv2 \
 		$(use_with ffmpeg libavformat) \
+		--without-gexiv2 \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
 		$(use_with jpeg2k jasper) \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
+		--without-mrg \
 		$(use_with openexr) \
 		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
+		$(use_with raw libraw) \
 		$(use_with sdl) \
 		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
 		$(use_with umfpack) \
 		$(use_with v4l libv4l) \
 		$(use_with v4l libv4l2) \

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 59a46cd..4fca26c 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -27,13 +27,16 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
-REQUIRED_IUSE="vala? ( introspection )"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_IUSE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
 	dev-libs/json-glib
-	>=media-libs/babl-0.1.12
+	>=media-libs/babl-0.1.14
 	sys-libs/zlib
 	>=x11-libs/gdk-pixbuf-2.18:2
 	x11-libs/pango
@@ -50,9 +53,10 @@ RDEPEND="
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
-	raw? ( =media-libs/libopenraw-0.0.9 )
+	raw? ( >=media-libs/libraw-0.15.4 )
 	sdl? ( media-libs/libsdl )
 	svg? ( >=gnome-base/librsvg-2.14:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( media-libs/libwebp )
@@ -88,15 +92,6 @@ src_prepare() {
 		-e '/composite-transform.xml/d' \
 		-i tests/compositions/Makefile.am || die
 
-	# commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
-	# for the new CIE conversions
-	sed -e '/test-image-compare/d' \
-		-i tests/simple/Makefile.am || die
-
-	# Skip broken test with >=dev-python/pygobject-3.14
-	sed -e '/test_buffer/ i\    @unittest.skip("broken")\' \
-		-i tests/python/test-gegl-format.py || die
-
 	epatch_user
 	eautoreconf
 
@@ -126,6 +121,9 @@ src_configure() {
 	#  - There are two checks for dot, one controllable by --with(out)-graphviz
 	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
 	#
+	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
+	#    is enabled
+	#
 	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
 	# https://bugs.gentoo.org/show_bug.cgi?id=451136
 	#
@@ -145,17 +143,20 @@ src_configure() {
 		$(use_with cairo pangocairo) \
 		--without-exiv2 \
 		$(use_with ffmpeg libavformat) \
+		--without-gexiv2 \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
 		$(use_with jpeg2k jasper) \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
+		--without-mrg \
 		$(use_with openexr) \
 		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
+		$(use_with raw libraw) \
 		$(use_with sdl) \
 		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
 		$(use_with umfpack) \
 		$(use_with v4l libv4l) \
 		$(use_with v4l libv4l2) \