gentoo resync : 28.11.2020

14 files changed, 47 insertions, 364 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9f2be3e11091..381e5fdf3259 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 69970f3f9540..44ebed38111d 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -3,5 +3,4 @@ AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb05
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
 EBUILD aewm-1.3.12-r1.ebuild 861 BLAKE2B 8d0d4d5539bdb487dfd198e665c95f547e7271be94331c6cb87166798a720a975a9aa3a3cceaee4746438790414eeedc478068354bf701d4c81109fa2166c881 SHA512 d81b797d708481bb305587cf1d49a13e58a3c660602330b625ef04178079dcda3cdf581cc0b93d7b896db97ef110f5f47dea09300ea4ed87a912812520b74fec
-EBUILD aewm-1.3.12.ebuild 951 BLAKE2B 1ff4d9bcc9a1c81ae28eb061ed0d2dd588bee2a57d69621387ead0654284c654b8d2c1dbb7b7978094c799b3263a37ca433e00e9a59e9d732950f20be88392ff SHA512 3b0e6f2b45500c6120f2a813b7e5a031464f22820a0b518c06526d39cc4a5e2a4fcd1f85b929ba57a0b5351d677dfba63fc78a7499879d754a9b0bbd0727d606
 MISC metadata.xml 517 BLAKE2B db81b6c45753c24205433ed2b9cf2bc9a595f806992475a1d41697b6b92d2c1d18ff8eef0fb9f882b68eb184d317839507b2f1158e5f421f3b8af65fd64291e7 SHA512 7095bff22d6bd655a93e3c1d48b8fecf8e327f1efd07638caba28163ad2a21129ed6f0e2a904113ce629ae25c2ee029d863c7e777f0457caf78f5e71c684b080
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
deleted file mode 100644
index 3bd723e335ba..000000000000
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A minimalistic X11 window manager"
-HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
-SRC_URI="https://www.red-bean.com/decklin/aewm/${P}.tar.bz2"
-
-LICENSE="MIT 9wm"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i -e '/^font/s|".*"|"fixed"|g' doc/aewmrc.ex || die
-	sed -i -e 's|skill|pkill|g' doc/clientsrc.ex || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		MANDIR="${D}/usr/share/man/man1" \
-		XROOT="/usr" \
-		install
-
-	dodoc NEWS README
-}
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 5c50fccb73e8..8886de99bb13 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -3,10 +3,8 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa
 AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45
 AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196
 AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f
-DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-EBUILD fvwm-2.6.5-r3.ebuild 4829 BLAKE2B 00dc802a709c4ac1bdec33b723899895f26fe20e70ff245838c142d25b24eae646a16c93ba342395684b914ec52c3bd9f256efe5a4f876232b40b33bcb286277 SHA512 c1ae5188318030d01b65f6429874a990fe8df1a62afefe265e82beade9b5960958a40fd3f578c8ed1e34a10ec060ae6d2d277b493a399d292435585872152e25
 EBUILD fvwm-2.6.8-r2.ebuild 4105 BLAKE2B 8453a380d28fe71055c5fbfb73d0c4084409393c1be91e52ef772315389a413e902b14ee618d072449da9803b949ecc9192bb8b43dab3dc11ed0400b9a85d4bc SHA512 a783b93180542b66a5f2d394cba759f6af7fb4e51bdfb881f671aab3a9f4c62ed36fcee1e3e47d322a416d6d8153c74a888373b674599844e8dcbb425b0095b2
 EBUILD fvwm-2.6.9.ebuild 4102 BLAKE2B 875b3f30630d9fba8b1f2722f294b0dedc3fef1d1226c0f1d39027c6c1dbe7f85a4fc88fa20225050e4b1a0604ebce9a74ffcfb9c0c39e8315d2ad6deb238b9e SHA512 9d367e2b42c7db780721b21ac604058d54ad13f5f120026d7f41c2a22e9ab8248ed7468a2f7f24e9a60223bfb82c7ce640e1b0bafd5893863f16207375b13b79
-MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
+MISC metadata.xml 707 BLAKE2B 6b51c0eccf9ca01664d552a5f2dca340bbabbbd4753fd2248923c3ed73df76279de6001790c188ed7ccf7c6d769648c8e271f8992492be215cd609f62aef461a SHA512 1be8383a2a6f0f4e4c4ae8728657783bbd7ed98d23bc35453eef5de18a898136ff92dc82e1acb431853f8cf42c8fea3fcb56efe5d448a6657bbe4b9258fa6086
diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
deleted file mode 100644
index 62f0374f99b3..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="http://www.fvwm.org/"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
-
-LICENSE="GPL-2 FVWM"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	png? ( media-libs/libpng:0= )
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	stroke? ( dev-libs/libstroke )
-	svg? ( gnome-base/librsvg )
-	truetype? (
-		media-libs/fontconfig
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	gtk2-perl? ( dev-perl/Gtk2 )
-	perl? ( tk? (
-			dev-lang/tk
-			dev-perl/Tk
-			>=dev-perl/X11-Protocol-0.56
-		)
-	)
-	rplay? ( media-sound/rplay )
-	lock? ( x11-misc/xlockmore )
-	userland_GNU? ( sys-apps/debianutils )
-	!x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-libs/libxslt )
-"
-
-src_prepare() {
-	if ! use vanilla; then
-		# Enables fast translucent menus; patch from fvwm-user mailing list.
-		epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
-		# Allow more mouse buttons, bug #411811
-		epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
-
-		# Apply user-provided patches to the source tree, bug #411811
-		epatch_user
-	fi
-
-	epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-	epatch "${FILESDIR}/${PN}-2.6.8-perl528.patch" #674742
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
-
-	# Non-upstream email where bugs should be sent; used in fvwm-bug.
-	export FVWM_BUGADDR="desktop-wm@gentoo.org"
-
-	# Recommended by upstream.
-	append-flags -fno-strict-aliasing
-
-	# Signed chars are required.
-	use ppc && append-flags -fsigned-char
-
-	myconf="${myconf} --disable-gtk"
-
-	use readline && myconf="${myconf} --without-termcap-library"
-
-	econf ${myconf} \
-		$(use_enable bidi) \
-		$(use_enable debug debug-msgs) \
-		$(use_enable debug command-log) \
-		$(use_enable doc htmldoc) \
-		$(use_enable nls) \
-		$(use_enable nls iconv) \
-		$(use_enable perl perllib) \
-		$(use_with png png-library) \
-		$(use_with readline readline-library) \
-		$(use_with rplay rplay-library) \
-		$(use_with stroke stroke-library) \
-		$(use_enable svg rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--docdir="/usr/share/doc/${P}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
-
-	# These are always removed, because gentoo doesn't have anymore
-	# a dev-perl/gtk-perl package, so, these modules are pointless.
-	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
-	find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
-
-	if ! use lock; then
-		find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
-	fi
-
-	if use perl; then
-		if ! use tk; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
-			if ! use gtk2-perl; then # no tk and no gtk2 bindings
-				rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
-				find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
-			fi
-		fi
-
-		# Now, the Gtk2.pm file, it will require dev-perl/Gtk2
-		# so it implies gtk2 as well. That's why we need another use flag.
-		if ! use gtk2-perl; then
-			rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
-		fi
-	else
-		# Completely wipe it if ! use perl
-		rm -rf "${D}/usr/bin/fvwm-perllib" \
-			"${D}/usr/share/man/man1/fvwm-perllib.1"
-	fi
-
-	# Utility for testing FVWM behaviour by creating a simple window with
-	# configurable hints.
-	if use debug; then
-		dobin "${S}/tests/hints/hints_test"
-		newdoc "${S}/tests/hints/README" README.hints
-	fi
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
-		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
-
-	# README file for translucent menus patch.
-	if ! use vanilla; then
-		dodoc "${FILESDIR}"/README.translucency
-		ewarn "You are using a patched build, so, please, don't"
-		ewarn "report bugs at the fvwm-workers list unless you are"
-		ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
-	fi
-}
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 63c21e06e5f1..e9ad5b468010 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -9,7 +9,6 @@
 		implementing functional extensions.
 	</longdescription>
 	<use>
-		<flag name="gtk2-perl">Enable GTK2 Perl bindings</flag>
 		<flag name="lock">Enable screen locking</flag>
 		<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
 		<flag name="rplay">Enable rplay support</flag>
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 390c27d32ebc..05348f14e648 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,6 +1,4 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
-DIST goomwwm-1.0.0.tar.gz 69967 BLAKE2B 562666d3a2d9121d07f00a339776f8c510f04eefae0f49f3f9475af250803194b8f4b1eb2673799f3f8b365a6623e5c1b1e49e009ed830699fca51a0846c0ffa SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de
 EBUILD goomwwm-1.0.0-r1.ebuild 793 BLAKE2B 490a4295bdabbba0ccee236ce3cfb749b56cd062e7e7c3f3561d35f04d162a7ad76d5756a4987adaf6c3bc9d6279bc5e5f9a2b71a909c0db34f842e0b97b25ce SHA512 7cfc759b3603a529c5f8d155b1cc0fef0afc890952204714501234b3c0e0ce3c2d731c6d5f1376689dbe5d53722c7ce0782e537e87b5a626f4a3b161657e5c5a
-EBUILD goomwwm-1.0.0.ebuild 741 BLAKE2B 51569a0c598ce722c8dd9db2577415613a2240b91f13701c3495680122c90ffdcaa76e201c4be930673f7968aa8b26e1acef2ab0840e02004dcd984e8369f5de SHA512 05822f05bcd943d87aed6ad1a9be461fbd50836a6ec897556842aff54c1dc3e6a95f1bab1bbef1da48e20a6e59c12267e5e8764acbabc117adcc72f2143f9975
 EBUILD goomwwm-9999.ebuild 752 BLAKE2B 80c360c689a694146c97d4fe69d8aa3cb5f591650bd015f4d8b3ce7240a571d48ddb14173418c378e8183361fe56f7843d6e9dfd18f47916f2ef6d286c663e6d SHA512 1e6eb95eac110029267de0e6a1d04f724335782b5a9831482f7feb7808195d25ad182c8bc49405d66f1116bea0c1c072edee5da72f9a72b4e742483be3df8551
 MISC metadata.xml 251 BLAKE2B 6fdd68cc8939870f258fd5749d367c53b66f787e241031f8af90435dc958045b805403d2457a51c6253506a52028ed412f14a405691673edc2e0edc77af43b76 SHA512 6d3cd2984b10fdaf21af0348f49303eae89aee923d8371ce49bee8e3e27d8c3ed595d793d0bdd9adc2b1fab44873f6bebd922eeb9d48c9e6629c6c2fa6c5400e
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
deleted file mode 100644
index d76d1d60f37d..000000000000
--- a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Get out of my way, Window Manager!"
-HOMEPAGE="http://aerosuidae.net/goomwwm/"
-SRC_URI="http://aerosuidae.net/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXinerama
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i -e 's|$(LDADD) $(LDFLAGS)|$(LDFLAGS) $(LDADD)|g' Makefile || die
-}
-
-src_configure() {
-	use debug && append-cflags -DDEBUG
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) proto normal
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest
index 88bc7f61ba48..91fb065409c9 100644
--- a/x11-wm/oroborus/Manifest
+++ b/x11-wm/oroborus/Manifest
@@ -1,3 +1,4 @@
+AUX oroborus-2.0.20-fno-common.patch 850 BLAKE2B d93da4bff9439414c68b66589d695a577ea6f8467adbeabdc35c30020ecce1b911894f325ecccdc55f77e5a120246e106628254807c6ddb33f4c0d78966ef327 SHA512 438addec1bcc4b0aa095be0bfa84f5223bd5637ff7a77694b8ef3f9d423b4b355890e879d2a41ba7b950ddc7aea0f659677db35b014efdf41beabad2678d3931
 DIST oroborus_2.0.20.tar.gz 335099 BLAKE2B 6c4dc4e8104f47ca847b0e358ac606aeb684b004a0fc6cf55130318814efd65ef96a602630ea01a090b6851595982fd7c3865d5efec38f72182e29c3ccc1aae5 SHA512 0ffa9e3ce25c3d2cb6f24c827755b4f7af14f6e34127fec66ef367cb8dc53ceb89d0fec3619f80f055f9d2241dfa0e4edf53e4e22dad1558d7b448f0b878c573
