x11-wm/e16: version bump to 1.0.25

- Update to 1.0.25.
- Enable container by default and rename USE container -> no-container.
- Update custom USE flags descriptions.

Closes: https://bugs.gentoo.org/843467
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

3 files changed, 150 insertions, 2 deletions

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 27b7b3f1699a..33779622ea3b 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,2 +1,3 @@
 DIST e16-1.0.22.tar.xz 1442288 BLAKE2B 7f102474f9054935ea15ed58c91f18613561eaad84c8398c410014a5dbfb2f7f5fd079399db4c6462096c9a351bd89e47fbd61d304ca99ec844806c26c97d6a9 SHA512 0ff40390a56f0dbd2219d9e4e665b1c1802801e552df3bd76fa71502ad2fb7466f2f175757b088b490fbc58e4196b362d6cf451ad43d5104849ac8ce2805299e
 DIST e16-1.0.24.tar.xz 1392444 BLAKE2B 5a4c30af2d484226fac73cbe9131ae9dc308638fc035958012b99747ddaa15b1fc1340fe74c7e809e399b5c93dfc7bf8a6ead338c3977483621f4ab98f8f4a3e SHA512 869e2c654bbdcdbb56656cacea8338b0f99a991e4aeaa4dde3fd01e358b1010a58422344e617d522e024186ab98a1d9364e6ea3428507b3831516d1da5dfb08a
+DIST e16-1.0.25.tar.xz 1400004 BLAKE2B 34ef7be6896d04234b3a48675c185aa86d7a70e0e8b5db2cdf15bef4336a40575065713f9612b94dd29a490902f36f9eb08489a779160801e885a5635d896e56 SHA512 e5cc6b08ddad8eb3052dbafda2a0ab56134e90eb9cdf75da405ac853301eadf8348dc918218119117a1f96d08e562367ff60365deb790a14af5fbdaaf89684d3
diff --git a/x11-wm/e16/e16-1.0.25.ebuild b/x11-wm/e16/e16-1.0.25.ebuild
new file mode 100644
index 000000000000..a7804aab9c99
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.25.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audiofile dbus debug +dialogs doc examples gnome
+libhack modules nls no-container opengl +pango +poll player
+pulseaudio select +sndfile sound +themes xcomposite +xft xi2
+xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+
+REQUIRED_USE="
+	^^ ( poll select )
+	opengl? ( xcomposite )
+	pango? ( xft )
+	sound? (
+		^^ ( alsa player pulseaudio )
+		alsa?       ( ^^ ( sndfile audiofile ) )
+		pulseaudio? ( ^^ ( sndfile audiofile ) )
+	)
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	media-libs/freetype:2
+	media-libs/imlib2[X]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
+	dbus? ( sys-apps/dbus )
+	opengl? (
+		media-libs/glu
+		media-libs/mesa
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
+	sound? (
+		alsa? ( media-libs/alsa-lib )
+		player? ( media-sound/alsa-utils )
+		pulseaudio? ( || (
+			media-sound/apulse[sdk]
+			media-sound/pulseaudio
+		) )
+		audiofile? ( media-libs/audiofile:= )
+		sndfile? ( media-libs/libsndfile )
+	)
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+	)
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpresent? ( x11-libs/libXpresent )
+	xrandr? ( x11-libs/libXrandr )
+	xrender? ( x11-libs/libXrender )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	zoom? ( x11-libs/libXxf86vm )
+"
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
+	themes? ( x11-themes/e16-themes )
+	!x11-wm/enlightenment:0
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable dbus)
+		$(use_enable debug libtrip)
+		$(use_enable dialogs)
+		$(use_enable doc docs)
+		$(use_enable libhack)
+		$(use_enable modules)
+		$(use_enable nls)
+		$(use_enable no-container)
+		$(use_enable opengl glx)
+		$(use_enable pango)
+		$(use_enable xcomposite composite)
+		$(use_enable xft)
+		$(use_enable xi2)
+		$(use_enable xinerama)
+		$(use_enable xpresent)
+		$(use_enable xrandr)
+		$(use_enable xrender)
+		$(use_enable xsm sm)
+		$(use_enable xsync)
+		$(use_enable zoom)
+		$(use_with gnome gnome gnome3)
+		--enable-mans
+		--disable-docs
+		--disable-esdtest
+		--disable-gcc-cpp
+		--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[@]}"
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/e16.html
+	dodoc COMPLIANCE docs/e16.html
+	use examples && dodoc -r sample-scripts
+}
+
+pkg_postinst() {
+	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
+	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
+	einfo "in the Theme setting should be disabled for this to work."
+}
diff --git a/x11-wm/e16/metadata.xml b/x11-wm/e16/metadata.xml
index 8a474b5136e5..5ee3f5c0bde3 100644
--- a/x11-wm/e16/metadata.xml
+++ b/x11-wm/e16/metadata.xml
@@ -6,18 +6,19 @@
     <name>Andrew Savchenko</name>
   </maintainer>
   <use>
-    <flag name="container">Use container window (experimental)</flag>
+    <flag name="container">Use container window</flag>
     <flag name="debug">Build libtrip debugging library</flag>
     <flag name="dialogs">Enable support for configuration dialogs</flag>
     <flag name="libhack">Build libhack window mode helper library</flag>
     <flag name="modules">Enable support for loadable modules</flag>
+    <flag name="no-container">Do not use container window (experimental)</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>
+    <flag name="xpresent">Enable support for the X Present extension via <pkg>x11-libs/libXpresent</pkg> (experimental)</flag>
     <flag name="xrandr">Enable support for the X RandR extension via <pkg>x11-libs/libXrandr</pkg></flag>
     <flag name="xrender">Enable transparency support using the X Render extension via <pkg>x11-libs/libXrender</pkg></flag>
     <flag name="xsm">Enable X Session Management support using <pkg>x11-libs/libSM</pkg></flag>