gentoo Easter resync : 12.04.2020

8 files changed, 177 insertions, 12 deletions

diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 7f1920a3df2a..5d8ad11b47c4 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -20,10 +20,12 @@ DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350d
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
 DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01aaabd5225ba07ab5cee3b369f42fe39691209f38d4d2a87d56997d9756449cafdb6288eb0864b49fb13a6a8ef SHA512 140ac1543aa24a23aa685dbd7335f21bcbf3d95c41c1451b2383f6d278842bd9f0c8c980ed27c70c67b2fefe9ba01f2d4bd4b77a1cee38ec1332c12ab3fd718d
-EBUILD gegl-0.2.0-r6.ebuild 4939 BLAKE2B 1cea4185489267540158e408740ac0c13a264959c0acca692e62c9336eea686044629f1eec789223b6591576ff4bbfe75614781804029675cfc6dafae8d246cf SHA512 91ada6e1e461114a3891ec8537d1542485c2bff9e8772f1ed689cde04ea30cb45ff77e9000445da707e196604a85c3b3007c4a110d1d8d40bf32283b31857df4
-EBUILD gegl-0.3.34.ebuild 5304 BLAKE2B a3877874e7960972db09997d510b2d3e1c96e2ea219e6c1d986485bee353fd4c857946fd9a479edeb1c7c14165bb0f5d59506e62e04ec8177f5f06e18a8748de SHA512 b003ef341c85fe89c6e8a359f2bcdbdb48db79767045bb88fb79b851e425f661836fdb6579898d994bc44162643f2ff887e974b199d94b5df427f64089ca6650
-EBUILD gegl-0.4.16.ebuild 4847 BLAKE2B d715f3ae0d1b7d4a3991d769d91537493f25cdb51a64783c8a1ce172d4bc0980b3897bd09bfce146bacb52e3de4d70b7ee80bc81fe17eebdece191109264dab8 SHA512 fa95f438de91116b9f5e4720a146230a65af69f7b85f3d6c7432cf7f4321e2ce0b198cf473bc8d18819cc371dab119e0a8ecdf8bbbe0c21535bf3da3e87e8af5
-EBUILD gegl-0.4.18.ebuild 4878 BLAKE2B be26ff0bb228295832b675317423413b400f277034eebba4214115398ae281254d784be6f6d1f1a314dd9ff3c58ecd3d6397143c8331c0668245a1675c982737 SHA512 dbf8429b00f79ed230dac38b9e5c8ea63a32dab638ad3af173359bd25a332b2210195583254dd4e0588910c860a2007dde21ebd9bf39d15be8acbbe3d408f3f3
-EBUILD gegl-0.4.20.ebuild 4857 BLAKE2B cf94e6f7a15e4824f5f97bc9dfc0ad3898a92fa6f7bfced65966621b9a515cea29b89c371d051f75e98b4b9e51568327ccdeb933ea8e81899e93166da10b34c5 SHA512 e3ab09d1214fd189bebf8fc052961a99e31be19848621da3ae03955800ce9deee0a02ee0b6b47485eed786da653ec1527bc87e6e9c5532db94f2b39de1a519ce
-EBUILD gegl-9999.ebuild 4465 BLAKE2B efcc8cfd2a932d910f2a82ab444bc6eb996077fa5ed0b9f9838c16fab29bddbba3eecdddfdcbe90f176a3c55c46360f0fdf67d2daa5195b4e4e62b42066cbee7 SHA512 e73cce2fb1b7d5cb0b1a4af2efe1656e3b48a71e3f97cf573f51691a70073a4c9c1a17f35c8365549e7bd2651ffb573429f5eef0edab298850134ca840df11c1
+DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
+EBUILD gegl-0.2.0-r6.ebuild 4933 BLAKE2B e903f3ccc6a6ce880125da1ba8169073907b8df184e22ad973af7c59100fd8c4008842af98c97b40f67e1a6989a240565926dc7bc16bd04965de5037b90ed5f5 SHA512 27973726c5eeae364a16d36cd50c5bb4e41975837de6be11f4c90d8084526f0d68d5db29e908befb617b895668fe13b62b6a5af7c80d2762fc1e74c04b439d50
+EBUILD gegl-0.3.34.ebuild 5298 BLAKE2B 704e6d61cadfd3c445d1238690efca0cdabe4ab77d683a8e72b98748567a397e3580cd213da09d603a0f036e60f03771762e911582f95161a922c85234074706 SHA512 cb0b6f3bf173291ee5e0a5aeeadd6b93f6dc6af8245816b6825658ecfdec9d5fd6e65c34b3dca11b19841f336523de35facf51bf005aa6519bdce19af77c8728
+EBUILD gegl-0.4.16.ebuild 4840 BLAKE2B ce62dc04961971073988378d37254886ab44293a313c45887307350d61469d852d3507e06a60b420d1eb68bb4b1aa44b5716ee7ef3dcd5f2de9805e61d35117c SHA512 f839903d2755a30a1b5a80dfd1d0f2e71044aa9622e03ef6dc0ac58ac8aea2b5e57e44d2055e427056203e05d2f160538e85ef66a6841a01385fbdf89c7b0f7b
+EBUILD gegl-0.4.18.ebuild 4870 BLAKE2B c1d0973a20cfc6d8b81a9ea58d8b2be4f2c0139112668fa0d8b7c2505fb4186c51111c0b26b0a1e1dbcf1ae219bcc8d849cc6b91679cf5d7ef0f127b4addc7ea SHA512 2326deb656b9231204ecdeb390ab2b145f7960a4005a5a14785a74671a42b3cd9baa49033691396df9ecb403e890c29ca983ed1b38083bf1086607a27a1d5f35
+EBUILD gegl-0.4.20.ebuild 4850 BLAKE2B ba59ffe459cd9db45e65c7eedbe7439314a91fb5937bb02870ba3ebbab7cac3e1429ce3a3eb1996b2186ce4ac483f64be6b30ec009c01485f9594465173a406a SHA512 aa3f7336bd03666f93dc918aebdb4cce47c2de50220c538a8b537cbfb0ad538ecc87119d3624c7a5a882c6d60e1f89f7db91396c2e2915c0178b778f384f8548
+EBUILD gegl-0.4.22.ebuild 4832 BLAKE2B be321671c4af360cd03364469ccd4b0748c1d02ec0a0e1fbc5ecf2ed3e0d0a98d04b1a1290968b49020f8dba12812009161c91ddd0f9e5ff2056945dea9b0348 SHA512 cda09f80ec7aea0c64412ddabece7a05a30cda33b5de0ff68660bf9dbf0524c363c80f62cfc6ed0124f0092d85d6d30517f1cefb649f0ec4a2fe88a1ade81d9c
+EBUILD gegl-9999.ebuild 4458 BLAKE2B 7890bbb3aebc18f9aebba3798a74036ad80542cb92d7d7fda34df393528294e3a8ebffbc84f84e7a61855af67de6a0c26abcb79646a8954bc5c6e2bdcca71acb SHA512 42171b8a3240c149c5f4971873b22ea8f74f4c69bee804769cd3c4f172a8b19416fe4b43c9209184e05926ef90e25abb2baad30572047c8aeca7d2c3d48930be
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index a8b67b0bda39..c59288c426bc 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 6d8e3d45a67c..bae946700d0f 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index e0e76c54584c..66714d0cbf37 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 68dae56ba0d4..83da45ee280d 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild
index 35677f76c85d..82324d1dfd26 100644
--- a/media-libs/gegl/gegl-0.4.20.ebuild
+++ b/media-libs/gegl/gegl-0.4.20.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gegl/gegl-0.4.22.ebuild b/media-libs/gegl/gegl-0.4.22.ebuild
new file mode 100644
index 000000000000..f72e89f41325
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.22.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.74[introspection?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	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 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
+python_check_deps() {
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix skipping mipmap tests due to executable not found
+	for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+		sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+		sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+	done
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Dgexiv2=disabled
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		-Dgraphviz=disabled
+		-Djasper=disabled
+		-Dlibjpeg=enabled
+		-Dlibpng=enabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index a12ca086b180..8207ef8087cd 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"