gentoo resync : 02.06.2019

11 files changed, 20 insertions, 157 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dc0083a6811d..7cf463086907 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 776cde80063f..a71a430e2636 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -13,7 +13,7 @@ DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f22229
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 EBUILD awesome-3.5.9-r2.ebuild 3120 BLAKE2B 71d1668a910bc570389cd9fdba9cf948c6937c53fb335df8d5cc8ab7fbc6811e0635895094be3fd67a49e4a7a43a7cc602d88a9b33534ffc6d6b684911ccc858 SHA512 c4c0d39f617c3cdede84786e4fc8a7c4f01b4e329a06d092a09a773af3be42dd0c28e6178f294710579737f3d441ef4f7cd88fd7afb1e1acfe2279ad81192ac4
-EBUILD awesome-4.2-r2.ebuild 4048 BLAKE2B c346c0cee0af4e95becc345b7d30254df0db768ecf3d84c10fa22fb9b2cab14fba30144027b6f9f2d89a27b8e5aab69e46d94bda9961e871def26e07f4f77c33 SHA512 2779eab46b8f93eff87ff3cd540252dec968e714731c3068effae90b7f7f4e2a8c36474a6e1beb696ef2060d096e6a4adee42b4ed930d583dc812d9ea601e15f
+EBUILD awesome-4.2-r2.ebuild 4046 BLAKE2B f0818242453a6b6e86cc5308f852bc39ceb582599fb14d47ecaaf99f4992fe5b79e530d20f803dc9717d7ac9bac42869dafe81571cbb6209940d8f0e0c90f2d6 SHA512 d20e5c640738bbd7dbcdafd91bf5af40fd5d336d91bd12f814b91f8d0b478fcbfda099fb995c44dffafd3d00973242faa48f85f6eba76d3f19d5df31fa0f14a0
 EBUILD awesome-4.3.ebuild 3696 BLAKE2B 2ecc88fe2aeccff7b40ee66b01e3d332a3a9e5efbf796fb04ec6bca266853c296abda8f5fa657efcbc2b752a75e13ebc27f706b4569ca45f07939a81c1d3aa33 SHA512 be1923652935a8fa73b07a9cb3f718a6909f20d85edc85a476f26c554b989167730c429aa7694c11190f7fb04d9f29e071c27a3362b7f66a3edc9e04dd4949fa
 EBUILD awesome-9999.ebuild 3612 BLAKE2B a7069d2671acfa6ca3c4d03fd1da6a89a794bd703c86889e082d8c6cb9bbbf1709f59d89264569b3f3d58315b1ffde3d0bef3aec925509dd47268c086c799aed SHA512 50a0836b211d4dab36b294e4a42a4775f6b84584bd5acb9aed3e45835b2089fdb85bfb5449d4ac5632de4a4d3992f285527756909bd25097e00dd8a7fe8891eb
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 19707b82ac5a..d40aa18c921c 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${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 luajit test"
 RESTRICT="test"
 
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 0cc9e051ad3f..51e037da8f87 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,8 +1,6 @@
 AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
-DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
-EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B afd66034af88b166bec62657b0d5d058697178fb42f94184f6bf099526d1755ba317fd96142a9ddd7590bcc65548b30fa06e1db75828fee67583e6bfcb270612 SHA512 5a32871dfa8c5671efc1870249411ca1ecd3b61737cdf11b7f662006293456083ea95223ea2e8b5033952fa1d96494ca437f1a24c34fcfc6c8d99cc400ab275f
 EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
 EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
 MISC metadata.xml 892 BLAKE2B 05d547df7e3f87b0e2d32bb7c3a0b30ad1b233778081c3595071fccdd5124b263d3a34de09c880f79199885b8da4a3c6cd499304ccd249cea9b764be4ba84bf3 SHA512 79cf7b40de376a2d3344d3e76cdb632bad71162814a9039f322ce12ce8473da3398fcc6aecad188a592dcd31ec7d32ce1563955e057c0750c4ed0e68b7551022
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
deleted file mode 100644
index 9e7dbed74f62..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 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 cpufreq everything
-	fileman fileman-opinfo gadman geolocation
-	ibar ibox lokker luncher
-	mixer msgbus music-control notification
-	packagekit pager pager-plain quickaccess
-	shot start syscon sysinfo
-	systray tasks teamwork temperature
-	tiling time vkbd winlist
-	wireless wizard wl-buffer wl-desktop-shell
-	wl-drm wl-text-input wl-weekeyboard wl-wl
-	wl-x11 xkbswitch xwayland
-)
-
-IUSE_E_MODULES=(
-	${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
-	${E_NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="acpi connman doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	>=dev-libs/efl-1.20.5[eet,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	connman? ( net-misc/connman )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		=dev-libs/efl-1.20*[drm,wayland]
-		>=dev-libs/wayland-1.12.0
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-sysactions=false
-		-D mount-udisks=$(usex udisks true false)
-		-D connman=$(usex connman true false)
-		-D nls=$(usex nls true false)
-		-D pam=$(usex pam true false)
-		-D systemd=$(usex systemd true false)
-		-D wayland=$(usex wayland true false)
-	)
-
-	local u c
-	for u in ${IUSE_E_MODULES[@]} ; do
-		c=${u#enlightenment_modules_}
-
-		case ${c} in
-		wl-*|xwayland)
-			if ! use wayland ; then
-				emesonargs+=( -D ${c}=false )
-				continue
-			fi
-
-		;;
-		esac
-
-		emesonargs+=( -D ${c}=$(usex ${u} true false) )
-
-	done
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index a98538c37878..2a73c7bbee10 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -3,7 +3,7 @@ AUX muffin-4.0-cogl-configure.patch 717 BLAKE2B bf55437c4a3c5b41fe4c9dc4bb0a7e58
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
 DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
-EBUILD muffin-3.6.0.ebuild 2015 BLAKE2B a1e42826b62c46bd57de0f2a849525f9cc9eaa162279188a893f3108d33ca9e5a028a8fc1c6c5b7391d444d266773880f5bb6ed0e680609f4c3a387e40e10a6a SHA512 86c08741e7787f220d94900a34f5fe9db2a8b09d9caadfef96b76ba5051f5eb20409d38f1a7a0111c8791664dcad07046ef88cbe53557b199e41b8cd90c43341
-EBUILD muffin-3.8.2.ebuild 2017 BLAKE2B 747a1089dabd01eabc88e1d3aac8c7c458b55873011773da9ad0c85a7d18523532be188c52c1bc162f32442794cd129e1a07c0ce8dca812bb0bffa728e8c2b56 SHA512 d19b4c928844be00ad61cc8a41fc0c76847a895b08ad6bbfe51da256c38757041ffdbc1915b8e3fcec381e9e737f84d2217eff44a68276713b38145ae3b811ac
-EBUILD muffin-4.0.3.ebuild 1996 BLAKE2B afb319d995eae03baedea4287c95005ab08f0d3e52dee3986dc03ffe0f27b466f553c7590b0dd68cf72ca7f3b33bb0f3bd5a4db48a2b71fc9f05030013e9b78b SHA512 4deb518b009494b8871d205bdd18bea4058584adb8496ff012564184a080b55d908bd27d4329139be225faf71c7b9e144eaa880e3de62de9e1f3c5f0d29e6f91
+EBUILD muffin-3.6.0.ebuild 2047 BLAKE2B 91bef2b48265f8abb8e72430404ea3b5bb86a9fb7603f7a5f6eca1ce04888a5693c42773abce631544083f0ac33075bb6b1f53ada813cd3249736671a6a38571 SHA512 3c8f33c6760d08a48b9d5cb58ab58afddd6294beabfd46653e5525db99a66abbbe69ad98f0ba14f4bbd8e05e093f1e480bea8948f00f27c8956b7b02a90b9314
+EBUILD muffin-3.8.2.ebuild 2049 BLAKE2B 787f368ec25ce0ba32712fee1304c575e1727f96e0867d2122cec4b303bfcb736e948adfe1db55761790c2d3605bb618450f85e1727c146e8b23c6ea85857b85 SHA512 a7caafcc86ae7fc2327eec12e445e86056cdc080d2ec8870cd67e74e80890b1ed1fd50fe41dbed23c54e1a57229d9f41447dd52136b9453ef29e4cadfd187de9
+EBUILD muffin-4.0.3.ebuild 2028 BLAKE2B 8947af0e8e8f32ed35aa493d8a0eb1a75f09fa142aae590f956f43683d44129e555a972b152410376edc226ae81520059e6c2b89def1c5a794d5e5162be3f2eb SHA512 4bcbd1a07cf209ad3a097a8353da96e2b4265898463da6763c70d2e4e7116003e7208db8c1b6686999db09473b8b8ec1a0797a6e00056847d4f43ffc5098d5cb
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 5b0e9e55033a..5c2e5abbdfbe 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/muffin/muffin-3.8.2.ebuild b/x11-wm/muffin/muffin-3.8.2.ebuild
index 691da9e9652a..1b8f08d29402 100644
--- a/x11-wm/muffin/muffin-3.8.2.ebuild
+++ b/x11-wm/muffin/muffin-3.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
index 1f5bf4aba312..612e2ad001ad 100644
--- a/x11-wm/muffin/muffin-4.0.3.ebuild
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
 SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 24220f55febf..7f7fca5a3138 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -6,5 +6,5 @@ AUX musca-0.9.24_p20100226-null.patch 4271 BLAKE2B 52ec8124f563fbe0e3b281e36cabc
 AUX musca.xsession 16 BLAKE2B ce00d05a09d8611a71c4d219a48bcc3e9386deb67c5ccb7d6638fab0d41862f0a503cb0ff506b71881606abb2a36da3d0df717791ff95cb8b344370ce3c4d366 SHA512 f276046ab82ceeaebf5307ea9050d55767a55cbd1913854ef0f73bdf162d2d751537ad604fc2a99d8d9c9b89426b609f127451c7a3f6b36868c74842d28a8622
 DIST musca-0.9.24_p20100226.tgz 81490 BLAKE2B 6aa9ccdd94749df1a701d605f07c29f8dbb7cb0afb73bdb9392d35df7e518496219e972535e671dd5d6d32520fa7e1d928e91489c2a303aebfe051cdd11a5230 SHA512 9030931dbc332fce144edc6bea907d86aab1eef6b1384958a7889b533af5065a2f20b7233ea063648fff0eb468c2083a310e38586c2c4d83848c773fb1984f45
 EBUILD musca-0.9.24_p20100226-r3.ebuild 1180 BLAKE2B a54c5c5492f08781e36f8da2429bad0d52b84006ca7c81a15075b867864466d0a0eb0219f1223ee2ce28bc77a27c85ea735c554f003677e805077722b5d63169 SHA512 bca766ac4931ad5d81ca212b44c69f85a318a175a303340b8e3116790bda7cae9600aa1108081b3c128c34b8d99aa6d7f0ad6a7120ee80c86dfcc990853bc2e1
-EBUILD musca-0.9.24_p20100226-r4.ebuild 1291 BLAKE2B a775b55a2c935ba4b21c59bcbe8d013d5f8f3ce24ffeb3751e212cde42370e1876f0e484cf37bc139d2863582ed1af8f90aaff74865a756968f7463e66812dbe SHA512 8ce1a6797954ed85d34408f002d78a257915b3c6eae4a5c2465135cda8f0ddbf17c6043ae65fb77f2840872e16be051d9c33b5176a2c49fc01299fafbb9bf45a
+EBUILD musca-0.9.24_p20100226-r4.ebuild 1234 BLAKE2B c729fb8db4480ffacf76ebd4694da222c9e48e280ddadcc10adc5ca1375725ec602a2e4ef6a46d70d573256f921efde1b0178a6fb7e93e22ff983d7b92183de6 SHA512 87c82a3f29f69d4364238a7041ff9867a95d2fe98a85b5af132ceb6d6e054797505d896562be1efe285051c50f6e6dfc1043db99311d4f41d4ac04796cac3d76
 MISC metadata.xml 486 BLAKE2B 12bdde943981e2eb7a6dc26a6744d596a8fce6b8125f788e760f27d1d7f3f6d8c840b173d7cd3418371a33fe2f064421b4f66484507dff22ea4895695a89cd8f SHA512 098a06d7dff066cf54e909923066078fc8347f7402846a66c26bae0e5df4752cd5a44dec6457e977b2060be5f3068e16ad5147e151ea1b4cac23b4e9e20c136a
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 129899ded8d0..adef927a76b5 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils savedconfig toolchain-funcs
+EAPI=7
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
 HOMEPAGE="https://launchpad.net/musca"
@@ -13,14 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="apis xlisten"
 
-COMMON="x11-libs/libX11"
-DEPEND="${COMMON}
-	sys-apps/sed"
+DEPEND="x11-libs/libX11"
 RDEPEND="
-	${COMMON}
+	${DEPEND}
 	>=x11-misc/dmenu-4.4
-	apis? ( x11-misc/xbindkeys )
-"
+	apis? ( x11-misc/xbindkeys )"
 
 src_prepare() {
 	restore_config config.h
@@ -30,12 +28,13 @@ src_prepare() {
 		-e 's:sed.*exec.*-i::g' \
 		|| die
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${PN}-0.9.24-make.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-null.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-cycle.patch \
 		"${FILESDIR}"/${PN}-0.9.24_p20100226-fix-pad.patch
+	eapply_user
 
 	local i
 	for i in apis xlisten; do
@@ -49,13 +48,9 @@ src_prepare() {
 
 src_install() {
 	dobin musca
+	use xlisten && dobin xlisten
+	use apis && dobin apis
 
-	local i
-	for i in xlisten apis; do
-		if use ${i}; then
-			dobin ${i}
-		fi
-	done
 	doman musca.1
 
 	exeinto /etc/X11/Sessions