gentoo resync : 25.11.2020

4 files changed, 40 insertions, 317 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 94f828357c89..d1f6d08e8522 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,7 +1,4 @@
-DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
-DIST efl-1.24.4.tar.xz 72283172 BLAKE2B 4e21b21108337fdf3fa7be55e804f25f32dd8dc6a1743819910d83da713bae28cb4771f2f0df5d392a6f542158ed3c48566fef8d8dfaad9c65747f9a8ee1560a SHA512 5796b33152e0375196d54557803db5928bfc45267250b80406043157193773084c39482bca40dc6811f4a3dd53d416b0d3b8317405923add0560debb24a3a385
-DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
-EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7
-EBUILD efl-1.24.4.ebuild 7343 BLAKE2B a6730f3d79edc0fcd5d8a913a0c166c36e5f4127dff362d0f43b0013e274cda38a3e1d7bc2280864f54b2f84c13f90b6a77d6ebb47f7827fb97bdb42a815f0f2 SHA512 10b9a2fc8d5caf3cda150c82ea09f30b7d823c691cf0370dea6493e310a4c0ec61475e507bfc1e43ec4f9d29d386d16d5d3288e89f7fa4832ae66bad19610e20
-EBUILD efl-1.25.0-r1.ebuild 7767 BLAKE2B e65c2de696221a73a94f9ea81691ed94418b45a55a46b6163905bc866de409f6ecf35689568f2b6b815089ecbf96fa0067480123c6a70817ca372c6ed4740126 SHA512 e2e3f4bf98d1042a595b4035c8c5bda9997e9ac5c330a86c6d12f3f1ebfbc2bfa610269d80b2cf7fc0e65fdb3aaf81c730e819b5f1bfab6c62ce3a421b6344a7
+DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
+EBUILD efl-1.25.1-r10.ebuild 7774 BLAKE2B 3787eb8fafd4e6277612a18850e5ecb296ff1373877249977e8c26b1f609b484ed8ffa8f18f2fdf48845b4bdb3db1c3f57c99ab9ed80d0339583ddceb3d2430c SHA512 b057178a6b6fa9e527bfbc1ac572930dd101f3bb64b16b159ecf51a3049e3dfae5c338ecdcd8438bf7e1e3be7851537ec3d1e2950b2728266e9610949883b28d
+EBUILD efl-1.25.1-r2.ebuild 7742 BLAKE2B 528c2395dea3802f79acb8cfcdadaa7bc96e964bb26a147c042213576e22469424a632a72bf7f95080cc79de20989b58d99f1e165e0fd71d0ed8d6a26dc4ab06 SHA512 a4cf73b4392d24abb785087b47423b4eaf225dce324ecd74b9fcf30415288d52d8b9c299d6ea1b198e0f9aa944fc7eae5ce0eb5a07561d6881bbc76f17777e11
 MISC metadata.xml 1985 BLAKE2B 5ad17cbfc665a26357c6b8d473d211663224eca97ed9a22c8575122e331b9661118890db1cf4f41e9e0e9b16f157d48da0920026fc83fdf965e4d1bd7c3d1ede SHA512 dbc127099457c88bcc419bd0c415f801765aeb85f010d7de43ea03e9400a7888c33c80f53048bf4edfd34ff95a43ac506026775a7bf11b041adc89acef0ec15d
diff --git a/dev-libs/efl/efl-1.24.3.ebuild b/dev-libs/efl/efl-1.24.3.ebuild
deleted file mode 100644
index b07e53a6ee40..000000000000
--- a/dev-libs/efl/efl-1.24.3.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2020 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 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
-	fbcon +fontconfig fribidi gif gles2-only 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 +svg
-	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
-	xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2-only opengl )
-	^^ ( lua luajit )
-	ssl
-	drm? ( gles2-only )
-	examples? ( eet svg )
-	gles2-only? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	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
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2-only? (
-		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? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	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 )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	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=true
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(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 luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(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-only; 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
-
-	local disabledEvasLoaders=""
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! 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 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}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	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
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -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/efl-1.24.4.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index f9943bbda177..778024e9b3f1 100644
--- a/dev-libs/efl/efl-1.24.4.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson xdg-utils
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua-single meson xdg-utils
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,18 +13,17 @@ 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 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
-	fbcon +fontconfig fribidi gif gles2-only 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 +svg
-	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
-	xpm xpresent zeroconf"
-
-REQUIRED_USE="
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+	xim xpm xpresent zeroconf"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
 	?? ( elogind systemd )
 	?? ( gles2-only opengl )
-	^^ ( lua luajit )
+	?? ( fbcon tslib )
 	ssl
 	drm? ( gles2-only )
 	examples? ( eet svg )
@@ -30,13 +31,12 @@ REQUIRED_USE="
 	pulseaudio? ( sound )
 	wayland? ( gles2-only !opengl )
 	xim? ( X )
-	xpresent? ( X )
-"
+	xpresent? ( X )"
 
 # Requires everything to be enabled unconditionally.
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${LUA_DEPS}
 	dev-libs/check
 	net-misc/curl
 	media-libs/giflib:=
@@ -61,6 +61,7 @@ RDEPEND="
 		x11-libs/libXScrnSaver
 		wayland? ( x11-libs/libxkbcommon[X] )
 	)
+	avif? ( ~media-libs/libavif-0.8.1 )
 	connman? ( net-misc/connman )
 	drm? (
 		dev-libs/libinput
@@ -88,8 +89,6 @@ RDEPEND="
 	ibus? ( app-i18n/ibus )
 	jpeg2k? ( media-libs/openjpeg:= )
 	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
 	mono? ( dev-lang/mono )
 	opengl? ( virtual/opengl )
 	pdf? ( app-text/poppler:=[cxx] )
@@ -123,19 +122,24 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
+}
+
 src_prepare() {
 	default
 
 	# Remove automagic unwind configure option, #743154
 	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
 			die "Failed to remove libunwind dep"
 	fi
 }
@@ -165,7 +169,6 @@ src_configure() {
 		$(meson_use X x11)
 		$(meson_use debug debug-threads)
 		$(meson_use drm)
-		$(meson_use elogind)
 		$(meson_use examples build-examples)
 		$(meson_use fbcon fb)
 		$(meson_use fontconfig)
@@ -174,13 +177,12 @@ src_configure() {
 		$(meson_use gstreamer)
 		$(meson_use harfbuzz)
 		$(meson_use hyphen)
-		$(meson_use luajit elua)
+		$(meson_use lua_targets_luajit elua)
 		$(meson_use nls)
 		$(meson_use physics)
 		$(meson_use pulseaudio)
 		$(meson_use sdl)
 		$(meson_use sound audio)
-		$(meson_use systemd)
 		$(meson_use tslib)
 		$(meson_use v4l v4l2)
 		$(meson_use vnc vnc-server)
@@ -191,6 +193,12 @@ src_configure() {
 		$(meson_use !system-lz4 embedded-lz4)
 	)
 
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
 	if use opengl; then
 		emesonargs+=( -D opengl=full )
 	elif use gles2-only; then
@@ -212,6 +220,7 @@ src_configure() {
 	fi
 
 	local disabledEvasLoaders=""
+	! use avif && disabledEvasLoaders="avif,"
 	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
 	! use dds && disabledEvasLoaders+="dds,"
 	! use eet && disabledEvasLoaders+="eet,"
@@ -242,13 +251,13 @@ src_configure() {
 	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
 
 	local bindingsList="cxx,"
-	use luajit && bindingsList+="luajit,"
+	use lua_targets_luajit && bindingsList+="lua,"
 	use mono && bindingsList+="mono,"
 	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
 	emesonargs+=( -D bindings="${bindingsList}" )
 
 	local luaChoice=""
-	if use luajit; then
+	if use lua_targets_luajit; then
 		luaChoice+="luajit"
 	else
 		luaChoice+="lua"
diff --git a/dev-libs/efl/efl-1.25.0-r1.ebuild b/dev-libs/efl/efl-1.25.1-r2.ebuild
index be750ab8e3a4..019efc881f10 100644
--- a/dev-libs/efl/efl-1.25.0-r1.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r2.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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	examples? ( eet svg )
 	gles2-only? ( || ( wayland X ) )
 	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl || ( elogind systemd ) )
+	wayland? ( gles2-only !opengl )
 	xim? ( X )
 	xpresent? ( X )
 "
@@ -133,8 +133,8 @@ BDEPEND="virtual/pkgconfig
 
 pkg_setup() {
 	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0
-		/usr/$(get_libdir)/libefreet_mime.so.1.25.0"
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.1
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.1"
 }
 
 src_prepare() {