gentoo (leap year) resync : 29.02.2020

4 files changed, 139 insertions, 0 deletions

diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index d3a3525e918f..6a8d2f828f1e 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,7 +1,10 @@
+AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BLAKE2B 229252af799b13bbb309407ad9ef0424c8315ed23e4a68459ba37737ee7bed5c787acfb034cf4aa195f0568e047bedfa83ecd5ace6dcdc181a806c27a0f4e5ac SHA512 4d45973d8775e227345de65ae6f6a2de5379eb4fcbe703bb88410c64986255b2de766a8d3665fc795d057c12df4aa1ea703e94c19a0aee28562c52e2b70b8bf8
 AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b
+AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B de6af484456b680f6bb5be82d5b2c2a8749bcb7373c2be7fddc39037f45ddc8664cd3291cb2794e96d54d99bd18e2b94e41bdaa5333dc4a121cdaffcf6651f54 SHA512 6a25e66188010955120055d98124e9dc30757e30826386a45e1d8ed1fb3b11d642c7c63fe8b755a3b047fe70a35a0691848573791581cd6a7298b69207e3b56c
 AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
 DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
 EBUILD libmypaint-1.3.0-r1.ebuild 1379 BLAKE2B e3603b7a33c563d63cae697e8bca9f1c4dbb94d6872f96207db9867a53108ca78270e637c6063a747158ecffcfedabb687c6a06b6a3c897f5679c32c45326635 SHA512 4343dc01b4d811b94f5b735a6b42a4ce11330c3f62675d5a0e06b68adf9b2ab49b3103f6189874f0c1a5fc5ede3b2a7de4547f47fa91dca90bcc0f0588e3ecc9
+EBUILD libmypaint-1.4.0-r1.ebuild 1719 BLAKE2B e3108b8ee6b9e3c17184d2266ca35ec4cd6578e7f6f02165e07ce5b2084fd39fd3366ba475033abc4c1d7b2e7453f0e5219149e5bcea76c0bc86eacb2e0b12da SHA512 d358058f3d2ade007b951ec3f0fdf3b2f62f2b49344c2fa696f2f58e47813b59718ab93e937b26e7f4bcdbc12fbc469dc5f71203af537016c32426a30d6bc26b
 EBUILD libmypaint-1.4.0.ebuild 1555 BLAKE2B 20c7fde8d07575df537f208890bf45ba552aa1efe6aafe37a792daf21d28ec150e554290cfe169595cccd4020c082117cb6ffa49f43315781bc359329475508e SHA512 c3685b89a00747c57f7b2739d27914044b77b87fd14d6062aa97bd9732f89180f28ea0892e54c2045e57e351e76664dc97b5c38a7f88038cb49ac6a55a9f1cea
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
new file mode 100644
index 000000000000..8f4b713b3af7
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
@@ -0,0 +1,31 @@
+From 748e735e7fffd2524bb3552fd79b2a2c13f60711 Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Wed, 11 Dec 2019 18:02:35 +0100
+Subject: [PATCH] Adjust generation script to be runnable in Py3
+
+---
+ generate.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/generate.py b/generate.py
+index 6ab3dd0e..1e0b4ee9 100644
+--- a/generate.py
++++ b/generate.py
+@@ -26,6 +26,7 @@
+ import json
+ from collections import namedtuple
+ 
++PY3 = sys.version_info >= (3,)
+ 
+ _SETTINGS = []  # brushsettings.settings
+ _SETTING_ORDER = [
+@@ -82,7 +83,8 @@ def validate(self):
+ 
+ def _init_globals_from_json(filename):
+     """Populate global variables above from the canonical JSON definition."""
+-    with open(filename, "rb") as fp:
++    flag = "r" if PY3 else "rb"
++    with open(filename, flag) as fp:
+         defs = json.load(fp)
+     for input_def in defs["inputs"]:
+         input = _BrushInput(**input_def)
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
new file mode 100644
index 000000000000..1413868094d5
--- /dev/null
+++ b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
@@ -0,0 +1,34 @@
+From 68e2c33add0aec09f1898aa80ef4f822bed67b87 Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Tue, 17 Dec 2019 17:36:22 +0100
+Subject: [PATCH] Drop python2 requirement/recommendation
+
+---
+ README.md   | 2 +-
+ autogen.sh  | 2 +-
+ generate.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/README.md b/README.md
+index 96c748da..fae90566 100644
+--- a/README.md
++++ b/README.md
+@@ -35,7 +35,7 @@ to get started with a standard configuration:
+ 
+ When building from git:
+ 
+-    $ sudo apt install -y python2.7 autotools-dev intltool gettext libtool
++    $ sudo apt install -y python autotools-dev intltool gettext libtool
+ 
+ ### Install dependencies (Red Hat and derivatives)
+ 
+diff --git a/generate.py b/generate.py
+index b613f91d..cd7e99e8 100644
+--- a/generate.py
++++ b/generate.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python
+ # libmypaint - The MyPaint Brush Library
+ # Copyright (C) 2007-2012 Martin Renold <martinxyz@gmx.ch>
+ # Copyright (C) 2012-2016 by the MyPaint Development Team.
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..92b25f6a172c
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
+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-5:*[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.4.0-drop-libmypaint-gegl-versioning.patch
+	"${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch
+	"${FILESDIR}"/${PN}-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
+	"${FILESDIR}"/${PN}-1.4.0-drop-python2-requirement-recommendation.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
+}