x11-wm/enlightenment: bump E17 to 0.22.3

Also, add myself as proxy-maintainer for this package.
Also, cleaned metadata.xml a bit.

Closes: https://bugs.gentoo.org/631578
Closes: https://github.com/gentoo/gentoo/pull/8328
Package-Manager: Portage[mgorny]-2.3.33.1

3 files changed, 209 insertions, 109 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 948218228bb6..cbef05e4118d 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -2,3 +2,4 @@ DIST e16-1.0.17.tar.gz 2417299 BLAKE2B 324c8d3cd4b9e18e7c7936065be24897e26838727
 DIST enlightenment-0.20.5.tar.xz 25039672 BLAKE2B b9f18ecb5afbd4f8675d0c5e9315173d6980e98d77e09c1e818161a92be727a504081c9944dd78519ff2eb02a146b8c3db276bd9a568f82c1584b74c4c7e7d07 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911
 DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c84ef89b53e7201723f0d74c99b006957f8c26cd8d4b914015aa7956d23f83beeb2ca2a0e9e145d9b2038a6a337acccd43bd SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29
 DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
+DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
new file mode 100644
index 000000000000..fe3962f31e94
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment DR17 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 ~x86"
+
+E_CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus paths
+	performance randr shelves theme
+	window-manipulation window-remembers
+)
+
+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
+)
+
+IUSE_E_MODULES=(
+	${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${E_NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	>=dev-libs/efl-1.20.5[eet,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.12.0
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	# 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
+}
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-sysactions=false
+		-D mount-udisks=$(usex udisks true false)
+		-D nls=$(usex nls true false)
+		-D pam=$(usex pam true false)
+		-D systemd=$(usex systemd true false)
+		-D wayland=$(usex wayland true false)
+	)
+
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				emesonargs+=( -D ${c}=false )
+				continue
+			fi
+
+		;;
+		esac
+
+		emesonargs+=( -D ${c}=$(usex ${u} true false) )
+
+	done
+
+	meson_src_configure
+}
+
+src_install() {
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+	if use doc ; then
+		local HTML_DOCS=( doc/. )
+	fi
+
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 8d8bf2c557b2..9b10f15ca40f 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -1,113 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="pango">Enable pango font rendering</flag>
-	<flag name="xrandr">Enable support for the X xrandr extension</flag>
-	<flag name="ukit">Use upower/udisks to automount devices</flag>
-	<flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
-	<flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
-	<flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
-	<flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
-	<flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
-	<flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
-	<flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
-	<flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
-	<flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
-	<flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
-	<flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
-	<flag name="enlightenment_modules_geolocation">Geolocation</flag>
-	<flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
-	<flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
-	<flag name="enlightenment_modules_lokker">Screen locker</flag>
-	<flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
-	<flag name="enlightenment_modules_msgbus">DBus Extension</flag>
-	<flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
-	<flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
-	<flag name="enlightenment_modules_packagekit">Package manager integration</flag>
-	<flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
-	<flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
-	<flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
-	<flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
-	<flag name="enlightenment_modules_start">Enlightenment's 'Start' button equivalent</flag>
-	<flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
-	<flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
-	<flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
-	<flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
-	<flag name="enlightenment_modules_temperature">Temperature monitor</flag>
-	<flag name="enlightenment_modules_time">Time related gadgets</flag>
-	<flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
-	<flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
-	<flag name="enlightenment_modules_wizard">First Run Wizard</flag>
-	<flag name="enlightenment_modules_wireless">WiFi monitoring</flag>
-	<flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
-	<flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
-	<flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
-	<flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
-	<flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
-	<flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
-	<flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
-	<flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
-	<flag name="enlightenment_modules_conf">Settings Panel</flag>
-	<flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
-	<flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
-	<flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
-	<flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
-	<flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
-	<flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
-	<flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
-	<flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
-	<flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
-	<flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
-	<flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
-	<flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
-	<flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
-	<flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
-</use>
-<longdescription>
-Enlightenment is a completely themeable, highly configurable Window Manager for 
-the X Window System, traditionally used in Unix environments.
-
-Enlightenment Features:
-* Fully configurable window borders
-* Iconboxes to store icons in
-* Graphical Pager that also does miniature snapshots of your screen
-* IPC mechanism to remote-control Enlightenment
-* Theme support
-* Menus
-* Translucent moving of windows
-* Window groups
-* Virtual Desktops
-* Multiple Desktops (more than one desktop of Virtual Desktops)
-* Desktop Background selection and management
-* Sound support
-* Multiple focus modes
-* Many resize and move mode settings
-* Manual placement of windows option
-* Autoraising of windows option
-* Tooltips
-* Configurable keybindings
-* Configurable desktop bindings
-* DGA support for fullscreen client zoom
-* Window shading
-* Miniature snapshot icons
-* Multiple border styles at once
-* Window layers
-* Array menus
-* Internal configuration dialogs
-* Auto-scrolling menus
-* KDE hint support
-* GNOME hint support
-* Primitive Windowmaker/Afterstep dock App support.
-* X11R6 session management support
-* Internal per-app based session and property management.
-* Background auto scanning support
-* Truetype anti-aliased font support
-* Window auto-cleanup support
-* Graphical on-line help.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="pango">Enable pango font rendering</flag>
+    <flag name="ukit">Use upower/udisks to automount devices</flag>
+    <flag name="xrandr">Enable support for the X xrandr extension</flag>
+    <flag name="enlightenment_modules_appmenu">Gadget that holds the menubar of the foreground application</flag>
+    <flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
+    <flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
+    <flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
+    <flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
+    <flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
+    <flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
+    <flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
+    <flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
+    <flag name="enlightenment_modules_fileman-opinfo">Allows EFM to be placen on the desktop or in a shelf</flag>
+    <flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
+    <flag name="enlightenment_modules_geolocation">Geolocation information</flag>
+    <flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
+    <flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
+    <flag name="enlightenment_modules_lokker">Screen locker</flag>
+    <flag name="enlightenment_modules_luncher">Iconic application launcher</flag>
+    <flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
+    <flag name="enlightenment_modules_msgbus">DBus Extension</flag>
+    <flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
+    <flag name="enlightenment_modules_notification">Notification-daemon alternative</flag>
+    <flag name="enlightenment_modules_packagekit">Package manager integration</flag>
+    <flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
+    <flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
+    <flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
+    <flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
+    <flag name="enlightenment_modules_start">Enlightenment's 'Start' button equivalent</flag>
+    <flag name="enlightenment_modules_syscon">Provides a unified popup dialog for all the system actions in Enlightenment</flag>
+    <flag name="enlightenment_modules_sysinfo">A gadget to visualize your system info</flag>
+    <flag name="enlightenment_modules_systray">System tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
+    <flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
+    <flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
+    <flag name="enlightenment_modules_temperature">Temperature monitor</flag>
+    <flag name="enlightenment_modules_time">Time related gadgets</flag>
+    <flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
+    <flag name="enlightenment_modules_vkbd">Virtual keyboard</flag>
+    <flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
+    <flag name="enlightenment_modules_wizard">First Run Wizard</flag>
+    <flag name="enlightenment_modules_wireless">WiFi monitoring</flag>
+    <flag name="enlightenment_modules_wl-buffer">Wayland buffer</flag>
+    <flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
+    <flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
+    <flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
+    <flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
+    <flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
+    <flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
+    <flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
+    <flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
+    <flag name="enlightenment_modules_conf">Settings Panel</flag>
+    <flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
+    <flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
+    <flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
+    <flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
+    <flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
+    <flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
+    <flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
+    <flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
+    <flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
+    <flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
+    <flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
+    <flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
+    <flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
+    <flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
+  </use>
+  <longdescription>
+    Enlightenment is classed as a "desktop shell" as it provides 
+    everything you need to operate your desktop or laptop, but it is not 
+    a full application suite. This covers functionality including 
+    launching applications, managing their windows and performing system 
+    tasks like suspending, rebooting, managing files and so on.
+  </longdescription>
 </pkgmetadata>