gentoo resync : 14.07.2018

9 files changed, 12 insertions, 447 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 58689cd2d254..03a7f75a9f34 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 2acd54e22a70..53386fcda600 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -2,6 +2,5 @@ AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
 EBUILD dwm-6.1-r1.ebuild 1498 BLAKE2B 54aaf754eb62d86e365512707ffc47fc69da3198e82050b0167fc49fd046115989c89c89a5a5704e490e101f0b9d802f2530d19437da34f537f12e3275ecc54d SHA512 c37b1663c8381ddaf5d6c9215da1691f7ac4e2a02579e6b6ac2a88399261b7891dd1d2492e3864367654815a368abd32fd4b6912b4b53e40cbf20ce4ed6a41f0
-EBUILD dwm-6.1.ebuild 2134 BLAKE2B 5ea7c1a9f34dc10ec36d8d7fa824bf8171b640ac4e6070bf942bbc0f8ae644fa9f0831b3d1ceb2df7da52c28cd94dcc8a96202fa1d8389ad86b89484df3be035 SHA512 6ecd18bda9707fb5c3d8b740eda0d6e86b7fd517f7030e59e42629b91f9f954e3000f0e429f576dca92a9ed83b73a16639144a394327e454a36a6bb27e328872
 EBUILD dwm-9999.ebuild 1403 BLAKE2B abc9035e7132ac3daef3452c0b3e0a33e401091c799c242f118871507a771d1519ed531ff62408f9757bd075d1544d78d342f181498f83c2f08a43135ffd70a2 SHA512 7cc1fbdcbaf9d78cf099d3da588c8523c551bbd8cede13bc7d54e29fe0978ceee9bc5f286c27495851dbc8df9b690bdac2ca8d2b24f202e2fa582f19d665c06a
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
deleted file mode 100644
index d8a03b2546df..000000000000
--- a/x11-wm/dwm/dwm-6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="a dynamic window manager for X11"
-HOMEPAGE="https://dwm.suckless.org/"
-SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	sed -i \
-		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
-		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
-		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
-		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
-		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
-		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
-		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
-		config.mk || die
-	sed -i \
-		-e '/@echo CC/d' \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-
-	restore_config config.h
-	epatch_user
-}
-
-src_compile() {
-	if use xinerama; then
-		emake CC=$(tc-getCC) dwm
-	else
-		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/dwm-session2 dwm
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/dwm.desktop
-
-	dodoc README
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	einfo "This ebuild has support for user defined configs"
-	einfo "Please read this ebuild for more details and re-emerge as needed"
-	einfo "if you want to add or remove functionality for ${PN}"
-	if ! has_version x11-misc/dmenu; then
-		elog "Installing ${PN} without x11-misc/dmenu"
-		einfo "To have a menu you can install x11-misc/dmenu"
-	fi
-	einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
-	einfo "the ouput is redirected to the standard input of dwm"
-	einfo "Since dwm-5.4, status info in the bar must be set like this:"
-	einfo "xsetroot -name \"\`date\` \`uptime | sed 's/.*,//'\`\""
-}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index e2809154495d..fafec8a3602f 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,14 +1,10 @@
 AUX enlightenment-0.21.11-quickstart.diff 478 BLAKE2B 5352107aad73aff99689cea903f0b7075bbf92623907e573f0be65a00e28654e0ba8f4e00557c01a163df97e96911c0a8cdaf6f2cf4623bc73ac66dce60a6458 SHA512 ca90e65aa3d4b6baa328c9fa6d3e912573ac049ec38cd0074ba7dc64efcde8ff51bf428534bc48d53834bdd49f42739272c68e685c908b0786ac3aaf1cb64c27
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 AUX quickstart.diff 474 BLAKE2B b5b46ccf535f08e1a7d8be64f2d548148efc24c5c9af31a1f0bfd67a94948eb535265d9b13d8fb65047ec9f22d924d16268bb2fa8ac03855e5513b0c60f771db SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c
-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.11.tar.xz 25313532 BLAKE2B 3128137fe81a5b3dccc909eee8aac6845648c088b4cc8de9965408445579ed6aa01bdd879b726d21449c674f07a78386348525d61c0c0d786493d638ec4ae2b4 SHA512 3dee0f7a49fff992a81ce82a730cf8f0cec52a9805dcdd643a35a0bb8c7a27c6af82c136219553684c24c8e2ee2e8623f04858fddab56cdff7477ed2c9cc0ddf
 DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277
 DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
