gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /xfce-extra
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
104 files changed, 87 insertions, 2156 deletions
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index c3348db4d48c..82f0023cd59c 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/multiload-nandhp/Manifest b/xfce-extra/multiload-nandhp/Manifest
index a52f2ec3cd20..17a04f57fb07 100644
--- a/xfce-extra/multiload-nandhp/Manifest
+++ b/xfce-extra/multiload-nandhp/Manifest
@@ -1,3 +1,3 @@
 DIST multiload-nandhp-0.3.tar.gz 34812 BLAKE2B 79ee7b5b2880e2e8242c40128ef320966fa9ec7c904e79efbc497fd421fe531f94c6ccd44be665bae2a092cf70ee8ac745d1e718ae5e6bf60efaae3339329c93 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c
-EBUILD multiload-nandhp-0.3-r2.ebuild 900 BLAKE2B 463946cba82a01a3aace3b49bdd17bd74cebd8c00c01e98a0a4d85cef6bc7749d1af1182813f43b2bf25cd9d1872c54d0fbdf51bb3fbf990b1cc0435108ce2b0 SHA512 a096c2fe3df435087c14768a20ef0d7990eabe24e6f06865e017c28682da092a9812552fe03ed2ce064b4a9333ed30d17d85a4f4c27eb58e0f15024fa8b4c823
+EBUILD multiload-nandhp-0.3-r3.ebuild 899 BLAKE2B a185edf0513b1ec009fddeba13c8c217293df7e458de6119c51d847acdfe8461cde2492f1b5235c0a17fe6e9aa496f49d01169fa0fbcb8a1a302eead99da7a71 SHA512 ac884e80e18cd481cf6b3a894e826b7c177de9500cd36bd456a7a91b3596d7435ab1a1877686c5385a806fb8ada612cc200c0debe34688f9152a39ae6bd99619
 MISC metadata.xml 339 BLAKE2B 98c21e065d9e6275f151981d14e5c48c75137dd2d6be1c5510224ff8136ea69fa5c93db58dcd7881d963fe240493b69e9b16a8596cf9af5b9dab5f50349f2054 SHA512 e74cdaaaa8772d4fe0a87ac55d52fc23dac307c2a8378e92350ac6a5f39b25a76f66eabf0e1db850e3f7ed703c6218377a792259f0a4267c54bd96b4104799bd
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r2.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r3.ebuild
index 573dd745136a..e10f7c1721f7 100644
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r2.ebuild
+++ b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r3.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.14:2=
 	>=gnome-base/libgtop-2.11.92:=
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index bc7d77f3ad6d..43ef769bb598 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -1,8 +1,4 @@
-AUX 0.3.1-add-engrampa-support.patch 1934 BLAKE2B 3cba07b81307ea4f4502c865ef1280504e408fcb4644b931ca34b6f77324c608d42f86851ce42e90e474e5fe83bfdc2dc1b9b94a5d5e663129fec4135526d9a6 SHA512 0510dcdda6524f6bad0a37ff6f13afd287502c08d7d260fc4b735bd188d191014f2d3dd5fd6285b80d945dd2acc7eb9055b1851aa461f1f9fe110af07fc69631
-AUX 0.3.1-add-support-symlinks.patch 684 BLAKE2B c35eb501afdf20bea96f45ce766763a521fab89a8479b7d2783a228ea05ccbaa5e4ba9d5d3a1d1fc0c3d0a2bdf13a588f4f5e9ab62b1c3415494cab001f4b465 SHA512 5bb183601d2c73cd967a72a2ed3a71e53c2b38b2afe0448f80fb4429df9dba35eeca05da2037496d6f0921590f21d09848e096965d5d8b9b51005ea0798b4eb0
 AUX 0.3.1-fix-kde-ark.patch 609 BLAKE2B db06f3ac161da82e534b60570a0890f1b2df96ea061430b6ee04d37e22daff8ac4a4bbf3a0143ead2c9643fc6d560f77ac486e2c1d21612069e6696cdd7f1d0a SHA512 43433f9022b1659eccca84d48555f5be997772873aaaeb2fb46fb89904d0d993aff7bd91d850d437ac33c85405ea8e09a05e035547e5d8bce6b9fbb27dea9702
-DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68
 DIST thunar-archive-plugin-0.4.0.tar.bz2 350011 BLAKE2B aebe828396e75701b788dd22266ed154b3a8296b8f6a912fbd99d4ebda1db2ed2a5cbf957a381523194270b5f1ea8ae6af24ca61e35b3953de54b0477bffd6cf SHA512 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44
-EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 1172 BLAKE2B 55dcbff1c9dd09f10e973663151f6fe16a77527b716678fe96f28b4a5fd42e32bbab785a6dc5c9baa002fb7928a72b6af3affc715d62cc747b9e7b613922352e SHA512 b94975a7717a84846b2406efd22891365f23b73d2f14fe277a11fc408099b414845fc236834a714caeb3ddf0dc59b98193f7d11310a8b76e4feca0084c319178
 EBUILD thunar-archive-plugin-0.4.0.ebuild 850 BLAKE2B 2be9c435328c0e79056044ca3495c918e3eff130834bb38b40958a6e9b49668be9f66386abe976c5e25d281a7e6b5e9b09f2c80a8dd9349e4f9349fa8a14e7ed SHA512 a5bfbe12157c5a0843b4310f978f8375092aaa0508cb044bf7d8275298c0b6d1c0f6c758bc4f6e37b4ef2fa43dc64e3d1c6bea053611b341bc2686e5db15b86f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
deleted file mode 100644
index 32d1b31e0c72..000000000000
--- a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/scripts/Makefile.am b/scripts/Makefile.am
-index 4da529c..ec49cba 100644
---- a/scripts/Makefile.am
-+++ b/scripts/Makefile.am
-@@ -3,7 +3,8 @@
- wrapperdir = $(libexecdir)/thunar-archive-plugin
- wrapper_SCRIPTS =							\
- 	ark.tap								\
--	file-roller.tap
-+	file-roller.tap							\
-+	engrampa.tap
- 
- # Install symlink to 'gnome-file-roller.tap'
- install-exec-hook:
-diff --git a/scripts/engrampa.tap b/scripts/engrampa.tap
-index e69de29..a9d9c10 100755
---- a/scripts/engrampa.tap
-+++ b/scripts/engrampa.tap
-@@ -0,0 +1,48 @@
-+#!/bin/sh
-+#
-+# engrampa.tap - Wrapper script to create and extract archive files
-+#                   in Thunar, via the thunar-archive-plugin, using the
-+#                   engrampa archive manager.
-+#
-+# $Id$
-+#
-+# Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>.
-+#
-+# This program is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the Free
-+# Software Foundation; either version 2 of the License, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+# more details.
-+#
-+# You should have received a copy of the GNU General Public License along with
-+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+# Place, Suite 330, Boston, MA  02111-1307  USA.
-+#
-+
-+# determine the action and the folder, $@ then contains only the files
-+action=$1; shift;
-+folder=$1; shift;
-+
-+# check the action
-+case $action in
-+create)
-+	exec engrampa "--default-dir=$folder" --add "$@"
-+	;;
-+
-+extract-here)
-+	exec engrampa "--extract-to=$folder" --force "$@"
-+	;;
-+
-+extract-to)
-+	exec engrampa --extract "$@"
-+	;;
-+
-+*)
-+	echo "Unsupported action '$action'" >&2
-+	exit 1
-+esac
-+
-
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch
deleted file mode 100644
index bbe5f566a4c5..000000000000
--- a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-support-symlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur thunar-archive-plugin-0.3.1.old/scripts/Makefile.am thunar-archive-plugin-0.3.1/scripts/Makefile.am
---- thunar-archive-plugin-0.3.1.old/scripts/Makefile.am	2013-05-11 13:48:30.000000000 +0400
-+++ thunar-archive-plugin-0.3.1/scripts/Makefile.am	2015-07-05 12:55:32.052090677 +0400
-@@ -9,8 +9,9 @@
- install-exec-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(wrapperdir)
- 	-( cd $(DESTDIR)$(wrapperdir) ; \
--		test -f gnome-file-roller.tap \
--		|| ln -sf file-roller.tap gnome-file-roller.tap )
-+		ln -sf ark.tap kde4-ark.tap; \
-+		ln -sf file-roller.tap gnome-file-roller.tap; \
-+		ln -sf file-roller.tap org.gnome.FileRoller.tap; )
- 
- EXTRA_DIST =								\
- 	$(wrapper_SCRIPTS)						\
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
deleted file mode 100644
index 0c51d9dfaad8..000000000000
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="Archive plug-in for the Thunar filemanager"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
-SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/exo-0.6:=
-	<xfce-base/thunar-1.7:="
-# dev-util/xfce4-dev-tools for eautoreconf
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/xfce4-dev-tools
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/0.3.1-add-engrampa-support.patch
-	"${FILESDIR}"/0.3.1-fix-kde-ark.patch
-	"${FILESDIR}"/0.3.1-add-support-symlinks.patch
-	)
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_prepare() {
-	default
-	local AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
-	eautoreconf
-}
-
-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/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index 04441f545179..f23a56da19ea 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 BLAKE2B 1f985fadaa58ebcf516c6f57f429d3a0c96161572a9829b7240e1f5550ad2cc5ebb121cb985f1680440ab4fc8be68be8f5ee3c5557d8f95aa0c23b3572514ec1 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d
 DIST thunar-media-tags-plugin-0.3.0.tar.bz2 378993 BLAKE2B 9ddb44862808eab8e836cd85ef9afd6b04a96d1b1b98a80bddba85c1544e91a563b3d40ede04035de50b032c01623d574d818cf19ba60483432a78a61e772c21 SHA512 f7c13acb1d9936676e22fdb2d6c1def5ad651ab104110559817fc51dfad845823de4ba724054a7e99a4af980e62e05db750097c32018effa29cb5f56676d9eaa
-EBUILD thunar-media-tags-plugin-0.2.1-r1.ebuild 689 BLAKE2B 2ad0bb8632797ec2c6828783d9955a57aec11601d60e757a29ad12385619c8df3067688984f64d5f88883c970434b7a3346b62d0be8bd9215c2a7e56861d6fa8 SHA512 4b735961ea05dc6772abf0113f0f3e29e4fc91bd6eb2fbafdba39823f4443f03a56d6e4a250f0d42ae96f8a8d38bed093afe4041cb63a4347a4d1506096b21b1
 EBUILD thunar-media-tags-plugin-0.3.0.ebuild 650 BLAKE2B 1aaa9a9c399e78a6773d51c3f04aebdd7e010bb1b55ae63c84b530ad9f46dddf094dd688fc0ad17b15f1bde3f9e3a92eac3eaaba35f5a1aa86f027de57ccee09 SHA512 93d3ac928600b9ebcc1478caf7cf4c634e9ca4dd07d21fc308e107005792866817e686b03d96db92b886cb0c88e95c7d2c3b0372b2606ff199a7bdd27617dc48
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
deleted file mode 100644
index 8b0d855dc077..000000000000
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Adds special features for media files to the Thunar File Manager"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
-SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/taglib-1.6
-	>=x11-libs/gtk+-2.12:2
-	>=xfce-base/exo-0.6
-	<xfce-base/thunar-1.7"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index 45e87bc4dd33..c71cdcdfd14d 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-shares-plugin-0.2.0_p20101105.tar.bz2 686286 BLAKE2B 2b4977cd6c0a407da20608c4abf6ff6de4b053cf1bda6e749aeed797c7db36747a421ac1463216f9aa33ac161b467971cbd2ddca256f916de468af5688500e0e SHA512 88e171eb1c859938df1c8f7d323456aa1ff2430a6c88928d3614aefbab16e8a9fa3052bdee2d7f7e16c6ba2bbf78301f1c4ac7c2454b8436cde49af716c46986
 DIST thunar-shares-plugin-0.3.0.tar.bz2 340867 BLAKE2B c648b9855a9627c0659087b55f8f45d36f998c11504d32be7bf18abb40ad0dc1124ed710f55c12b35978e5727ef6a4706c1415dbb04f2d5f6259fc6dd1f06f3e SHA512 20432990c6ea241d24fa8fd1b94990ec25a5ff6213361599936f1bacf86e323c8cbe868491ff600ef8c11dff86dfdf9773258b9c5e7919bab50f332cf4a7797c
-EBUILD thunar-shares-plugin-0.2.0_p20101105-r1.ebuild 1041 BLAKE2B 7106ba26c6d6315c2556e465f2c488e1759f70bfc7870332a2ae7bf2429fa245d9984c7627f1aeed841f36bcd2ed99b67f4faa6d18653d3d866dc872f04f09dc SHA512 ca616bb62c474a46f857cbedf444ec3d782fc8bfcb2e0467b1bb8035f572449dfdfb2851591532102efa59a21f698b55902ad3c050906b9f49828740485fa5d3
 EBUILD thunar-shares-plugin-0.3.0.ebuild 615 BLAKE2B a3ee9e90398ec21ae021d083d76991f695b6ccd69441cd9e1750583f7d14281821528284d5defe16aa45ed7e88248db03c7632627f5ee72f3783be728dc7013f SHA512 b245030452019792c1ffd1253f6b80c20993592a4bad0c68ceba5928ab3e052a0690b109a9363ad0b02439af1fd4295e093c444849ca144cc31d90f7e21f7eef
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
deleted file mode 100644
index c2bb9f571e56..000000000000
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Thunar plugin to share files using Samba"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.12:2
-	<xfce-base/thunar-1.7"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/xfce4-dev-tools
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		# workaround the default for git builds
-		--enable-debug=minimal
-	)
-	econf "${myconf[@]}"
-}
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	# https://bugzilla.xfce.org/show_bug.cgi?id=10032
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-Werror::' \
-		configure.ac || die
-
-	local AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros"
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/thunar-vcs-plugin/Manifest b/xfce-extra/thunar-vcs-plugin/Manifest
index 6318b7ce8f0a..072fd45be143 100644
--- a/xfce-extra/thunar-vcs-plugin/Manifest
+++ b/xfce-extra/thunar-vcs-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-vcs-plugin-0.1.5.tar.bz2 478866 BLAKE2B 9bf2b060d88a4379f02c0e8af1829f4cf621e2590f7885f59d9af56d825c1d9d218c56c3b97420087b46eece0eb6c15146f6630569928c8523fa34bcfdbbcc22 SHA512 0315613fe97d5cb2fa9589af49bdb5074f20c83b52d5f7d4a151091839679b4617e8e0b20df85914b7bcef2464173dc1bd2bc182312364c7d5a94171aba28983
 DIST thunar-vcs-plugin-0.2.0.tar.bz2 546608 BLAKE2B ccd0d057e358b321b6287284c25ee03c4252f5e120fcba9272139ebf0739ee7363e619da12f86e725abc70d4834451ec112386ba2b008b038c03571d26349f51 SHA512 c33f54caa2f27de6c8f9e5cb8368f7538ea82730f1364ad974b19017a25bc6a398c19dfe861b0d0133db08ee36e4e209c8d824ce07de0c2ae6da830aca9e7e68
