gentoo Easter resync : 12.04.2020

29 files changed, 581 insertions, 151 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index e599686a1cc1..aaa3f2d30786 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index c71cdcdfd14d..d048a2c82fb8 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST thunar-shares-plugin-0.3.0.tar.bz2 340867 BLAKE2B c648b9855a9627c0659087b55f8f45d36f998c11504d32be7bf18abb40ad0dc1124ed710f55c12b35978e5727ef6a4706c1415dbb04f2d5f6259fc6dd1f06f3e SHA512 20432990c6ea241d24fa8fd1b94990ec25a5ff6213361599936f1bacf86e323c8cbe868491ff600ef8c11dff86dfdf9773258b9c5e7919bab50f332cf4a7797c
+DIST thunar-shares-plugin-0.3.1.tar.bz2 373071 BLAKE2B 25562e8583503a170d15b611aa07c2e1426bee292b8cda4ae9c4eaa6861fa4c1a2fec531b3bdeca6bf06097e4bb2be924fddc07d73633c5f9d714837e8fe80f5 SHA512 08fca3fbf88448808ca84753d867c71114d1700fa63d792771c3c99a6da8c69ee7c53f05f883b2180cb06d2c187ee2a4d1fc889c7f392b1ec0d5981532284a3c
 EBUILD thunar-shares-plugin-0.3.0.ebuild 615 BLAKE2B a3ee9e90398ec21ae021d083d76991f695b6ccd69441cd9e1750583f7d14281821528284d5defe16aa45ed7e88248db03c7632627f5ee72f3783be728dc7013f SHA512 b245030452019792c1ffd1253f6b80c20993592a4bad0c68ceba5928ab3e052a0690b109a9363ad0b02439af1fd4295e093c444849ca144cc31d90f7e21f7eef
+EBUILD thunar-shares-plugin-0.3.1.ebuild 617 BLAKE2B 25ef86bc016e9ce44fbac65727cf6d1ca8ea6a380fa099924574e1d53714052f1ccdc13055f63ebbf46fb07572293c982d1cd99cedda65cac4fbb7f06ca24038 SHA512 edba792cc4378301eecf22ba64d9d046b07abcfa5721a9e3dd7ffb60a4c66f0c6fb8b2777c1665d90d36689dd08363e26c11669006ea947d8422d44a6ba9d7e7
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
new file mode 100644
index 000000000000..263de15ee58c
--- /dev/null
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Thunar plugin to share files using Samba"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"
+SRC_URI="https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/thunar-1.7:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 6ff23919c556..fc17a974a014 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,5 +1,3 @@
-DIST tumbler-0.2.7.tar.bz2 564538 BLAKE2B 64fc31e70be584ab04134de4f98e0302f91be213481b451c5b1563c001e240091b0721132415e92f5f60f7b0cd10099d9fa3fdf0435d3fa9e7c496f6f9673d3d SHA512 d5121da67bc2b1bf115980b6c9ef9fcaf71cdf52976227dd360afa44ac477c305a774a29be876e4fd0874f71bae3682b28c2429864283dd14b9e9bd1790a9083
 DIST tumbler-0.2.8.tar.bz2 591099 BLAKE2B 50cb9a0e8859e2f092356fd25a3ca68400b615bfabacce18f98660d761ad1e6723e075d651e99b99a1ca5209b0f6aa769acc05ecedab6ddcef5a33622f690087 SHA512 cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb
