gentoo resync : 22.01.2021

3 files changed, 11 insertions, 80 deletions

diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 9c1126bc712d..3f2d7d397a37 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,7 +1,5 @@
 DIST xfwm4-4.14.6.tar.bz2 1167818 BLAKE2B 2315843da3684ea069d8361d1d787634052da5449d7aeb4ba6b219cd46ae4b7b6007becca316a5ab552fe4432baab3efa6a23793b68a00d06c9fbe3d1164080a SHA512 1e3cc3e976250e311607d12e1a51047132584d6e8cd8979e3d5a85a3cc49e420453e3812b2d8a8f6268f3d6f1b44f4df2b57b7e1395d02ec63ae82a55bb9d4ee
-DIST xfwm4-4.15.3.tar.bz2 1180308 BLAKE2B e76651e58bdb6b4c4b15c6dd49d5df16b40729fc41302d0eff336194d84a8b467c9b6b2f37094657b0555c25d87d92744991dfc00127638468b23eae31088475 SHA512 6ca7faba7fdd225d1c91e7c217200eebf271abc6058f3b9a46ce7bce8f31028c99e454412afa4ca441a5b30decb0d33a03ca5caeed7e4b20a29efa855af8328d
-DIST xfwm4-4.16.0.tar.bz2 1200929 BLAKE2B 2df17028287ff3e4fea7ea082ea39545a05fba5089fbaea1764bbb59ff550d9dbf14322246d9dcd455bc589055c75b7941f08f6ab4a59fe2089001236ab8677b SHA512 f21e773b34092cadd86713373e59880cf68020cbfa3d16ab651f48a8a051a38925428358e0bca5ffc346eb62dc6cc53c87a9e6895d7e613dadf3cdac499dae02
+DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9
 EBUILD xfwm4-4.14.6.ebuild 1657 BLAKE2B 1ab8099643ce1df13fdceb9e9392a41cdd4702fe5988f3aed77ab1d458dac95c2fe1349eae47a931b978813f7d943a4e5862578aa7419feae72efe46ac2294ec SHA512 91ef2257a1f57051692291375bc0dbb280e27a886fb92d0d8bbdd5e916f47b7708c2dc0e852f7c4370550cba31b7cf20cccaabca50d1935ff05a23a04b2b2e24
-EBUILD xfwm4-4.15.3.ebuild 1606 BLAKE2B bde529d2983468acd410c3e54c6a1267307b21cb3bb7c00a43541a96a28f686d2c60cd32af23fc3c885064821bc7b16711d9a8f075f4842a126734a83b2f5bd7 SHA512 36974618e13580702378aedae3a18e350887fb5745584dc577b1b7a3c479ac2bab14cb747b8f9c39de32a2b64e91c1968b505fe5bff7811a81aa4d57cc404bd0
-EBUILD xfwm4-4.16.0.ebuild 1617 BLAKE2B e9d66f7aac23f5fc13d0f2f41809aaadaddd4c59327bc47e313deb9cc70e790b03ab758b46f22e168f4076e430507fea7dda1f372de94d4f64ab8694c9db51ed SHA512 935b85e3ba55a28de35308f64d87efa8a36fa63c50bcf5b73fb481af072eb18f60dd5d06e3913341aa3fd434d29bc151809e8ee64c870169dccb26e3f98b0a80
+EBUILD xfwm4-4.16.1.ebuild 1632 BLAKE2B eceb4ee21c08133a83180d2effb5298facfe895202385f7ab9eec7960ced047ca17533d97b0d41b25158de4a581e67067c5da5b70248fd8842da3a33edd6d11d SHA512 3d963ab9804e465f07128438418360e13a6cfb66735856c34847add4372e89ca2471089b67482c6662b2ecf441ce90e2e11dd7ca4ca3a8b5c83114d28d225342
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.15.3.ebuild b/xfce-base/xfwm4/xfwm4-4.15.3.ebuild
deleted file mode 100644
index bf9677a00866..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.15.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/pango
-	>=x11-libs/libwnck-3.14:3
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.16.0.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild
index 26cb91f81588..3e1e46eded7a 100644
--- a/xfce-base/xfwm4/xfwm4-4.16.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ RDEPEND=">=dev-libs/glib-2.20
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
@@ -29,12 +30,12 @@ RDEPEND=">=dev-libs/glib-2.20
 	>=xfce-base/xfconf-4.13:=
 	opengl? ( media-libs/libepoxy:=[X(+)] )
 	startup-notification? ( x11-libs/startup-notification )
-	xpresent? ( x11-libs/libXpresent )
 	xcomposite? (
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
 		x11-libs/libXfixes
-		)"
+	)
+	xpresent? ( x11-libs/libXpresent )"
 # libICE/libSM: not really used anywhere but checked by configure
 #   https://bugzilla.xfce.org/show_bug.cgi?id=11914
 DEPEND="${RDEPEND}
@@ -43,18 +44,18 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	xfce-base/exo
 	virtual/pkgconfig"
 
 src_configure() {
 	local myconf=(
 		$(use_enable opengl epoxy)
 		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
 		$(use_enable xcomposite compositor)
+		$(use_enable xpresent)
+		--enable-randr
+		--enable-render
+		--enable-xi2
+		--enable-xsync
 	)
 
 	econf "${myconf[@]}"