-EBUILD thunar-vcs-plugin-0.1.5-r1.ebuild 1047 BLAKE2B d51bc9ecb75ef5ff44d7a9884f8cf5b9c5bd61128fc217e29a3df8e4af0d0d8bd9a97fcca41cd59dc763d6600ff29a03a05f02ca9918ed838651b780eb228d69 SHA512 bb3a76ee42077891f10e37e9d6134ace8778b21935a38d38aa6d4f602cbacd758c00108b3e300aab99631bdd941121b9ef5e0b40008898c24c5ecf0ac06b82ba
 EBUILD thunar-vcs-plugin-0.2.0.ebuild 1009 BLAKE2B 8194a1dad47c20f35f56ea90ce703202dd76c68be5f510f89c2c078639cf429611a7143398140dec6395111e9fb2e98b8e8b24c5f5a410f364c9c06da8aec491 SHA512 443987624c7299ab2be642edd09eb4890f93aa5155bc655a02dd45910a5ef93c0233490f19337ebaaaf576d35cc9e45bad3dabf16a3cc5e4f4e0ea960e048bbb
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild
deleted file mode 100644
index f8ed9e146de6..000000000000
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Adds Subversion and GIT actions to the context menu of thunar"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin"
-SRC_URI="https://archive.xfce.org/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+git +subversion"
-
-RDEPEND=">=dev-libs/glib-2.18:2=
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4util-4.8:=
-	<xfce-base/thunar-1.7:=
-	git? ( dev-vcs/git )
-	subversion? (
-		>=dev-libs/apr-0.9.7:=
-		>=dev-vcs/subversion-1.5:=
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myconf=(
-		$(use_enable subversion)
-		$(use_enable git)
-		)
-	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/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 7b903ac0ead9..3b37836ab388 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,7 +1,3 @@
-DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
-DIST thunar-volman-0.9.4.tar.bz2 501493 BLAKE2B 788b881f40995e95fffcedd70c0c0ea66ec8f9a81386e103d41c853a2d24408d79be04053cf34fbb5a8a28a367713ccd63cc3eaf4e536ec71a3466edb8d387ae SHA512 e75d1d8a6094f9722e170f7dc2978a213b292225ec66cdb602c4a3a2b9dac07b5d5228c970c0a39f46f4f7a0197c089f7f930fbc24dfc202dbdc27501686fb2f
 DIST thunar-volman-0.9.5.tar.bz2 501846 BLAKE2B e64a1593551cb542461be54e7e0624a9e3a3f0db43df166f0922f79e031a0f85da3eb00289a8d30c427c5f6500a3e12b065a7fdf3f34e24d6e88d27be048669a SHA512 843ff1f55b68e6f584da29c2c6c91ed045c4e9ee05cb573db6a0192553cf05faefb4227359bd6ef306c2bbb94e2fe5357c07f70a0d170b35c48d3e9ebac7a9b9
-EBUILD thunar-volman-0.8.1-r2.ebuild 1082 BLAKE2B bc5e38559e6ec01f9504b0a3d90b04f4b85fb3795cd356dfc354db15af28d8e97e027c958f54e726986aaf5e5200268cf00f8c8fbc8a50082b7131dddd776e08 SHA512 a0a2df2e01f753e0f4f2271fb2bff0d88e55c325c9ef244cc1b85ffdfe45f82124d3e95b6fa45e8cfd14b46d65e195a3f8ee58ba6c5e60be36ecd859acc87016
-EBUILD thunar-volman-0.9.4.ebuild 1071 BLAKE2B 9eb3f41381e1b034ad0dca93479d3b458232839061e3d51973d9ac4117cfa7cb4e29a0da844d1ec21f787affb1ded55ccb4d6dd961a497932c93878ca576e252 SHA512 993de83a46754b447a29765751fa40127e988c42bd5d3dbc658a7f3cc14222f263edec456e41d26d584374c629656a9bcb9e1d7ea7497155132b1e3a269e91e6
-EBUILD thunar-volman-0.9.5.ebuild 1060 BLAKE2B 6c506181304089a5e441e833cb48e6c5410703e67cb0d806dc329461b0baddf49e412d3056e2dd437313e881d7d684b47ea6309e1a991619a6a7f74df2f20262 SHA512 a775b05590926ff51d3b8dfcb6e1b1db100c6a81c73d1541facb4f21cb3a67a46569802d33d51ab4a77b2bed69db055cc6aa2b36ef52e7e5eb1b9f9724cdc2b5
+EBUILD thunar-volman-0.9.5.ebuild 1061 BLAKE2B 486d8146a223ce93fa51bb0eaf0ed1a35ead5668077fc856964cdb7e91955b9a6daa98a60abccc3fcf7aa3117a659326fc2c60ada7485a7aca86b52b52a6e966 SHA512 4f32444d4aeba7474e2e346a0f02991c46f9e7255895db6f5a5f0c6cc185b3b494f2871141665b5fc090d227bc27fbce5df28e707c3b06af32ab57da54b17125
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild
deleted file mode 100644
index c1006380dbe6..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	virtual/libgudev:=
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10[gtk2(+)]
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-		)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.4.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.4.ebuild
deleted file mode 100644
index 629d4c75ad1c..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-# CC for tvm-burn-cd.svg
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30:=
-	virtual/libgudev:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild
index 3e8b93497636..2192d6e6d2f3 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="libnotify"
 
 COMMON_DEPEND=">=dev-libs/glib-2.30
-	virtual/libgudev:=
+	dev-libs/libgudev:=
 	>=x11-libs/gtk+-3.20:3
 	>=xfce-base/exo-0.10:=
 	>=xfce-base/libxfce4ui-4.12:=
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index e9c4b916773a..fc1c620314c5 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,7 +1,3 @@
-DIST tumbler-0.2.3.tar.bz2 538109 BLAKE2B 74f99241aad53202f1241b3865a51bbcfa0b503495e02edc55aed997343fac7057fb7f8f76ef2473cdce9fa38e8069bbb69812aaccfedab41d5f3fb67b2a3a39 SHA512 aefe284c3baa1d8eaf79c9bdb3cfc044ee6a1f36be34efd67541e6310aa275b5235b29f68483b7b7b5a8df699a8b3db8dc75569ec2b90253756fd6285a2e3816
-DIST tumbler-0.2.6.tar.bz2 564327 BLAKE2B feed9064a8bebc86d266a554ff398fa2d91b495adfa298497b698c5225961c20f8039924933aa500ae2d80e3c6d303c6b9e4aab0c1a372778ccd3e8e9b5980d1 SHA512 1b7d3c25c797bdd021924dacda3e9028fbd217536214d8ce95bc8097e285298822e0f1c54cedcbda76de6469e0721e4ef1a5cebd28e9e9c5a600bf8fd1953562
 DIST tumbler-0.2.7.tar.bz2 564538 BLAKE2B 64fc31e70be584ab04134de4f98e0302f91be213481b451c5b1563c001e240091b0721132415e92f5f60f7b0cd10099d9fa3fdf0435d3fa9e7c496f6f9673d3d SHA512 d5121da67bc2b1bf115980b6c9ef9fcaf71cdf52976227dd360afa44ac477c305a774a29be876e4fd0874f71bae3682b28c2429864283dd14b9e9bd1790a9083
-EBUILD tumbler-0.2.3.ebuild 1516 BLAKE2B e617d98637d7ba3ce1d3775c3902b34a024dc861d4555a024197c565d9e8a1207d8ce1ce42da6202ae41ec28f45755a76ab2e30d063d2d691fe927aad8c19311 SHA512 6523e17566c3fe8b66aa7fbfee23243f47b5fc07876b567cd9b32be867a6fc052a99a013eba3754f3f2bbe8ee5ad9ac408156971eb24e1cebe037fd06b3270ac
-EBUILD tumbler-0.2.6.ebuild 1528 BLAKE2B da8fa22b8d431af5bf8c1df1d8fcec603846007bcb1f3cda8b0408766571ea153eaa063a504f6910a87119c21e1ec19da581aafb8a4e9c9bc726e90bf689b9cd SHA512 d4d4e582ded506019bb81b0000abcef1e7bae537790cd7b974431bdba50ce4d3b4962ecb762dc3f4ca8f9191a6845de60117158b17604dfd5b763bb5c3c5f6ed
 EBUILD tumbler-0.2.7.ebuild 1518 BLAKE2B 5b1bef05bf18013fe2cea1bbbeb42f01d707a94893042747512cfe29d78fa9dabfa2184ce8ca1230e293b94a3cce874ffffab6955372d062229c1b2fa5e295e2 SHA512 b6e3251428049f5f06614c85263ab9b904c9394960af5603b6849bd658558d53543796a40c0b78d6382bb505d3dc7291829d8aff29765aaa4dc62f135af5997a
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.3.ebuild b/xfce-extra/tumbler/tumbler-0.2.3.ebuild
deleted file mode 100644
index b35a70e058e0..000000000000
--- a/xfce-extra/tumbler/tumbler-0.2.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
-
-COMMON_DEPEND=">=dev-libs/glib-2.26: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.6.ebuild b/xfce-extra/tumbler/tumbler-0.2.6.ebuild
deleted file mode 100644
index 529b2c3371d5..000000000000
--- a/xfce-extra/tumbler/tumbler-0.2.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 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/xfce4-alsa-plugin/Manifest b/xfce-extra/xfce4-alsa-plugin/Manifest
index 67e3f8a25053..6ec17d88dc95 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-alsa-plugin-0.1.1.tar.gz 126701 BLAKE2B a117a737023f0d4ef9473030f9a3e313a53687f4a4b049147be6a63320e346db3d0d2cafef55ff13546fdacab70f849acd1006f39b8606fc8a51323562214c08 SHA512 05273467944a08dd87455fcf20da0292899ace7254afcd2eb141c8d3f10996ad8ee08c6e61abb0178f65d52b066b0804e05a579d0a7f7e65b46fe5c4fd744fd7
-DIST xfce4-alsa-plugin-0.2.0.tar.gz 29283 BLAKE2B 42e93d0968e5275ae5c542b85907e45515eb5886f06675c3e25125796d6ae851540d377e4617c89903b3c8349b2ccdb5b49563f127b82ca7f249514819181c97 SHA512 1d4409aac80d2d0fd3022e8467f77b06df7d6e4bd31e69197caa89c2bf3c4347830054b550d0faf530eaafe05835192c915da36b987847687518e71997620e75
 DIST xfce4-alsa-plugin-0.2.1.tar.gz 29375 BLAKE2B 1bb13203af1c21c472531ecddd4d65b84c5610893a434440585c1e51e2e717cd8642874e7ea784b2c5ae7e0c9203dfa9104e95485045f5749e77ea2d4d56c8a2 SHA512 d04ca015d33bd068cbd45d200181239f1b1ecc2fc7723ed8d4566fe28a8b6b28e916e2c484ef535cbabcfb81813ffc46f5fa2b1f8535fde2f4cd719cc0f65e27
-EBUILD xfce4-alsa-plugin-0.1.1.ebuild 752 BLAKE2B 3a6aa888ba18f4f874e09138fa0615208f62f68bff68599c2cca620eea8398b48a4f6c56bef7f94eecd216de70ad4d2272e7a8478b8d3d6434182054116b87cd SHA512 9118318448ffb9262be1d1248457bf37a32ebb1a3a130c9535d1f87de0b538a711ebe12ffbbb4f89e747f1946981915f687b272bb91e8fcfed53375378abce3b
-EBUILD xfce4-alsa-plugin-0.2.0.ebuild 668 BLAKE2B ced0f4361ee3a9eb1eeb206bf34c83a77c83130bbb1a6e7ea2a371bf60d3ed538fb7bdc95d216a40fa35b0900426f510887d5d86e74204195eab4604f58e5101 SHA512 eafe8fd6a9f850e7ff6b150a4769656bb561ff39cd4812de0262382332f032bf99076e91fc3bfb3ea1ab25dddcf5515111afff91b1d6a350fa03a9a1c57c00b1
 EBUILD xfce4-alsa-plugin-0.2.1.ebuild 666 BLAKE2B 5fceb002dbd5997c22db29bdc774d7db80aa0aefd6273655e07757cfca397d4ca40a756ec734bab3b5b56fff76039ae0f9149aae53746497aca41860b4c549ae SHA512 ee21e46a8ec154a15b5cdb1c5011864ceced7dbc8d28baeb275b93d267544118c32cde9de9a80310be00fabb20173181901c317bf7279f359ea95bf9cbd18d67
 MISC metadata.xml 330 BLAKE2B 73c387f918e801398808c85c8f8a3ee064dd4b4a1457c04ab2a7aa75065665427b931ecc198105e0a93a8f17bbce0801966659873c1b54a3c4d5e061821880ff SHA512 4348ea62b4041beca20200b351f0f3914b99c413ba18123f70345ef007a403aadc131f15ba535b6f4efbba745e6fa5b7851d74945d09236f36d000732fd34dba
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
deleted file mode 100644
index d78c37e16b94..000000000000
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)' # required by waf
-
-inherit python-any-r1 vala waf-utils
-
-DESCRIPTION="Simple ALSA volume control for xfce4-panel"
-HOMEPAGE="https://github.com/equeim/xfce4-alsa-plugin"
-SRC_URI="https://github.com/equeim/${PN}/archive/0.1.1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	xfce-base/xfce4-panel[gtk2(+)]
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/intltool
-"
-
-pkg_setup() { python-any-r1_pkg_setup; }
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	eapply_user
-}
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
deleted file mode 100644
index c39931e05f59..000000000000
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vala meson
-
-DESCRIPTION="Simple ALSA volume control for xfce4-panel"
-HOMEPAGE="https://github.com/equeim/xfce4-alsa-plugin"
-SRC_URI="https://github.com/equeim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	>=xfce-base/xfce4-panel-4.13
-	x11-libs/gtk+:3[introspection]
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	sys-devel/gettext
-"
-
-src_prepare() {
-	vala_src_prepare
-	eapply_user
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgtk3=true
-	)
-	meson_src_configure
-}
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index f63cd5730d89..b17a3cba00f2 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-battery-plugin-1.1.2.tar.bz2 464077 BLAKE2B d3a8c661a96fae4992d89a9e0e7c313fc7a816bc6586443eb0490617f00a5afc81a2e4cdc0b7b3e3444ffb7342cc503f0fa1e84c967c0412ce287daaca41c950 SHA512 51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491
 DIST xfce4-battery-plugin-1.1.3.tar.bz2 431118 BLAKE2B 305255b4ea0f232f5dae29b47c4ec66b26a5848783d6aa6b3379b98fe9312b302cde8302aa3d2c8bd945b3b160cdf5b6e612f452f5595f61ddaf5659342e3480 SHA512 a591fb37855efbd54d18ae97e320fa4521da611c8ea107813bfd66fa570e8c84576fcf779c7b676ee9918709912de728b0fed490e64d3d2ad403baf719db4520
