gentoo resync : 22.12.2021

3 files changed, 39 insertions, 20 deletions

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 813784b1c92b..df13a59aa80b 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,6 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
 DIST e16-1.0.22.tar.xz 1442288 BLAKE2B 7f102474f9054935ea15ed58c91f18613561eaad84c8398c410014a5dbfb2f7f5fd079399db4c6462096c9a351bd89e47fbd61d304ca99ec844806c26c97d6a9 SHA512 0ff40390a56f0dbd2219d9e4e665b1c1802801e552df3bd76fa71502ad2fb7466f2f175757b088b490fbc58e4196b362d6cf451ad43d5104849ac8ce2805299e
-EBUILD e16-1.0.21.ebuild 2948 BLAKE2B e64075e36b879a8367acdab664168ca7a75680cb62267aa71f100645c89594e6139f24f8b0fb9631b7f5a752be7dfaa547f68458177bb318c88bc31f0d95ae2b SHA512 e8f6df7bfa6f9011083a1d6d59b7ceb889ef140ec3bca7498c8193328824e250ae11e39e004c6b0a44e7e61bdcf192ac6d67ce431a74b9a5b73029870a3c2083
+DIST e16-1.0.24.tar.xz 1392444 BLAKE2B 5a4c30af2d484226fac73cbe9131ae9dc308638fc035958012b99747ddaa15b1fc1340fe74c7e809e399b5c93dfc7bf8a6ead338c3977483621f4ab98f8f4a3e SHA512 869e2c654bbdcdbb56656cacea8338b0f99a991e4aeaa4dde3fd01e358b1010a58422344e617d522e024186ab98a1d9364e6ea3428507b3831516d1da5dfb08a
 EBUILD e16-1.0.22.ebuild 3427 BLAKE2B 33ca3b091d59a39b322ce2a42cec37d8592a2ad5bbc4f87b59420632f3df701c66c9e3cfde8c0e66706980e0c7ecb6807c24afd32a54955356e84a0620624b2c SHA512 4ae42d166df0935206cb9821c923fddc88e5b3c9f60e25a503ab180e71847530bccd7454584229087d39f9325b98621a12e8ee24dfc05034f614b436f6128797
-MISC metadata.xml 1732 BLAKE2B 80c69535febf0d68fd6c279f27057c98d34d356c4f95318a224eebfd169d7aa2f73aacdcba6b3d0639f1b331a3d830140a32c6ee877c7f79d94bb4f2a7099a59 SHA512 9366036258ddc12f15a013ffcd82a47e906a9b8d97baca855564a9e3f766994687de51581cac57ce94b92b1bb906a4dc49ff78b8534f544b6e7691db14fd960a
+EBUILD e16-1.0.24.ebuild 3502 BLAKE2B 67579dc57dd69ed10d2eda9fcdad640c3c5c8e527eaffa77d33cc347e447fd320b4711fe80412c9adfb2b599692b3ae917d0cd28b5335e68ee9e79a435a4c295 SHA512 8051e832f1f94ee14b0fddb9f6f0ff834eb08b15cd3f4ff2bcda1c5093e547fa266f638027f6b6e5eb36ebcb7f4318de762e4b48173597b42b4160cc3a87baba
+MISC metadata.xml 1866 BLAKE2B 9123b6c7f77a370e4ef514b56e9ebd4049ece0a22697360b274738b2e85fb13a88f458a3edf03f9916889f26e86d70ab5656ec91a1ddb87ffb2f8747f10a0bfc SHA512 89047e65b2461c8ddc51d05f8c358900ca21917c17cb70c77386112120aa39bfb3738b729fd8d8e8619e86d862aa7662716f1d5d7a54f8d1b7680cbf66eb2ba9
diff --git a/x11-wm/e16/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.24.ebuild
index 891c63f37815..89f74d6029b6 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Enlightenment Window Manager (E16)"
 HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
