update enlightenment and efl + cleanup

6 files changed, 1 insertions, 651 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index b8ab182..9923caf 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,12 +1,4 @@
 AUX gentoo-sysactions.conf 3056 SHA256 5939973a9fbaaba81751e936fb541d6aebd7ec1c599174ea568f5a579356939f SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a WHIRLPOOL 0c05e0d295ede8b2f436a87c4b98876fed64d5cc780f13bb6bde1a74a3c87847f2f90ab482a61c2b39f20894572329f5497e5da22537261eef2f0a9fb33ce56d
 AUX quickstart.diff 474 SHA256 9201674d2f8707f216e18c471f0a4a5a7366b3dd32cb8ec131ca1795a10bb3e6 SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c WHIRLPOOL 7ea473b01d46ab1ae10ed50d9991de652e3c2945390a71dfa3cba4bf7c6d8ae526dbd18a275db7bd714be7e48414b90ea470c46d2460c68512ede070025b9c49
-DIST enlightenment-0.20.3.tar.xz 25039740 SHA256 321103dda0383450a1dcf1a7c172479e1bdf8face5150ac688fc5ffe1b5fe3a7 SHA512 40c5f4c2b19d25e439f5ebc83b5e044e1594a503adf4d30d2ac9823ecee65b77e9c69cd3309062e2b809e18ab0a7a81df935f2ef2e9901caf3d40023114b0097 WHIRLPOOL a8d45c43f3f68e2d1072699095320d70e3a57b8ad76915b6d6ab79732a6bb2224ee6a176c57a551ac80992aafef8c2802e4bc72341895f0d3a36f65b4b6e4828
-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.0-beta.tar.xz 25211828 SHA256 ed6f3e7efaa1584d75e08fb69dba7e96d5435554024d69e7482fafeb1dc6e701 SHA512 a929ed58a8853868f192cbcc1374670e438813542f06ebaaafacef650c78b0577cc0dfab6fb8d9fc1c1ad892e63a9ccf109132b3ebae609abdf19a6921bed65a WHIRLPOOL d8a1a761e67d3da0ceb086f1f0cb207d976f89f7e6a9681734b5c41b5dc8faef4054150b92fb11a8891c19cee2759defabd81ec41fcf4884a24ff61aefd549d9
 DIST enlightenment-0.21.5.tar.xz 25305272 SHA256 f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb SHA512 e4d5de2b436613940e5c7e54d2f67fcfd45393081495da35f3253fc8f5a3a5abdb9a953d7dc9da8c6396506288d21e32056ded5407351f7c86039383a2b0b548 WHIRLPOOL 7f8f78285d5bd66705e77d8cff59163651adff633a4bd5b00c2bb893adba89cf69e859dfaa435c32ae70cb366211e2e2eeafa5ebd3c9e9d1b60f5605ec4f65a4
-EBUILD enlightenment-0.20.3.ebuild 3171 SHA256 00011721c19f42bc12610d78b65872416164f6f8d1184deaff2db36cb8130094 SHA512 d6013a1623c74a8193c0c0e6a79a7ca284db5188e48538a28c5438792c466e762122ea4375327edef4ece0a3e131120905a178979ac22600a39e5bafb4d0fc63 WHIRLPOOL 0ddb8fdd5cd360a8f7895c45b33698c848e15df97f42162403974c9c2ef2efb15b19746d34f9d427d2141f2e945a710d8b23933c3ab76b54061b069c80dc7d2e
-EBUILD enlightenment-0.20.5.ebuild 3171 SHA256 00011721c19f42bc12610d78b65872416164f6f8d1184deaff2db36cb8130094 SHA512 d6013a1623c74a8193c0c0e6a79a7ca284db5188e48538a28c5438792c466e762122ea4375327edef4ece0a3e131120905a178979ac22600a39e5bafb4d0fc63 WHIRLPOOL 0ddb8fdd5cd360a8f7895c45b33698c848e15df97f42162403974c9c2ef2efb15b19746d34f9d427d2141f2e945a710d8b23933c3ab76b54061b069c80dc7d2e
-EBUILD enlightenment-0.20.6.ebuild 3171 SHA256 00011721c19f42bc12610d78b65872416164f6f8d1184deaff2db36cb8130094 SHA512 d6013a1623c74a8193c0c0e6a79a7ca284db5188e48538a28c5438792c466e762122ea4375327edef4ece0a3e131120905a178979ac22600a39e5bafb4d0fc63 WHIRLPOOL 0ddb8fdd5cd360a8f7895c45b33698c848e15df97f42162403974c9c2ef2efb15b19746d34f9d427d2141f2e945a710d8b23933c3ab76b54061b069c80dc7d2e
-EBUILD enlightenment-0.21.0_beta.ebuild 3185 SHA256 ce5b42c9b100836e742f861c51973e63dcaf00ba931f07f1b944058b50be0812 SHA512 afb009962610a1575b6c7351c0af3ca7a88092cc9394a10ec09235c71de017f62d91c320a843add07385101c86ea849980ae1d7419cdb9163e1805e086066450 WHIRLPOOL 2e26e199f030933d052822431928345cceb56f855d9635e6fc6442bf748a8b26ba87d86a085c42ee5d5ba6d1c1c6b4c8dea1e16abec3984d1b34aacfd0d36082
-EBUILD enlightenment-0.21.5.ebuild 3397 SHA256 49c5a66269e1d7e57286b583d45addecdc7327b981880cb75c4333404f1ccc38 SHA512 0cbfd1a1478b12aee2cd33d09af3c4788c7c0d89a78bb07c782db3d8dc8f94e7f5ac9026f44892955d6dc146fe78f2a21ecaec07a10840a2db12354bf3cf618d WHIRLPOOL 106497d05c4617b43465be137c5957f75f778bad20c4876f9896423e7283c745af4abc0fb1d1bc87bfffb3b683aae211b181d5430d9d6dada83c77e722fe2585
+EBUILD enlightenment-0.21.5-r1.ebuild 3342 SHA256 dcae6762f4392f46c56d7e532744c59afa8efc5d75662793c983bc3a60be778c SHA512 5d913d5178800f98911c3b7435b165be17f1a488272fec831295dfdfe94d8b99eea2d8930a24f327c13b15e90c56df459d981e25bf91975fd23d2d4cc89f0a44 WHIRLPOOL 7a3fc3b222026b6ef806a3de2405ce84ca214da2d794601893b20fdf2bf77294f41d45f1b00477f96f807934d89624904fb39475958063ee633fd7830f531239
diff --git a/x11-wm/enlightenment/enlightenment-0.20.3.ebuild b/x11-wm/enlightenment/enlightenment-0.20.3.ebuild
deleted file mode 100644
index 24f6675..0000000
--- a/x11-wm/enlightenment/enlightenment-0.20.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-	EKEY_STATE="snap"
-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
-	winlist 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 +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
-	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 udev mount-eeze)
-		$(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/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
deleted file mode 100644
index 24f6675..0000000
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-	EKEY_STATE="snap"
-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
-	winlist 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 +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
-	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 udev mount-eeze)
-		$(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/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
deleted file mode 100644
index 24f6675..0000000
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-	EKEY_STATE="snap"
-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
-	winlist 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 +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
-	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 udev mount-eeze)
-		$(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/enlightenment-0.21.0_beta.ebuild b/x11-wm/enlightenment/enlightenment-0.21.0_beta.ebuild
deleted file mode 100644
index b2a54e7..0000000
--- a/x11-wm/enlightenment/enlightenment-0.21.0_beta.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-	EKEY_STATE="snap"
-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 +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
-	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 udev mount-eeze)
-		$(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/enlightenment-0.21.5.ebuild b/x11-wm/enlightenment/enlightenment-0.21.5.ebuild
deleted file mode 100644
index bef3699..0000000
--- a/x11-wm/enlightenment/enlightenment-0.21.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
-
-__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 +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.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_user "${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 udev mount-eeze)
-		$(use_enable ukit mount-udisks)
-		$(use_enable wayland)
-        --enable-xwayland
-        --enable-wayland-egl        
-	)
-	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
-}
\ No newline at end of file