gentoo resync : 15.01.2020

2 files changed, 38 insertions, 25 deletions

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index c2183ece815d..fc7fb6fa746d 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.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
 DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
-EBUILD e16-1.0.19.ebuild 2890 BLAKE2B bbabc819922d8f4174e44bb53d3e7c68cf3fcd390f08c276a8b06f8506ebdf4b7b3b05334096343c8797acd235222e9de93bf32dc69dd7876f873ed93e6fe841 SHA512 de0d6644a1a998df765d6e827a48c24041eb3d460ddd8a453b1b043ab8fa9e9337e3e2bd8e3a7ec0466bf8efcc637c3ff0f4d4f87c72e026140186b6d44ce6d4
+DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
 EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
+EBUILD e16-1.0.21.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
 MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.19.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 8f543706ab66..5d940a12f3f6 100644
--- a/x11-wm/e16/e16-1.0.19.ebuild
+++ b/x11-wm/e16/e16-1.0.21.ebuild
@@ -6,28 +6,48 @@ EAPI=7
 DESCRIPTION="Enlightenment Window Manager (E16)"
 HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 
 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"
 
+REQUIRED_USE="
+	audiofile? ( sound )
+	opengl? ( xcomposite )
+	sndfile? ( sound )
+	sound? ( ^^ ( sndfile audiofile ) )
+"
+
 BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
-CDEPEND="
+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 )
-	doc? ( app-doc/e16-docs )
-	nls? ( virtual/libintl )
-	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
-	pango? ( x11-libs/pango[X] )
+	opengl? (
+		media-libs/glu
+		media-libs/mesa
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
 	sound? (
-		|| ( media-sound/pulseaudio media-sound/apulse[sdk] )
+		|| (
+			media-sound/apulse[sdk]
+			media-sound/pulseaudio
+		)
 		sndfile? ( media-libs/libsndfile )
-		audiofile? ( media-libs/audiofile )
+		audiofile? ( media-libs/audiofile:= )
 	)
 	xcomposite? (
 		x11-libs/libXcomposite
@@ -39,28 +59,21 @@ CDEPEND="
 	xpresent? ( x11-libs/libXpresent )
 	xrandr? ( x11-libs/libXrandr )
 	xrender? ( x11-libs/libXrender )
-	xsm? ( x11-libs/libICE x11-libs/libSM )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
 	zoom? ( x11-libs/libXxf86vm )
-	=media-libs/freetype-2*
-	>=media-libs/imlib2-1.3.0[X]
-	virtual/libiconv
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-misc/xbitmaps
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
 	themes? ( x11-themes/e16-themes )
 	!x11-wm/enlightenment:0
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
-REQUIRED_USE="
-	audiofile? ( sound )
-	opengl? ( xcomposite )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
-"
 
 PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )