[gentoo-commits] repo/gentoo:master commit in: x11-wm/enlightenment/

["Michał Górny" <mgorny@gentoo.org>]

commit:     0c0d00c060fb5f87129d0b4acf7d981b3a31e76c
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Sun Jun  3 14:22:26 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 09:32:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0d00c0

x11-wm/enlightenment: add 'acpi' and 'connman' USE flags to 0.22.3

Removed sed line which 'fixed' QA issues.
Updated description.

Closes: https://bugs.gentoo.org/637034
Closes: https://github.com/gentoo/gentoo/pull/8711
Package-Manager: Portage[mgorny]-2.3.36.1

 x11-wm/enlightenment/enlightenment-0.22.3.ebuild | 31 ++++++++++++------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
index 042b54c3f25..a099540f896 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit meson xdg-utils
 
-DESCRIPTION="Enlightenment DR17 window manager"
+DESCRIPTION="Enlightenment window manager"
 HOMEPAGE="https://www.enlightenment.org/"
 SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
@@ -22,17 +22,17 @@ E_CONF_MODS=(
 
 E_NORM_MODS=(
 	appmenu backlight battery bluez4
-	clock conf connman cpufreq
-	everything fileman fileman-opinfo gadman
-	geolocation ibar ibox lokker
-	luncher mixer msgbus music-control
-	notification packagekit pager pager-plain
-	quickaccess shot start syscon
-	sysinfo systray tasks teamwork
-	temperature tiling time vkbd
-	winlist wireless wizard wl-buffer
-	wl-desktop-shell wl-drm wl-text-input wl-weekeyboard
-	wl-wl wl-x11 xkbswitch xwayland
+	clock conf cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker luncher
+	mixer msgbus music-control notification
+	packagekit pager pager-plain quickaccess
+	shot start syscon sysinfo
+	systray tasks teamwork temperature
+	tiling time vkbd winlist
+	wireless wizard wl-buffer wl-desktop-shell
+	wl-drm wl-text-input wl-weekeyboard wl-wl
+	wl-x11 xkbswitch xwayland
 )
 
 IUSE_E_MODULES=(
@@ -40,7 +40,7 @@ IUSE_E_MODULES=(
 	${E_NORM_MODS[@]/#/enlightenment_modules_}
 )
 
-IUSE="doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+IUSE="acpi connman doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
 
 RDEPEND="
 	>=dev-libs/efl-1.20.5[eet,X]
@@ -49,6 +49,8 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
 	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	connman? ( net-misc/connman )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
@@ -70,8 +72,6 @@ src_prepare() {
 
 	xdg_environment_reset
 
-	# fix QA issues with .desktop files
-	find data/desktop/ -type f -exec sed -i 's|OnlyShowIn=Enlightenment|OnlyShowIn=X-Enlightenment|g' {} \; || die
 	sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
 }
 
@@ -80,6 +80,7 @@ src_configure() {
 		-D device-udev=true
 		-D install-sysactions=false
 		-D mount-udisks=$(usex udisks true false)
+		-D connman=$(usex connman true false)
 		-D nls=$(usex nls true false)
 		-D pam=$(usex pam true false)
 		-D systemd=$(usex systemd true false)