gentoo resync : 16.06.2018

4 files changed, 33 insertions, 30 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 830c89d6332a..4c4110ccdb42 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index de1d71fb13a3..05cb0cd82b31 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -10,8 +10,8 @@ DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0
 EBUILD enlightenment-0.16.9999.ebuild 1714 BLAKE2B 18aec7836c982ebf03213d6b8080da238e1581022c9b9b828fe5e28dc82d114762aeb33bda8a9528e245d679c923c46c82c0259f77045ed9b7f5c4951d62271c SHA512 f996d2ee9efcb4abd71f38f2ac54bfcf9da5e5f782bb8f44730aa65024d2eaad725b247b94467b49a4e06ca9049a6a1f5da948e4829e0123947215963d8559d5
 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 2902 BLAKE2B f95763398ccdfa0da8b37287a48afd9dabd704d9acac7397260250a360118c485b5ef874f84263f6ed2295e2298fb08190d346f48b00ad70679a06d98010ba0e SHA512 306acfe71445a50c66356f20eaad5942cef86115cd226f053bade749bd2dc4102b6542f0ee5266d637925206b601bdb707a7b9cab7599bb4aea0e06be761691d
+EBUILD enlightenment-0.21.11.ebuild 2962 BLAKE2B 18dd6a1a5467fe93c9d534485b5b4043f12ad1e99ac57fddcdc3e1c5ed8c482197760f89ba44cf6f2ea943e2a6a420eca7e344c78b4750aaa61cd0103b738519 SHA512 1edecf2e573eab822e7e919ad65dfa538308e84680de3a1d1ac7c7b670222b577c9bdeee59e044532d98a52f6ca1532e8bb9e0148ef85fef6b80a4db3facc58e
 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549
-EBUILD enlightenment-0.22.3.ebuild 2796 BLAKE2B a21e2239da1ad1b9d76c499d52784d514aee4429188fb052c063b6437e847980fcc55d80d254be57e814923c34feb8fe08382c9e6f36cdd4e4d2809b935a09ee SHA512 227ec9eb86fffb045cdafeddeed67d21aa1c9a0803cfbf252d0c60d0e51e11229f2fb95e0fb3c81da4286c796b2b9c82fae78df7db3087ff8fee415eb485cfd0
+EBUILD enlightenment-0.22.3.ebuild 2750 BLAKE2B 3b16543cd7851d0611717908f591b756bb3f4699573bf19a395d24a3e6949f37a26761fb1065c45852dc94e3f8cb93471c786f2a57ec823178da177edfd9a7b0 SHA512 ee7605ad460a9ce8c511956738926e12f256721c9032e530d869e650784e3baf9b1521f62bb10fd0e35d0318b540d02513b9cc6401f41bf43a695a8439bba3bb
 EBUILD enlightenment-1.0.17.ebuild 1704 BLAKE2B ebc96726bb26d5a4b8f9eff7b36931424117e2e084c4dc584e5c82418d7d64792b3164eafe5a1bdd5f2790eaca2fd866f48221e775854ca1504568aeb06bf446 SHA512 c9373ff015e3ef2c316e84b827c7dad00daf458571fe3537f7d55f34676c9fedc260d9329ead2ce167a3b31570ea1a80580376373c8dc5ea446da364c9c82e74
 MISC metadata.xml 6804 BLAKE2B b71090abce4143b9900ab68af0daec44abbdbfcf812c03572dc9359f42a024ff3646a7e1316f6e7c8387c3d837895e8ccce95ed64a70d6a5ee5c4960f8aa78c2 SHA512 afac4d81982042885b76fb11fbc6dd660522e39a5709cd5c00342787e682bf3dfd3f8b0006ac95e61354fcd29e3074b337abfb62b328db2be14318f12409c3bf
diff --git a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
index 2abc80fad22e..b360779f58ff 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 E_CONF_MODS=(
 	applications bindings dialogs display
@@ -22,16 +22,16 @@ E_CONF_MODS=(
 
 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
+	clock conf 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=(
@@ -39,7 +39,7 @@ IUSE_E_MODULES=(
 	${E_NORM_MODS[@]/#/enlightenment_modules_}
 )
 
-IUSE="acpi doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+IUSE="acpi connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
 
 RDEPEND="
 	>=dev-libs/efl-1.17.0[eet,X]
@@ -49,6 +49,7 @@ RDEPEND="
 	x11-libs/xcb-util-keysyms
 	x11-misc/xkeyboard-config
 	acpi? ( sys-power/acpid )
+	connman? ( net-misc/connman )
 	egl? ( >=dev-libs/efl-1.18.0[egl,wayland] )
 	pam? ( sys-libs/pam )
 	systemd? ( sys-apps/systemd )
@@ -82,6 +83,7 @@ src_configure() {
 		--disable-install-sysactions
 		--disable-policy-mobile
 		--enable-device-udev
+		$(use_enable connman)
 		$(use_enable egl wayland-egl)
 		$(use_enable nls)
 		$(use_enable pam)
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
index 042b54c3f254..798567aaf326 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 
 inherit meson xdg-utils
 
-DESCRIPTION="Enlightenment DR17 window manager"
+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 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 E_CONF_MODS=(
 	applications bindings dialogs display
@@ -22,17 +22,17 @@ E_CONF_MODS=(
 
 E_NORM_MODS=(
 	appmenu backlight battery bluez4
-	clock conf connman 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
+	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=(
@@ -40,7 +40,7 @@ IUSE_E_MODULES=(
 	${E_NORM_MODS[@]/#/enlightenment_modules_}
 )
 
-IUSE="doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
+IUSE="acpi connman doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
 
 RDEPEND="
 	>=dev-libs/efl-1.20.5[eet,X]
@@ -49,6 +49,8 @@ RDEPEND="
 	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 )
@@ -70,8 +72,6 @@ src_prepare() {
 
 	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
 }
 
@@ -80,6 +80,7 @@ src_configure() {
 		-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)