gentoo resync : 29.05.2018

21 files changed, 207 insertions, 656 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 79555e76ed52..844a6109790c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 3027c8e78bfe..ae5b7752fa07 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -11,7 +11,7 @@ AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
-EBUILD awesome-3.5.9-r2.ebuild 3121 BLAKE2B ea3a419afae1e9964aae9e16e0b0aab842326c3c4bc5e1da1448e52040904fadef52986ab5abc9bc41a0d6d0c3cf67c0b320e18b2e4e1ef61d16c45e63ddd258 SHA512 a5deff9c9bd7dad5b1502c146646da35ab52522dd9fa2de4fbc5f34ab3d490efcd1166ab0ef7488e658e3b35382a82f5a80d25b5d4f30fbb0077cd88e348fedd
+EBUILD awesome-3.5.9-r2.ebuild 3120 BLAKE2B 71d1668a910bc570389cd9fdba9cf948c6937c53fb335df8d5cc8ab7fbc6811e0635895094be3fd67a49e4a7a43a7cc602d88a9b33534ffc6d6b684911ccc858 SHA512 c4c0d39f617c3cdede84786e4fc8a7c4f01b4e329a06d092a09a773af3be42dd0c28e6178f294710579737f3d441ef4f7cd88fd7afb1e1acfe2279ad81192ac4
 EBUILD awesome-4.2-r2.ebuild 4036 BLAKE2B ea15b83f977e57203d3ea875917c88a86fbe6fe7d4bddb91c4135edf26660be212bed707c3b42bf5951825928ca616fc86ef10f540f64d188c1d97443b7cde88 SHA512 3f90acc941090576ad99b40f97c254431796c29c846db5b67e59303a158e68397d791ec6cbe798d698c91075c56823522b6728f2f955b136e65669743a889c07
 EBUILD awesome-9999.ebuild 3615 BLAKE2B 7bafe7eec8369c0dcab8152d5f40fdc77edff5c05d4d91ab73a92edc09f3754a4f73a7fddd18c4d3cb27c32b57bfb3b182dc3bf0684985d45afa56e503a61a13 SHA512 a39da115a6829487a9bd08b5297e7ca4d4eb443945cc733f8b07d86a390b50137fb9b23f524d9ad5c43210fcac403e34630b8f2c84a0e75e9b02ebc50db43666
 MISC metadata.xml 568 BLAKE2B 2a3b777ad5eca2e372536b4ad13b3861b67f88d1cd7746c9a5c0d5b42ff2aec908d53ffd338a5eed7f146f74602017ec67a3d1e1cedcd61d57741af9c599d754 SHA512 6f46bf6d3ba0d5d7917e6d54fa4b98309a7cca66da2299b3206544b90ff1322a2705fb11cdee31808d91a3a59149811c9c25436cf204787278c03f620ef3b105
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 6c0ad6ff15c8..0a13897d09e6 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
 COMMON_DEPEND="
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index de46e0da360f..c984f3e18f8e 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,15 +1,17 @@
+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 e16-1.0.17.tar.gz 2417299 BLAKE2B 324c8d3cd4b9e18e7c7936065be24897e26838727f64b08d3d371bc898b421831ed37eb30ea859ab33eb58898984e48a580404a6632977d84e564096fba284e4 SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021
 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.16.9999.ebuild 1714 BLAKE2B 18aec7836c982ebf03213d6b8080da238e1581022c9b9b828fe5e28dc82d114762aeb33bda8a9528e245d679c923c46c82c0259f77045ed9b7f5c4951d62271c SHA512 f996d2ee9efcb4abd71f38f2ac54bfcf9da5e5f782bb8f44730aa65024d2eaad725b247b94467b49a4e06ca9049a6a1f5da948e4829e0123947215963d8559d5
