gentoo resync : 29.05.2018

6 files changed, 160 insertions, 128 deletions

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>