-EBUILD xfce4-battery-plugin-1.1.2.ebuild 1019 BLAKE2B a075f2425fcb93fb61b86b7e23cb395d6a79faaef3a5f349de1d84ef6cf71395a2aaccd42c498e3f05a44ac302d6f98ff3b795e4d1287eafe4e40cd40fb50703 SHA512 0e469126e0f6de8be485bbe39dfe5600daa206e0407898e87bf54eb626d51b9bd533debdd62ae4fb5d64deaad77758de82c2a88e694c5ed014f4059b955388e6
 EBUILD xfce4-battery-plugin-1.1.3.ebuild 949 BLAKE2B 455f99991d852e15ecaf4525e86295ea3c326bec67ef90ae834339304ed33cb9cbcfd407ff351b1b62afbd766063613e470ef654762b2d1ba93388d9c344f968 SHA512 9d27466665fafe7a9b8d0f803fb96a3b27f2ddbbe576901ffc5ee33ca02e42e3803b418aa363460c39a32db491bfa521b966625da2bc56b50778ab3ae5fdb53a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild
deleted file mode 100644
index b83baf8184a7..000000000000
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils linux-info xdg-utils
-
-DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.24:2=
-	>=x11-libs/gtk+-3.16:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~ACPI_BATTERY"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 59b1c0234f17..dfd34121c938 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,9 +1,3 @@
-DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 BLAKE2B 7c39aa6fd9d0d6ecc5bedce1d99d330765c329d1fa673b61282fdea654ebd997caa118f57dd0776008584eaa2dbe0a6ae7df532ed3b941b03b111f5ae753d2e8 SHA512 3d1246958dd30638104f14a8b0078e25c05b67b42da953a97cb51d2b04e70d3f1da9d42ca4f4575b7114bce5abc4cb94d598737631536c0575b55d9a391e210a
-DIST xfce4-cpugraph-plugin-1.0.90.tar.bz2 386127 BLAKE2B ec1809f64fa2fc142aa6efec315e2c138b7b49261ecce4735cc0dce225c24c69013f4b2a4250dcdf1513029765d81cb757e0bb38ebb3bd024b5b07fe2e0475d0 SHA512 7f2be5b41948ba4c730e6fd58038e96044ef8d007ae55f107a434308bfffc99071706c92854e41a589a807913fb98b9b216c141fc1d37c744275d5a3944aee09
-DIST xfce4-cpugraph-plugin-1.0.91.tar.bz2 377694 BLAKE2B da75c1295dc190923e1a16c2627fcb36517b00ded3a358c198152705ac220720b97db36a9e6b43c1efee11cbd95249acec38a0aa8985ce6b7d1e3c35a6d93d26 SHA512 513fdec6ed9c00b1f979c3ca9223667d7b50ccb55e9be9506497eade4d4495547e60e53507bf114aabd23af911a477f997c6f7c2944c1761125a12227c67ccf5
 DIST xfce4-cpugraph-plugin-1.1.0.tar.bz2 391629 BLAKE2B e1a18df75461466abf908100e3ace73c46751d78527a9928a5712e3b3388cb0908b697055bd229f700f3e36e908cbc90f2732fc65568ebbe47d876aa376fd087 SHA512 c928baac776517da8929b8ce3842be7e02a2b3394b7cc848028d1720ca611e1aa4ef706bd00736fecfed0b3b2d0cce94c09b0f905a226db5e50c036dabb8df2a
-EBUILD xfce4-cpugraph-plugin-1.0.5-r2.ebuild 824 BLAKE2B 61d2ec39f2b087ff1adf008ebac108dae32133ef5c91c437579bc6cfc4218bcd8550b7b68ab291306a79e0a7c3120fbc45ed0b5a1d787847254ea6e79d5ba3f7 SHA512 da60d7c948ed9c23ce09660e077186b2f2b3884f3c1f06f291ca22f60e4f41db3e00c45a49d8c25192e3db5cdd38bf54c09427a86a398f5c0ba68f3cf7ab5817
-EBUILD xfce4-cpugraph-plugin-1.0.90.ebuild 807 BLAKE2B 04a3050c839756ca5e0529de2f8a90284b5cf164e2ddc6450ecd84eb21134be810288dc6db6d748299901220b152424297177c26cbd56d9d254691761a8b21f2 SHA512 818d38fd050b00a5cd406fbaca6ef77787dbb111142569c2eab598d5e5f99aac0d4b085cc2a801e526a1aabab699d985a752f71101aca2eeffee645f0c2e8786
-EBUILD xfce4-cpugraph-plugin-1.0.91.ebuild 807 BLAKE2B 04a3050c839756ca5e0529de2f8a90284b5cf164e2ddc6450ecd84eb21134be810288dc6db6d748299901220b152424297177c26cbd56d9d254691761a8b21f2 SHA512 818d38fd050b00a5cd406fbaca6ef77787dbb111142569c2eab598d5e5f99aac0d4b085cc2a801e526a1aabab699d985a752f71101aca2eeffee645f0c2e8786
 EBUILD xfce4-cpugraph-plugin-1.1.0.ebuild 804 BLAKE2B 35509a4c86a14c4e9514d79acd4553fef1ebc313aa33c74e85cf677d7759d88798818500fd08185d39e7610f30103f0c43acb8b47c9c2dfb0bfb6c8f642e0d55 SHA512 497ceae5553f16567bbfc268fc58870955f0b6b0362c1f50fc0ac970ec570cea5d6d8212d17a98a1845d7516dfcb92ff03bff3eed8d4118df7daac8dabcb0e69
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild
deleted file mode 100644
index a2d50c7f1a54..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=xfce-base/libxfce4ui-4.8[gtk2(+)]
-	>=xfce-base/xfce4-panel-4.8[gtk2(+)]"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild
deleted file mode 100644
index 1ba720abcf20..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.90.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.91.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.91.ebuild
deleted file mode 100644
index 1ba720abcf20..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.91.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 5524de4a4a04..18f49f09e529 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-datetime-plugin-0.7.0.tar.bz2 283142 BLAKE2B 6b65ab036a0781492b09c277bc1a9531edf5f197a98e83aa748579e58c1c765d9c8eccf860a934dd37fd45b8626e516e6deae8383a909c2335ff6f81a9663809 SHA512 a6d12a5f30fd6f5d0cfa85e50ed261c09378ff9f74897c5b30aef491c0f81a1985c033a416c9e080c1b07551666e1c6d1b1a1d75b5fac72dd71417ec23a640f7
-DIST xfce4-datetime-plugin-0.7.1.tar.bz2 318918 BLAKE2B 9f279add9a57ced612b864b2331c8b2cdfb9f23fbaf80aeb9ef832b15e8859eadd976fb40fd45c93018a05fa5a88cb1b1c44ac0e855d97d0a049d3c10e46e8c9 SHA512 458d6d16953f8e150a6e3560567ea818e18db0477092ee392d00a4770a6feb7b6d50f2e4cd9373f987f0f6323539e7732bed187e3f74f14f2cb4c093a2a526fc
 DIST xfce4-datetime-plugin-0.8.0.tar.bz2 334063 BLAKE2B e9d42a85cf83c0c8e305f6d3c0977995943d729d2e45adbff6467a89af7ba5725e9690291ea95f8a115903ab8ba282f4b0b8ed15ef115d63b5fab6f85a038c02 SHA512 936af402bfd3ef199dc05254c57201b90f9554b2d824d74d2825f16d60e9a4c1a03f25811d80bc666a05dd6b47798ef2119f458b55d612e0803f75fc583fe550
-EBUILD xfce4-datetime-plugin-0.7.0.ebuild 947 BLAKE2B 93950255575aec6d45db7d00acdaf6158355bb978385235e24bc5357c823e46423667d946c288821fff19a22c8ff61070598bb1babd4e089b2186cf4025103a3 SHA512 3d042ac077626831ad2ed60f158ead440a5acc3daa08343b9eec4982c8cd47b8f06961150da3948ab24813b53eb06c2247b06a9a29d1d183facb8b2db5883944
-EBUILD xfce4-datetime-plugin-0.7.1.ebuild 703 BLAKE2B 0955fd6d82be3715dc57dde14b4619d228de3307949c613b191bd5a6d3eaef2d645c67f53b7b9bca038f5f6ca1b81ae13016de9d5fc545fdaaec4cd1012fee7e SHA512 8547681d89c864433748b426b2561530f14635af8c2e2d0b05dc403f862615d0c19c5c891c5fd4c329e47b61fe5dad5493cd796c37cb26a2d8971742002b65c3
 EBUILD xfce4-datetime-plugin-0.8.0.ebuild 697 BLAKE2B 95ef677832494f770160e6feaa8966ab8dba3e8a34bd6e82a9f29b6e15952a370d8aa6ed53697809a17f384b3d593536cf64eb89631ec7fe7de1a685b3a85ece SHA512 bb60f8cdef6a7e22feded2b4ce43e25b540a8589dd13ee2bad1632c9ecceffb392525e6968064453219822d3bf193bd0232c0baf7663782606f4c8a89d2bb718
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
deleted file mode 100644
index d06f59ebe1b8..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plug-in with date, time and embedded calender"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${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=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS THANKS )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.1.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.1.ebuild
deleted file mode 100644
index 68e72f993677..000000000000
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in with date, time and embedded calender"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${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=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 2a35be97f715..b5490e0e2ad8 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-dict-0.8.2.tar.bz2 486727 BLAKE2B e70bed1a0adf6bf1726ef290f802b5dfed85868407d5889b2c138aef41e3f136e24995dc739e9c7bf055b6fff3362531489f694e216cfeca18f9b0d92e243452 SHA512 b22edae6adc9e965d8d59156d7b241e6454be9af1c7cd2b6264987dfe9411293987065b179a362651ccfc1f0423a41672803467e6df5307b998c5c359e487b5b
 DIST xfce4-dict-0.8.3.tar.bz2 491964 BLAKE2B 8435ea8d176301b73e34e7cb7fc2383b07e5fb5b0e9ff31c825cb51211358642771c1526971924c8e4a59c046b7133b6f82d86cfa739e68cfb89dffd13a2a65e SHA512 d4779a928e351c06d8866d1eefcf2efb5f364b64591a76abd19b87ac08905196b436725db3660e694b7071a534ebd9b08f298945a515fcaf335b74ce15eb0617
-EBUILD xfce4-dict-0.8.2.ebuild 967 BLAKE2B 09291d1f52e492c914a3ec8c1f854cf122b84629ce67ebad91102a2df95e35c43e87cb2da12536b26c69e3895db656f12a8d34b24500ad6162fd1e3cb32c3ccf SHA512 a8aae9174dedd508024813a51a590894a8fa76ec11b577e2ae02bf9e28a0392f6f82f4ee6209e22df5d3e9222f314230a3bfe8a6d3b1d3b3a522b886a010919e
 EBUILD xfce4-dict-0.8.3.ebuild 954 BLAKE2B 39b92f0e70c4c934e8bf218be98815ca121e373581205257ff8ec1e68603c689fd75e240f561ba678aa986d08f8c714fdfe56cee1a503fa6dc01379b5023500d SHA512 fea4e344acfab31ec32f73d758826cb3cabdb7ea4187042b2cb022a1e6348acd9b03e4959654cf318605f74f6d6d303ec0c84493bc90ca87407670041b3bf670
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.2.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.2.ebuild
deleted file mode 100644
index 60ac828619e7..000000000000
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict"
-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 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:=
-	>=x11-libs/gtk+-3.22:3=
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 404be7ff4b22..460bdb380090 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-diskperf-plugin-2.6.1-sysmacros.patch 626 BLAKE2B 116648fa6b865abd4e9a1ec2f42cc6d3efb8c5f1380fdd197722a50206460573e3a4c6eeee61f3f1005962c36d1cbc8371112204c4745ab4c816a1c108f01d0a SHA512 d2e42cb9c5b430d20996ca912504bbce949c4153bff12f6be72ed6b73e891194ce2d1de0f3ed8e1cefca0d7740732a01e8dd38b522deb0b29ff6b35f32341626
-DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
 DIST xfce4-diskperf-plugin-2.6.2.tar.bz2 347244 BLAKE2B 82ef114b6ac445627d05ed99b34f128391061e5028192aaaa47e8b87f17cb89842d541585e77da4b6ec319fc50f242fe6d1fcb510048497e2b1184a8e3dfcadb SHA512 e91a888a9936f8a0279a062801d16ebe03159df479413087a01e20c15913df781378e4b4c91ecba94d71afa813c6d3a5367b11c1c6d3d62bf10fea78c4853031
-EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1058 BLAKE2B 32df565ba5cdebdd438d8278e26ddf1ac3ce5f9a50a93a4592d9ba5a7b3e7cda160ef8bbf5e5eacf3eee083d59de8be54dc68a897f4ebf910464afe85dc64493 SHA512 6b5a984d997d3bb6b48f2a4e172d465dc19434fbc836a7d9ac6212246c00a1f5ff890a5f737f47040026cc2dd949c3ef4a5a6fd0546bc828c2b2e81f479fc780
 EBUILD xfce4-diskperf-plugin-2.6.2.ebuild 799 BLAKE2B e4787b162fa2521e00f64e69e92a270cb6a6e13d5de90f14000b522172400282c8affcc60f30aebe5e4d861ac8347b62d16d9bcd47ff1f1f5595c9c6112860ee SHA512 9457f35ff920871bbb924853722a7944b286b4801cb5dd2d0ef4f59d20844b9e38862df6d9bc4adb86a41f945adc73564fd1881cc3d22fbe96d6aea65e6f5f44
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch b/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
deleted file mode 100644
index 13a8df73bfe2..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/files/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dd62d6dae6ad77b586af69faf8fdee8d7c87051b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 Oct 2017 00:14:32 +0200
-Subject: [PATCH] Add <sys/sysmacros.h> include required for glibc-2.25+
-
----
- panel-plugin/devperf.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
-index 175fd44..9348c9e 100644
---- a/panel-plugin/devperf.c
-+++ b/panel-plugin/devperf.c
-@@ -35,6 +35,7 @@
- #include <sys/time.h>
- /* for major() and minor() */
- #define _BSD_SOURCE
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- 
--- 
-2.15.0.rc1
-
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
deleted file mode 100644
index 3d8b6c40f952..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plug-in for disk usage and performance statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	# https://bugzilla.xfce.org/show_bug.cgi?id=13940
-	# (simpler Linux-only version; portable version merged as 0787a89)
-	"${FILESDIR}"/xfce4-diskperf-plugin-2.6.1-sysmacros.patch
-)
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 4ada6496c587..c948a667017b 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-embed-plugin-1.6.0.tar.bz2 348026 BLAKE2B 5da2423f2717798070cd8f550db75567263c2632de7109b94899fd2a6b469ee6f92f0b38c8ef5a8833ceec2f9d8d5bb58aa54e06caf7494268175388d605d186 SHA512 0d036a5b3f8394edb9640ea891fa848416ef9f173b67ba2ccc55eb8bdab96619c355c3cdfaa3cd59d6f48e3de0a01c95682a2466452f8c01a631bd5d8196df6c
-EBUILD xfce4-embed-plugin-1.6.0-r2.ebuild 735 BLAKE2B 0f7a352e056b0ffe0f642597491089bc1e06b06b684253b4fcfb625ac2d441d20d05bae32f8cc3e36204e12c2e13786fc93dd34409573dcc03abaa45a0846f9e SHA512 346fba17102a091214091cbf231ea6d88f67735ee1e13195b49ad85bd501f1e5db3c7e493d75bddb4cb6ca150a0a09a34974699cf62bdd81ee6ebd21a2580eeb
+EBUILD xfce4-embed-plugin-1.6.0-r3.ebuild 734 BLAKE2B 25c670ff5b017d69ac3e85495449ae09aded01dd05bb9be05427b9cb036567dd3842a53ffb4958a7764a9e5e48c0e3c348028042e762399ffd8fa2139bf95b21 SHA512 98fe7e0a189f330f72d18d263c72af4611422bdc5de6447bc2792916eb8b895b866147b947ea6800c0fe40388da5dde77652520b7a83e9559641d599ef698a4c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r2.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r3.ebuild
index 5228c9e5d641..0c56cd3df48f 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r2.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r3.ebuild
@@ -16,7 +16,7 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	x11-libs/libX11:=
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest
index 338b49ee11f8..08f947e699ef 100644
--- a/xfce-extra/xfce4-equake-plugin/Manifest
+++ b/xfce-extra/xfce4-equake-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-equake-plugin-1.3.8.1.tar.bz2 393086 BLAKE2B c34b68ee79cd087b9f0eb178d947c73d596a978415ecb2cef55238bdae65a4443ac83daa6b8350ab8560fa026a8e580c49bcdd4cbba682adc50e53c02ff1782b SHA512 dc9d399ea3f6dd6ee401b29a821130136c1f2ce976d2dfe6a434ec7030e999ad1c903b5c42e8bd3b25397ffb51327cfceb112b1d45193e82efd4fc4f86190890
-EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 848 BLAKE2B edd41503efe41150f075bfad76cd594cf0f91b8aef52f43b352c6cfe8e13b883c2e4f27036b8fa38cbbd7561bfa6ac9d26b224fe0aee9cf63b42dba35a5623a7 SHA512 d97549d689f9a8e06f745a635fcc621cab1cb2d49afee5d123529e01c71a75b56d7be97f73c16f17d74f19772dca9db111e8be8a6a9c4f0f7b2d77f5a5f6e89b
+EBUILD xfce4-equake-plugin-1.3.8.1-r1.ebuild 847 BLAKE2B 1ccca990eab1c387a25b250d7a1fddd10db6809b748434d0a6b26184994bacafab0deae8a5e523e3ebf2f30607127898092e23078f8c1ce55c4517fd95623f50 SHA512 a40cf8a315ec4c34db646fb9ec4b8103ba2a8f4ced5415f3614384c14b401319600f9389f489f2cbb765c7b9dce160f8e2fa6d5a4a933d68d013c8e337668d4c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1-r1.ebuild
index 8ac43429caed..345168450de2 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2:=
 	x11-libs/libX11:=
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index b8a84df05a0a..5e6615f8e1da 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-eyes-plugin-4.4.5.tar.bz2 369297 BLAKE2B c1e7b9e01174e3909306abfb53c9836b2817013b6cb8676cfd7717da986b68827bd286b6319853d79143b7f0b44abec75342abb7e68df3d2fb1c7424a8f763c1 SHA512 f8ac109edbf2edb066af3f13617e2c247151c36fd91551a99b334d85f528663d3764c8566bb4a8b8ad7ae2c021d5b5c46933dc63d523566055d243b440c61e01
 DIST xfce4-eyes-plugin-4.5.0.tar.bz2 366460 BLAKE2B 4f773eb44d622a0a232c9881cf601c0b7ce01f33c9d76091b9f896fee4df76381c558b0f0bc62d720aba35fb2064cb49ed61b8c6992be71b4afb2edf3a21e9e0 SHA512 884f409bda74688ccf3426cc139235daf709d1eabe884db80ecaa5300814308f8ddcf205af7fa2a48cef7d08c03b1f5778e3aedc2f08e15ce22d13066775c771
-EBUILD xfce4-eyes-plugin-4.4.5-r2.ebuild 762 BLAKE2B 33c41b8caf1c75fe1f4ae914b9b5962a717b628c58fef5d4f90eafaf63457bfbb93abc078289936f32ca60567b92454d679bf09c354030ef837748a912973cac SHA512 81c10b5f88651bdd78c3b21c270dea7b63e3501ba4759e944b70463fdc3376118366d96c625cc7e5ecccdfe6f08d1713ecc6526ea4e911a44aec87a598ee6af2
 EBUILD xfce4-eyes-plugin-4.5.0.ebuild 815 BLAKE2B e9b306df54f81277675b9b9d934938809f55da54bb51710e509e385d301c9791e0579c71f3198985c13fb288dfe8dee86556ee78814d9459bab2662f31993346 SHA512 cbfc07764e576b486627ec062aea4e2a767a50cbe4ab902b9d5da63275c4398550915d158ef9aab6d47178e4422f1bac05fbcabaf2f398e65dba020094ac2548
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild
deleted file mode 100644
index a989f20303ea..000000000000
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-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=""
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 7f23060992dd..832d8f5b0bd2 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-fsguard-plugin-1.1.0.tar.bz2 360463 BLAKE2B a83bfcf9d2847a2c37731c6549a51d1d6e18a5a8d689e5c6b7bd3270988cccf25007aa6b47bd70937f61998c676e08ab071caf41b50631d031e5c11fb8921932 SHA512 c5e49a045f1987d57c6e6d120ad25785d2f9ad4e97d07af3d40ab88c268b5b8417deba40e0277ecc1725092063fa2a7f94aa163579f04a419aad5b4e47c79d7d
 DIST xfce4-fsguard-plugin-1.1.1.tar.bz2 367902 BLAKE2B 2fbd088cc2a53dc99e01fbbc880c6223bb3cb8f030cfbed5373d50b7a1e37a072f71beed2f2e84b7f0adcbce28cd0d6cc0c32356589195482c9dee143d04e46c SHA512 9b8a8c171baddc0261e4253c2e710c5d2e180e7ee669915f5a81e53778775880623af43b1638679b86d6a3e077826a69a948577a558e768fa41924ce5d1006fe
-EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 967 BLAKE2B 8e2cf118c132207d04b07ac85041f3c8706194e5566ed208ee06f76489cf32846e6a6d203cb3660023356641c99f10836f3d09513cb6b875d770f602920ca3cb SHA512 ab48f813f21a3332a7e184b8ab58bb5cb10b4dbd5aed84cb2d05c1808840574f652fc844813d5266e69eaabae6894f4269ecfbada0d6698462206520d6ec4134
 EBUILD xfce4-fsguard-plugin-1.1.1.ebuild 818 BLAKE2B 03e7db60e96bdbfa96e155fea49915f476c0f28ec761330d4102242a88e6dbbe79cce7ddd812da5968339daa28f09500ac204f571b3c7b4b497ce6c5da7532db SHA512 aab5fb7632ad51242684942871539dd8ca1cfda98544318e85f84dda71262224ed31df463969e3a246319cafa2fa726805d88993eea67fd3b3ee8d7a514f38aa
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
deleted file mode 100644
index 61a72657289a..000000000000
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index 64107059c3ed..72652c245c60 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-genmon-plugin-4.0.1.tar.bz2 327605 BLAKE2B 908571d5ca2cc8e657416d18f1da61452b045163233a82beb5a1e876a244b2ce463e6cda54f0b7a8239e642eb4bf5d73ea807a5d26c22ded48baf955595fa805 SHA512 14590ba4a3b31773e38139d274c93060b2dfdf3cd476dc2235f95f987529b93b74d2422507cc4bf1152f376ec9c6a01bd1da903d422757b95b19c01aa412b35e
 DIST xfce4-genmon-plugin-4.0.2.tar.bz2 334196 BLAKE2B cd4bc651809a5421cd5938cd5b9cef13e94d81e39fd8f249348cb65921ffe0b55d68254b76f391118d33c3a00cdf331e32c730ad5a9059b1f3fc501843a0fe1a SHA512 78a9cd95a83d6ffcb512647f1c674589bf80e4ef24a3431be96fd7506c7642e42c796f7316e034083fe794ab79521d856083b12a186276a1dfe4f14dbe97149e