-EBUILD tumbler-0.2.7.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
-EBUILD tumbler-0.2.8.ebuild 1524 BLAKE2B 17d7b18ed4491bd3d072b73e7c45f6d93ba2eb8c72a4ca32f695a6dfd0159ee2dcc889a3c1e114f0575bb262a2c62b41661c4960ffb52c6aa3323dcf352bbefb SHA512 130aa7b5e4546449af4e202bd5916c149a4d0f15e44e069ca3c2fe70d676412737c2c6b4de7d306cd607089bf6586ef45110c97373e2cea83947f5d7921932ef
+EBUILD tumbler-0.2.8.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.7.ebuild b/xfce-extra/tumbler/tumbler-0.2.7.ebuild
deleted file mode 100644
index 9421282d86ae..000000000000
--- a/xfce-extra/tumbler/tumbler-0.2.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
-
-COMMON_DEPEND=">=dev-libs/glib-2.42:2
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6
-	>=x11-libs/gdk-pixbuf-2.14:2
-	curl? ( >=net-misc/curl-7.25:= )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		)
-	jpeg? ( virtual/jpeg:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/tumbler/tumbler-0.2.8.ebuild b/xfce-extra/tumbler/tumbler-0.2.8.ebuild
index c9883f6524b0..9421282d86ae 100644
--- a/xfce-extra/tumbler/tumbler-0.2.8.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.8.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="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
 
 COMMON_DEPEND=">=dev-libs/glib-2.42:2
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index becccfd2e7e6..c48554594430 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,3 +1,7 @@
 DIST xfce4-clipman-plugin-1.4.3.tar.bz2 492784 BLAKE2B f52dc92976e0b826b7aab2b8a3b9e099bb31e3d670911608d7a39c9805b011bb4c77db1fb01379e3244682a4bcefba617e246cc9ade50ecd275ea554d928385f SHA512 28bc8e2be8dd3eac13a7988b68933ce84dd8cc756f0a19636cd5850d6e36714a73ad9650a28ebfc54d9ad3adb23c242abf89806124b4e00fe7d1701be1b52414
+DIST xfce4-clipman-plugin-1.4.4.tar.bz2 460114 BLAKE2B c3a6d8a9a3f36367bddf3803b86dc4bd5bf2dff94d675695caf95010c563b96b69ce4015d83568e9500f8f5d579f41ef8c5ce94804ecd58baa04f7cc9aa54f16 SHA512 4cb798faab4efdc7a5013cffd06ce527efbda4ba5b96063734d261a864f22075a2d6dd1f79a33c8bdfb39ceea8f89af3daac023aaed8a5a386c70604e8a77965
+DIST xfce4-clipman-plugin-1.6.1.tar.bz2 471364 BLAKE2B cd037db1920aabde5f661401b9adbb81041e72688b431407c19865c10f3c61e41bbc034ff218461b108965b1d294ebd603be500dec7741687ddc0cdeeec69a6c SHA512 2a2aa5d7b5d841b11c6d54d4872fc8cbfb83981b2d4678075ff5aa2a4df9ea88de95b837bf3896d7ce5f434827ebb64238e68cca2e17a7104433ed5847d949dd
 EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1084 BLAKE2B f8a4e2f86f7ba9cf3fec923f99b65a2c729c39d4e8163701aaf388e0fdc475f4ed8fb1238e436f96b625baa265896a3b97679d5a72589564c9d738d369b41a2b SHA512 beac46d153686f0099d5bd50c40d880bd4f1c0aa3a80e1eb7d29eae367269acf90d65fdecdaf85a9dcd885824dae0f5a4f8ddd979c35313ab5e31714896e49c7
+EBUILD xfce4-clipman-plugin-1.4.4.ebuild 1089 BLAKE2B 7df5c2140f9d281bacf349345556303975ff7dc09f3bc82afbb62bd45a5f1cd81388930bb67fd272c60d9d7fbaa646d429ca80556310ad0efe34d5d825a0f0d7 SHA512 e6fe757b4f57f890ddc6a0779a6ae4ff7a46f2fd7112fa73ebe1056f9c54d228fcdf9c4f76f61100c815bef0adfe60afbd12637fab7887c3d19302703727d679
+EBUILD xfce4-clipman-plugin-1.6.1.ebuild 1089 BLAKE2B 7df5c2140f9d281bacf349345556303975ff7dc09f3bc82afbb62bd45a5f1cd81388930bb67fd272c60d9d7fbaa646d429ca80556310ad0efe34d5d825a0f0d7 SHA512 e6fe757b4f57f890ddc6a0779a6ae4ff7a46f2fd7112fa73ebe1056f9c54d228fcdf9c4f76f61100c815bef0adfe60afbd12637fab7887c3d19302703727d679
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
new file mode 100644
index 000000000000..d763b3de7d1f
--- /dev/null
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="qrcode"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.14:3=
+	x11-libs/libXtst:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:=
+	qrcode? ( >=media-gfx/qrencode-3.3.0:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable qrcode libqrencode)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
new file mode 100644
index 000000000000..d763b3de7d1f
--- /dev/null
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="qrcode"
+
+RDEPEND=">=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.14:3=
+	x11-libs/libXtst:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:=
+	qrcode? ( >=media-gfx/qrencode-3.3.0:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable qrcode libqrencode)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index abab15e231ff..e760a09dec31 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-notifyd-0.4.4-r1.tar.bz2 536304 BLAKE2B bde62a773f7a702338e07fad8483d57576edb4c046b709c8644c17697ea73b72e46b8b4e2737d02bf23a554cbcac7c9725d7f19ee9f1ea511efb0943280f1b60 SHA512 546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5
+DIST xfce4-notifyd-0.6.0-r1.tar.bz2 539371 BLAKE2B aed910e3a547b29b2efb96ec5b5ab03bc3b73269dc7928018be194025d46abaa18bc2d0a879cd797b18167717b2a1f354f1a49f64e9bfc77dd2be51e06090978 SHA512 31f7977cb4639c90d806e8eaa94c00c19bacf1c9d5df2bc1d66ed791e446ed0ecf6bc59ec402994b1eeab5432dc20cffe67fbb267e86b1848fc2206aa4eaf10c
 EBUILD xfce4-notifyd-0.4.4.ebuild 915 BLAKE2B 58384c17773fe32dbebf460d821d1104c6844979aab6d5fc789637ce4e98faa586c19376f7cdd4748bdc9757f44e30bd2c0652496e8832376d4fdd031c108d1c SHA512 734fe242b9bfcb52264f58986ad913b762cfd4f55cea8f5472a80a8935ed4edbccbddc753bd16f5ac3514bc2682341abd9618b8e089dd7ac2d44b37a22ddf6de
+EBUILD xfce4-notifyd-0.6.0.ebuild 917 BLAKE2B 82593c174c396ac084e2b8d611c78cef251242fdd72265b7763b4d9bedfe6f3c06e0dcbb69a0d36b0c1a5a8edbafa8905b19d8a5fdee47b9e5d7b9ac5d0d254a SHA512 20a89f9f4d4ffab6221184c95776b08d765e6e81f7051f114786136146b38c1240aa7cb441e12cb882c953224bd08fd42523f92f3b10753ee77523da169f9e42
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.0.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.0.ebuild
new file mode 100644
index 000000000000..6d7684102cf5
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2 -> ${P}-r1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.14:3=
+	>=x11-libs/libnotify-0.7:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index fc01b5f39343..3eb05c0d5652 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,7 @@
 DIST xfce4-power-manager-1.6.5.tar.bz2 1205473 BLAKE2B 64d3aa04ccb11b7b541b9ec8c3dd4544c66f8e7de626c5395cd10ea1e0004d7f3e941d9357941b73aec3997ed9935f04540d2c04ca1e6ac271baa80732de0f72 SHA512 ebcf9ba7431518fdafa74f49511200e16093c34f78516e823a2f7ac02a085a08377efe5f9c6fe285f3d1e2de253789404e01b34a48e3f5ff23c2c143b2801207
+DIST xfce4-power-manager-1.6.6.tar.bz2 1227814 BLAKE2B c5f9ca3ff1f7bbed8c534cbba43355a62734b6e1553f852740fe332545df910ecba07be249365f9815b2467226d67a41cdb740e99d4f547ee86abf2d014211f6 SHA512 c9377619df9ebab64ed234659e5798f47448e26fae5b19eb15bcbc9416df1afec6b4de32bc272b81531d2643a215ea46892523077017dc6b232bfe802dba6cd9
+DIST xfce4-power-manager-1.7.0.tar.bz2 1235629 BLAKE2B bf6bd6c3ebfc86d199362168788b3d9b1ca2cd691a93a2cbab04415d7e68e11a3b1cb36328e8a974e504eb00282e584cc497ea4f7dcddb20e6854d06bef5ec7d SHA512 30c6c37ce278d869b73880bc33d04115086646850c8fc9129e4fbeb71b36d4bb7ce7ee1758ea804b42b3736ec6632f7bcd8e7806a00421e0e24ac8433e34ac24
 EBUILD xfce4-power-manager-1.6.5.ebuild 1399 BLAKE2B f88ea3eaddb102895859ce512eb394597e1728736fa80204a273bee13fa0a6743de02fa322ce5010223d80eef6123d79554c85423933eab4ccf311372c578494 SHA512 09da812510afe6af3f2281334a4906d59d1032c7421b2dff082a09bdc644003f454847b16b0e0f6d21720a366c68cc435831106fd51ef6b9708fe29f015a471c
+EBUILD xfce4-power-manager-1.6.6.ebuild 1404 BLAKE2B f7a9e297c9aa03bb85a0d75ce59417e49b61dee8d5d2c1b0cf81f2ddda06e29df051c6fd61848819520a41a3f7e6a74286870960a57fbaeaa31e68d1eecb8bcf SHA512 b9179e69a7e80dd730cc9039c7e08992a4aa200669b00eb939320ac6b650f76fde531d3ab6a1a5d2f0d01e096b11adeb7dde93f2e4510dce9ce99a836c037eb9
+EBUILD xfce4-power-manager-1.7.0.ebuild 1404 BLAKE2B f7a9e297c9aa03bb85a0d75ce59417e49b61dee8d5d2c1b0cf81f2ddda06e29df051c6fd61848819520a41a3f7e6a74286870960a57fbaeaa31e68d1eecb8bcf SHA512 b9179e69a7e80dd730cc9039c7e08992a4aa200669b00eb939320ac6b650f76fde531d3ab6a1a5d2f0d01e096b11adeb7dde93f2e4510dce9ce99a836c037eb9
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
new file mode 100644
index 000000000000..9df144416fc2
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="kernel_linux networkmanager +panel-plugin policykit"
+
+COMMON_DEPEND=">=dev-libs/glib-2.42
+	>=sys-power/upower-0.99.0
+	sys-power/pm-utils
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
new file mode 100644
index 000000000000..9df144416fc2
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="kernel_linux networkmanager +panel-plugin policykit"
+
+COMMON_DEPEND=">=dev-libs/glib-2.42
+	>=sys-power/upower-0.99.0
+	sys-power/pm-utils
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 93032673f70e..ca362e4dbf1c 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-pulseaudio-plugin-0.4.2.tar.bz2 428504 BLAKE2B dd8c855e75aaee060df1e7abb2f8b835f1a630ce8b45b28c407c48f52071a51729e0bf8c645d5f68f968f12a45dea272d03ee69f4554009421a1a075a8fb8d2c SHA512 94184fe7379a7f1763d606fe3c45186767a43180329b43c8cba04b76ae5e1b2249531fc1fb6304da9bb03e7475ad65f861341253ead530d9a945165b4eb9e46e
+DIST xfce4-pulseaudio-plugin-0.4.3.tar.bz2 431773 BLAKE2B 2c0de4ea0ab9304b737fe4ce570bcd8427f983845fe898dbe7e053a5fe79793223df6882a931b186664d8c95d4c767daf39ba36a98dc58595ba77e8a18c13a6c SHA512 d3214b2b7c35a0a87ea60a5d843f5027d1b09f320d4d24c6bf89a8936de92226223cb4dc5368edf4c0a1aedb3b8796510981eeadee8e836e764569d9284f0efa
 EBUILD xfce4-pulseaudio-plugin-0.4.2.ebuild 1458 BLAKE2B e874b0db23c6b99f72aace1af730ab124a98852505563a6183abacc137dcf5c3b3744c368b62115efdbcb5f9504596905bb75d9f4d7b2d14afa91088661b669d SHA512 094bc7fc802460f831d8fffe4edabd25605a887ed4d8e6795963818d5cd33449a24ff325d35a2a92a8f95a86803cb9e2d8454862dd688dfa504c23a191b2d837
+EBUILD xfce4-pulseaudio-plugin-0.4.3.ebuild 1484 BLAKE2B 6c40b9144fed019ce5ae6d3bf0ceac97b8262aaf5625e22b8743ddf3b1564ed65d13d67002a206d8de59112a48f9991c06843b014c5dfbdad2a7ad11805025f8 SHA512 b1cea96cd674c368eac41375951e5e05ac016e07f5694965d429aa28f1702aa0a754dddec3f060dfa6281b60d6fdc23fba50797e8921ab50bf26d220956cab55
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
new file mode 100644
index 000000000000..bd780cf925bb
--- /dev/null
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in for PulseAudio volume control"
+HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug keybinder libnotify wnck"
+
+RDEPEND=">=dev-libs/glib-2.42.0:=
+	media-sound/pulseaudio:=
+	>=x11-libs/gtk+-3.20.0:3=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.9.0:=
+	>=xfce-base/xfce4-panel-4.11.0:=
+	>=xfce-base/xfconf-4.6.0:=
+	keybinder? ( dev-libs/keybinder:3= )
+	libnotify? ( x11-libs/libnotify:= )
+	wnck? ( x11-libs/libwnck:3= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable keybinder)
+		$(use_enable libnotify)
+		$(use_enable wnck)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! has_version media-sound/pavucontrol; then
+		elog "For the 'audio mixer...' shortcut to work, you need to install"
+		elog "an external mixer application. Please either install:"
+		elog
+		elog "	media-sound/pavucontrol"
+		elog
+		elog "or specify another application to use in the 'Properties' dialog."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 1431817c1d52..2ff6ae04538c 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,7 @@
+DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
 DIST xfce4-screensaver-0.1.8.tar.bz2 593968 BLAKE2B 693fe6e057bc1f5f1abff67c8a0a99244d5c270ab9c9afd7945f21b6eeb2bea027448d1485dea9a9f912b5f231211878a92a882bac56f28696557e44215ce283 SHA512 4cb76272f2f94f5e265a86d3fa58de8da6167da013466a4dd2a08a2e94fafe14816ce6c5a1e635a8c07e91497ede0650c014d21b0bbac666b8a72bc5f4645f69
+DIST xfce4-screensaver-0.1.9.tar.bz2 665025 BLAKE2B 290fc9cc81a19971cebd2876c767c04f1e010ed4282c9ccae8d2f615230f8fdb65fffbfb0ec7526cd5e23c7e1450565e6d23c108d23e6f2fd29c94ee4d6fc873 SHA512 ff2a967ebb62a5290405e1070ea064dba18e4a4062c2b2d990a23f44a6f730e0c56a98eac5ba86a166e5a8f67388333b0be695e2e59318abd76e8b6c3765d8eb
+EBUILD xfce4-screensaver-0.1.10.ebuild 1724 BLAKE2B 34115c26110250587fe347c4a837c1c761737e97685121b6af6eba40998038890323e8eb66dd98b7507a63808a9fee0afa960743d09880af9ca106c0935bf90b SHA512 02b7f4e6cb39a4bbb28adc8a221c9db0c170becb2e8d6e089ba04cc18c938be4b70411d51fa39e5eb97291f5a1788b4c7ed2bdf098ace7e0b31791156a5a511f
 EBUILD xfce4-screensaver-0.1.8.ebuild 1722 BLAKE2B 70065cd642c22986718d33bae0ed0f97b08c43d71490e8c7fc6924e6d7d1b9339bbb5eedfe52926c84f3eeb585ce6d08710881a020afa456da70dfd3fe5ea988 SHA512 fae41f934f7ac0bcaedb326b813ab12def44df1cd39fb1fdd9e01fa0db41d0e2231759b74fc263ec5c2228198f19372ae9d60ebc1c54cc42d6d8637a2397a8b0
+EBUILD xfce4-screensaver-0.1.9.ebuild 1724 BLAKE2B 34115c26110250587fe347c4a837c1c761737e97685121b6af6eba40998038890323e8eb66dd98b7507a63808a9fee0afa960743d09880af9ca106c0935bf90b SHA512 02b7f4e6cb39a4bbb28adc8a221c9db0c170becb2e8d6e089ba04cc18c938be4b70411d51fa39e5eb97291f5a1788b4c7ed2bdf098ace7e0b31791156a5a511f
 MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
new file mode 100644
index 000000000000..22482ef51e2e
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="consolekit elogind +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	>=dev-libs/dbus-glib-0.30
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.20:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	consolekit? ( sys-auth/consolekit )
+	elogind? ( sys-auth/elogind )
+	locking? (
+		pam? ( sys-libs/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with consolekit console-kit)
+		$(use_with elogind)
+		$(use_with systemd)
+	)
+
+	if use pam; then
+		myconf+=( --with-pam-auth-type=system )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild
new file mode 100644
index 000000000000..22482ef51e2e
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="consolekit elogind +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	>=dev-libs/dbus-glib-0.30
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.20:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	consolekit? ( sys-auth/consolekit )
+	elogind? ( sys-auth/elogind )
+	locking? (
+		pam? ( sys-libs/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with consolekit console-kit)
+		$(use_with elogind)
+		$(use_with systemd)
+	)
+
+	if use pam; then
+		myconf+=( --with-pam-auth-type=system )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 0070040c551f..138b6e8425a6 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screenshooter-1.9.7.tar.bz2 536583 BLAKE2B de6376b68a7936f7ea22762449389ddd8ae1bf29f5fb062054691e4dc3f19471b63ef6201e813624cf2ec34c565ec0ac0d1de9db7d1b86296c736def5ab5023e SHA512 364594bd00172f0becb85f8643e4106b4a7b71ac5dad765850f54de011a77175801bd9e7eaab6a8bbb3b1353299fdfa25cc0a4a52d49017f9b51330377eb9add
-EBUILD xfce4-screenshooter-1.9.7.ebuild 1118 BLAKE2B 97f04d16e86ce32ad2be942c4949aff0e0105a3038ee206bd6e284ed045f81c8edd15c13439649f0cbd6e2e486a3735f3009ceae3772e3de00324b0e09074b66 SHA512 ef7d8cf80a4126b25bb7d78dbef819b4a53fe61c701ca94d3f427cb6f371b3309e0ffa52761f84256cd4ffba21195d1b455f3dccabadc8315baad7256080997a
+EBUILD xfce4-screenshooter-1.9.7.ebuild 1114 BLAKE2B 6ab724f5d42a762c056e5362846889c58c8164ffd9529ffa51dbfa2a5085613177dfb36a7e43e20729f0d01914b224eebd71ee0ddc5ba651bce7f81396f7fc37 SHA512 760f4e8c8173a93de0ac144f5f78026cf66af45f1d4c8092343e2cb0b4dff16dd0124ee9d65179fe76a3e4c4733cf089a3189e8c3a6abc6ac7ba53ee40a5b1b4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
index 1b50b412ea15..d1dd296ed8c9 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/Manifest b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
index 7ceafdc0e31b..e777a507c76b 100644
--- a/xfce-extra/xfce4-statusnotifier-plugin/Manifest
+++ b/xfce-extra/xfce4-statusnotifier-plugin/Manifest
@@ -1,3 +1,3 @@
-DIST xfce4-statusnotifier-plugin-0.2.1.tar.bz2 384119 BLAKE2B e8035750c8d376569d3694340c8630af3032da19e684adb374fbb79379d523a293b78b98d3c61601a0abe3639125106a56e976d8e0fe0b60244569593a087384 SHA512 508614543716a64f2fd45909c4a2acfbd4f41f9e494a48b97dd51a83171eec44811a8a2925d39ba8a5b5dba1f9faedddade0e5b7bf2ae08f494954637cf2209f
-EBUILD xfce4-statusnotifier-plugin-0.2.1.ebuild 879 BLAKE2B ad760d50956238cfe3c6afdc3e67a33c0ce27844b337dc7dfa9d8b6d9d591a07ddc2174b2cfbae7398d1b9f9030b88b885d70781d7382028d4eb0e627eb83fe7 SHA512 5afbee62d2c23fc00e09c98d55e190a14c644bfe4a425afe1983cb66baa133cc30496378150018c88848682640f5d8f24d53671a719097be98d563b69285a519
+DIST xfce4-statusnotifier-plugin-0.2.2.tar.bz2 376903 BLAKE2B 23e99a6687016de7352ab0611719f5a9ef319d6280a2fb8474f2ee1471f219f29926c07e4072ac75039377eca98d9c7f2f3fce29ce1d29cfc0d1112642e9016d SHA512 76f719ffed4ec9e178a844173cb0728888beba9a1ad69c9da025cb2d1fb3ad18448b4b4a60a94bb329ec7b80760307000550d451859c33f4b5d7bb8590cf227d
+EBUILD xfce4-statusnotifier-plugin-0.2.2.ebuild 862 BLAKE2B 460702a1425dbb7a1061c206b7d7c70b1013082e2197328edadb20de7fc9f52e59146a58e3bf1873c1608484abc3da4f09f199fad1ad166930a34f5efdde6be7 SHA512 62eb38fb3f63ce8de57282d2994843d234746d8e1298e303f8bd1e3b9cb63c7fdc239c1b3cae412fd033f5203ca5e7e26b06c487c15591c1c0240c7eedbcbc5e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild b/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.2.ebuild
index 1eb2dd7f2ff3..2ea6ad2a91fe 100644
--- a/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.1.ebuild
+++ b/xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils
+inherit xdg-utils
 
 DESCRIPTION="A panel area for fd.o Status Notifiers (systray replacement)"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin"
@@ -15,10 +15,10 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/glib-2.24:=
+	>=dev-libs/glib-2.24
 	>=dev-libs/libdbusmenu-16.04.0:=[gtk3]
-	>=x11-libs/gtk+-3.18:3=
-	x11-libs/libX11:=
+	>=x11-libs/gtk+-3.18:3
+	x11-libs/libX11
 	>=xfce-base/libxfce4ui-4.12:=
 	>=xfce-base/libxfce4util-4.12:=
 	>=xfce-base/xfce4-panel-4.12:=
@@ -32,9 +32,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 7f1a249bfe3b..f25b074d330c 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-taskmanager-1.2.2.tar.bz2 395320 BLAKE2B d844e4db79ca110c4f83a7fd6c9b813cd6cb4bfb8639d3bcc0b2ec19f9e81c1df1bf6f1dac6f4df3d5f004e85d48a5f504bdd7781bb720b13fbdf508895c820f SHA512 670e8fd09bdaa85dc822dd5a7b055f898941e8079315843344e4dae12e2c0a14049b58241fb58f170461e7b8829bc479bea1a488b756210ef91ef8a4d7ff3348
+DIST xfce4-taskmanager-1.2.3.tar.bz2 406223 BLAKE2B 1cf70aaa9e28765596730e7446942b74c9999ca35d6dc59644ee74804b6f12cf220f53f36c907bd1b95d038855d2cd00fae15f46637e95a609e191b3a3d05e0b SHA512 e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3
 EBUILD xfce4-taskmanager-1.2.2.ebuild 881 BLAKE2B bdec47998fc0235f66b7b95d2aa7513fac641f6fab55c04f77ae63696096042a4e5d27bbdcd416c6aecd091cbe7d1dbfd41b7153f2272bd5b1c9b54f0cd0bb37 SHA512 69f511a10904634cf4fb6f8862a49b509fb1d2a247966548e2d91e29465dcebe4e8e6c7e8b02a225dcacf168c32a50c0d20fcceb14526f2bf01e09b13e575bde
+EBUILD xfce4-taskmanager-1.2.3.ebuild 886 BLAKE2B 3e083ed7dc91f34421f6dd16ef160f90b3e0705f376d0575beb2e4a321e0b40472d3c5dd90deea02f7c334a5fca4d46b1c5279df2ffa517194737391333ad101 SHA512 3ab1ccbeb12a004b9b95e50e0db7971bce36d52cd96fe46607009c13c138258e612014b0f7e025908a6feedd61dc6e7aae534494ea484ac99d0f7915a95e9e2d
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
new file mode 100644
index 000000000000..404a6bbb2d4e
--- /dev/null
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Easy to use task manager"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	x11-libs/cairo:=
+	x11-libs/libX11:=
+	x11-libs/libXmu:=
+	x11-libs/gtk+:3=
+	x11-libs/libwnck:3="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--enable-wnck
+		# GTK+3 is required unconditionally anyway
+		--disable-gtk2
+		--disable-gksu
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 161ffff7a701..77cbfac34a1d 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST xfce4-whiskermenu-plugin-2.3.4.tar.bz2 160614 BLAKE2B 276842ef860965d139166ea6d8e988d39694aa06ace52bc3f48d6e3d9c9d8c930c3b9e44c3d9f84aaf7bb6fd9412a5efdda39834d8c2d33ed3f048db68893266 SHA512 8e59b6d0067e2302e3bf3e7f528cf96d613586c78c2ce6040143b449bffb3e3037b0d08738450c701d57f11cc5393154221bfbe5fa43825ca5df7ddd3c9f4cf4
 DIST xfce4-whiskermenu-plugin-2.3.5.tar.bz2 160984 BLAKE2B c4a53ca34ed0eec2de27837c01d52ace334af5cf952b46b7f9f651314eb7f4aad52f5706ca8df7ddcfb4a9c0ed2fe207a138c3cb432306caa38220a6c13aa2fd SHA512 7697a5d41599df8150d4e7ad1c5898b651d196fb1bd1a657efee33206312455f24056edf679592e0a6a78b17b324fd5d93e202ae7cc461ca70df7cd41794bd58
-DIST xfce4-whiskermenu-plugin-2.4.2.tar.bz2 171280 BLAKE2B acc7ec7316231f3fc46c8407a0ab9d3fe3428ea1e87d8bacae0ddeb02016fe2ec01428da49e6921e213f1140070c7ec4035288f233599ef1239ecaed4209b93a SHA512 00bec0bee2c0311090ad06839ed2ea49c4d63bd4bd2869670cad7f4be3c7693f589cd4167ca7c27c39bcba486a34944449441b45e743b8d542e7003016c8dce7
-EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1082 BLAKE2B 791bb658bf695009b4b18386c6abb0672fa6a8cdc589eae707e13c0da2880d74a7c346f7b3548ca226f0cd803627a62e19e4690ec6adc4d4becb20b198b4f28b SHA512 779c2371da3b988a3c89d97940922a989cf0e338ac788fff7a026d06db926a811fce3385e747b2749ae99c34e9662809a9499b4e5dcdec2fecb661bce281f39c
-EBUILD xfce4-whiskermenu-plugin-2.3.5.ebuild 1084 BLAKE2B 985fc9b50d43684b17eb0429a03c1b59568f2bc5bcbdb87559863ea257dec998862952f945e87b33d8849e89ea084a002e4504e106398f2bb8afa051e9e0cf44 SHA512 b4c4b02ef95e51ec4e75b139ac7564761de6638b45d0ca07e5d85ea2762f5f4a91f753e242487f0dcb760741f18cc972f4317675aa8ef7278937d66025bfa3d0
-EBUILD xfce4-whiskermenu-plugin-2.4.2.ebuild 1122 BLAKE2B b9882e94c6649c8883155bd910e3da494529d433fc0f7a0a1554279ed82ebbf57f1ca5c7842178d273ad6b232a42c567898eb02cbc6c9bd48b33e3b5dad64123 SHA512 c63c728682ca15112400dc22958aee6d4a88f4d7d72a68aac4cfa3e4bdde8d24680c8e4b990e6345e854771a8f396ec0e8a0d593a63512532641dfd425c35a28
+DIST xfce4-whiskermenu-plugin-2.4.3.tar.bz2 171822 BLAKE2B 3bba151c768e9dbd3eb0904e675c334ba073a6e22a2c216e41df3bf1e6d5e2961cf25650b90dd459f40a10b4b12f4209e1a370e66d71fedc05da110693f039ad SHA512 378f9b1a5ef4ffab079090aeb10b2e571918aadf7dddb051dc30288b325d3f1e6621fe9c2d3db5815b706d63361d77616124a543d0c96e0d1cc06407152e9f32
+EBUILD xfce4-whiskermenu-plugin-2.3.5.ebuild 874 BLAKE2B 5cb115b533044ffecaeb09444f46adb0346601afc71b9abed9cb5681148767f805e369371e5b7cafecb3a1536d0d272a175b5961ca53428a597482068140dd58 SHA512 8c79b718309dd0a3c48347b8343148b48ad7f429dd6f5602c4619623fd3c303d1d1782f1eec1a994294e5d096f7c5d4eefb137c51a8b304322da75b9fd41a227
+EBUILD xfce4-whiskermenu-plugin-2.4.3.ebuild 914 BLAKE2B dbe2088a5b1b3d60feda2c38fd8b86a0ca720ad3b1caf04bc9d06cd295f6ffbee534fb3e517e4b052662e469055f4cddbd04fb2f25fd399be439ab62df6c9866 SHA512 d44b9e619188fe17919c5b8788f6b345decdb85ca3534ce68310db96cb08c42f7d395b2bd1d2145a6d106be7b0c4edb01acdcb3ed015e22cf77aa0ac0ab03bef
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
deleted file mode 100644
index 203d930b0b47..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
index 9587f377d461..08a62d270871 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
@@ -31,13 +31,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_AS_NEEDED=OFF
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
index eababf76189b..14e62615b423 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.2.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
@@ -31,13 +31,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_AS_NEEDED=OFF