gentoo resync : 28.04.2019

3 files changed, 285 insertions, 2 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 853fdfce0729..34c91b397e46 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,8 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
+DIST efl-1.22.1.tar.xz 71314132 BLAKE2B 6222797da4815c7f863ff2a91b167fc78198b349d54948544b2c2bd19269836e48c343e782bf18a6eb3aeb92248a35590117ccb40f6a6f76978283a05ec41184 SHA512 2a961e2d36458e0f1f6a6b66fdd02b040590e130d9098f64e99d2fb29fa19bb292e92ab7ab8224223c186a256b3ffe7716ab218acd891a01fa9e4652c0e99230
 EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
-EBUILD efl-1.21.1-r3.ebuild 6624 BLAKE2B 7fd08fb919a063aeb05fb8040aa9bc48ea756c57b7c734a0e729f8186ce4b61da0c92985af5ced01f7bf67a5e711cab4143a06161a61ce44e7b270d7c423a556 SHA512 b4adf09b44ff904a553e7ddb6f885d83fa4d7cc09cc2f5427396155e5c2908b50eb7593144376ee715223bf47a2d2bed220ea7c26bd1d2ea9b3ce056654859be
+EBUILD efl-1.21.1-r3.ebuild 6631 BLAKE2B b127f01247ea7ce5b1c925b14b8d2222d3b2f837dea2cf059ad14b554de5cb8d0ff8e146ce2af8ecb6b338960ea38393555cb09304c9bb2ecc8cdb4510189413 SHA512 46c9b081cb79c0b39c026787ada23b50aef90e4ca265915c4d48516154caeccef5a3ecdc667a47ed0fe7ac5aaa978c71ab1b0951a68d3b30e27178f172cdfbf3
+EBUILD efl-1.22.1.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
 MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index 4a976814b021..5d68d8ef7d72 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -11,7 +11,7 @@ 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 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.22.1.ebuild b/dev-libs/efl/efl-1.22.1.ebuild
new file mode 100644
index 000000000000..dce1d89b8816
--- /dev/null
+++ b/dev-libs/efl/efl-1.22.1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	fbcon? ( !tslib )
+	gles2? (
+		|| ( wayland X )
+		!sdl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+RDEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/jpeg:0=
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? ( sys-auth/elogind )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles2? ( media-libs/mesa[egl,gles2] )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	nls? ( sys-devel/gettext )
+	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
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		gles2? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cxx-bindings
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-quick-launch
+		--enable-threads
+		--enable-xinput22
+
+		--disable-cancel-ok
+		--disable-cocoa
+		--disable-csharp-beta
+		--disable-csharp-bindings
+		--disable-doc
+		--disable-ecore-buffer
+		--disable-ecore-drm
+		--disable-ecore-wayland
+		--disable-eglfs
+		--disable-g-main-loop
+		--disable-gesture
+		--disable-gstreamer
+		--disable-pixman
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable elogind)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use gles2 ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}