-EBUILD enlightenment-0.17.9999.ebuild 3227 BLAKE2B c37c736f8bc4d681f044a36a355fd5e1ec463b4d6f771d0cf4b32f43b5a5fc682d96291d9c767a6f2920e5b6b3e33a34fbecdfd8521933652e92bcea1f384cf4 SHA512 5eb72120a2448a82bea63ae5a3c817d9474648931564e95d883bada8eef5471e20602a36bbba33a5df84f28d40ab3d5f8d8ea8a9b00ee160f00beda8ebfe0c46
 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 2867 BLAKE2B 673e3bacef30dae7037612357e30fc4bb871e60ac90fce4d90e7d70fac2075be0100fe7cd92f111f692ec0d32c791c683254bcf0b6aeed12ad09161e29b12d52 SHA512 fc0457cd0eddcb328d9ffce938b6ea8c41ae87201613988144bb31af2f1d5d46d6b0c86a70d11dba0ce14be8788718eda968d6a4677107a9240194e9b8d8a4b4
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
-EBUILD enlightenment-0.22.3.ebuild 2737 BLAKE2B 7bf2b1a96f6c161d5596363543f82262b7b1d68046f5abec134251c18771d3d557f158a1c71ef22b2134dfb661b9b134c1db931dd4723a968d6c05d074bfdfe0 SHA512 8cdfeed5cb353317be0ee3326fbfa12608d965d4d25f0303033c52d1ed6931be4b711c5d7c535580780e90651b880b872f96c2281ae830fb4aa6c404aaf92713
+EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B bc511dc8d7456a4d12a1b0b71cd09e6c84b6b5a790671d7f260a84ff94c88b9d0459a432edafd0b6264361f029e0e8bfe963f75e81cca1a8cf5f5a9b0b2b5955 SHA512 c50eab81b567a6800d9ea45b84a30a95b91a34ce4c6a55f6dfed072c0aa1680a975f463121bf23349894c7dafacaaf9e5c05745980f0149ddbfa4389e7868277
 EBUILD enlightenment-1.0.17.ebuild 1704 BLAKE2B ebc96726bb26d5a4b8f9eff7b36931424117e2e084c4dc584e5c82418d7d64792b3164eafe5a1bdd5f2790eaca2fd866f48221e775854ca1504568aeb06bf446 SHA512 c9373ff015e3ef2c316e84b827c7dad00daf458571fe3537f7d55f34676c9fedc260d9329ead2ce167a3b31570ea1a80580376373c8dc5ea446da364c9c82e74
