x11-wm/enlightenment: version bump to 0.21.7 #582482

4 files changed, 134 insertions, 7 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 0c422bb1aa0f..358422dd22da 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,3 +1,4 @@
 DIST e16-1.0.17.tar.gz 2417299 SHA256 41ed67b648acc9b570cc681cf69d0accf38b69fd5d0af6b8ea8a6eacbf87659d SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021 WHIRLPOOL d4996798db0ce676c0cdce8bc6a354fcb6649ee4a9c579dc4c51beaeb96d7dcd2dfe0f063ead6724b21bb9f7f66608596412a251df0c2670b944f7376cb3e504
 DIST enlightenment-0.20.5.tar.xz 25039672 SHA256 22749584d2fdf62d5a63c64dd9e57a1e318837a48f10fb9cdd2097769aa802d0 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911 WHIRLPOOL 5bfa8e6cc2d5d17fc61a08fc9edbc8970f60cb9e44fcfaf7035b764d21525b375ce9f4060ac33a45627cc3a1f2eb21335e322f88f8a79709fce9284aa668d983
 DIST enlightenment-0.20.6.tar.xz 25030572 SHA256 f21fbace15b8ea0e47c7aeb16a3f4d1e8a41cb85bc0035491091518b0ca55085 SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29 WHIRLPOOL 2f475dde50e16bad656d4cad87fc6972003cc4fcc9174e55c2309e1781b4f039da1eb5727ff14708837d8cbf3ec3f55f4a984cecdd73a744208b81502609da25
+DIST enlightenment-0.21.7.tar.xz 25307500 SHA256 7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277 WHIRLPOOL 05bc214bdef9f8bf55e8b8ee4d22f10442c63c0fece870dffe3fc5d0077b5e6457ed985b5b96aec9d4f0bb23f694ddf9e11dc29fb694e795f9b9009acd4098e9
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
index 2bff4209bbf4..42602fa69e5d 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_URI_APPEND="${PN}"
 else
 	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="snap"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment
@@ -33,8 +33,8 @@ __NORM_MODS=(
 	ibar ibox lokker
 	mixer msgbus music-control notification
 	pager packagekit pager-plain policy-mobile quickaccess
-	shot start syscon systray tasks teamwork temperature tiling
-	winlist wizard wl-desktop-shell wl-drm wl-text-input
+	shot start syscon systray tasks teamwork temperature tiling time
+	winlist wireless wizard wl-desktop-shell wl-drm wl-text-input
 	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
 )
 IUSE_E_MODULES=(
@@ -49,12 +49,11 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 	wayland? (
 		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
+		>=dev-libs/wayland-1.10.0
 		>=x11-libs/pixman-0.31.1
 		>=x11-libs/libxkbcommon-0.3.1
 	)
-	>=dev-libs/efl-1.17[X]
-	>=media-libs/elementary-1.17
+	>=dev-libs/efl-1.18[X]
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
new file mode 100644
index 000000000000..42602fa69e5d
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling time
+	winlist wireless wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.10.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.18[X]
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 1f8968e4c387..c586c606ffe9 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -40,9 +40,11 @@
 	<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>