gentoo resync : 04.05.2019

3 files changed, 170 insertions, 0 deletions

diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 2bcf8207e3c7..5b8718da74c1 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,7 +1,9 @@
+AUX libmypaint-1.3.0-gegl-0.4.14.patch 4368 BLAKE2B f4094718153e1cf08a173f2a350fc63e0993de839763b1e733214c1966c00f14e8c5e760b0ccc113401d82078af92b19938f9bd6ea96ca3caf41883eef82d548 SHA512 cb0cf38330d820681d6b089884ac8af13ac24c0600807a5c301bd03a5387df9e1a17caf3519985deb188a28b4a9c8d6c5f9d19cf2a481a4a696c871f997244d2
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
 EBUILD libmypaint-1.3.0-r1.ebuild 1380 BLAKE2B c17825bf21bfbf5774a85a2f2b088ada6b700d3ea7f39b7a5a87c190a4ee18b209dec2b50524c0e24f0d206305f4adb553c9e990ba40b1d4277dd7361d0f2e01 SHA512 f8ce3da4972b0138025522aaa5cba4f78bb10d049b94fe13af1b1b3a53d4f26c3b5ab6bf4b213458f95ed65ba8f16b197fca6a70c5d1ef88c9df70d9958e0ec0
+EBUILD libmypaint-1.3.0-r2.ebuild 1461 BLAKE2B 2f6429f2b99c144dba254bce0f20d8110f553d6007c23b8d933090d2adbfe749249415ac42bcea68f4d0cd874fab7cc2b1c3791e899b05f85ed2689e5314cb8b SHA512 e21750363fc23262d7614ee879bd9580e95cfa0bf10cef555eea73a39f52edbe4cb8db7f71b5e755dca05170245326b244f8509111c7a87a31128ee39b0a1189
 EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
 EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
new file mode 100644
index 000000000000..d59cacb3a5d3
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.3.0-gegl-0.4.14.patch
@@ -0,0 +1,100 @@
+From 068e5f7ecacf152a9872441fb2f67b8578448a5b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 28 Apr 2019 20:24:05 +0200
+Subject: [PATCH] Depend on Gegl >=0.4.14 rather than 0.3.x
+
+Inspired by
+https://src.fedoraproject.org/rpms/libmypaint/raw/master/f/libmypaint-1.3.0-gegl04.patch
+
+Gegl commit introducing breaking change to GeglBufferIterator:
+https://gitlab.gnome.org/GNOME/gegl/commit/9dcd2cde63f95a080bf16a58c10e9ffbdd99aace
+---
+ configure.ac                | 4 ++--
+ gegl/Makefile.am            | 4 ++--
+ gegl/libmypaint-gegl.pc.in  | 2 +-
+ gegl/mypaint-gegl-surface.c | 5 +++--
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7a5b231..95473d0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
+           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
+ 
+ # Dependencies.
+-m4_define([gegl_required_version], [0.3])
++m4_define([gegl_required_version], [0.4.14])
+ m4_define([introspection_required_version], [1.32.0])
+ 
+ AC_INIT([libmypaint],
+@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
+ )
+ 
+ if eval "test x$enable_gegl = xyes"; then
+-  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
++  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
+ fi
+ AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
+ 
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index b45707d..5ef22c1 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
+     --warn-all \
+-    --pkg="gegl-0.3" \
++    --pkg="gegl-0.4" \
+     --pkg="glib-2.0" \
+     --namespace="MyPaintGegl" \
+     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
+@@ -38,7 +38,7 @@ introspection_sources = \
+ 	mypaint-gegl-surface.c
+ 
+ MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+-MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in
+index 75aa729..9184980 100644
+--- a/gegl/libmypaint-gegl.pc.in
++++ b/gegl/libmypaint-gegl.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libmypaint
+ Description: MyPaint brush engine library, with GEGL integration.
+ Version: @LIBMYPAINT_VERSION@
+-Requires: gegl-0.3 libmypaint
++Requires: gegl-0.4 libmypaint
+ Cflags: -I${includedir}/libmypaint-gegl
+ Libs: -L${libdir} -lmypaint-gegl
+diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c
+index 5c86d3c..e51bb5f 100644
+--- a/gegl/mypaint-gegl-surface.c
++++ b/gegl/mypaint-gegl-surface.c
+@@ -77,8 +77,9 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+     }
+ 
+     if (buffer_is_native(self)) {
++        const gint max_slots = 6;  /* i.e. <0.4.14 internal GEGL_BUFFER_MAX_ITERATORS */
+         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
+-                                      read_write_flags, GEGL_ABYSS_NONE);
++                                      read_write_flags, GEGL_ABYSS_NONE, max_slots);
+ 
+         // Read out
+         gboolean completed = gegl_buffer_iterator_next(iterator);
+@@ -88,7 +89,7 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
+             g_critical("Unable to get tile aligned access to GeglBuffer");
+             request->buffer = NULL;
+         } else {
+-            request->buffer = (uint16_t *)(iterator->data[0]);
++            request->buffer = (uint16_t *)(iterator->items[0].data);
+         }
+ 
+         // So we can finish the iterator in tile_request_end()
+-- 
+2.21.0
+
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..4b4cf2fa1944
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.3.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/0"  # first soname component for subslot
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		>=media-libs/gegl-0.4.14:0.4[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( sys-devel/gcc:*[openmp] )
+	nls? ( sys-devel/gettext )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+	"
+RDEPEND="${CDEPEND}
+	!<media-gfx/mypaint-1.2.1
+	"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-gegl-0.4.14.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-ld-disable-gold  # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}