gentoo resync : 02.09.2020

3 files changed, 2 insertions, 72 deletions

diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index e02cbe8979cd..d425708682b8 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -4,7 +4,6 @@ AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B
 AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
 DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
-EBUILD libmypaint-1.4.0-r1.ebuild 1709 BLAKE2B 646c5a4fdd64b7a736469cbd812e1fcb5bd90bc195ea8df24dacf191f46251a83e94bb0ed61e5617dffb4a8c73eb8b9d40c5483e1d9e78be7be8d8ae38f83692 SHA512 ee60210e9d56a4d861c14ee0515c70715e18e94f83cccd6f74993e78a64473bea4e9db42e0d99a77d4951368257852ae254edc325226d590303d9112273e0ad2
-EBUILD libmypaint-1.4.0.ebuild 1547 BLAKE2B 2c313f5538f415ccd0aed83030f1b99c735131fe912a8873196b4443175b24a4913706a6512e4c81687d8e8913beb669ff823b8ce5ca9748a5e3a2f1ed8ee712 SHA512 5e0ee94cca9d0fecff12c5fbfc3460a417ae4e7a0517d851e035c4fa8321c678ca4f6e52d9cc9b40dfbee9b027ae1884e5509a070cb7f908849da2aec81fb82a
+EBUILD libmypaint-1.4.0-r1.ebuild 1708 BLAKE2B 0a62cf06d349502020db734d24eadf4926967e827d76ab8e3cd372fcb377ac1e3a73c3336f71b5b8b81b732ebd1d7205db0dd9cbbdb4a6e86d909488cd970207 SHA512 ab64f9fc0e967a1b18ef377db3c2e7319d1ad6bc3127ddb3b4673a28c2be72e3ea393ea78d2516503da5a3483802eb03e458a820e807d3777425f551a710e0b3
 EBUILD libmypaint-1.6.1.ebuild 1421 BLAKE2B b0bd8294e8c218cb20555c6f427ea82128c2f44dc83446ba55482b54d85a9a33387870330cd0da1e9ded6722f9ce191678a1d80c81d5b9f4beb3869937655135 SHA512 277a446bf192f81078c1bbc0c01582e9f8abb93cc1fbf4596cd7c85033bb5be160e1ee13beb8298ca5d9108fc4966642dfb5f07f3881500f69154d54e6a31a53
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
index 4dc0bf008ef9..47f1fccbd44d 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="
diff --git a/media-libs/libmypaint/libmypaint-1.4.0.ebuild b/media-libs/libmypaint/libmypaint-1.4.0.ebuild
deleted file mode 100644
index af8de840c9d8..000000000000
--- a/media-libs/libmypaint/libmypaint-1.4.0.ebuild
+++ /dev/null
@@ -1,69 +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 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 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.4.0-drop-libmypaint-gegl-versioning.patch
-	"${FILESDIR}"/${PN}-1.4.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
-}