gentoo resync : 18.12.2020

12 files changed, 144 insertions, 53 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 56046f272cc9..4e831d1eb5f9 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index d1ff97b1decd..eedd1cdf1cd6 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,7 +2,7 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 DIST icewm-1.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3
-EBUILD icewm-1.8.3.ebuild 2780 BLAKE2B 247c5a39d442164e0b2ed097a9618c0db264c554dc5b9bc2e0f1f2f5eacea089e929414193a85924e081e97ff9a8dc621e1c9e37d2d753533d71835419d6da8d SHA512 2a88275a9f9b1f023f024db5cf79563d5c35c39406f3733a00ec7b5faf822520fe9b8fcb6aa2c4ea17a71c9a3b27858ae8c2ded73106444681cf4ab5ac8a5dd6
-EBUILD icewm-1.9.2.ebuild 2816 BLAKE2B 798b2d1b6ed7881a66bc1d502d7c2a69ef0f8b1cfc8cff4183b432538236541789caf8f6ee4e1c91648acf59af4abf7fb867524342ef067e08909cb8a64a65fd SHA512 ffd7a7e21470e8bea16968ed9fbbec71e988d768800e157220f63f3486a9ef7ffa706115b627ab82c69dcc5fb5adc0bf7b96d6db9ae05899914c50b8f49ae4cb
-EBUILD icewm-2.0.0.ebuild 3010 BLAKE2B 942c8cd13674c6d3e9be00ff0ce71271bd7eb94cd9122f35eb97d0eb5a843aa827c7bb2043e4b514d329dc6eed27385e5af42b9cdd0861b7bcc384e879a0ae03 SHA512 5d26146e561976a571b52d636155d45ee7b062bd7fffa6e278a2932994b7277fd87d390c0431038e09c8b74ce6840c210d7c407a3ff4564ceb227932dbabf2a7
+EBUILD icewm-1.8.3.ebuild 2719 BLAKE2B f420c9d85bef2b93851fa1d59412b2e95f52e19970c1957e6a6ee62b49454f8c42ef9253a6da6748db0be781fd9f7bf847d81f27a6c96b233b5e4012ac5a8ebc SHA512 289fa93b96464189a1c2fb70a2d2b4a980f511e4a698db62ba8c62b22aceb0ed3a3031b6a07a52640ecbd3d922dbd5db25cc1b20acf97593adbac39bbef4a2c8
+EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
+EBUILD icewm-2.0.0.ebuild 2949 BLAKE2B e8e0ac64383edd04cbe752917c001dade85ba729d440d6711cd9f80f2506dbd6565fbd0fcd70ab4e0d8051df82c4597040882dc79ff4056762d020bbe25e9e6d SHA512 14ea2d985d54b32c8788a0b35f4ddfeccfbe6edbd45f751992340127575bcecdee972543c37d339541fe24daf3b5b8f828c6918af4a79f11fbd0b2ec8792a323
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-1.8.3.ebuild
index a9502b12ad78..acff330bc419 100644
--- a/x11-wm/icewm/icewm-1.8.3.ebuild
+++ b/x11-wm/icewm/icewm-1.8.3.ebuild
@@ -51,13 +51,8 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		|| (
-			(
-				x11-libs/gdk-pixbuf-xlib
-				>=x11-libs/gdk-pixbuf-2.42.0:2
-			)
-			<x11-libs/gdk-pixbuf-2.42.0:2[X]
-		)
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/icewm/icewm-1.9.2.ebuild b/x11-wm/icewm/icewm-1.9.2.ebuild
index cd8d3315fba2..bd9668540305 100644
--- a/x11-wm/icewm/icewm-1.9.2.ebuild
+++ b/x11-wm/icewm/icewm-1.9.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
@@ -51,13 +51,8 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		|| (
-			(
-				x11-libs/gdk-pixbuf-xlib
-				>=x11-libs/gdk-pixbuf-2.42.0:2
-			)
-			<x11-libs/gdk-pixbuf-2.42.0:2[X]
-		)
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	!gdk-pixbuf? (
 		media-libs/libpng:0=
diff --git a/x11-wm/icewm/icewm-2.0.0.ebuild b/x11-wm/icewm/icewm-2.0.0.ebuild
index 0dfca601ae26..e00f833b8352 100644
--- a/x11-wm/icewm/icewm-2.0.0.ebuild
+++ b/x11-wm/icewm/icewm-2.0.0.ebuild
@@ -53,13 +53,8 @@ RDEPEND="
 	)
 	bidi? ( dev-libs/fribidi )
 	gdk-pixbuf? (
-		|| (
-			(
-				x11-libs/gdk-pixbuf-xlib
-				>=x11-libs/gdk-pixbuf-2.42.0:2
-			)
-			<x11-libs/gdk-pixbuf-2.42.0:2[X]
-		)
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	!gdk-pixbuf? (
 		imlib? (
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 0eb07f0065c7..897744d8ab39 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -3,5 +3,5 @@ AUX muffin-4.4-gobject-introspection-fixes.patch 16907 BLAKE2B 02cc9f22053580f04
 DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 EBUILD muffin-4.4.3.ebuild 2129 BLAKE2B 2666ee555fdd226e7ca873369b8d698241ff9660734575a49a6f04fe6222f97af97b11adb3ab20893da2d0979ebb08d3cd407d2dc89f0e8a8b224e29ff8097e3 SHA512 d3f3c37d8788824f1a2ad7e88d636b8067340ccf254a46216981b62752740c5ed6fdf9dd3042ed4db30ce27a71ee5caada99ec5ae2fbbb65105c047bcc19f810
-EBUILD muffin-4.6.3.ebuild 2222 BLAKE2B 3c6b46af4077b9ef28189861a610caa378111514d27a99c65fc469b35f5488cb2803f52d2def6d1e12a36a4261280dba013c3661a708825ac09617e0b24bb95c SHA512 d3d6e5074fd5b5dc69d9ffe7eecf7b3455fe4e55ed3920d2e824ad0f0c4078f461cd8a0a93bea13aaf3c73c6be395ebb7e66c43767d6cd3c4ddfb9d60a5527c9
+EBUILD muffin-4.6.3.ebuild 2229 BLAKE2B b46d8fc2d6f01e567cfe275b098cb912763156a3cee02585fc6aefdfa0d66e2576ca1aef6e24212410895770c4ecbd7bb35adfb2bfdc93f0fbcfcc166d12166d SHA512 9ca12c33d48a135e31996c050507b0fecfbce32fd742306c66658caab611e13f44b242e67a8a51ec5b78bc3bc2f58cf06e19de546226b66a474f5326579d3489
 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
index 3cbf7b38cc64..773dbebcd2d5 100644
--- a/x11-wm/muffin/muffin-4.6.3.ebuild
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index d14267dd0f1e..28f18b96e7fc 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -3,5 +3,6 @@ AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
 DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
 EBUILD notion-3_p2015061300-r1.ebuild 2234 BLAKE2B 3ce2236197618615e6f1bc1ce86d964aa855996ef2739c9b357a2c2e5023aec69239ac3a20fd42f7d311777bbb3958910387077c0bb4b89df46a37933d8d4c53 SHA512 ba7058f9a713c7b89d11857614e012ccd69ffe953a7a1f5b0c361cfc93ff4be4c916322a9443d5c09d92766832e09e070baca0f7db24a2e9472363b7f61ef487
-EBUILD notion-9999.ebuild 2190 BLAKE2B 74d2802871b888c0bae7c9a6d90f257847ff1468790d6d74ac1b4b360ed8b422c61418bdf5247e1c91dcc41a4cfd858d414b208b179651464d1dbbdb6bb3f849 SHA512 fb09070ca7e4a0d479e4d539919360073dda1112e6a117aef2b8a3f8735f806de0cd91b9cfad45c9c4635e80d60865bfec8452a45e11fcfb6f9c1e7f3e466c46
+EBUILD notion-3_p2015061300-r100.ebuild 2362 BLAKE2B cde9df6b82ad429e29de3c65417615d44f1237f34fb9fde8f1eb83f644f25e455bd57d17bbeb895c9cf069d6705d4051e00c1fc77f90c1eb4236e814ae53219d SHA512 93ffd486ab64078d7010b949af167b93d16ae97eea741e2ad08627a559f787d72811f1379a68689efe6f9db85578239dc0e5da23d7c949c7edf59be8dc89b9a9
+EBUILD notion-9999.ebuild 2226 BLAKE2B 37f5b955dd35f1e94d00865223e0c5beb538e5e92e7dee608d5fc20b84967bdbb9f774572933be989471ebed5a801345bff1ede813a829b906bd87d2d1d8e6a8 SHA512 b63a100f090dd2a95b754a255657aceae5fd5b8dc0d2e141fd30e9640d2ff4fea2b04860d648eb00cf893255d0bca1e1a34ed5ee10bf7661e173cebc62025979
 MISC metadata.xml 440 BLAKE2B a967115c8e255bb279de1a7a231ea2c45209383ae50bb03ee5e0aeea428e71afdb32ae027286e82820ce3f67849bba51a35ad263c32961de5191d4e053af782e SHA512 e113a6d332d785d2f6fb25d55796d499ccb67978b40130b06be408ae4ba4b9551e35ee928c43c95962e202f12f11ab152073f9d5cbfc16067385c7b34e25dcba
diff --git a/x11-wm/notion/notion-3_p2015061300-r100.ebuild b/x11-wm/notion/notion-3_p2015061300-r100.ebuild
new file mode 100644
index 000000000000..2aee50148789
--- /dev/null
+++ b/x11-wm/notion/notion-3_p2015061300-r100.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit lua-single toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="https://notionwm.net/"
+SRC_URI="https://github.com/raboof/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls xinerama +xrandr"
+
+RDEPEND="${LUA_DEPS}
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="${LUA_DEPS}
+	virtual/pkgconfig"
+
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
+
+# needs slingshot,... not in tree
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3_p2015061300-pkg-config.patch
+)
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+
+	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
+		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
+		-i system-autodetect.mk || die
+	echo > build/lua-detect.mk
+}
+
+src_configure() {
+	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
+		echo "PREFIX=${EROOT}/usr"
+		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
+		echo "ETCDIR=${EROOT}/etc/${PN}"
+		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
+		echo "VARDIR=${EROOT}/var/cache/${PN}"
+		echo "X11_PREFIX=${EROOT}/usr"
+		echo "STRIPPROG=true"
+		echo "CC=$(tc-getCC)"
+		echo "AR=$(tc-getAR)"
+		echo "RANLIB=$(tc-getRANLIB)"
+		echo "LUA_MANUAL=1"
+		echo "LUA=${LUA}"
+		echo "LUAC=/usr/bin/luac5.1"
+		echo "LUA_LIBS=$(lua_get_LIBS)"
+		echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
+		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
+	} > system-local.mk
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' \
+			-i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+DOC_CONTENTS="If you want notion to have an ability to view a file based on its
+guessed MIME type you should emerge app-misc/run-mailcap."
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 575a0c3ed279..56c03dbb134d 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils git-r3 multilib toolchain-funcs readme.gentoo
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit git-r3 lua-single toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="https://notionwm.net/"
@@ -14,24 +16,27 @@ SLOT="0"
 KEYWORDS=""
 IUSE="nls xinerama +xrandr"
 
-RDEPEND=">=dev-lang/lua-5.1:0=
+RDEPEND="${LUA_DEPS}
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
 	nls? ( sys-devel/gettext )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="${LUA_DEPS}
+	virtual/pkgconfig"
 
 # mod_xrandr references mod_xinerama
-REQUIRED_USE="xrandr? ( xinerama )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
 
-# needs luaposix,slingshot,... not in tree
+# needs slingshot,... not in tree
 RESTRICT=test
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3_p2015061300-pkg-config.patch"
+	default
 
 	sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
 		-e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
@@ -41,21 +46,21 @@ src_prepare() {
 
 src_configure() {
 	{	echo "CFLAGS += -D_DEFAULT_SOURCE"
-		echo "PREFIX=${ROOT}usr"
+		echo "PREFIX=${EROOT}/usr"
 		echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
-		echo "ETCDIR=${ROOT}etc/${PN}"
+		echo "ETCDIR=${EROOT}/etc/${PN}"
 		echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
-		echo "VARDIR=${ROOT}var/cache/${PN}"
-		echo "X11_PREFIX=${ROOT}usr"
+		echo "VARDIR=${EROOT}/var/cache/${PN}"
+		echo "X11_PREFIX=${EROOT}/usr"
 		echo "STRIPPROG=true"
 		echo "CC=$(tc-getCC)"
 		echo "AR=$(tc-getAR)"
 		echo "RANLIB=$(tc-getRANLIB)"
 		echo "LUA_MANUAL=1"
-		echo "LUA=\$(BINDIR)/lua"
-		echo "LUAC=\$(BINDIR)/luac"
-		echo "LUA_LIBS=\$(shell pkg-config --libs lua)"
-		echo "LUA_INCLUDES=\$(shell pkg-config --cflags)"
+		echo "LUA=${LUA}"
+		echo "LUAC=luac"
+		echo "LUA_LIBS=$(lua_get_LIBS)"
+		echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
 		use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
 	} > system-local.mk
 
@@ -79,7 +84,11 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/notion.desktop
 
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
 
 DOC_CONTENTS="If you want notion to have an ability to view a file based on its
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 23dd3fbaa291..8f34c0bc2674 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -2,5 +2,5 @@ AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c
 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.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
-EBUILD sawfish-1.12.90-r1.ebuild 2296 BLAKE2B 3b17f55b6f910e7f785927ba79c80937cc56b6decd25d87a66514c3ef210b39766da9edf30e317ceb4e9c54c57aff64663016a19aae984fb495158f37c1f305c SHA512 d5f5576554e32f125b5e9f89239be7dded65492da4c40b29cb707b6ebb4d11d0fb89f160542b46d2b1afbaa4b2ede7430b1dc459e69000962d65ba458b597479
+EBUILD sawfish-1.12.90-r1.ebuild 2240 BLAKE2B 3db5195071521570c91ccf44ab00d39989692861f193530c9b7242610d3ff98beec964105df4b47155adad1b13d972ca68189076ba901b177ec163ea162b0c27 SHA512 d5bac3996e9bfa0cac5b4c295036d9ed76b5a195b6030a457915b43da2e6cbaa1edbc9e84f8106318575c0083bf6e68f076e8fc017a217075c65a8a8c14c6f24
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild b/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
index 2eab675b63a9..7b796ede0e0c 100644
--- a/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90-r1.ebuild
@@ -19,13 +19,8 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
-	|| (
-		(
-			x11-libs/gdk-pixbuf-xlib
-			>=x11-libs/gdk-pixbuf-2.42.0:2
-		)
-		<x11-libs/gdk-pixbuf-2.42.0:2[X]
-	)
+	x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	>=x11-libs/gtk+-2.24.0:2
 	x11-libs/libXtst
 	kde? ( kde-frameworks/kdelibs4support )