commit: 3f31bd54bdc89c64c1bc20fd4df1ad725fa9db79
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 16:31:33 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 16:33:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f31bd54
media-libs/gegl: 0.4.14, sync 9999
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-libs/gegl/Manifest | 1 +
.../gegl/{gegl-9999.ebuild => gegl-0.4.14.ebuild} | 17 ++++++++++++-----
media-libs/gegl/gegl-9999.ebuild | 13 ++++++++-----
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index fb4d4e30290..1bd5946385c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -3,5 +3,6 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B
7ac52fb22bab3b84068e10610d8681a5bcf56f6c
DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B
1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5
SHA512
1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B
4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f
SHA512
a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
DIST gegl-0.4.12.tar.bz2 7065555 BLAKE2B
f0801739e67e6d6ecc88abaed8638c900edd7229d240f63af7cc0bf503cd29b33b84d7e3018c757b0bdb6ee5245f6af595b96decc3916b57debfb46712213577
SHA512
cacf9f5c34357b3939162d0d4712ee2b47298a3e806b55e275cdf5e23f186d436ea1a840b91b1b72b76d450d94674cca217b7c253cd6b52a7d9505b4ad73fde2
+DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B
a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305
SHA512
1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B
c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5
SHA512
6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B
ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae
SHA512
20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
diff --git a/media-libs/gegl/gegl-9999.ebuild
b/media-libs/gegl/gegl-0.4.14.ebuild
similarity index 92%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.4.14.ebuild
index 1d5e515f803..58165e60783 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
# vala and introspection support is broken, bug #468208
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l
webp zlib"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -36,9 +36,8 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/glib-2.44:2
dev-libs/json-glib
- >=media-libs/babl-0.1.56
+ >=media-libs/babl-0.1.62
>=media-libs/libpng-1.6.0:0=
- sys-libs/zlib
virtual/jpeg:0=
>=x11-libs/gdk-pixbuf-2.32:2
x11-libs/pango
@@ -52,6 +51,7 @@ RDEPEND="
lcms? ( >=media-libs/lcms-2.8:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( >=media-libs/openexr-2.2.0:= )
+ pdf? ( >=app-text/poppler-0.71.0[cairo] )
raw? ( >=media-libs/libraw-0.15.4:0= )
sdl? ( >=media-libs/libsdl-1.2.0 )
svg? ( >=gnome-base/librsvg-2.40.6:2 )
@@ -59,6 +59,7 @@ RDEPEND="
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
webp? ( >=media-libs/libwebp-0.5.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0 )
"
DEPEND="${RDEPEND}
dev-lang/perl
@@ -74,6 +75,10 @@ DEPEND="${RDEPEND}
vala? ( $(vala_depend) )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+)
+
pkg_setup() {
use test && use introspection && python-any-r1_pkg_setup
}
@@ -135,6 +140,7 @@ src_configure() {
$(use_with lcms)
$(use_with lensfun)
$(use_with openexr)
+ $(use_with pdf popplerglib)
$(use_with raw libraw)
$(use_with sdl)
$(use_with svg librsvg)
@@ -146,6 +152,7 @@ src_configure() {
$(use_with v4l libv4l2)
$(use_with vala)
$(use_with webp)
+ $(use_with zlib)
)
if use test; then
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 1d5e515f803..377cbb02f89 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
# vala and introspection support is broken, bug #468208
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection
jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l
webp zlib"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -36,9 +36,8 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/glib-2.44:2
dev-libs/json-glib
- >=media-libs/babl-0.1.56
+ >=media-libs/babl-0.1.62
>=media-libs/libpng-1.6.0:0=
- sys-libs/zlib
virtual/jpeg:0=
>=x11-libs/gdk-pixbuf-2.32:2
x11-libs/pango
@@ -52,6 +51,7 @@ RDEPEND="
lcms? ( >=media-libs/lcms-2.8:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( >=media-libs/openexr-2.2.0:= )
+ pdf? ( >=app-text/poppler-0.71.0[cairo] )
raw? ( >=media-libs/libraw-0.15.4:0= )
sdl? ( >=media-libs/libsdl-1.2.0 )
svg? ( >=gnome-base/librsvg-2.40.6:2 )
@@ -59,6 +59,7 @@ RDEPEND="
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
webp? ( >=media-libs/libwebp-0.5.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0 )
"
DEPEND="${RDEPEND}
dev-lang/perl
@@ -135,6 +136,7 @@ src_configure() {
$(use_with lcms)
$(use_with lensfun)
$(use_with openexr)
+ $(use_with pdf popplerglib)
$(use_with raw libraw)
$(use_with sdl)
$(use_with svg librsvg)
@@ -146,6 +148,7 @@ src_configure() {
$(use_with v4l libv4l2)
$(use_with vala)
$(use_with webp)
+ $(use_with zlib)
)
if use test; then