gentoo resync : 25.11.2020

3 files changed, 4 insertions, 134 deletions

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 9f86c628e0e3..c913ad4a045d 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,4 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 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
+EBUILD e16-1.0.21.ebuild 2948 BLAKE2B e64075e36b879a8367acdab664168ca7a75680cb62267aa71f100645c89594e6139f24f8b0fb9631b7f5a752be7dfaa547f68458177bb318c88bc31f0d95ae2b SHA512 e8f6df7bfa6f9011083a1d6d59b7ceb889ef140ec3bca7498c8193328824e250ae11e39e004c6b0a44e7e61bdcf192ac6d67ce431a74b9a5b73029870a3c2083
 MISC metadata.xml 1636 BLAKE2B 10638b577feb461fedc925dee696ba44bdd2cc3e781c37150bfb50d252777cb33bebbc16b2fbf7c27fa7cd194d1de7871d9037bef690b653c3e197e58af86f52 SHA512 06fc94f51d8ce392cd1dfb3c1ebe96167e9e792c5a707109d3a58779bbd054ea6a13b18351823875d408befb5dac1dcae85ea4bcc7a8d73c7243a72f643da955
diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
deleted file mode 100644
index 5d940a12f3f6..000000000000
--- a/x11-wm/e16/e16-1.0.20.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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
-"
-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? (
-		|| (
-			media-sound/apulse[sdk]
-			media-sound/pulseaudio
-		)
-		sndfile? ( media-libs/libsndfile )
-		audiofile? ( media-libs/audiofile:= )
-	)
-	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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
-
-src_configure() {
-	local myconf=(
-		$(use_enable container)
-		$(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 opengl glx)
-		$(use_enable pango)
-		$(use_enable sound sound pulseaudio)
-		$(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 audiofile sndldr audiofile)
-		$(use_with gnome gnome gnome3)
-		$(use_with sndfile sndldr sndfile)
-		--enable-mans
-		--disable-docs
-		--disable-esdtest
-		--disable-gcc-cpp
-		--disable-hints-gnome
-		--disable-werror
-		--disable-xscrnsaver
-	)
-
-	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/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 5d940a12f3f6..891c63f37815 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"
@@ -17,6 +17,7 @@ libhack modules nls opengl +pango sndfile sound +themes xcomposite
 REQUIRED_USE="
 	audiofile? ( sound )
 	opengl? ( xcomposite )
+	pango? ( xft )
 	sndfile? ( sound )
 	sound? ( ^^ ( sndfile audiofile ) )
 "