-EBUILD oroborus-2.0.20-r1.ebuild 512 BLAKE2B a3180dc0a0b4b229f820eb5aa1e5476e59b975aa7d7d4c8ca2938bcfe69cd616626de4fee6829f439a8cc7345f181ff373c6c911201f253f159605f9f5f4a99c SHA512 d5c7b956b4459fa5a2040553f129901e5ad1554479c9981f6431cf146668c21b60e56ec3db91e3aa5c1f065e5b4a91ff13f5728022a91722e2439fceb99ca054
+EBUILD oroborus-2.0.20-r1.ebuild 550 BLAKE2B 99f5fbab1b6c9488ab7c101dfec491cbcd826280a66bdb3e7f2f47872fa1833332b7e00c5c38c90a70a69d1fdec963040f8eebfef36a351b446d5d7c4e91f74d SHA512 6df8ebdcbdf867706fc6f52628c3660fd60ca967912afd641636aa1d377fc174d47a5557bd8e06e9f89f2444042c5a67893b995bdf261d6800d270c0e7fc4390
 MISC metadata.xml 493 BLAKE2B 8885e6d63fa88a19a9866150d3774733d459c7a40d75269f575f54ac6657e4426d706d2efde4363c539a299134816ab97687106844861c774e4f66ff371604f7 SHA512 f5e29aa56730150e348a610458c2faf18a203712e06ec78cfe0861dc61d0bc1f3c502f53abf02648b81566cee831ddf590894923b220f9b071badc5572d6cadf
