gentoo resync : 25.11.2020

3 files changed, 6 insertions, 116 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 7243de2e88d3..4ab87fb0e78b 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,5 +1,3 @@
-DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.1.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
-EBUILD enlightenment-0.24.2.ebuild 2845 BLAKE2B d347d2f36eda1ff9a2a5026c4db8f6e4ccd7f198dbfdcae6f73b6c2af99c96ab7d390c7bedb4af599954e4e9d69cc01e7223f96989542bfa62d4e93476a4ff52 SHA512 baf8290219fc7b560ea9c31565c3bc5ab0e5236b670dd575bbb61bdd548672f48b9b37b3d3bca7d0cdf6c31953ea949c8f8d329a905fa6dcf5ddf666670ee4a3
+EBUILD enlightenment-0.24.2-r1.ebuild 2897 BLAKE2B 26188ab06629b984c5ea2fd5ae80051355a5de10b5da127252bffe61aa5efeecc17650f45e596cea2ba33322613f91762da46a4a3778ee9807eeb70b2e760a3a SHA512 77267e1df1557baa2a757722f852062d687c76b759a1e56a312c4a574b58235ad663563f1f359b628e93769a275127a4500ff496f0894d75f456a917cd02c8dd
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
deleted file mode 100644
index cbc938e2391a..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
-
-REQUIRED_USE="xwayland? ( wayland )"
-
-RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	bluetooth? ( net-wireless/bluez )
-	connman? ( dev-libs/efl[connman] )
-	geolocation? ( app-misc/geoclue:2.0 )
-	pam? ( sys-libs/pam )
-	policykit? ( sys-auth/polkit )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		>=dev-libs/efl-1.22.0[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-	xwayland? (
-		dev-libs/efl[X,wayland]
-		x11-base/xorg-server[wayland]
-	)"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-enlightenment-menu=true
-
-		-D install-sysactions=true
-		-D install-system=true
-		-D mount-eeze=false
-
-		-D packagekit=false
-
-		$(meson_use udisks mount-udisks)
-		$(meson_use bluetooth bluez5)
-		$(meson_use connman)
-		$(meson_use geolocation)
-		$(meson_use nls)
-		$(meson_use pam)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use wayland wl)
-		$(meson_use wifi wireless)
-		$(meson_use xwayland)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	elog "Additional programs to complete full EFL suite: "
-	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
-	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
-	optfeature "an EFL-based IDE" dev-util/edi
-	optfeature "image viewer" media-gfx/ephoto
-	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
-	optfeature "system and process monitor" sys-process/evisum
-	optfeature "feature rich terminal emulator" x11-terms/terminology
-	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
-	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
index 6120d4f829f3..5503d259ae4e 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
@@ -31,7 +31,11 @@ RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
 	wayland? (
-		>=dev-libs/efl-1.22.0[drm,wayland]
+		|| (
+			dev-libs/efl[systemd]
+			dev-libs/efl[elogind]
+		)
+		dev-libs/efl[drm,wayland]
 		dev-libs/wayland
 		x11-libs/libxkbcommon
 		x11-libs/pixman