-EBUILD xfce4-genmon-plugin-4.0.1.ebuild 617 BLAKE2B ed3ecd85464b6fffffb8f0d3de25ea6ef148fe351252c9d3289f5e8af82cbb3675e7363eb057da67878fe7217172ab96b87079ccd2365b51da3130221d643492 SHA512 a16d5debbde3c3f2c918360fb89ee14aefc616f671d5e1aa5e468049101d1a915063e0897b85b0b66ecfb46bffab6874b2a356e8cda678e5a4b7ab4cead2332a
 EBUILD xfce4-genmon-plugin-4.0.2.ebuild 688 BLAKE2B 51ec2f58627eb52b62ec51f010f500b8449938f0493d347a4af795dfc214dc95d419a8139cc58e73cfac09ea6f451f8478973def20aaedf974a630e98691ab1f SHA512 8a2addeaa71baef914ecd8190e4a2a16937d69781b2a88e8eb8fb2995b8fc2aaf993684727a10b776272634d6d50f56fbc4f96ef6255560530c490ab246c9a14
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
deleted file mode 100644
index 3322cb9e59f8..000000000000
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Cyclically spawned executable output on the panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 42f8c29b7738..6016ac1ab781 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740
-EBUILD xfce4-hdaps-0.0.9-r2.ebuild 1050 BLAKE2B 6c5014a88ea0745d6012d1bd873ea20353ebe7a8082ee84da3509dff78a59a247f67da0cd93bc4a9b77b94dcc8df564bc09d30db62fd8d194d8acb3819686ec8 SHA512 92a50b10c182886ed81eceeac3cfb0400eca8667c422e9a3a9e52f9dd6e07d46b41fbf44eeaf85cee75e28aed1a45cf64a2566980ac586c07bfcdbd214cb1039
+DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b
+EBUILD xfce4-hdaps-0.0.9-r3.ebuild 1052 BLAKE2B 7200f829a04ba2c7d6af4f3072c80ff7635811c5ab8796bb5d4d1a559e5d988c71d4faaf0733f9ac3c70117efb5b43fb58521c12dcb80c83790c0db39abb05ae SHA512 9b655be0ddfa487b43464b57d046a97314094dcfae19d830972ccf92f0cce4fe18d8167923183ee81530e454a77ed89823813fcb88b68934281b036539c54264
+EBUILD xfce4-hdaps-1.0.0.ebuild 814 BLAKE2B e5fa920d432566c6a4cf8414d2130a07cd83ea7af16a5f1ce2fd0181dd477b858b2f8bb05b41be068981a576659a4207510fb3d99975ced378fe15b901d67d0b SHA512 19aaa2f75356d0eca84f2c82d266768d813d404432846f870bd7e781203257daa6913174a800f6e81295aac31f74c8527e34d7644ce4bb094e774683dbe99fd9
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r2.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r3.ebuild
index 838a7e62f6fe..e978cf76e319 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r2.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r3.ebuild
@@ -17,7 +17,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
 	x11-libs/libX11
 	>=xfce-base/libxfce4ui-4.8[gtk2(+)]
 	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8[gtk2(+)]"
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
 RDEPEND="${COMMON_DEPEND}
 	>=app-laptop/hdapsd-20090101
 	>=app-laptop/tp_smapi-0.39"
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
new file mode 100644
index 000000000000..a680a7fb6696
--- /dev/null
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg-utils
+
+DESCRIPTION="Show the status of the IBM Hard Drive Active Protection System"
+HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.14
+	>=xfce-base/libxfce4util-4.14
+	>=xfce-base/xfce4-panel-4.14:="
+RDEPEND="${DEPEND}
+	app-laptop/hdapsd
+	app-laptop/tp_smapi"
+
+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-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index 0e3da056ff5a..739f8ff62e91 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 BLAKE2B 1b166dce725f92fe05273d427dd4d185e6a240c984e4e2503f092af222e7a08b8697b8031804490322bb156bc5109c82f38273278fff185a9039b26334541ef2 SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f
-EBUILD xfce4-kbdleds-plugin-0.0.6-r2.ebuild 783 BLAKE2B 335960d8acd48e9e9666022452d5001e5da9e106c44264509d84026507860c9c27430cd32661ed236f4461e490db3447d716964711e34c5a513ac40c29e42fdc SHA512 464f10313da3be56bd80cbfc171a73da36dbb928624e2af5a98f174b271d341be436aeb19013a4198d5a57e3072eb6ad7eb34e85019f5363b070bf6be00d7ae0
+EBUILD xfce4-kbdleds-plugin-0.0.6-r3.ebuild 785 BLAKE2B 3047ace6f78f40db5c93c8c6454ad2d734244daeed72930ac5d785fa6d9dfb2aa4c95d76cf05ed644502121df1a2c571c3fb87719a44ef5b2a9a2821734dcc60 SHA512 748e4e35a9dc6792c557cc0943bb9f3cabe3ac502894d4b21298829074e73338b211df6adb69bfc740d4a3a93cd10d2714e8d590fc7a93445a6f9e3d9eccd9a8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r2.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r3.ebuild
index 4d5722a6e549..b6c88cb649ab 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r2.ebuild
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r3.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.8[gtk2(+)]
 	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8[gtk2(+)]
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
 	>=x11-libs/gtk+-2.20:2"
 DEPEND="${RDEPEND}
 	dev-util/intltool
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index d503526e8f5c..e9edf7e39db6 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 BLAKE2B 7749914cf4e8ca34e27c63033e84718c4bc8d9da11ca9f6487bf9291c145f5b062d6b7b07d03d2eb273d0e88b96946641721f6f24dd19c19db9f923e9b33ff53 SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83
-EBUILD xfce4-mailwatch-plugin-1.2.0-r4.ebuild 1072 BLAKE2B f35bbc0218ecf9878515275bb68db46815e4436e5e522fdcf7eb82230eeefba6bdf73f77f71b7fa2d4de970388e823d20ef632e72fc7755dbf39f8c2d95ba579 SHA512 13ba831d3a70f6cbce4bc6a99779e9801ce181f8d001fdb358e3ed42bf8d64add6528604c19d0457afd06982191abe0c1c711b203c9b22b902c34570cefbc61c
+EBUILD xfce4-mailwatch-plugin-1.2.0-r5.ebuild 1073 BLAKE2B a7bd63b2c5a5b1ee16b0c71c927db0a030e703949a2bba210c48f354a4b99f1adb17d765ad10f1804a4648c3edeba263da03c2c0e664dde813db6b53c03b36ca SHA512 06047104de647883e26c86097dc0c04d8d15edfe3b0e79a1e2fe6fba9f730e3e643950990dc5f25c27e8a6014ef4b5667b91f3b7c244d18ead82091c22059c2b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r4.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r5.ebuild
index dd1da22675fb..12ca55845868 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r4.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r5.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2:=
 	xfce-base/exo[gtk2(+)]
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10[gtk2(+)]
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
 	ssl? (
 		dev-libs/libgcrypt:0=
 		>=net-libs/gnutls-2:=
diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index 72b79f263b46..6a24d7224048 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-mpc-plugin-0.5.1.tar.bz2 290830 BLAKE2B 464bf4e3ca12049d241ddbf5cd2e30e4e41bda2934e809f8c75f2ceaa659647918d90a6265a49d01f84e2d0d3a6cca880ee8c90dcbf377a163e14fcfe25e5ae0 SHA512 7647ecdc7058e67be26c615853059cba25944fc6e31b06bca1e48f5378d3afddc2c4b82c5c581fe8ec716e0723a4d65c7ec4ee592540936ccca331049b3e024c
 DIST xfce4-mpc-plugin-0.5.2.tar.bz2 293655 BLAKE2B 0b82ee0c8d19342365d6e7a7fc28fcc4ccf880c735df70e793123e63ff86df7e6c3d6d80a8b1c81dd4f7fb264a291897a1900c76aef35c4855c333c85ddfc467 SHA512 c0e6580d5c9c8677a1ad4e8ec4233de1aafc8a2e6744d5d82d3f58f5689e53096a40ff0d1355475a0fdb3e6bc54b44aabb9ca91e5e9caf5cf3ef6fdd4778c22e
-EBUILD xfce4-mpc-plugin-0.5.1.ebuild 718 BLAKE2B ddc4378d0c41bc36ecd3b0845136cb13154461f737948df1748f47172f2a1ad492535bec693e070f6326e907c0baf29f6126dc75d03d4119d968fb50b8f87daf SHA512 ec1565d252505e905287ff817e17b8b98fd459039a3192c29f9241dc762bf623d930c1789987169cf6bbe50d307bf985f32bcd985406f9102092ed4c8633da6e
 EBUILD xfce4-mpc-plugin-0.5.2.ebuild 707 BLAKE2B 2b139ab6111dbe0d0f23f3d2dc9e0807e34377cfded33f1fb51944b47de9316f006fd1bf95b3576afe09dc02e581415105a4a73b20568cc3a22dca6c63a3e221 SHA512 33d489d34f81567ee35f9d130117051ff8662069d945770943775127d3d233ba1ec7621486dec7c7c4d7bf0624ba0965409f846f97cae62e7bb080478b988c83
 MISC metadata.xml 391 BLAKE2B 5f0144a6e45fa3c716c04e9c482be6c6f132e461f57af55bdf2f3c41590909e7c65a0cc36ab0b29a2dd0cdc2a3c4b9d8f2042d90cbe54458aa9c4175a9e7148a SHA512 cf9d54decdbcc2879e190343f71a2fee82f1bf91a34c83e6b262428e9a7042f0e54169d4d28005bf623c2d8a7ac38269e1531ec853e6332ef761a057b42fe2a4
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild
deleted file mode 100644
index 9722928fb36d..000000000000
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Music Player Daemon (mpd) panel plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="+libmpd"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	libmpd? ( media-libs/libmpd:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable libmpd)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 251695caaae5..a7acdce976ec 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-netload-plugin-1.3.1.tar.bz2 367844 BLAKE2B b68cfefd2f54f8ee5868d6dab5dd4818b5268e4da96d9e53b55b354d170c56d72ef8fc7f360a1c97e1700795935c81ef6d0c982578fd8237c83ce04d266ef780 SHA512 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9
 DIST xfce4-netload-plugin-1.3.2.tar.bz2 380571 BLAKE2B 015e4fcbdf14b72cbaaf4fdad09e96a7da4eeb8e4f5a6b86281efec7550355cb1cda20260a73e43edd6df2d76c7702d96ef0d6296683c7665f6295a4351578ca SHA512 519d18b1212d7c43e016220f94c6d0dabcf676ebe4f32e4c166497e7292dd4b297836d37cbea08572ab77ecdda2461b081411a6cd37fe3a20013b4d77419ef93
-EBUILD xfce4-netload-plugin-1.3.1.ebuild 912 BLAKE2B b0dc743539c9cef8acffcb05165a28d3fc9c114778a9f61ab31a96ad02aa6b82156782a394ffe37d95992d143fd89f43ad19fb0718b6eceefb3aa91a85608679 SHA512 6985be3db54421ba9412540b995d17cc1406b400870ffd2ea9f12c278f33029703de6bb6857c153cd546c296c8c8dd578211363f5ca68c4b1be2203950daefd4
 EBUILD xfce4-netload-plugin-1.3.2.ebuild 764 BLAKE2B 8e5791b1abc4fcaa08691f38dd7ff419292bc6d42cd4b22cffd5014abd5716656a4504d730b5dd0980655536935cc7d37b3d394482fa41abd6c98d581e0e650f SHA512 cf6a0d9111c885ede2d44ac33801d226f7de04c15ff80c8aa68f3960660d606221aedcccbb5adb93c55544c3345513eeec9ba5268f4cbb9e83daee87ed2c4ab3
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
deleted file mode 100644
index 1a1ccdd15219..000000000000
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A network load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-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=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 88e9d4c4208c..e1eb6d4cf6d4 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
-EBUILD xfce4-notes-plugin-1.8.1-r2.ebuild 895 BLAKE2B 498463a3688f15a35303002b8b244dc61c25ef3479fb82ffb2247c4959a848b8c70fc9c6b0fb744b11e1433196430ea3e8d552a67da6f7ff2f757c4f856fe96b SHA512 1b858f2430f3e4e08d8a514fa962c1af4fbd2fde80eba6e2408aca9462750e940f3374fbc5536fd61f6411888ccb9925c057facb937343561807a876b0d2e6a1
+EBUILD xfce4-notes-plugin-1.8.1-r3.ebuild 894 BLAKE2B 83419b571223bcf0845c6dfb46f900b2c4d7315b9c6b465ca518fb687bd006e19cf02485bfdfe2d5580af3ddd2946666fbee77b1c8d07db9a4e4eda2fc012cb7 SHA512 55e04e98cb008d4b9c9e7553d46680b3131286e48d65449bce06d8ee3997168e454e0ac033489a1b4bc30606481f8bac569f7eb8b437461ae720350947dcc534
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r2.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r3.ebuild
index 716eebe8897c..8fdfcfee5ee6 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r2.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r3.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.24:2
 	>=x11-libs/gtk+-2.20:2
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
 	>=xfce-base/xfconf-4.10:=
 	dev-libs/libunique:1="
 DEPEND="${RDEPEND}
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 355f756130f8..083140d4b08d 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-notifyd-0.4.3-r1.tar.bz2 534378 BLAKE2B 43f4b5d4dec5fc76bb88df0c92bad55620337f80ad3e51dfb84da46e58786c79df984dccea8f4985435864a3e8f77321e50284c113faf21380fe49837ae80e6f SHA512 eed16d863dddfe29ce6dd1e34260ae64f558bc5ffe5af837e293a9492b728a400338b950116fb934f0b3d0a76ed8fd280aacd075d44524be614bb27257b99a9e
 DIST xfce4-notifyd-0.4.4-r1.tar.bz2 536304 BLAKE2B bde62a773f7a702338e07fad8483d57576edb4c046b709c8644c17697ea73b72e46b8b4e2737d02bf23a554cbcac7c9725d7f19ee9f1ea511efb0943280f1b60 SHA512 546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5
-EBUILD xfce4-notifyd-0.4.3-r1.ebuild 1003 BLAKE2B df39c5f94237f22f9d90b71d9fbda8e0c920cda4f8980e9a8c01b8002c17fd12321b451c45791bc7caa04703ccd37e1876daa6669ee6f6eba5338bf3220d5b23 SHA512 5f51e5a6eb1561af57d35bf4cbb39010d674d8fda0a68828a6ec4e419f8dce51048b8ce5722a3354b7525bd94c46c4f18c8e96b9cb6077b540b791df28fa62d9
 EBUILD xfce4-notifyd-0.4.4.ebuild 908 BLAKE2B 65dfe8a7964c2703923b9662c7c745e3a56b78905433939db41f0705ef6671150f2b0867d60f555335f08ff0ffcfeb8e75a8a130858a95fd9fc2380b5bd2723c SHA512 48f40c02a0ced75b98ae409a29e71d1ddeb8405e7ea14f4b0a93804707ebb378025609d4ad97b47951e771695c612ef0124baaeb686a5b067a7f2505fe4d77a8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild
deleted file mode 100644
index f4203efac496..000000000000
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-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 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_configure() {
-	# DBUS_BINDING_TOOL is not used anymore
-	# https://bugzilla.xfce.org/show_bug.cgi?id=14835
-	econf DBUS_BINDING_TOOL=$(type -P false)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index c97c20133da4..d5de96f05503 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-panel-profiles-1.0.8.tar.bz2 40074 BLAKE2B 620e74a6c5a7316e82bda0ad217abc9868685ee9fee6857c4e8aa35002f78f938a754ce709e56466ad648ae4637144d3e90d909e5d9e6865c5e519db75c4da8e SHA512 2d7980a79250414cc4611ccf573c2a3ee5eb510cf3ef6c32035ba23197eee1fded2e158cb50714dd935070916b07b3f33db02570f3d46a598144b4a2d3979ff4
 DIST xfce4-panel-profiles-1.0.9.tar.bz2 58886 BLAKE2B 3711bfdad68701af833e8ffcb8ada151b1120168193d8508d14dcbb3eabdd5eeb9f0b3b5ecad3c17e5e3afa1b42e73e72340b8ea2fcf9efa5235415384a49018 SHA512 a9b381d357482582210e153fdf1ced8055847ace0507dafc29fc952070fc4fe8fd34aff62342f442ec7045cfe87550c56ccf5d78c0f0a7de7ed64e4c303aab45
-EBUILD xfce4-panel-profiles-1.0.8.ebuild 903 BLAKE2B 24b9c21451ce442df55d73999777d7109b119731918507ce5dc468069591886e7f77b406ef7097dac4f97dc610f41e4d5d8bd6bf78180696189b2e335b69f5e0 SHA512 6f531a448cdb78af0ce782244c65df9cdf1879cdae4335cbb3c0a5117d2775f95e5cbeea0e2651cfec461e47d3e9f0f58862e7583d3c80a2cc2747e20eac7623
 EBUILD xfce4-panel-profiles-1.0.9.ebuild 903 BLAKE2B 24b9c21451ce442df55d73999777d7109b119731918507ce5dc468069591886e7f77b406ef7097dac4f97dc610f41e4d5d8bd6bf78180696189b2e335b69f5e0 SHA512 6f531a448cdb78af0ce782244c65df9cdf1879cdae4335cbb3c0a5117d2775f95e5cbeea0e2651cfec461e47d3e9f0f58862e7583d3c80a2cc2747e20eac7623
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.8.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.8.ebuild
deleted file mode 100644
index 7be1dfb541be..000000000000
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-single-r1
-
-DESCRIPTION="Simple application to manage Xfce panel layouts"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-panel-profiles/about/"
-SRC_URI="https://archive.xfce.org/src/apps/xfce4-panel-profiles/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-libs/gobject-introspection
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	xfce-base/xfce4-panel"
-
-src_configure() {
-	# home-made configure script, yay!
-	./configure --prefix="${EPREFIX}/usr" --python="${EPYTHON}" || die
-}
-
-src_install() {
-	default
-
-	# the default gets it right
-	rm -r "${ED}"/usr/share/doc/xfce4-panel-profiles || die
-}
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index cbed90e980b9..c3fba3954f5d 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-places-plugin-1.7.0.tar.bz2 371395 BLAKE2B fe18391e0cabe06d9d63dfc86a829e35461858b5915d7331053dfabbc9bb689bba0a3cc05b7d7f6dced6e19aa6e32308ba052cca9416bbfb2f050768d3e86f5e SHA512 ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3
-DIST xfce4-places-plugin-1.8.0.tar.bz2 371134 BLAKE2B 5ef5cf79ce565a827520ed281a0be2533df643137d673f12d15393efb2a0ef5db1a18fff3c5e807cdb98d29a8ab4767469fa248cbca85c5a77d9a4e66aff6b59 SHA512 9db3b311881292a9cd380d505be8cd529b51ee92c25e0bbdcbc28dc099369cd7ea078e7c729856d9718967de8f8e2f08db045efb00a4be097d4ebf766da51263
 DIST xfce4-places-plugin-1.8.1.tar.bz2 380906 BLAKE2B 3b5c82fe3fb9fbcc0b9aa79df62da06025f5dd154d4323787d52cbf659351dcc808a4c6e8d4148332eb31a8d292b51d58dba6c81fdf49443b94928a1e82f66f0 SHA512 c0db29050df6ff2862a6ebc6f89d92e39f0c0511f9e719a979b5132935655078a5f5418b8b87bee2fbccaa37f5489d503dc1ae329eb7fd88970dc55b31db3324
-EBUILD xfce4-places-plugin-1.7.0-r2.ebuild 1034 BLAKE2B 08245960ed7161ba56eb760ae4a94ee8c84488aad3d1a9a3c4a6132a7b6aa305fbfa2ab54c77d24d3cd5a88fb1422eb7311d88c694bf1161e727eca9c3121b59 SHA512 6cada22f2e96a6d7f76097d85a7d0b08a27a735f1bc8b2ed063fa683f19536f5467142e3eefa7aa21db69a696cc38f95a4fd8b83feb97ead4507d181d41e4bf3
-EBUILD xfce4-places-plugin-1.8.0.ebuild 1013 BLAKE2B 9d475e78465d49b0a942034216d011fb60214165ade3ca574d91409f39181852bd6f6b6f4ab7e409a13ee79a5f66f897a119941051c2d81abad698465ba0e1d9 SHA512 4478543b4655ee38fbe7fb6958befbb6b01a5705a36b95f0b156acedf2362fc4e926b2aa339d1833163ad6424290e7ee0d3f7a946389fe522957f478dc3fec2a
 EBUILD xfce4-places-plugin-1.8.1.ebuild 1011 BLAKE2B ef15457e1a4c2bfebe9925916a22c2ba576a2557c2badb739660536f38c4ff31033d35da59683859f76202fd0ab9f5961dc2d1306a1e689b8126dfab7e53c6e9 SHA512 b6c9ffc4f3344d54538b024ccc39acb6c03df8d35f6ef26445752a689e4dee70d241f82f30ba9e5f997d0b35fc04d127f9bee1611fca239c6b6e31b68f3b1344
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild
deleted file mode 100644
index 1b1a4a0bca9f..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-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="libnotify"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.6:=[gtk2(+)]
-	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
-	>=xfce-base/xfconf-4.8:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.0.ebuild
deleted file mode 100644
index ca535a14ef22..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-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="libnotify"
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.8:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 8fc904ab4cb5..554feaa53253 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,9 +1,3 @@
-DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
-DIST xfce4-power-manager-1.6.3.tar.bz2 1216971 BLAKE2B 872011a6d18841aa7b9cfee3b9aa91e75b7db95a77dd8ac3484ebdc5d289c375a7c805d8638650e72870b8eaddd71bfac74a5e3f568b8ca1366160c972c61cc4 SHA512 4a3c629bf14b3214d57df9b9a5fc77ec675e02c300c508525634bcaf38d94ab0f6e125ea5ec7bd41c1d0c3d065dfb3ab1937ee7f1006adc0093142f466950c6b
-DIST xfce4-power-manager-1.6.4.tar.bz2 1216948 BLAKE2B bc89c30f1668e4cef662336c3294bc0ac495e3a8350d4bcd1c4f514a52840482b9129a822e4e3edee5379f32cf9df897564493e444b2c4607ec5cd8c6a562d43 SHA512 0d1aee648d4fbd1543dc65abf97eb9c7da7d5eb39d034ea9c99a6e9c2144854f6fcd12d5581d1bf1a31afb308f0ff34d4f6888a766c1eb7d0f1d63765a73e02d
 DIST xfce4-power-manager-1.6.5.tar.bz2 1205473 BLAKE2B 64d3aa04ccb11b7b541b9ec8c3dd4544c66f8e7de626c5395cd10ea1e0004d7f3e941d9357941b73aec3997ed9935f04540d2c04ca1e6ac271baa80732de0f72 SHA512 ebcf9ba7431518fdafa74f49511200e16093c34f78516e823a2f7ac02a085a08377efe5f9c6fe285f3d1e2de253789404e01b34a48e3f5ff23c2c143b2801207
-EBUILD xfce4-power-manager-1.6.1.ebuild 1410 BLAKE2B f1526099bfa749d48cbc0e6ad7a5cbaff51819fd027fa2821268031a00dc4f31b129faa1554d6c770f83ac5124144fd4b2ecf9c70ba9abc2239b8dad11fe2a03 SHA512 320fab64dfdd9ef0a95657f2269dbe6dc819189581314c3b641cfeb48e56f6aa891cbbfda0fe70fdaaf4ca2580ac6c13ae299cee51518665f96b1cd6dd255092
-EBUILD xfce4-power-manager-1.6.3.ebuild 1410 BLAKE2B ac6c4e67d7653ff39313ac98e70e90119c769fde74bf5d24b7111f321b51c53deebf87b5022c487b6a92701d67286b4858feb2ffc35f2f7d3ac5cccb039c0025 SHA512 d7ab5b66043ca78386e5ca7921a858f7bc9afefb30cd3e42d953971dbf1cc20b349640fdcdbfcfcd72865b33b51c2773f914f840cc7fd7930cee247780b6dd29
-EBUILD xfce4-power-manager-1.6.4.ebuild 1417 BLAKE2B 2a207b77522be39a96bedde75020aee3fb4a602b1c76e3e412afde751f56dbf3b39c39b54748b05036165625c87af78d45a49b2d786622e1056d77326d902e12 SHA512 e45fa7544801a97a9c2fa05aefb56db74fc9ece8f1e66c13ca835f2d93235a2287bd0f3cb04157e52990e5ba5cc5528dc4daf8827d619faaf0bdf0b54194800b
 EBUILD xfce4-power-manager-1.6.5.ebuild 1398 BLAKE2B 12de1649f19e699b64367b4f4660a2da71e456d4b8b6cd2b7bc467ebf8cf778d068af9b6b7ab44ee19a461a3e3273b3782a7993170c4abc04c0e11f93f1b8383 SHA512 beae7093a21f3606bd18206228ef9d60b27dbfb4ae3d76bdcba4a6bde03a6aaae82e531a09180b249d469888613b9d2d583711de8f1f50e50417ede4e405ece1
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
deleted file mode 100644
index 5a75b1ef93e7..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-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="amd64 ~arm ppc ppc64 x86"
-IUSE="debug 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() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.3.ebuild
deleted file mode 100644
index f7dd4f54e23d..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 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="~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.6.4.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.4.ebuild
deleted file mode 100644
index 6b9e25612933..000000000000
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 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 5924484d4cdd..93032673f70e 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-pulseaudio-plugin-0.4.1.tar.bz2 391791 BLAKE2B 038eedbecbc6ba4845f1be86938aa57165f55e1d287f914deea998383fad5a019d1ca7500c7366d76692c1b59cf87214e2057833786318cb69c326eea2a69ea4 SHA512 e7b778c78ede9ad62afaa379941ce03636a79dd000e40e748079d3e0f3c71f2e68e32cf85e527be4e1192074652714db4b7c5707b727066198c2ea43184a71cc
 DIST xfce4-pulseaudio-plugin-0.4.2.tar.bz2 428504 BLAKE2B dd8c855e75aaee060df1e7abb2f8b835f1a630ce8b45b28c407c48f52071a51729e0bf8c645d5f68f968f12a45dea272d03ee69f4554009421a1a075a8fb8d2c SHA512 94184fe7379a7f1763d606fe3c45186767a43180329b43c8cba04b76ae5e1b2249531fc1fb6304da9bb03e7475ad65f861341253ead530d9a945165b4eb9e46e
-EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1466 BLAKE2B 4b1111a9c7d31be46358135aef0d864b5c3c8e07435b956627cc5d0427d64ad086bb96acd7b765f29a060532f86f5f5cb8498bb148944f36c1106e45603c9f2b SHA512 d5f08999601dde100aac0a8523a999d5cfcb90348c702d4c00380e4fcd6c8245afa7897737f89173e8b1a29df520ca218b7465a2ebeb51435b1cd60501a6d55c
 EBUILD xfce4-pulseaudio-plugin-0.4.2.ebuild 1458 BLAKE2B e874b0db23c6b99f72aace1af730ab124a98852505563a6183abacc137dcf5c3b3744c368b62115efdbcb5f9504596905bb75d9f4d7b2d14afa91088661b669d SHA512 094bc7fc802460f831d8fffe4edabd25605a887ed4d8e6795963818d5cd33449a24ff325d35a2a92a8f95a86803cb9e2d8454862dd688dfa504c23a191b2d837
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
deleted file mode 100644
index dc770e058990..000000000000
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-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/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() {
-	gnome2_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() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 4201e714ddbc..1431817c1d52 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,9 +1,3 @@
-DIST xfce4-screensaver-0.1.4.tar.bz2 617922 BLAKE2B c5cdf360cb1a9c38583a52bcb2d2735d2513c26aaebf23b4be4300266b72d780a3a0d8981c14f9753592eb1f63088f3fd8fd234efb6a595cb49262adaf54aca7 SHA512 5f074eb3c34ba731d0c135c657043ee687809146be512943f0f2892e1d06806400a5ecb1278dcb47da39ded47ddd4f9020cefc917ebb502962e16e56ee3a9b6d
-DIST xfce4-screensaver-0.1.6.tar.bz2 601882 BLAKE2B cc351320f5b4e1d0c5f897fcf3067303c4c61cd71306eeb17df024a9b81e9dabb5b54d627654704a6b0e70b992aac9a760501691fe29e88a761ce0a639a06975 SHA512 b4bc1e6e57ed9c76795cc9655a10956d739ed8003a7eb1195da9dcd185af87409a2150ec8a37c2f58a27ad6c53719713e954914de47f2a8d6b7bf438b2d5e8a4
-DIST xfce4-screensaver-0.1.7.tar.bz2 607447 BLAKE2B e05987309fe71c2f9f424fc160b600eb569281223835916bd2446beed0406cdfbfa01aaf6a6de9a95b389064af84f9c738d52e663db9f465d60c2d62d8e8f0bc SHA512 e46f06357f18d422716924c19aed6db79c4ae1029eacf079ae939964ac22ef609e907f2b898b6d14bf882cb3691a481ad6bd0eb49e85e272f05b445f28de071f
 DIST xfce4-screensaver-0.1.8.tar.bz2 593968 BLAKE2B 693fe6e057bc1f5f1abff67c8a0a99244d5c270ab9c9afd7945f21b6eeb2bea027448d1485dea9a9f912b5f231211878a92a882bac56f28696557e44215ce283 SHA512 4cb76272f2f94f5e265a86d3fa58de8da6167da013466a4dd2a08a2e94fafe14816ce6c5a1e635a8c07e91497ede0650c014d21b0bbac666b8a72bc5f4645f69
-EBUILD xfce4-screensaver-0.1.4-r1.ebuild 1634 BLAKE2B 5189055c3461d9d040cea5514943a6e555a15950b7eddd7ff207e505a08fa46117d9cdbbefe096215c3080f9fa74c17fc8ffa3da78127a75435dfc6f4e625263 SHA512 26bb10f35a25ba25eac1f98e69214d69089baff21463361216291905e14b5c121dc2a8a2b7d9f80665530355d5e73d122d7c11ad3d2b865c8c6b49b86bbbc7e6
-EBUILD xfce4-screensaver-0.1.6.ebuild 1696 BLAKE2B 4e0bba5a89238db76282e6dadde56bdeb504326a7ee5b9a38620a0f52c67ef61242535c6c3294eb13248bb98bb43d5793917fcf9db1c190c89575bbd100b2e41 SHA512 27c0ad7771a2ae13d0e24aa4e69124a558db76219ff16da67f5439689dfbb27969b8c11adb54a12c4652e224455327568fc5a1bd41544125fefcb069dffbb101
-EBUILD xfce4-screensaver-0.1.7.ebuild 1651 BLAKE2B 59c51d55d308eaeaa1bf4438c259f056b1bbcb511fab9c8b871edb7bd0012819a814c0b5fc88bc922f25efd6422560f0cff1a6053dda0ecc3120057e6c15ffb4 SHA512 7b2bf0ad48c9d77675285f252a9fefdfa0dd145535bb3b5301c67d253986249499816037690f3532eb14a852674cc23714e0e6f685327fe6fdaa070e4c112f2d
 EBUILD xfce4-screensaver-0.1.8.ebuild 1722 BLAKE2B 70065cd642c22986718d33bae0ed0f97b08c43d71490e8c7fc6924e6d7d1b9339bbb5eedfe52926c84f3eeb585ce6d08710881a020afa456da70dfd3fe5ea988 SHA512 fae41f934f7ac0bcaedb326b813ab12def44df1cd39fb1fdd9e01fa0db41d0e2231759b74fc263ec5c2228198f19372ae9d60ebc1c54cc42d6d8637a2397a8b0
 MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
deleted file mode 100644
index 734e2eebb3ba..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="amd64 x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	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 )
-	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 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.6.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.6.ebuild
deleted file mode 100644
index c29dbd601ebb..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 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="~amd64 ~x86"
-IUSE="consolekit elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	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.7.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.7.ebuild
deleted file mode 100644
index 5efedff79a69..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 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="~amd64 ~x86"
-IUSE="consolekit elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22: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 c8d8aea8ac06..7181edcdf5f1 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screenshooter-1.9.5.tar.bz2 502423 BLAKE2B b71dd5d016ff86ea5b654264dca129fd1b9316a0d0f2926a40556448c11a51992e4921c3ff9da952ac5e2962cf5baa18df8a110127cb68e89ee1b1cb2252bb7a SHA512 e5797a6defa4df94c552e8ff39b21f4203b6795669e8145ea5ef609fc7b29bcfa846b19b253b39b12ab0e6c130c7f9e67dd5aa628cefe9b063fb9f74dd2c3ee1
 DIST xfce4-screenshooter-1.9.6.tar.bz2 529233 BLAKE2B db314b3b451c3f560d8068932b21049f3e9587f8e329b1efb08e25227ab812c15b76a9d9a5bd3ffa1b4663ec81508f6cda2b6d31054b72d7487a111477962a62 SHA512 17d4afb346f09f97225c0fe65ed2389733e98d58729f15f7ec2b601682d7e15a6d9c67b85840593c17298fc32c250d8eb2e8d349ccd355507f4c18b5e312ae35
-EBUILD xfce4-screenshooter-1.9.5.ebuild 1128 BLAKE2B 4d4cdde478b6ea85895f812fcd154129da92cd4c4ea09d2a9a285e1c74c8cb742b717cd10b47658d32563696e45337aed0c0b28ece9422a9a7140632e99fa43d SHA512 74aa0ba4beec8257c7648fb6f6fe25773710db8b0b8427d6684157b03d1ff411a43fa5dc8947a2bc9943fd560d9ec4e64d2925ba6dbf78dc23267aedce5e18b4
 EBUILD xfce4-screenshooter-1.9.6.ebuild 1128 BLAKE2B 4d4cdde478b6ea85895f812fcd154129da92cd4c4ea09d2a9a285e1c74c8cb742b717cd10b47658d32563696e45337aed0c0b28ece9422a9a7140632e99fa43d SHA512 74aa0ba4beec8257c7648fb6f6fe25773710db8b0b8427d6684157b03d1ff411a43fa5dc8947a2bc9943fd560d9ec4e64d2925ba6dbf78dc23267aedce5e18b4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
deleted file mode 100644
index e35d86d294b8..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="Xfce4 screenshooter application and panel plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-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"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16:=
-	>=net-libs/libsoup-2.26:=
-	>=x11-libs/gdk-pixbuf-2.16:=
-	>=x11-libs/gtk+-3.20:3=
-	dev-libs/libxml2:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--enable-xfixes
-	)
-
-	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-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index de07047391a7..f7f6e4fb1caa 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
 DIST xfce4-sensors-plugin-1.3.92.tar.bz2 477837 BLAKE2B e5399a3052b124c5391209c6ca6bc849467e09be3dac6b7a7d1c946f800e22dcfe84d245b6236cb56cdcea756c98d9bb70c1c945b597f13e49ff18455f4f4715 SHA512 a5b7d90683c993205323084431606cc6d13de88989e3636fba5c06bfa7ef52fbe6285e3bd7f8eb70683541b5c42727c8fbe7bf80e8832bcfb378de0e6d7d7b37
-EBUILD xfce4-sensors-plugin-1.3.0-r1.ebuild 1594 BLAKE2B ab013a33e9a900f13ae968788c4a5aedad40e852f66dc273037316d412ad0107a70c3218bf29949567a485dadf1a08d4b6c5ccacb7b449cf97e9b67b6e4b2524 SHA512 c7f482c7165bd7e7eb6cab8956505e5b9bbb9e62799b695d6da3c9127ca0d65f9d6c3608b5009497c1d4351f871600ff0518ef53eafe01f5dad5e085562e7ec7
-EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1597 BLAKE2B bae0557e5fbf2d9efbb2baca93f8d4bccf3e9edee8089d908304462513bcec252e8ec2b635baae67297246101e9a45782a4e2786a6c465b96bfd68d1d3526b63 SHA512 e0ef9d336d2dee601bb57abad087d7cc8ee8373d54c8a693ee16a2a4d7aa0f6b8efa36979cbd5f31d9e9522ff2e37b277d1e54125ed316d3e93ac37157210576
+EBUILD xfce4-sensors-plugin-1.3.0-r1.ebuild 1567 BLAKE2B bd8bd7c18d1876e9f09151d2d6495f819cd24ef0e1d8946cb4175a15f119a5e18a69e281042b4f730471853dd4e233638db48e433d98b0a58729d1a53980fa99 SHA512 d224a63e203e96158574604169b213f5195ebe8fe56b63c447f07809c06648b5fdf5bff9ed232719887a386fed360556b55d947e48db0afa7beb3ec257287b59
+EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1570 BLAKE2B 0c6c17727009749b06a3b494d1c31e16430d183c46ffc7be253eab0ca43b98ae5fee11ef372e41cf38959a99decf6a006861def7ba60d571ab0c620488b4c80a SHA512 72267ac99b487aa32674a7662952afbe4d58106e7128bdfe505f786fc3b2a67f6eeda44ec7da1ad120dd8b206a25cb85d4747e71c3a059c405fcb75df49a581a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
index 9d8815f02a92..0200450c71c4 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,6 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 		|| (
 			net-analyzer/openbsd-netcat
 			net-analyzer/netcat
-			net-analyzer/gnu-netcat
 		)
 	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
index 16b568dc0ee5..4ede2b8abc0a 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -24,7 +24,6 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 		|| (
 			net-analyzer/openbsd-netcat
 			net-analyzer/netcat
-			net-analyzer/gnu-netcat
 		)
 	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 1d5b15fecd61..3c6ce92f81ed 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-smartbookmark-plugin-0.5.0.tar.bz2 280988 BLAKE2B 783d495aae351454abf1a3d9bd43c0656baf7ff94bf3015ad300a103cd17eccfdae13385b025d293bd9d7a65b37c0a19aebf3cbca8276ce36d1e41287359d62c SHA512 0514a1159cb5218af73d28897a218c369a64b9c3a7c286c0bf45ad404773ccaa49af5c8b0492e38f56f8089a2ec79b0434de93388d960b993ad67cecef5315cc
 DIST xfce4-smartbookmark-plugin-0.5.1.tar.bz2 302735 BLAKE2B 3d80b78cefda5bd501578ac2b74734ac4e21f220b200239e6cd530c573b1e6b3f7e39e041d8def52bfb075cc8c584e09bc6c9249d3910a5bd98fa9d3d4cf82a2 SHA512 fb11d890f11751fd1b6ddd4ac351acde5a8b57cd67c0951ba655d762086be01527fbec59a2b4b7a191a1dcd1d4744929c8cad2b9ab30c83f3341e2ba06dd2596
-EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1095 BLAKE2B af46d9c7dcbc587399b55f84a68fb11fc2b815fb9bc30b3a3606d562aae1eec2ac06b5120a9a4c010ed8a0323b5b19589050f1f463be127e3be9cfebdbe00926 SHA512 e3fd4c38a6e3742af80e09c857dc37c059e6b14126a2d865f54e7b188754846ae2a29512c1af8da6ecb37b8b5d012b765da9633857ca60ab9854902fb0b4a06e
-EBUILD xfce4-smartbookmark-plugin-0.5.1.ebuild 885 BLAKE2B e3de2110ca1391589661d8f96cfcc3b19825fb140b4235486809f1f7776beef68c812a5bac950a2199560244f66925f9f021ca2d0827dd2b7209d16b28da6784 SHA512 dd5a7ed0729b29e22746f2781af09115ccc9df474b49d79df590ee2ac9729b31ceffa95a62b0407c6fd36ce3293f1d5e0cb31d83f78157e5cfb2f0458d21407c
+EBUILD xfce4-smartbookmark-plugin-0.5.1.ebuild 1161 BLAKE2B 2ff3e4c4dd8c7929e7ac28c81a0e8a930232b8a9824c8e3c191aab6ec99d53438918a6f352c9496344c0959f50565ec3460428d223a242797e45db8089c3a8dc SHA512 5696772d955a681ede975db46748489888453253195bda51d4cd893197a890e6ee61ab4e8da26040f35cb01df27c86446d8a3089c7fe1851d764b45bd0956289
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
deleted file mode 100644
index bbcea5c2bdd5..000000000000
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-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=""
-
-COMMON_DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
-	# substitute default bugtracker
-	sed -i -e '/bugs/s:bugs\.debian:bugs.gentoo:' src/smartbookmark.c || die
-	default
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
index 9499b8c94ffa..0210eef60a4b 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
@@ -24,6 +24,10 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 src_prepare() {
 	# substitute default bugtracker
 	sed -i -e '/bugs/s:bugs\.debian:bugs.gentoo:' src/smartbookmark.c || die
+	# fix build failure w/ xfce4-panel-4.15.0
+	# https://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin/commit/?id=856d73b51f5d237d3cf6792f5e9f55220e5facf1
+	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
+		src/smartbookmark.c || die
 	default
 }
 
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index c48ce802479d..0c5308420393 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-systemload-plugin-1.2.2.tar.bz2 344197 BLAKE2B c83a55c3262f313c432947dbc240953e54a719bab6ba3714014624addab9b54b5172963792afab4d53c44d30590d9fef6f8b9712eddd7e57906cbe8e9dec35a8 SHA512 92930431383c128e449545b15a6d50aa6e236685619cc1abf0b60979f8a25010eb82ac4428f3e0e7eaac1468c3b101d6a0ef5d39e556346e74f4dddfffaa446b
 DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
-EBUILD xfce4-systemload-plugin-1.2.2.ebuild 990 BLAKE2B dccab74f96283ceb82579f2040aa8cfaa8d2e2d011afb1ca61ab0de9b08aeec2136a3709e507d3fd027f81cea36b3ad29c8b6085ffba8cf469a9b21f6b7bb246 SHA512 c67ac234d415dad0e7b83f2ec7b9aae2570fdb01edb36e30773e4c79445750a9c179ebae0a92c79aedb00b1444e4ef18b9a3b000de6d248943c5e79b51391c96
 EBUILD xfce4-systemload-plugin-1.2.3.ebuild 750 BLAKE2B f9450558067efce6b323df528be34bab68b2096a46326035450cc8a6835c0001b286db161e97bfb64a229c51820893b5a0da125b6b8cc8f7f43b5333b744c80c SHA512 6f452d6c319ef0cb240ea7df645f160f6fecdf74456372947c2e280e8549b6373f209d129f58d09d38cf50e93c95fd0768ef524df6828a7edd07fd534a2a1930
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild
deleted file mode 100644
index f46ff74bfb5a..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="System load plug-in for Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="upower"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable upower)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index 8506edb55aab..6fbf91677ed9 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-time-out-plugin-1.0.2.tar.bz2 337382 BLAKE2B e98102dcb2531ee42950022e484ed57b307ebf9b4ea7adbff3508e75465b9ade24f90e9c800ff0daa8b0da59ffe84aac9fe802267327e9d361de4359b0b95eef SHA512 3f49664fc8fd947627e40de0338e3a115806045c97fa08fd678fdbb831947bcfe14c02e9961d671ce7546d4913fd9319322476df590a70458bdf86fa3bd43464
 DIST xfce4-time-out-plugin-1.0.3.tar.bz2 362390 BLAKE2B db7ba33a1d30dca7361d6ab6be5559786891273a36e00a028a0e27084d3fb4760af18f5cecc5c2edfd9a76640130ba4a4412d2228b26154f8b85173df360fa38 SHA512 c2080abef330e9f783b3e9c008a76d11bdbdfe1a666435237b6b06a50e93191a760441a9d343f24234eb4343b550009ed9e2101dbffbec3d8f53c562d4bb3cfc
-EBUILD xfce4-time-out-plugin-1.0.2-r1.ebuild 856 BLAKE2B 0874c659efc36ae15e5cc91d379d96404381b9a61b6b8d136bd22373ab33fe3df7096b1760eb8ee80e29208a06296a6c9eb9395c90927bc9c8a43393b880a9db SHA512 2597831ac7e5be80861e3a66cda99714441aec93ef0f3713320f718a86e841e7fd14cb7e4fe034b35cf69d553d84e759383b3d7be3ffa17fbc464a25a47ea69b
-EBUILD xfce4-time-out-plugin-1.0.3-r1.ebuild 854 BLAKE2B 3be277cf90e790aee57ce76fb5ea491bd9026fe064d09ae5632c30ff6982994c2983d4fefe9f2e705bd19bbe52131e24e23451f713b84533c64615145375dfeb SHA512 c8e802ae1a81386f32335960f3564b1c27b80b85040f2313d7f716fd2a577e9796667dc0bda97f8c96ea33321c2d85c42741505ebd22e1b72c1b8dbfba21b4a9
+EBUILD xfce4-time-out-plugin-1.0.3-r2.ebuild 854 BLAKE2B 7d90ffdaa74370a6b7598884626c47be08df1f4bd73a076582e0518aaea161d1e99f7bbcca6dfc5baf5fc4f2eec03838fb3fac0ea369060441cebcd43c6e798b SHA512 174128925d9b687d3b1450d33d07538cb12a1dc7feed3587669e9450cd7645915eb7248b8f2d58c68142656f7ab140a3aff4bb874d92e1516749edf315b56413
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
deleted file mode 100644
index 8bb1c7efcec9..000000000000
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-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=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	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-time-out-plugin/xfce4-time-out-plugin-1.0.3-r1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r2.ebuild
index 6ab59e48043c..543c543cafb1 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r1.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11
 	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]"
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-vala/Manifest b/xfce-extra/xfce4-vala/Manifest
index bf07efb82442..6fa6acae7ae0 100644
--- a/xfce-extra/xfce4-vala/Manifest
+++ b/xfce-extra/xfce4-vala/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-vala-4.10.3.tar.bz2 88023 BLAKE2B fb5ec9ae0cf14d0f28c49ee04288a9fb78d512f2619e3fb52fd7ceca743763ab12a2e504fdcac78ff3c37b2e8c1aa43acd082b1101f10a2e881eac4655684367 SHA512 ef5d6c67d53edc428ed10e59c21a1264a0d6d06efbea531a15f2eb1309e632e3cd275657aeb01c5723f437b9c319b922055598f97b0ee7db45853beef4f4d987
-EBUILD xfce4-vala-4.10.3-r5.ebuild 855 BLAKE2B 420f286e2e9d61897c1a1d2fec78212c6726d25399cc9feb7ceb8d9f5b7e53a16f04b992a9e6ac1e67523ec0ef1f9d1a0ed666b5fc5846802542f89ea62bc53d SHA512 25800566a5fa877a8c961b62deab4bfad6b194e9c8cfb5e77090c459f96085e70f57455a6bda54260cfc73b4fc184ed28010e345321d9bb77691c70a1ddba330
 EBUILD xfce4-vala-4.10.3-r6.ebuild 855 BLAKE2B aa8bbe2ea0a31edabeb2c7a83f7cfb488bb7976f9c82f050c0cc412a3bfef1f7825090db738bfd8e3e8df08f1f50992b3e5427f4f69fd4fed8531520f8a20078 SHA512 a4298a976f5e1163ecd5c96fa07fe1fbf8f1bd73cdc424abb5f7c2a8cbc7924ae33551bc2f461c88ac7334494b218bd790f258fea2639db749a9566fc5e5a275
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r5.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r5.ebuild
deleted file mode 100644
index b365b1d7c8eb..000000000000
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION=0.40
-VALA_MAX_API_VERSION=${VALA_MIN_API_VERSION}
-VALA_USE_DEPEND=vapigen
-inherit vala
-
-DESCRIPTION="Vala bindings for the Xfce desktop environment"
-HOMEPAGE="https://wiki.xfce.org/vala-bindings"
-SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="$(vala_depend)
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	local myconf=(
-		"--with-vala-api=${VALA_MIN_API_VERSION}"
-	)
-
-	vala_src_prepare
-	econf "${myconf[@]}"
-}
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index b823ea2027a1..ae064aed7661 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-wavelan-plugin-0.6.0.tar.bz2 303220 BLAKE2B ce2a8fe3f8cb6ef312459ae73d2cde1a87052a5a9b45e06795937656bf926ff3f8dd73ad0e8d1770d6ded7761cbc787b21ef0ca1b04580ab3dd4961453ae0ef3 SHA512 50dd069902d69071f0d4ab7036fa451ae6cdaca9fbeb56255d58a5864d4e4b3749267b1cc4b411e1073daac9678554f3d483d30aba759ef161425ba3cdd0306e
 DIST xfce4-wavelan-plugin-0.6.1.tar.bz2 328287 BLAKE2B ff48a3ea2a0a3ba349545b687f0ce345055917a7da1e7e6bb829239f2e304bf4092713e40599e641d54e225a86470c292ac224f5bab479f99496d0aea00dfd73 SHA512 530758dec07b404009117038fa6bcac5aaebf9db97710cdeafadece4eb5680318023404276fae8cf1ff38fb5e9eb807f77eea23a30740674a8659404eb17aeec
-EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 1002 BLAKE2B b27185a7c6acc3c2d7faf24dbb6ed8c5f9bb343973431c9fd4f836f1ebf4e9fbfd0c3576cadcb3262def320087730b4f4db77b3a9c5c81c6015a8a2e0ba945a2 SHA512 d31b4084b676fdd639ac14c5ef8ac25e73608e5655173a59eb45cdbeda0f77c3b7f3a2f05992ecd666c81944eefc671d21cdf89f04947261344d51d2fb2efb11
-EBUILD xfce4-wavelan-plugin-0.6.1.ebuild 740 BLAKE2B 568177e2acc0ed335f85555c1985e3bf0870d962ea893b0a1580e16cd5287d3f3011cc2252a099291f43a0220e70c13315511329c9cdc3b6f93ee79a9d45e5d0 SHA512 de8ca55776eeeaf938268571f6c2768585bb56da94129493c78e82affb398774166f86e56333eea2af98c540b6354b63bcaecdb6985afc27ed0ebc414b7e1e9d
+EBUILD xfce4-wavelan-plugin-0.6.1.ebuild 1041 BLAKE2B 4d7eb1a2dcaa02472b048b9b198b84dbcfc36d44505d113ddd80978d42267791f7ad579c2056765f96d7805be5fbfc154f949032edd4f14f7994403d70fd94cd SHA512 17f0f1d80c79180b0c48e4d9932778ee32875fb01d699526c3c5771124e0bbe79e90a4d5bf51a0be0801d7b2fbe996bc6c8993dabd949d97ffae03195e76025a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
deleted file mode 100644
index ba6ce6615fcd..000000000000
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plug-in to display wireless interface statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="kernel_linux"
-
-COMMON_DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/net-tools )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
index 9648eca0c016..ee23f4668d69 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
@@ -21,6 +21,14 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+src_prepare() {
+	# fix build failure w/ xfce4-panel-4.15.0
+	# https://git.xfce.org/panel-plugins/xfce4-wavelan-plugin/commit/?id=c0033c32ec28bbdd5f735f9b52d212e881eb2219
+	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
+		panel-plugin/wavelan.c || die
+	default
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 2b4b01befb35..e76bf85f6161 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1,3 @@
 DIST xfce4-weather-plugin-0.10.0.tar.bz2 3032575 BLAKE2B 2dc81c8d60ab63ff9adb90d53a5eb89e98c3e4b950d8b5943fb2b39b4944164470d7e10dcd096ef90665129d1aa59e052b3140d1462077a285afde4bcdcba047 SHA512 168a850c60f419f40f6c05dbedf24a4f3aea3be04e14c5eb2596a03a8dee5850a80d06b63bee54690b63385109d53ccf8ff2b97a2c879e196046308436a7d126
-DIST xfce4-weather-plugin-0.9.1.tar.bz2 3018842 BLAKE2B d1fa1d3e1f99aff9f726fad13a40a6f288bddc32e3c06958a571a4526d1f4a7a9386cebc5ddac1c5132f591099e0f01507fab1d158b8f686f28d2d7c9e1d8c19 SHA512 f8f50ad629719193f18cf9106379a7de7ba4ba0824eca3ec3716031cd46f5631280ff446fe651326097e3fbe6703c1d29f2ce044b1eada1613b198d30d167d09
 EBUILD xfce4-weather-plugin-0.10.0.ebuild 1062 BLAKE2B 7c51d989685b949069e93314bdbae3af2076835ba213942f99643d775b3a1168dd3f2800822bdb70c5defd45d77cccf9acc5be0d8a4a679cfb48d5eec78e51dd SHA512 80f4f33393aab8cf871781e890a1242abafaed57588b2583c301ba12c03adf4ea2e5a0290cdcb4f8d15de8443941c67e539341299588c0a9f3d6957d13bc9944
-EBUILD xfce4-weather-plugin-0.9.1.ebuild 1006 BLAKE2B 88554f7c2dadb06039bb7e742131698e3750f7c855f51d59be142151a4ec6fd4fe8c1e57c266e2318e1eca1519cac48aa159abfc7b9eeea5a96b810ba8e3fb32 SHA512 cfc3f931be69b17f8c002b399a0a2779c585c03e6a7577a5198d20ec590b8dc52609cd8f75ad090e67aa165df3c82eb32df839b0cd0fe3721262ddd3613b3e03
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.1.ebuild
deleted file mode 100644
index dcab9b5b881f..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="upower"
-
-RDEPEND=">=dev-libs/glib-2.42
-	dev-libs/libxml2:=
-	>=net-libs/libsoup-2.42:=[ssl]
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	local myconf=(
-		$(use_enable upower)
-		GEONAMES_USERNAME=Gentoo
-	)
-	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 6c5a12031c66..e2fd041ec5bb 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-whiskermenu-plugin-2.3.2.tar.bz2 159652 BLAKE2B 4afb6b3ae039a4193e08d4b06130aa757d3c14123798afb360fb696679a3692d10c2de8a5aa2075711e06474380d61ab21fe3186546a9afb871a295811d70f1f SHA512 2b9557b29d1b30b5d46df5f182d64562873defd59cd36e6444da4b73bbdf3835cfb17101f11a3ac6e9f875a9dc4d51e2301a420a888bfa1d7fdc6ae715d92443
 DIST xfce4-whiskermenu-plugin-2.3.3.tar.bz2 160277 BLAKE2B c4c96175f1d8a7202e8a6d207dc113ec172493eb724f7da7ef18fa3de26e52c3b86bc0135ca8cb1e650a0e9d835e065b6baa18816dee7c90c4034dcfc9033639 SHA512 06e8c0ec623538103974c266c26b8efea94f97093324b5f55305ba6832a8c9eb7fa19c636249dffbc09ed4c7e3f543d338b2bd3455c14601237b2253683f5ac6
-EBUILD xfce4-whiskermenu-plugin-2.3.2.ebuild 890 BLAKE2B affe14750cb78d1614ded23d3782cf47e9193b082ab9508d6a11a0d352bb5bb5b2496b7844d49ce3f04cf9963a1d896d9a5b20d15e4cc37c79a9f6fa09829704 SHA512 7f46c324303a11b9724bc45ceeffc9096d2e0e04be446cd172f80b784dd81459717e87ecefb8e58452d2999529ea3bede215174b19c302fd4954fc5acef5c31b
-EBUILD xfce4-whiskermenu-plugin-2.3.3.ebuild 886 BLAKE2B e1c95a8b1c66b3c2e0460c6859c47d855044af92df971cd7a0aedeb478c2b03ab4709bf66315034f479380cf392561a3b933a00bf3fd73982d4b379e7858ab65 SHA512 23eaec165dd1e5a6e80739a13118840405a024ae45a203bb58536e7183db4732084512757e8fa8960a2eaea7541a28b14b49b03a9a19883ffb0264dfd31f3b81
+EBUILD xfce4-whiskermenu-plugin-2.3.3.ebuild 1101 BLAKE2B 0ec7c8b3e67e3e6d228903a0756cd1eca7fb2d2939cd91fc80ead4d1cc1daee1696afe1f916fe16772dd579e750159af9079b7a0d264a4c56811a63bded6242c SHA512 ea0a9b10a9e1def314bae0b97f5ddd5fd4a254572d1c4d0eadaa24f3c7399d601d17c0001b7fd676e5f013c77c8a6ce43f53e40fdd2f1bb1dfed262b8248e792
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.2.ebuild
deleted file mode 100644
index d9f614f4b00a..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-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-0.11.0:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild
index 2f57d6b05358..530eae19a64a 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils xdg-utils
 
 DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -31,6 +31,13 @@ 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-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_AS_NEEDED=OFF
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index e39ce2322833..245751489c1b 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-windowck-plugin-0.4.6.tar.gz 67622 BLAKE2B 38a1ff76a75b3eb833be586bf93bc9bd73b7237e74cf06fd7540fef85befa4ef9ad8c8351d1d2bfad4af1f342c59b1cb0ebb94e50a3f5cc9c38c5fe9f0377d86 SHA512 a02f6f1b275484dc7ed08f3f9868af7a456c9f3b52bb893c2ac109a0ca8c4376e9d6d714f40d40c491531584486c8be3bebf3669f3186a143f6fcfe923b9f376
-EBUILD xfce4-windowck-plugin-0.4.6-r1.ebuild 1222 BLAKE2B 9c6f0e76bf4ebc0d971a6c7cdc6e4d2c7302b8c099828ea35601f7257a7acda550f1aa99ff734fb04a14b7742cbb51129075df3b1d5c22606e77b1517e2423c8 SHA512 07c93cbb9f2ce46c97073c7c9817815fd8949fdcfedf10399c10088eaf26d7c2118d210ed5d8b1619e2bf71d61a83a56fd972afa6723a4f8fb31214b4d2c086b
+EBUILD xfce4-windowck-plugin-0.4.6-r2.ebuild 1221 BLAKE2B f82454bbb23ba8047db397c3948e3bc88535fc585b2bc842881f882c3045126b3eb044035b970c39e3481106da33ba4b044b9573c4d5c5aa337a26184bfcc994 SHA512 b30f5bbd59ef167f8663899297b339469a1437c3d70effe0425c2b736d5137170181b2b626d6086893896e8f696227deeb2fac527d4736984662921956c44ced
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r1.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r2.ebuild
index ec4c80869267..2250b56bca85 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r1.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r2.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	>=x11-libs/libwnck-2.30:1
 	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.12:=[gtk2(+)]
+	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
 	>=xfce-base/xfconf-4.10:="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 330d4467d7d6..c8e33f252042 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,5 +1,3 @@
-DIST xfdashboard-0.6.1.tar.bz2 2402318 BLAKE2B c45713ae63d69f55ff18606a2d865334cdf5ae4a853c1cb3027be368e3c803629e83c2363a9ffbf470391096b5c3bd22497ef35b0f7c41caa6357b4510b66bbc SHA512 3e68009ccbea71f22d7bb2d171f5f9331382a3128d32ea3ece976b31408bb4ff84cf8212efd268d655dba1396a5a9e01bb8449cd6f44d3e9c07b0c6841978897
 DIST xfdashboard-0.7.5.tar.bz2 3366413 BLAKE2B 4fb9c9bd298f5e9b0f3052e1f3d488386446d37e9130e750ee09756da856d232fdc4c18fc21e9883c3df46e7cba636c82f32942b17473a5710e30006baf6a54f SHA512 5d32aa3a49e02d85ca92bee6aa37a3b743e50ca5d992128decea5846e8c9008a9f5bdb98cc0ee3e980761a6538a4867ff28410e066ef22f0aa2c2bd4c5ce1523
-EBUILD xfdashboard-0.6.1.ebuild 984 BLAKE2B a1776a0b3a0d8c1b4ba12ebe5c9d96520f87e6794d07cb740dea279fbe0ef30d6a59b88aed952c05a7817d11cfb9d3e891d3b863fd4be297a025c9eae37a6533 SHA512 37f9dfdb794acb2cb30044b6092ef77252546fd570ea42c6cc1073641cbb22bc26e93df4e1aa3b7d38c31dafc978a2ecdc7529b45540551891c9904e3f3b533a
 EBUILD xfdashboard-0.7.5.ebuild 959 BLAKE2B 7304eba0441b2b038071ca6bd06d8e716af476c83d2d4464986473e3a375b2ea6f798f9b59fc0f38a6b7697b94d9d7f35a0250f49158aeefa9b9a7e96b241171 SHA512 e85c0cc866164b16d75ba2b22f97579c3d21c1f9627322ee584bc4bacb7527d3f1e827e6b7a4d7dad08392775e721a747402b4854c749ea80e4db119d8b85907
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
deleted file mode 100644
index 5eaf8acad413..000000000000
--- a/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.2:3
-	>=media-libs/clutter-1.12:1.0=
-	>=x11-libs/libwnck-3:3=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXdamage:=
-	x11-libs/libXinerama:=
-	>=xfce-base/garcon-0.2.0:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /xfce-extra
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)