@@ -9,17 +9,21 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="audiofile container dbus debug +dialogs doc examples gnome
-libhack modules nls opengl +pango sndfile sound +themes xcomposite
-+xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audiofile container dbus debug +dialogs doc examples
+gnome libhack modules nls opengl +pango +poll player pulseaudio
+select +sndfile sound +themes xcomposite +xft xi2 xinerama xpresent
++xrandr +xrender +xsm +xsync zoom"
 
 REQUIRED_USE="
-	audiofile? ( sound )
+	^^ ( poll select )
 	opengl? ( xcomposite )
 	pango? ( xft )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
+	sound? (
+		^^ ( alsa player pulseaudio )
+		alsa?       ( ^^ ( sndfile audiofile ) )
+		pulseaudio? ( ^^ ( sndfile audiofile ) )
+	)
 "
 
 BDEPEND="
@@ -43,12 +47,14 @@ COMMON_DEPEND="
 		x11-libs/pango[X]
 	)
 	sound? (
-		|| (
+		alsa? ( media-libs/alsa-lib )
+		player? ( media-sound/alsa-utils )
+		pulseaudio? ( || (
 			media-sound/apulse[sdk]
 			media-sound/pulseaudio
-		)
-		sndfile? ( media-libs/libsndfile )
+		) )
 		audiofile? ( media-libs/audiofile:= )
+		sndfile? ( media-libs/libsndfile )
 	)
 	xcomposite? (
 		x11-libs/libXcomposite
@@ -76,8 +82,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
-
 src_configure() {
 	local myconf=(
 		$(use_enable container)
@@ -90,7 +94,6 @@ src_configure() {
 		$(use_enable nls)
 		$(use_enable opengl glx)
 		$(use_enable pango)
-		$(use_enable sound sound pulseaudio)
 		$(use_enable xcomposite composite)
 		$(use_enable xft)
 		$(use_enable xi2)
@@ -101,9 +104,7 @@ src_configure() {
 		$(use_enable xsm sm)
 		$(use_enable xsync)
 		$(use_enable zoom)
-		$(use_with audiofile sndldr audiofile)
 		$(use_with gnome gnome gnome3)
-		$(use_with sndfile sndldr sndfile)
 		--enable-mans
 		--disable-docs
 		--disable-esdtest
@@ -112,6 +113,22 @@ src_configure() {
 		--disable-werror
 		--disable-xscrnsaver
 	)
+	if use sound; then
+		use alsa       && myconf+=( --enable-sound=alsa )
+		use pulseaudio && myconf+=( --enable-sound=pulseaudio )
+		use player     && myconf+=( --enable-sound=player )
+
+		if use alsa || use pulseaudio; then
+			use sndfile   && myconf+=( --with-sndldr=sndfile )
+			use audiofile && myconf+=( --with-sndldr=audiofile )
+		else
+			myconf+=( --without-sndldr )
+		fi
+	else
+		myconf+=( --disable-sound --without-sndldr )
+	fi
+	use poll && myconf+=( --with-evhan=poll )
+	use select && myconf+=( --with-evhan=select )
 
 	econf "${myconf[@]}"
 }
diff --git a/x11-wm/e16/metadata.xml b/x11-wm/e16/metadata.xml
index df0e841644f4..8a474b5136e5 100644
--- a/x11-wm/e16/metadata.xml
+++ b/x11-wm/e16/metadata.xml
@@ -13,6 +13,8 @@
     <flag name="modules">Enable support for loadable modules</flag>
     <flag name="pango">Enable pango font rendering using <pkg>x11-libs/pango</pkg></flag>
     <flag name="player">Enable audio using aplay from <pkg>media-sound/alsa-utils</pkg></flag>
+    <flag name="poll">Use poll() event handler API (recommended)</flag>
+    <flag name="select">Use select() event handler API</flag>
     <flag name="themes">Install the official E16 themes using <pkg>x11-themes/e16-themes</pkg></flag>
     <flag name="xi2">Enable the experimental multipointer input XInput2. This incldues the MultiPointer X feature</flag>
     <flag name="xpresent">Enable support for the X Present extension via <pkg>x11-libs/libXpresent</pkg></flag>