gentoo resync : 25.08.2020

4 files changed, 20 insertions, 100 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index bc009c648b14..98116986e788 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,6 +1,5 @@
-AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
-DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
 DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
-EBUILD enlightenment-0.23.1-r1.ebuild 2752 BLAKE2B 272b992ec94ae89c9105c547b23511acc46b58f20cca99e608b1dd0684d9666957ee07b9f97272291362912a3ab7dcad9a6fd84bdfcd829d97c8c0ab89d6e6f6 SHA512 2c04ceb74c05e55911b18867693930e66846754d97dbe93c5f650ed706609f37227ed57cafc9ba5b333216cfbd4b315c4d093792298039a43864ffeac9d632e3
-EBUILD enlightenment-0.24.1.ebuild 2756 BLAKE2B eefd3a4b6928202d62388fcaf5d6875147a3810d455cffd9a476e93bbeffe73403ba93190ea94148ccb7ea9be79206b7d8390bf4b5264f2ee82b003a5b8e4614 SHA512 43b3831a3652e144f37497d35f99406ed93bc0c06d56af792c4d8acacbd51290028f46eed9ebe4e9e9043e833b48c82858b3f43e9654a437c3e72cf8bff674e5
+DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
+EBUILD enlightenment-0.24.1.ebuild 2834 BLAKE2B 67075f39d81bf0e9ff5c73439c8a34a9852899f82b054b31dac358cc4c32178732a802636e8a289fe5d53240b8d6f6a089fbf0b9f5823231ebea6608f4039015 SHA512 429ed851d600e7fe029637818ddef3473f78ed6cfbc3eb6d58ec2239b427b6d21873c0d564c5e0939c0cbffc57bed1a08ffc13d567729d7fc6f0ea4864bbbb48
+EBUILD enlightenment-0.24.2.ebuild 2836 BLAKE2B 590ee18adfcba7dde36322307fe0a0457f6b38602d715e0acfe434688d59545573dbe89e2d72894dff530eba8094216cde81a92fc375aa3c500fd7265c1bfde4 SHA512 0460438b0bda971bae141e3b1d3c0fe66f7cada94f8a2e3d80c3fbbcab7baf99a471421fcaa941d86f99d5eb5a9420f4a75c78f0b543bf2cb0de3c69f35e3a81
 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
index bf2169b4ee55..d0fb774324f3 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
@@ -94,6 +94,7 @@ pkg_postinst() {
 	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
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
index e499a09c51e8..b35c9836e6a5 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic meson xdg-utils
+inherit eutils meson xdg-utils
 
 DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org"
@@ -11,13 +11,12 @@ 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 systemd udisks wayland wifi xwayland"
+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.22.3[eet,X]
+RDEPEND=">=dev-libs/efl-1.24.1[eet,fontconfig,X]
 	virtual/udev
 	x11-libs/libXext
 	x11-libs/libxcb
@@ -28,6 +27,7 @@ RDEPEND="
 	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? (
@@ -39,12 +39,9 @@ RDEPEND="
 	xwayland? (
 		dev-libs/efl[X,wayland]
 		x11-base/xorg-server[wayland]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
+	)"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -52,8 +49,8 @@ src_configure() {
 		-D device-udev=true
 		-D install-enlightenment-menu=true
 
-		-D bluez4=false
-		-D install-sysactions=false
+		-D install-sysactions=true
+		-D install-system=true
 		-D mount-eeze=false
 
 		-D packagekit=false
@@ -64,6 +61,7 @@ src_configure() {
 		$(meson_use geolocation)
 		$(meson_use nls)
 		$(meson_use pam)
+		$(meson_use policykit polkit)
 		$(meson_use systemd)
 		$(meson_use wayland wl)
 		$(meson_use wifi wireless)
@@ -82,24 +80,21 @@ src_configure() {
 		)
 	fi
 
-	append-cflags -fcommon
-
 	meson_src_configure
 }
 
 src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
 	use doc && local HTML_DOCS=( doc/. )
 	meson_src_install
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 
-	einfo "Additional programs to complete full EFL suite: "
+	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
@@ -112,5 +107,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/x11-wm/enlightenment/files/gentoo-sysactions.conf b/x11-wm/enlightenment/files/gentoo-sysactions.conf
deleted file mode 100644
index fe676238b907..000000000000
--- a/x11-wm/enlightenment/files/gentoo-sysactions.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# ENLIGHTENMENT SYSTEM ACTIONS CONFIGURATION
-#
-# This is a system configuration for allowing or denying certain users or
-# groups to be able to do certain actions that involve system restricted
-# actions such as halt, reboot, suspend, hibernate etc.
-# 
-# This file is read in order from top to bottom - the first rule to MATCH
-# will be used for a user or a group, and nothing after that is read.
-#
-# You must put all the ACTION definitons BEFORE user and group rule matches.
-# Any action definitons after a rule match has been found will be ignored.
-# This allows actions to be re-defined for different user groups, so matches
-# so the command for an action can change for matches to the rules later on.
-# 
-# Any user or group NOT matched by an allow or a deny will be ALLOWED to
-# perform the action by default (system administrators should be aware of
-# this and implement whatever policies they see fit). Generally speaking
-# a user of a workstation, desktop or laptop is intended to have such abilities
-# to perform these actions, thus the default of allow. For multi-user systems
-# the system administrator is considerd capable enough to restrict what they
-# see they need to.
-# 
-# A WARNING to admins: do NOT allow access for users to this system remotely
-# UNLESS you fully trust them or you have locked down permissions to halt/reboot
-# suspend etc. here first. You have been warned.
-#
-# FORMAT:
-#
-# action:   halt      /sbin/shutdown -h now
-# action:   reboot    /sbin/shutdown -r now
-# action:   suspend   /etc/acpi/sleep.sh force
-# action:   hibernate /etc/acpi/hibernate.sh force
-#
-# user:  username  allow: halt reboot suspend hibernate
-# group: groupname deny:  *
-# group: *         deny:  *
-# user:  *         allow: suspend
-# user:  billy     allow: halt reboot
-# group: staff     deny:  halt suspend hibernate
-#
-# etc.
-#
-# user and group name can use glob matches (* == all for example) like the
-# shell. as can action names allowed or denied. 
-
-action:   halt      /sbin/shutdown -h now
-action:   reboot    /sbin/shutdown -r now
-action:   suspend   /usr/sbin/pm-suspend
-action:   hibernate /usr/sbin/pm-hibernate
-
-# on FreeBSD use this instead of the above.
-#action suspend  /usr/sbin/zzz 
-
-# root is allowed to do anything - but it needs to be here explicitly anyway
-user:     root      allow: *
-# members of operator, staff and admin groups should be able to do all
-group:    operator  allow: *
-group:    staff     allow: *
-group:    admin     allow: *
-group:    sys       allow: *
-group:    wheel     allow: *
-# common "user" groups for "console users" on desktops/laptops
-group:    dialout   allow: *
-group:    disk      allow: *
-group:    adm       allow: *
-group:    cdrom     allow: *
-group:    floppy    allow: *
-group:    audio     allow: *
-group:    dip       allow: *
-group:    plugdev   allow: *
-# put in a list of other users and groups here that are allowed or denied etc.
-# e.g.
-# user:     myuser     allow:  *
-# user:     another    allow:  suspend hibernate
-# deny everyone else by default
-user:     *         deny:  *