-MISC metadata.xml 6755 BLAKE2B 2a78b350dad2b56323c33b77f74487ca7c2a58b61eda01500ed4c2c2401fa327d9b136485ed9b10d2e699e22a4d4c58f178777adf0e87f9e262c4c72b4c11a32 SHA512 865f8cdd35ff16f6b80fe75a1d5984e7904f15f1567a473e2db69ecbbac7179e3f2c60471decba60ff0392cb365080a41327bdeabc0eb2db2344400edf493ba4
+MISC metadata.xml 6804 BLAKE2B b71090abce4143b9900ab68af0daec44abbdbfcf812c03572dc9359f42a024ff3646a7e1316f6e7c8387c3d837895e8ccce95ed64a70d6a5ee5c4960f8aa78c2 SHA512 afac4d81982042885b76fb11fbc6dd660522e39a5709cd5c00342787e682bf3dfd3f8b0006ac95e61354fcd29e3074b337abfb62b328db2be14318f12409c3bf
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
deleted file mode 100644
index 1b788a54f596..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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-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 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/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
new file mode 100644
index 000000000000..b87b62d2c320
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils
+
+DESCRIPTION="Enlightenment 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
+	mixer msgbus music-control notification
+	packagekit pager pager-plain 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=(
+	${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${E_NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="acpi doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	>=dev-libs/efl-1.17.0[eet,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	egl? ( >=dev-libs/efl-1.18.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/wayland-1.11.0
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.15
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/"${P}"-quickstart.diff
+
+	xdg_environment_reset
+
+	sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
+}
+
+src_configure() {
+	local myconf=(
+		--disable-install-sysactions
+		--disable-policy-mobile
+		--enable-device-udev
+		$(use_enable egl wayland-egl)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+		$(use_enable udisks mount-udisks)
+		$(use_enable wayland)
+	)
+
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				myconf+=( --disable-${c} )
+				continue
+			fi
+
+		;;
+		esac
+
+		myconf+=( $(use_enable ${u} ${c}) )
+
+	done
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+	if use doc ; then
+		local HTML_DOCS=( doc/. )
+	fi
+
+	einstalldocs
+	V=1 emake install DESTDIR="${D}" || die
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+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.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
index e295cfe0e858..b637ae9ab613 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
@@ -68,6 +68,8 @@ DEPEND="
 src_prepare() {
 	default
 
+	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
diff --git a/x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff b/x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff
new file mode 100644
index 000000000000..b54dfe2aba98
--- /dev/null
+++ b/x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff
@@ -0,0 +1,13 @@
+Index: src/bin/e_main.c
+===================================================================
+--- a/src/bin/e_main.c	(revision 61690)
++++ b/src/bin/e_main.c	(working copy)
+@@ -93,7 +93,7 @@
+ static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
+ 
+ /* local variables */
+-static Eina_Bool really_know = EINA_FALSE;
++static Eina_Bool really_know = EINA_TRUE;
+ static Eina_Bool locked = EINA_FALSE;
+ static Eina_Bool inloop = EINA_FALSE;
+ static jmp_buf x_fatal_buff;
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 9b10f15ca40f..c5dc2af1c12c 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -9,6 +9,7 @@
     <name>Proxy Maintainers</name>
   </maintainer>
   <use>
+    <flag name="egl">Enable EGL rendering</flag>
     <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>
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index fb85c18255c5..01a8bbd740f2 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -4,6 +4,6 @@ AUX 1.4.0-poppler.patch 511 BLAKE2B a81c3086043dadfa62cc493a37ca22044a74d2e4966e
 DIST lumina-1.3.0_p1.tar.gz 86451718 BLAKE2B 7834fad1541144524fc44d5e2cc1af21e82878c05f0cc2da4cf90f8f7e51614f535bab1bcb81c6d5929e14b2fa7ba7df8e66e53a9a81b55c973511f3b3e7cc17 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707
 DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba5987113a12f72285e5dabfe25ca763683a23cb76889673ac3c2817feb2233e8b7da9fefed41040f91b0bb01d8ce03ae SHA512 340079832f4f6c9c9c70f11d7743b7c7db6772897f6411a966bf2bd77124bab1fbac8f5751164fb8a08a12c4443f515aaee76b117b4f959263eeaa98dbcbe41e
 EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
-EBUILD lumina-1.4.0_p1.ebuild 2596 BLAKE2B 32cf312812abffcf373f0c55873f295b02bd366838e82677ad3bc5b24238d08d356ff59c45958f6dfc2dd3b8168b30223e642df68c314bde04f6d6f3841d6a95 SHA512 1834805af41c1fd7a49c5c7489674149e41340e4f5b413e6d67c54242650402503a9beff342ed9b0ddf124bea5250cac16ab8bb733f9e027f763f7d5bb414db2
+EBUILD lumina-1.4.0_p1-r1.ebuild 2158 BLAKE2B ce102e9cf2a5dc026ae83205dedc31cfd3295de9c38bb88f899fd09e509067711620a5643fc7b5ff571547a9c8b134f3cdb5db3ae365af174cd8db774e71ad16 SHA512 5087d59aaa8be0b47672b5f66db4db3d068f47021e8a41e65d63f73fcc1192d93cb7fe36d48fb5b7dd7f02fa889832055a26c50ac7a78e3c3fef0e7c336b2bca
 EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.4.0_p1.ebuild b/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
index 4bab7adf10bf..27374bbd02dc 100644
--- a/x11-wm/lumina/lumina-1.4.0_p1.ebuild
+++ b/x11-wm/lumina/lumina-1.4.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
+	dev-qt/qtprintsupport:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
@@ -46,7 +47,6 @@ S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
 	"${FILESDIR}/1.2.0-desktop-files.patch"
-	"${FILESDIR}/1.3.0-OS-detect.patch"
 	"${FILESDIR}/1.4.0-poppler.patch"
 )
 
@@ -65,22 +65,16 @@ src_prepare(){
 
 src_configure(){
 	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
 }
 
 src_install(){
-	# A hack to avoid sandbox violation and install liblthemeengine*.so to the correct places
 	emake install INSTALL_ROOT="${D}"
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop "${ED%/}"/liblthemeengine*.so "${ED%/}"/lthemeengine || die
-	mv "${D}/${D}/etc" "${D}/etc" || die
-	mv "${D}/${D}/usr/bin" "${D}/usr/bin" || die
-	mv "${D}/${D}/usr/share" "${D}/usr/share" || die
-	rm -rf "${D}/var" || die
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
 	einstalldocs
 
 	remove_locale() {
-		rm -f "${D}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+
 	}
 	l10n_for_each_disabled_locale_do remove_locale
 }
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index faf3339d57ad..58b6e623d921 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,14 +1,3 @@
-DIST muffin-2.8.5.tar.gz 2715965 BLAKE2B ef2e223bffc877a0d3b6010f286f5de2b4f1151969954674fe7e95fd9d4524ef366dfc042bb053836c1271763f3da5d0627a990aa764e335d22f32fa07056c59 SHA512 a285e076f27e3a52ba4c6d813578e780f7f900e0ed3fa009951d908ffef3b0ded3678f6d298dd08f80b1cd61f20c90b0acd8607d53ad2accc27e16bf1bc14221
-DIST muffin-3.0.5.tar.gz 2717820 BLAKE2B 07896a3112eb8f0f4ca8869f7cd841ddca948783b604b29f8b40869b36ffb031a8e0705ab9bbc73c45f63761abc63ce829c0596ebf0045f3a14ea09f79a49a29 SHA512 2d4d37099e33ee5b0817970f5f7e264d679752ef5a256916e54a7072419e8c75a67d8609c541238bd76c462a85c9841167e051b3ced968a557aa4a90f41b2d5c
-DIST muffin-3.2.0.tar.gz 2718913 BLAKE2B c77ee145b53a5362f853777582dbbcdbd849c241a664e031830010613be06d0b60abbc60a3cb4efd3c37a612e3695c59ba9e7cf45309ef03865c0ebcbf794e9b SHA512 f1c17fdaf4d8f32ae9e62a60811a24c120413ad2a1e824ee412527a2c3336c2523596cb06fcad01a2f1fbf1a09a78cc30a5769b1cb860ce26d96690a8c3c4043
-DIST muffin-3.4.0.tar.gz 2719701 BLAKE2B 245154f95c92789b2195be5d4b498314cbd2c4a8e34bf1522251a4f259705688c826145e38ec55cba30d2b0ea00d5d8f3653912eb7e957f4c78ff86bfe14acef SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d
-DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
-EBUILD muffin-2.8.5.ebuild 2056 BLAKE2B bfb7be5032d41266fb45c8d21dd9b6d0ef8d8edfaf371f33492710824e399e8ca1cf0cf4c74c7a77eebf5e8799df62bb1c6212f92b068e229a9b83a4039949a0 SHA512 b72de64ab390367c6977eb8e899b92db9bfa29392239f1a7151998d244f40798a2a161b1c2e5b5921a58f509223e09b9747ec76a38d8f05902d656122508f96d
-EBUILD muffin-3.0.5.ebuild 2013 BLAKE2B 6545978d6ed60c71e2d6a6466c4b727b28a1ad701b567b3884bc01b32b1fb0775cee5709cc02cf28004860fd59004a30584e6668c39ecff2cfdde3ccb8d58de9 SHA512 1a349ec0c3985ad36d866a2f5754b49506b7c105cfcbbc15a20c5c309f89c24e645c3f52cfb399df9e0ff6e3eedd56cce374650cf787905c65db93289faa8370
-EBUILD muffin-3.2.0-r1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
-EBUILD muffin-3.2.0.ebuild 2015 BLAKE2B 757ac4f0c132db1b9763d075b65ea64fb696b50e8522ae499f753e8ca634efaa2deb42a01d48fd4181fe0b4fd13fa1bff2c33f168ab65b099fcb1ff63daab4ea SHA512 9b48be96b243c2cb2adefa6fbd0a611ab4e5ed77845ae9255d1aa707b4f33f53a656f8db878ec97b0b5fd4fcac282a79ec92aaeefcc477d93e3b928c0ed714f3
-EBUILD muffin-3.4.0.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
-EBUILD muffin-3.4.1.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
 EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
deleted file mode 100644
index c8ed0ba12a9b..000000000000
--- a/x11-wm/muffin/muffin-2.8.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.0.5.ebuild b/x11-wm/muffin/muffin-3.0.5.ebuild
deleted file mode 100644
index 489e8ebb0541..000000000000
--- a/x11-wm/muffin/muffin-3.0.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.2.0-r1.ebuild b/x11-wm/muffin/muffin-3.2.0-r1.ebuild
deleted file mode 100644
index 691da9e9652a..000000000000
--- a/x11-wm/muffin/muffin-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.2.0.ebuild b/x11-wm/muffin/muffin-3.2.0.ebuild
deleted file mode 100644
index 4f0194061da0..000000000000
--- a/x11-wm/muffin/muffin-3.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.4.0.ebuild b/x11-wm/muffin/muffin-3.4.0.ebuild
deleted file mode 100644
index 691da9e9652a..000000000000
--- a/x11-wm/muffin/muffin-3.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/muffin/muffin-3.4.1.ebuild b/x11-wm/muffin/muffin-3.4.1.ebuild
deleted file mode 100644
index 691da9e9652a..000000000000
--- a/x11-wm/muffin/muffin-3.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/startup-notification-0.7:=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/opengl
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	gnome2_src_configure \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index e26435ea6747..b10f883aa739 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,7 +1,8 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
+AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 AUX sawfish-1.9.1-firefox.patch 920 BLAKE2B 0ba7db2c91be76de52af3e07458b2a088e3cdee7147c64878a2429ce5a00c762bec55f46a8f8fedd622a8a8a6a30edbb51df74bc46a9b74fba8221f5a336443e SHA512 194b27a5674113b0820d5e03892973fb15b377cac9c43913b0f5698eb63cf6da556ff0edcee2b426fc218ea97f44bbbf5b21a4d6aa73af4a907cfc7944c53966
 DIST sawfish-1.9.1.tar.xz 2616612 BLAKE2B c81231723dbab4dcd994d838c2918e7af8415ccf0a2c8dd74031ab00adc29cf72563cca2d3ab7376fb88d42c4111e1460edc0789a9a07c00c3ebe93a57d941a4 SHA512 243a818e2cc2546c040f33fbc076bbcc4033b88f0b4be573f9daa80b2dcfd8d9dc97384d236b9b71d6efe08ad39bfd3f3f31b5c055b9b268418efb7668e27a42
-DIST sawfish_1.11.90.tar.xz 2751684 BLAKE2B 5635e26b7cad2455f232b0a2359c9d78485e4b9fb63f975d51d132680f88e50ad20b66d84375234aa42c725154a2ec046f348409e4576d3a09c050ffdbf0b7c0 SHA512 24735438167c1146e57f82a58876b68b1126d45f237751828ae9603a8eea966058fb6d8fbfddc28e1a96ab774a044b4b9b70b1e299f958b77eb32c987684925e
-EBUILD sawfish-1.11.90.ebuild 2332 BLAKE2B b0b05e5ad4359d4610048f5a321d756b50f2081ca86637ee8a9d1a4399a85bf8b1236c3a119e2eba2236d4aea1bb706cce97f40eacc1044c8afb1c599eb5d9f1 SHA512 745912863185eaccb070fd83a7157f1e386c742a3d279735fece5b7bbd367397e47b25662e17b347ae65a40f3b15d082b3a9f198b3029d0cc81bc371be7f05a6
+DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
+EBUILD sawfish-1.12.0.ebuild 2012 BLAKE2B 31886b09a130134407b51c1109f2e9f420c682225bca7272f162e26c832554c17c200179c22120a5ecb3b351a7ffe27f886b62ed679dc710514c17ea82cf7f92 SHA512 5e62f21e7fdbf1f0df9929c82f4506156d09f728a1cdc5987bc139d5628cc0bd9a9a5053401e25ad72211f26f33a754cdd1d981f607acfc79b1f105c41c741e1
 EBUILD sawfish-1.9.1-r2.ebuild 1832 BLAKE2B 6723a40547880fdcc4b471068fd79c08a1e4beeb3b282c6956a691d9f8aeb3c8858b453c3e1f5ce11e8906c6d43b6e9b2017da6302107f2e914636c8ab833ed8 SHA512 970a02beb9306c21f68b789fc1924bfa389d01e8e2ad0c67bcb201b5a79c7623112eae9843e71c322ae5e9a861e423da1a996c5ab8808f5f070c2bd2469ce72d
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch b/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch
new file mode 100644
index 000000000000..305155418c6b
--- /dev/null
+++ b/x11-wm/sawfish/files/sawfish-1.12.0-desktop.patch
@@ -0,0 +1,19 @@
+diff -ur sawfish_1.12.0.orig/data/sawfish-config.desktop sawfish_1.12.0/data/sawfish-config.desktop
+--- sawfish_1.12.0.orig/data/sawfish-config.desktop	2016-08-13 11:26:23.000000000 +0300
++++ sawfish_1.12.0/data/sawfish-config.desktop	2016-08-13 12:02:33.283152716 +0300
+@@ -3,4 +3,4 @@
+ Name=Sawfish Config
+ Exec=sawfish-config
+ GenericName=Sawfish Config
+-Categories=Utility;Applet;
++Categories=Settings;DesktopSettings;
+diff -ur sawfish_1.12.0.orig/data/sawfish.desktop sawfish_1.12.0/data/sawfish.desktop
+--- sawfish_1.12.0.orig/data/sawfish.desktop	2016-08-13 11:26:23.000000000 +0300
++++ sawfish_1.12.0/data/sawfish.desktop	2016-08-13 12:02:31.790154154 +0300
+@@ -4,5 +4,5 @@
+ Name[el]=Πριονόψαρο (Sawfish)
+ Exec=sawfish
+ GenericName=Sawfish
+-Categories=Utility;DesktopUtility;
++Categories=System;
+ Keywords=Window Manager
diff --git a/x11-wm/sawfish/sawfish-1.11.90.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index a7d4141d7884..0c22bd469e35 100644
--- a/x11-wm/sawfish/sawfish-1.11.90.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -12,41 +12,39 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="emacs nls xinerama"
+IUSE="emacs kde nls xinerama"
 
-RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )
+RDEPEND="
+	emacs? ( virtual/emacs !app-emacs/sawfish )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
 	x11-libs/pangox-compat
+	x11-libs/gdk-pixbuf:2[X]
 	>=x11-libs/gtk+-2.24.0:2
 	x11-libs/libXtst
+	kde? ( kde-frameworks/kdelibs4support )
 	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )"
+	xinerama? ( x11-libs/libXinerama )
+"
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS
-	   doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT
-	   TODO )
+PATCHES=(
+	# From Fedora
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO )
 
 src_configure() {
-	# The configure script tries to use kde4-config (bug #573664) or
-	# kf5-config (from kdelibs4support) to detect where it should put
-	# its session files. This could probably be enabled for kde5 going
-	# forward (behind USE=kde), but there's currently a bug in the
-	# configure script preventing that from working nicely:
-	#
-	#   https://github.com/SawfishWM/sawfish/issues/22
-	#
-	# For now, we just disable the kde[45] session support entirely.
 	set -- \
+		$(use_with kde kde5session) \
 		$(use_with xinerama) \
 		--with-gdk-pixbuf \
 		--without-kde4session \
-		--without-kde5session \
 		--disable-static
 
 	if ! use nls; then
@@ -72,7 +70,7 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 
 	if use emacs; then
 		elisp-install ${PN} sawfish.{el,elc}