gentoo resync : 14.05.2020

3 files changed, 2 insertions, 67 deletions

diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 0dea35ac2a2d..3734e2f89f31 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -2,9 +2,7 @@ AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BL
 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 1372 BLAKE2B d3c6855f3d41abbd2140420702035eb9442a062cfc3bb0d0688146e1e0cc88641b2ebbecbaa9fab51931a273c16c65e7f9b204c1a35480dffface59840bea6cf SHA512 d263257420ee02aad0c44f107840e88ead259126fc87e380216b679b04fd17f1ac174b90d00d50808651c50d4b8edd3f6a695900b6da3db0c4ff4a67588a40a3
-EBUILD libmypaint-1.4.0-r1.ebuild 1712 BLAKE2B 2f4b25d83be297f47234c2872f769b130c6d289244b980bfcdcefbfb45424668c4ef02b3596164b843d259ebe2eecbcc6336140899248f179afb1862cf5a0bda SHA512 807a41635fed5dc20437fc821faf630b09265b551236892135f363e99a2dc7a66ec3bf344e88843dff1bf37c2cd1042f409008bea5f298cee45ad77cddb4edce
+EBUILD libmypaint-1.4.0-r1.ebuild 1710 BLAKE2B 1af97fe704b5cf33c215ed3fe597b34b32ff14d0af312a4d94c369fdc014fa12e03dd8e9ce34640d3503028a6a786d1783d7aa185bb570cfaaa75961dc76541e SHA512 966b2a8541310aa6cc570c52058c9321cc6476830f9ce53bc85508d1bd51db393e882ec2a93f9cfba2002210d15a1b83e5d1e894ff077fe8e05ab4c29b03721c
 EBUILD libmypaint-1.4.0.ebuild 1547 BLAKE2B 2c313f5538f415ccd0aed83030f1b99c735131fe912a8873196b4443175b24a4913706a6512e4c81687d8e8913beb669ff823b8ce5ca9748a5e3a2f1ed8ee712 SHA512 5e0ee94cca9d0fecff12c5fbfc3460a417ae4e7a0517d851e035c4fa8321c678ca4f6e52d9cc9b40dfbee9b027ae1884e5509a070cb7f908849da2aec81fb82a
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
deleted file mode 100644
index 38fbc7ccbf6a..000000000000
--- a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils 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 x86"
-IUSE="+gegl introspection nls openmp"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	gegl? (
-		media-libs/babl
-		media-libs/gegl:0.3[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}
-
-src_prepare() {
-	xdg_environment_reset
-	eapply_user
-}
-
-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
-}
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
index b41e50a804ae..9ab57d2652e1 100644
--- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 IUSE="gegl introspection nls openmp"
 
 CDEPEND="