gentoo resync : 28.11.2020

3 files changed, 8 insertions, 92 deletions

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 )