diff --git a/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch
new file mode 100644
index 000000000000..e7a1e2157152
--- /dev/null
+++ b/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/hints.c
++++ b/src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer, win_workspace,
+   win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
+   gnome_panel_desktop_area;
+ Atom net_atoms[NET_ATOM_COUNT];
+-Display *dpy;
++extern Display *dpy;
+ 
+ void
+ initHints (Display * d)
+--- a/src/keyboard.c
++++ b/src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include <stdio.h>
+ #endif
+ 
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
+--- a/src/keyboard.h
++++ b/src/keyboard.h
+@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
+ void ungrabKeys (Display *, Window);
+ void init_keyboard (Display * dpy);
+ 
+-int NumLockMask, CapsLockMask, ScrollLockMask;
++extern int NumLockMask, CapsLockMask, ScrollLockMask;
+ 
+ #endif /* __KEYBOARD_H */
+ 
diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
index 071ee8295d30..1c0dec3cece9 100644
--- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libICE
@@ -21,4 +20,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 DOCS=( AUTHORS ChangeLog example.${PN}rc README TODO )
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 4eb9be158b24..23dd3fbaa291 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,8 +1,6 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be
-DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
 DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
-EBUILD sawfish-1.12.0-r1.ebuild 2032 BLAKE2B 6aefde862da34a34dc1f4c570385e65a223d1b5538322877313dc9bb177939f485afb4ff7c70605976bdc351c042830c82e32e39e18d208893819c16aaaf7f39 SHA512 5a85929922b63fec43b0c89ea512063b743a178048b6c84efbe829444683ee6e0d8978d0b35cd6cc25ef2ea7f2602b5d5c0067521d58e740f5dd775dccd58865
-EBUILD sawfish-1.12.90.ebuild 2208 BLAKE2B f5d0d5ff6f7c37f92bc58e23ff4295f8c034aae87188bbfcb0bfe7bdb86b00720a763a11c5d290776d495013262372eaa636f5faec5a25e82f64cc7530150b70 SHA512 6252bb4d23a5fc15c50fdf9e8148ae3895de10c0507a2083c56e05f931113d22b8fb7497cfd2ca62b850b3deec81f166ec5629824059deebb8a52583d105e7fb
+EBUILD sawfish-1.12.90-r1.ebuild 2296 BLAKE2B 3b17f55b6f910e7f785927ba79c80937cc56b6decd25d87a66514c3ef210b39766da9edf30e317ceb4e9c54c57aff64663016a19aae984fb495158f37c1f305c SHA512 d5f5576554e32f125b5e9f89239be7dded65492da4c40b29cb707b6ebb4d11d0fb89f160542b46d2b1afbaa4b2ede7430b1dc459e69000962d65ba458b597479
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
deleted file mode 100644
index 726c0ecafee0..000000000000
--- a/x11-wm/sawfish/sawfish-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/-/_}"
-inherit eutils elisp-common
-
-DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
-HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"
-SRC_URI="https://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
-IUSE="emacs kde nls xinerama"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	>=dev-libs/librep-0.92.1
-	>=x11-libs/rep-gtk-0.90.7
-	x11-libs/gdk-pixbuf:2[X]
-	>=x11-libs/gtk+-2.24.0:2
-	x11-libs/libXtst
-	kde? ( kde-frameworks/kdelibs4support )
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# From Fedora
-	"${FILESDIR}"/${PN}-1.12.0-desktop.patch
-	"${FILESDIR}"/${PN}-1.12.0-fno-common.patch
-)
-
-DOCS=( AUTHORS ChangeLog CONTRIBUTING doc/AUTOSTART doc/KEYBINDINGS doc/OPTIONS doc/XSettings MAINTAINERS NEWS README README.IMPORTANT TODO )
-
-src_configure() {
-	set -- \
-		$(use_with kde kde5session) \
-		$(use_with xinerama) \
-		--with-gdk-pixbuf \
-		--without-kde4session \
-		--disable-static
-
-	if ! use nls; then
-		# Use a space because configure script reads --enable-linguas=""
-		# as "install everything". Don't use --disable-linguas, because
-		# that means --enable-linguas="no", which means "install
-		# Norwegian translations".
-		set -- "$@" --enable-linguas=" "
-	elif [[ "${LINGUAS+set}" == "set" ]]; then
-		strip-linguas -i po
-		set -- "$@" --enable-linguas=" ${LINGUAS} "
-	else
-		set -- "$@" --enable-linguas=""
-	fi
-
-	econf "$@"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile sawfish.el
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	if use emacs; then
-		elisp-install ${PN} sawfish.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/x11-wm/sawfish/sawfish-1.12.90.ebuild b/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
index ea8f5ba03694..2eab675b63a9 100644
--- a/x11-wm/sawfish/sawfish-1.12.90.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
@@ -19,7 +19,13 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
-	x11-libs/gdk-pixbuf:2[X]
+	|| (
+		(
+			x11-libs/gdk-pixbuf-xlib
+			>=x11-libs/gdk-pixbuf-2.42.0:2
+		)
+		<x11-libs/gdk-pixbuf-2.42.0:2[X]
+	)
 	>=x11-libs/gtk+-2.24.0:2
 	x11-libs/libXtst
 	kde? ( kde-frameworks/kdelibs4support )