-EBUILD enlightenment-0.20.5.ebuild 3582 BLAKE2B d8ca7622c40b90e7eb1326ea5ae6a4a78e71bc7f4de1473403521bedad35e303a8aee37a6e78e498e571b35eca208dca993ef781e018ce862887f6b151fb26be SHA512 af054b708d87e08123888867041eccef68921220650ead5003fa097fecc252a25aa5c26959fb7a1d7af7e257b84291cb44f9183d523569c4548b32a5998df5f7
-EBUILD enlightenment-0.20.6.ebuild 3585 BLAKE2B cebdabb24670587ebb5c5ae96d41c6ba3bf50e9b1737336cfd9f5c397571eb41ae9f63f8c8c96bf85d429230561f3db8167c03b231bcf357a679db960e9c0fef SHA512 4e794929e1792decd901e0ce8f14d51aaca4ee045be3e34df108314e3b48ee620bc3c9efc45729e5a9d4af20c34a8c6ccc51aca424e0627e8f587b61e1744f81
-EBUILD enlightenment-0.21.11.ebuild 2968 BLAKE2B f73ab1346145ebb965a40e2c912276aa358bdb99084e2df173abc050700d1674c7994189b1a1091bb558b6b67ee08ad4bae06dca9d9682874cfe68c88530b28b SHA512 c1b49f18124ee44a338f2a04a86eed8239f8a82fa562e0d7c64b06d56e89f86be5c47a9801648ed5f9e04bcb0a87c030c34904479d98c38996cc0778c495780a
-EBUILD enlightenment-0.21.7.ebuild 3550 BLAKE2B ca84756e5a169d8c6586ce3ba4fce7bb69b2229d98fd6ee996e2d0589d8720c1fc00cdbbff0d784d80c32e25414bdd12ff4d5e52981295bfe15d2a46586de2d5 SHA512 1c53877dfa557b3798d20921fc5272fed16920e56933e5c1b20188c415806306ea251fda3f26b11d675a8659ac316b95f62c3bebb31aeabc16eb026906f82b21
+EBUILD enlightenment-0.21.11-r1.ebuild 2934 BLAKE2B 6da33bada30368794b68fe9cc3b23269f29d4fd6e43b5fd1b6f4104f47d632111ae0c3d2c94a16aeb88b68a07231038346ae2ed293709f630edfadd71501ad1e SHA512 a85dc19c6c67611365489854f104f0fc640835c86014dab396a2f3e3b55bfd33f3861e4140c7d637683c71a02162fc7948d16ebf85c402c5fd99ca17b3d22670
+EBUILD enlightenment-0.21.7.ebuild 3549 BLAKE2B fc55bb1649adbbc9392b9191127935ddc296ec74713190568454815ab38dd5b251176047ca485455757f70bffaa85be93871229c01ea2d54ef8a675ed6ebd092 SHA512 e5aa1003f2fc30c907d856a2b691686d260acf6c4e3fc3406542e46b197042c338866d23ff8241a02fa80341349b732387985427637c6866d6a5013b937df305
 EBUILD enlightenment-0.22.3.ebuild 2756 BLAKE2B ee14ee71677234737634adfef3bcfa7c34baed7d39751523c4aacc47c09eb1a8a9c1e4105abf06f2dd9adcd61e6160a4893fb9dd3c635404e2971af9a96127b1 SHA512 a8275b72598cfc2dae651c1eda4e3ea91d53897862787a1f2b9bb3df32b3b04571231c7861d0abf8c946409a84532056bd64993fb16fc2ce68c2e1a49092baf2
-MISC metadata.xml 6673 BLAKE2B 44881a9e8c5d642e1fe30ada0af18325d1cb39b6f793d3c8c9d243fbb4789b29818bdd36c22d1f6e7dbc7d04a7539de81a8a1506a35c809c140246142997cb23 SHA512 8c860fd1efa5f17399d3a261f5f2f7759b65127ea2bfe6f5dcc489d04261e855b4e7b4869d7a292fe3ce4f9edb1847ce46bce435ec0da1d6e5b5fee0b53d58fb
+MISC metadata.xml 859 BLAKE2B 265af2c39eeabf8258dee417bb364125df91585b97219914f56f9d1214866de51ae0aba91d75183d33960a5ca62f8c124374279fc0e27ee2a6bee6eb9f1f6b47 SHA512 c1c22af63670478cc4cb8e24c544bce45b2fef0314be7d9c5ee6b16d5ca3e2fd447ce0a26d68d860f1ad0384829fa5e28b716180fec3e92848ab84330711b211
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 9d9e764576ef..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 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"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment xdg-utils
-
-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-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-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 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 ukit wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.8.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.17[X]
-	>=media-libs/elementary-1.17
-	x11-libs/xcb-util-keysyms"
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake:1.15
-"
-
-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() {
-	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
-	# see #648896. Can be restored with future release
-	# 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
-}
-
-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/enlightenment-0.20.6.ebuild b/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
deleted file mode 100644
index 130c64f8a4c3..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.20.6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 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"
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment xdg-utils
-
-DESCRIPTION="Enlightenment DR17 window manager"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-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 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 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.17[X]
-	>=media-libs/elementary-1.17
-	x11-libs/xcb-util-keysyms"
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake:1.15
-"
-
-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() {
-	# sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c
-	# see #648896. Can be restored with future release
-	# 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
-}
-
-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/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild
index e9327acd31af..6924bb9aa531 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild
@@ -42,7 +42,7 @@ IUSE_E_MODULES=(
 IUSE="acpi connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
 
 RDEPEND="
-	>=dev-libs/efl-1.18.0[eet,X]
+	>=dev-libs/efl-1.20.0[eet,X]
 	virtual/udev
 	x11-libs/libXext
 	x11-libs/libxcb
@@ -50,12 +50,12 @@ RDEPEND="
 	x11-misc/xkeyboard-config
 	acpi? ( sys-power/acpid )
 	connman? ( net-misc/connman )
-	egl? ( >=dev-libs/efl-1.18.0[egl,wayland] )
+	egl? ( >=dev-libs/efl-1.20.0[egl,wayland] )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd )
 	udisks? ( sys-fs/udisks:2 )
 	wayland? (
-		>=dev-libs/efl-1.18.0[drm,wayland]
+		>=dev-libs/efl-1.20.0[drm,wayland]
 		>=dev-libs/wayland-1.11.0
 		x11-libs/libxkbcommon
 		x11-libs/pixman
@@ -125,9 +125,7 @@ src_install() {
 	einstalldocs
 	V=1 emake install DESTDIR="${D}" || die
 
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
index ce5aacf8041c..6b17730274f5 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -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"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 inherit enlightenment xdg-utils
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index d01bc2f6aaeb..4b927b67c714 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -11,74 +11,11 @@
   <use>
     <flag name="egl">Enable EGL rendering</flag>
     <flag name="ukit">Use upower/udisks to automount devices</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.
+    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>