dev-libs/efl: bump to 1.23.0

- 'doc' USE readded,
- new image loader for lottie animations through 'json' USE,
- new meson build system,
- reworked dependencies, logic and REQUIRED_USE constraints.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

3 files changed, 327 insertions, 32 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 41567e68e5d1..1247524d178f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1,3 @@
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
 DIST efl-1.22.5.tar.xz 71358856 BLAKE2B d1b9c8263608bca61760adb129eb5ad3d507caaa2d4e03847d9c06c99494d6dcaa0756368f700fde64d15dd33147a1f58f5391164902c1f9f586ef7307b14510 SHA512 87d10ab244778fc8452ea85cbf698a6b0ccd065964941f7c04d073cf7db9632b09d7956d86bd5c4e9fa102efceb1057269322e84504c70ee5f740176cd4bb26f
+DIST efl-1.23.0.tar.xz 77467596 BLAKE2B a07d988623d1b743bad02803f870b8b2cbf9e629b78c7614a733cb916ef2ab585d855396eda62949ae9dd55d2efd99f38c11fc11bdc7eccead6c727baa279a0e SHA512 6f96b822a8e8d44309b6174f2bde66aec8cce94386574e61fac88ab539113fec173e7f00db16a03d83b7294f5d4892800861cfda2f2b72bb78636a781bfd21b3
diff --git a/dev-libs/efl/efl-1.23.0.ebuild b/dev-libs/efl/efl-1.23.0.ebuild
new file mode 100644
index 000000000000..03f2c7c26a54
--- /dev/null
+++ b/dev-libs/efl/efl-1.23.0.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
+	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
+	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
+	tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
+	xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	^^ ( lua luajit )
+	ssl
+	gles2? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles2? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( dev-libs/rlottie )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D install-eo-files=false
+		-D mono-beta=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D xgesture=false
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D elua=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use drm)
+		$(meson_use elogind)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use systemd)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	if use static-libs; then
+		emesonargs+=( -D evas-modules=static )
+	else
+		emesonargs+=( -D evas-modules=shared )
+	fi
+
+	local disabledEvasLoaders=""
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gif && disabledEvasLoaders+="gif,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local disabledEmotionLoaders="gstreamer,"
+	! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
+	! use vlc && disabledEmotionLoaders+="libvlc,"
+	! use xine && disabledEmotionLoaders+="xine,"
+	disabledEmotionLoaders=${disabledEmotionLoaders::-1}
+	emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
+
+	local disabledGenericEmotionLoaders=""
+	! use vlc && disabledGenericEmotionLoaders+="vlc"
+	emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="luajit,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples/
+		doins -r "${BUILD_DIR}"/src/examples/.
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index a67c1169284c..02343d8644fd 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
-	<use>
-		<flag name="bmp">Enable WBMP image loader</flag>
-		<flag name="dds">Enable DDS image loader</flag>
-		<flag name="drm">Enable DRM engine</flag>
-		<flag name="eet">Enable Eet image loader</flag>
-		<flag name="fribidi">Enable bidirectional text support</flag>
-		<flag name="gles2">Enable the OpenGL ES GL implementation</flag>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
-		<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
-		<flag name="hyphen">Enable text hyphenation support</flag>
-		<flag name="ibus">Enable Intelligent Input Bus</flag>
-		<flag name="ico">Enable Ico image loader</flag>
-		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
-		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-		<flag name="physics">Enable Bullet physics effects and support</flag>
-		<flag name="ppm">Enable PMAPS image loader</flag>
-		<flag name="psd">Enable PSD image loader</flag>
-		<flag name="scim">Enable Smart Common Input Method</flag>
-		<flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
-		<flag name="tga">Enable Tga image loader</flag>
-		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
-		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
-		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
-		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
-		<flag name="xcf">Enable XCF image loader</flag>
-		<flag name="xim">Enable X Input Method</flag>
-		<flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
-	</use>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name="bmp">Enable WBMP image loader</flag>
+    <flag name="dds">Enable DDS image loader</flag>
+    <flag name="drm">Enable DRM engine</flag>
+    <flag name="eet">Enable Eet image loader</flag>
+    <flag name="fribidi">Enable bidirectional text support</flag>
+    <flag name="gles2">Enable the OpenGL ES GL implementation</flag>
+    <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
+    <flag name="harfbuzz">Enable complex text shaping and layout support</flag>
+    <flag name="hyphen">Enable text hyphenation support</flag>
+    <flag name="ibus">Enable Intelligent Input Bus</flag>
+    <flag name="ico">Enable Ico image loader</flag>
+    <flag name="json">Enable lottie animation support</flag>
+    <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
+    <flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+    <flag name="mono">Enable mono bindings</flag>
+    <flag name="physics">Enable Bullet physics effects and support</flag>
+    <flag name="pmaps">Enable PMAPS image loader</flag>
+    <flag name="ppm">Enable PMAPS image loader</flag>
+    <flag name="psd">Enable PSD image loader</flag>
+    <flag name="scim">Enable Smart Common Input Method</flag>
+    <flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
+    <flag name="tga">Enable Tga image loader</flag>
+    <flag name="tgv">Enable Tgv image loader</flag>
+    <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
+    <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
+    <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+    <flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
+    <flag name="xcf">Enable XCF image loader</flag>
+    <flag name="xim">Enable X Input Method</flag>
+    <flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
+  </use>
 </pkgmetadata>