gentoo resync : 18.05.2019

56 files changed, 175 insertions, 872 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index e876596c180d..72c1f9c5bd09 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 695b5f2be615..4be27cc26c8e 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,5 +1,7 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
 DIST thunar-volman-0.9.1.tar.bz2 489210 BLAKE2B 4550c49f816438c0692c2afc2350423c9e07d165f58d9aa8f8ab56d0409e74900348ea2d188b07011a07b5c702a97f477a1d35f4d18bf47abff5bdd70ac115c0 SHA512 73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc
+DIST thunar-volman-0.9.2.tar.bz2 495324 BLAKE2B cf02e61d76804b0e1d407c9370daa3c4d0ceaf2c887dcf32a82cacd60e9befbdd7173338dbf025ee16fe3ea4e01c4bd4cd0b1c21452e389712bc103ffd02532d SHA512 808f3dfdf105911275b0c96705604bd1575cd9c5bddaaae96583949c995a3bc84a71ce154c05ed3ce395d4b4d78e4d67770f79b3226fd4a35c509f5e612de72f
 EBUILD thunar-volman-0.8.1-r1.ebuild 1072 BLAKE2B 499a87f5bf590fc075e158d8359a5217446dfcd7f4e24f422232787b26357f5e14aa0bb9ca6a70393a68dd311b8b7b09c10f3f5aaec783f134985981d81b5718 SHA512 dc81052be56239ea4180db4da03a714cfec87c18517ff7dc464359302197e07251e7c15444e51301d5388e80db92fafdb2fd10dc64a86df9f315eca924408fa4
 EBUILD thunar-volman-0.9.1.ebuild 1080 BLAKE2B c36b5cdbb7098f7cda2a5c38ddbc35088b1a83e07181998634e3160ca947415dc6ec76071453a945d2e0e332714729731f69dc918f04342d4b79f26d948f7590 SHA512 5a105c7d02cd36186627b10877d3f6695d4006a9429b47dcda3f531fb5356f68b7de5a96527e578e119a33b88c32f7761b329e0fccf04881d457c559ce9ca5b1
+EBUILD thunar-volman-0.9.2.ebuild 1080 BLAKE2B 5ce48977a2c8e0a4ac732709d0610483943cbc88db8c4014e6ce7f7a2b31490907f83d59c7435b957efb49deeac1b1655140b50c3030ce42012387ba49c92d98 SHA512 f0be8cbd706b336196874a27f27052f8de400f85d5cf668ff270792ba387e2623ce8d0eee079f2df5574bbe1a69341e3e564cdaf84da4e9cee18ed740868b5d1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.2.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.2.ebuild
new file mode 100644
index 000000000000..07219cde44df
--- /dev/null
+++ b/xfce-extra/thunar-volman/thunar-volman-0.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/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() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 9bfd95b1988a..2c8ed650e759 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,3 +1,5 @@
 DIST tumbler-0.2.3.tar.bz2 538109 BLAKE2B 74f99241aad53202f1241b3865a51bbcfa0b503495e02edc55aed997343fac7057fb7f8f76ef2473cdce9fa38e8069bbb69812aaccfedab41d5f3fb67b2a3a39 SHA512 aefe284c3baa1d8eaf79c9bdb3cfc044ee6a1f36be34efd67541e6310aa275b5235b29f68483b7b7b5a8df699a8b3db8dc75569ec2b90253756fd6285a2e3816
+DIST tumbler-0.2.4.tar.bz2 560604 BLAKE2B e22d836bb6af10a53bc84363ec239aab97822afd470de6b88b82c29e7e25dd4933b23fd3ea285587ee3205149095259eb35a8e0a01b60c0f9801cef57e7436aa SHA512 cf1d9499ff293086176a0e5055181e5527d9ae39a7786d9fe15a47202e1b02218981c072229e736a7057e85bf0c6ceff34c1f55a12396b3df0b3ab9fda822d02
 EBUILD tumbler-0.2.3.ebuild 1526 BLAKE2B 17dc318463a533e8c682344448f3fa8f99284c708fe7d693ea0f72d3321f563c94801485ddfe976113d96faf3af9feca8ba06b52d09aad07e5a5a6afe289b1f5 SHA512 0ce72d04edbb6872ae83d43b26962c77c9254b453b4a94b033b19be1d2b6103e8f706859a22998581cdde19e9d4689b19b540a6b5e5181bb85abff3d0d6ecf83
+EBUILD tumbler-0.2.4.ebuild 1531 BLAKE2B e52281202b43daa3491b354fd45f563cf7fc3c0b1ed5496b1b252740e46a5a694f3f9dabf94448f1d6a7a0f5b44531cec834c81b75d948e883d3e242f1e6800c SHA512 4692ecd524bf6f1ca0438a123dc5719a73b5042197d3b210612d6415f2f2add4737a3162585fe4939da85dfb7b202e39991a70e1f454c59f3ff00754e1a8a39d
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.4.ebuild b/xfce-extra/tumbler/tumbler-0.2.4.ebuild
new file mode 100644
index 000000000000..e70a4f83753c
--- /dev/null
+++ b/xfce-extra/tumbler/tumbler-0.2.4.ebuild
@@ -0,0 +1,57 @@
+# 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 ~x86-fbsd ~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-cellmodem-plugin/Manifest b/xfce-extra/xfce4-cellmodem-plugin/Manifest
deleted file mode 100644
index c09c75df1069..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xfce4-cellmodem-plugin-0.0.5-asneeded.patch 329 BLAKE2B 266428763655887f88cd7329ab1be741933bd18ecfec4b6c94ffee24a02bf8bd55c96564bc95bcdbf1acad626bec627c61aa118d4e91101d5e049f83f16e96b6 SHA512 6aea16f064c0ec86aa88e1adca475ba6da1c66249fd9edf4764d519733db1d56521dee686af254a20b37994cae1b408218cbf1afb3b91b988ce711a3f3822ef4
-AUX xfce4-cellmodem-plugin-0.0.5-build.patch 1601 BLAKE2B f51476b859b063feb7c12bd312128e8f4ab21ea29d2ef95d29f0543a0b115a3f7e5797cf6945892bf9d37274d1f62a215f3f795c83ea7539a4334fff7d602426 SHA512 825fcb47f2bbadecec1efefb4ee62eac1e91e29505615355d15ef17d3e6b792ea97914ccf52ae3060ffd4b2714237d2c9de4a3ebcfef6dd8092e954018d9fec4
-AUX xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch 864 BLAKE2B 64c0d402afcf7ca0441a8540e45c19e9d8164154021ac9bace8c032a7447d8a0cd22ac1929c3d913bdfff7d2b3c6f791299a176f3ec6a3ee77573bc3406ec8b8 SHA512 29522daf5e822f272d5014019656076d5e400055fcc0ea274181eb599eae739a5598f55fd224aafd10602a2ffb706b0a28335a988682c8b1aca674831424e6ee
-DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 BLAKE2B d5a0e040d92886d37232dff755069fa8f58951fc5bbdcb261f308629ac7802d474f2e677da50b82187d14b7956655af9a90639a81fa32bf2482c582675262544 SHA512 a59e2b8fa71b490abc99dc9f28e5b147e77538036988ae4c2faa93bc3f7a0187607d486b7eb92580fe2519a31917cbdba5c7312070149340adc417871e8702bd
-EBUILD xfce4-cellmodem-plugin-0.0.5-r1.ebuild 1004 BLAKE2B 74e104e5bbb625c9d9b569ed8a07d85a4617891edd0ebbade1b6da393e5c2cd3429959ae08fa1218087037a3ce3517ad4367c83b5e7915879407c2f908b2ef19 SHA512 0acefbf545a566f608032617640ae76f6332c618fcc428e41be082103111053a56677ea5224131c3f96ed2d00e4a5d8f0e6c47e0b72c1eb396bec05688c07866
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-asneeded.patch b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-asneeded.patch
deleted file mode 100644
index d0f9c6a4486f..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6613
-
---- panel-plugin/Makefile.am
-+++ panel-plugin/Makefile.am
-@@ -5,7 +5,7 @@
-         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- 	@LIBXFCE4PANEL_CFLAGS@
- 
--xfce4_cellmodem_plugin_LDFLAGS = \
-+xfce4_cellmodem_plugin_LDADD = \
- 	@LIBXFCE4PANEL_LIBS@ 
- 
- xfce4_cellmodem_plugin_SOURCES = \
diff --git a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch
deleted file mode 100644
index 23f8eca7f2e2..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-build.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Two issues in one patch:
-
-We use shared libpci so we don't need to check for libraries it might be linking to, such as zlib.
-Change mkdir_p with MKDIR_P for compability with recent autotools.
-
---- configure.ac
-+++ configure.ac
-@@ -14,6 +14,7 @@
- AC_PROG_INTLTOOL
- AC_GNU_SOURCE
- AC_HEADER_STDC
-+AC_PROG_MKDIR_P
- 
- AC_CHECK_FUNCS([vasprintf])
- 
-@@ -33,14 +34,6 @@
-   echo "> Not using debug"
- fi
- 
--# PCI library needs libz.
--
--AC_CHECK_HEADER([zlib.h],
--AC_CHECK_LIB(z,inflate,
--LIBS="$LIBS -lz"
--)
--)
--
- AC_CHECK_HEADER([pci/pci.h],
- AC_CHECK_LIB(pci,pci_alloc, 
- AC_DEFINE(HAVE_PCIUTILS,[1],[Use pci utils to discover devices])
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -37,9 +37,9 @@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
- subdir = po
- install_sh = @install_sh@
--# Automake >= 1.8 provides @mkdir_p@.
-+# Automake >= 1.8 provides @MKDIR_P@.
- # Until it can be supposed, use the safe fallback:
--mkdir_p = $(install_sh) -d
-+MKDIR_P = $(install_sh) -d
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -98,7 +98,7 @@
- install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
--	$(mkdir_p) $(DESTDIR)$(itlocaledir)
-+	$(MKDIR_P) $(DESTDIR)$(itlocaledir)
- 	if test -n "$(PO_LINGUAS)"; then \
- 	  linguas="$(PO_LINGUAS)"; \
- 	else \
-@@ -106,7 +106,7 @@
- 	fi; \
- 	for lang in $$linguas; do \
- 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
--	  $(mkdir_p) $$dir; \
-+	  $(MKDIR_P) $$dir; \
- 	  if test -r $$lang.gmo; then \
- 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- 	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
diff --git a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch
deleted file mode 100644
index 5ffb48b38f95..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=6613
-
-xfce4_cellmodem_plugin-pin_helper.o: In function `pin_helper_pin_entry_callback':
-pin_helper.c:(.text+0xa6): undefined reference to `xfce_warn'
-
---- configure.ac
-+++ configure.ac
-@@ -18,6 +18,8 @@
- AC_CHECK_FUNCS([vasprintf])
- 
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
-+
- XDT_I18N([cs pt])
- 
- AC_ARG_ENABLE([debug],
---- panel-plugin/Makefile.am
-+++ panel-plugin/Makefile.am
-@@ -3,10 +3,12 @@
- 
- xfce4_cellmodem_plugin_CFLAGS = \
-         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
--	@LIBXFCE4PANEL_CFLAGS@
-+	@LIBXFCE4PANEL_CFLAGS@ \
-+	@LIBXFCEGUI4_CFLAGS@
- 
- xfce4_cellmodem_plugin_LDADD = \
--	@LIBXFCE4PANEL_LIBS@ 
-+	@LIBXFCE4PANEL_LIBS@ \
-+	@LIBXFCEGUI4_LIBS@
- 
- xfce4_cellmodem_plugin_SOURCES = \
- 	cellmodem.c modem_driver.c \
diff --git a/xfce-extra/xfce4-cellmodem-plugin/metadata.xml b/xfce-extra/xfce4-cellmodem-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild
deleted file mode 100644
index ab7bfda70628..000000000000
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib
-
-DESCRIPTION="A panel plug-in with monitoring support for GPRS/UMTS(3G)/HSDPA(3.5G) modems"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-apps/pciutils
-	virtual/libusb:0
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/xfce4-dev-tools
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-asneeded.patch
-	eapply -p0 "${FILESDIR}"/${P}-link_for_xfce_warn.patch
-	eapply -p0 "${FILESDIR}"/${P}-build.patch
-	echo panel-plugin/cellmodem.desktop.in.in > po/POTFILES.skip
-	default
-}
-
-src_configure() {
-	AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/xfce-extra/xfce4-gvfs-mount/Manifest b/xfce-extra/xfce4-gvfs-mount/Manifest
deleted file mode 100644
index 1388eb1a0705..000000000000
--- a/xfce-extra/xfce4-gvfs-mount/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2 280614 BLAKE2B f3405351c3a2cab4a051fa74a7de68ee52b1c82aa065253a3779d48ea298eae3521d0838b1b427833945bfc7421a2cae68bc1073217edde41d82315a1cbc16b3 SHA512 0bab5e20620594e1633c12c4c20724a43317004eda6f353579f890cc1d9b3288b7a3bdc411e9f34efb00ed31876d1e29d70e8bfacc9f18ed6806b36f5e112527
-EBUILD xfce4-gvfs-mount-0.0.4-r1.ebuild 952 BLAKE2B b0fc05c6be9dd689bcdbeb3ba0e97dce39a8dd0b0e0333dcb626a9cd756aa3af02b07e65bc20e2f95bac630dae2ed5596443e6aeac97ac98633cde6000a32b57 SHA512 70dd83f8a7ff9a5729efeeb614029287a070ef53efede36ce7c9edbbd27fc49ed728bf71a70ba8bfe466361659a2a724b0a4cb2fe92c7ba7f2461950f45229ff
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-gvfs-mount/metadata.xml b/xfce-extra/xfce4-gvfs-mount/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-gvfs-mount/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild
deleted file mode 100644
index 298f2348e387..000000000000
--- a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils
-
-MY_REV=6d2684b
-
-DESCRIPTION="A panel plug-in to mount remote filesystems for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-gvfs-mount"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}-${MY_REV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.24
-	>=gnome-base/libglade-2.6
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-${MY_REV}
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS NEWS README )
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest
deleted file mode 100644
index e9689f888171..000000000000
--- a/xfce-extra/xfce4-linelight-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch 2439 BLAKE2B 727c0379f1ac28011c395667258d02decc7bf42bb8f2d4948931db2d902866754709a4c0202b4743a856859d09c43d5761f6f8f9f14fc5488c85592a3d0e67c5 SHA512 12944d8dbcf882b1fd3c60746daca702dc58b02728dff253cc6a98f6a361604f3152681f17ba8ba23a108d5fe93c8aef6ca402496230ff77e5d34985e4339c26
-DIST xfce4-linelight-plugin_0.1.7.orig.tar.bz2 239068 BLAKE2B 26a279756db47f7e53d57e83642739b4c726462f2184cd6d1f23b6e80b11fd56995003a0c50d1203c64d80b5ea9b56430741278de9bc6064b1d96edcf0b3c5f1 SHA512 56cca14813ed75d008821db6c112fb213930658d78ae2ad0eeaeb0816272df35fa9c962ea9ab0a41d082f4f4dcc8dbbcd9fb70b847a8044ade0e57d96b056737
-EBUILD xfce4-linelight-plugin-0.1.7-r1.ebuild 962 BLAKE2B ae5e9fbc7e4670559d603919182c6625348fa393500faf2de8e8375abb67dc9a3681a62bf2eab03eef715d6d70dd9c9405243b1ac9ed09c46e4cf874883df7a1 SHA512 8bd2d9aa1b96112942e794bf6dc5600b2dc66f2dd12abe40e2add4e8c65d275f21843f411e41fedf60afa86e3ac8db0f1e5b9c54411402ce2d3b99661e040ea0
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch b/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch
deleted file mode 100644
index 2c7bb4795248..000000000000
--- a/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-http://bugs.gentoo.org/411949
-http://bugs.ganymede.ch/
-http://lionel.lefolgoc.net/misc/01_port-to-xfcerc.patch
-
---- panel-plugin/linelight.c
-+++ panel-plugin/linelight.c
-@@ -207,7 +207,7 @@ void linelight_add_list_entry(LineLightD
-     remove_newline(entry);
- 
-     GtkTreeIter iter;
--    char *icon;
-+    const gchar *icon = NULL;
-     GdkPixbuf *pixbuf;
- 
-     gtk_list_store_insert(data->list, &iter, data->listPointer[sec]);
-@@ -218,13 +218,15 @@ void linelight_add_list_entry(LineLightD
-     //icon
-     if (g_file_query_exists (file, NULL) && sec == BIN_SECTION )
-     {
--        XfceDesktopEntry* app = xfce_desktop_entry_new(entry,categories,3);
-+        XfceRc* app = xfce_rc_simple_open(entry, TRUE);
- 
--        if (app != NULL && xfce_desktop_entry_get_string(app, "Icon", TRUE, &icon)  && NULL != (pixbuf= load_icon(icon)))
-+        if (app != NULL)
-         {
--            gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
--            g_object_unref(app);
--            free(icon);
-+            xfce_rc_set_group(app, G_KEY_FILE_DESKTOP_GROUP);
-+            icon = xfce_rc_read_entry(app, G_KEY_FILE_DESKTOP_KEY_ICON, NULL);
-+            if (icon != NULL && NULL != (pixbuf= load_icon(icon)))
-+                gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
-+            xfce_rc_close(app);
-         }
-     }
-     else if (file != NULL)
---- panel-plugin/main.c
-+++ panel-plugin/main.c
-@@ -155,14 +155,15 @@ static void cell_renderer(GtkTreeViewCol
-     }
-     else if (strstr(name,".desktop") != NULL) //Application names based on .desktop files
-     {
--        XfceDesktopEntry *application = xfce_desktop_entry_new(path,categories,3);
--        if (XFCE_IS_DESKTOP_ENTRY(application))
-+        XfceRc *application = xfce_rc_simple_open(path, TRUE);
-+        if (application != NULL)
-         {
--            char* app_name;
--            xfce_desktop_entry_get_string(application, "Name", TRUE, &app_name);
--            g_object_unref(application);
--            g_object_set(cell,"text", app_name,NULL);
--            free(app_name);
-+            const gchar* app_name = NULL;
-+            xfce_rc_set_group(application, G_KEY_FILE_DESKTOP_GROUP);
-+            app_name = xfce_rc_read_entry(application, G_KEY_FILE_DESKTOP_KEY_NAME, NULL);
-+            if (app_name != NULL)
-+                g_object_set(cell,"text", app_name, NULL);
-+            xfce_rc_close(application);
-         }
-     }
-     else
diff --git a/xfce-extra/xfce4-linelight-plugin/metadata.xml b/xfce-extra/xfce4-linelight-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-linelight-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7-r1.ebuild b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7-r1.ebuild
deleted file mode 100644
index 630aa5ac5458..000000000000
--- a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib
-
-DESCRIPTION="A simple locate based search plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
-#SRC_URI="http://svn.ganymede.ch/private/trunk/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.12:2
-	>=xfce-base/xfce4-panel-4.8
-	>=xfce-base/libxfcegui4-4.8"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/mlocate"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-port-to-xfcerc.patch
-	AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
-	default
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/xfce-extra/xfce4-messenger-plugin/Manifest b/xfce-extra/xfce4-messenger-plugin/Manifest
deleted file mode 100644
index f350a9ed7c0f..000000000000
--- a/xfce-extra/xfce4-messenger-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST xfce4-messenger-plugin_0.1.0-5.debian.tar.gz 2849 BLAKE2B fddc7a93cb524852c9ff04d0032b00820cd5b8da2414cb8a492b65d1bace664ac9db23f482743344b8dc26b4995165ea52a2ffb8c647fdb2e1dfaed6e0be45db SHA512 744398a1fbf50d00f45c3ec173dac67f8945d64b482481eeb7bfc29d79141ecaa0f116cc59574af9c6865f49fad58b3537fea9bc31fc4813dd5821c9cc6c65ee
-DIST xfce4-messenger-plugin_0.1.0.orig.tar.gz 403341 BLAKE2B 59d4a663e05533a7b3f4e7bb1ea68538df2692a43b5bdaca81be67f77e206dac957a535340f93fd1a374583cbb976786ff50ceda341b0ae12aaf867e584cfd62 SHA512 d9cf1c0caeef1c858ec2a917635081cfab644846b767b05d8dea9b450f0a9027ac48c4f3080eaa190d9db7d98c7871bc9cb4ef101fb1bb52f088190ff594ccfb
-EBUILD xfce4-messenger-plugin-0.1.0-r1.ebuild 1014 BLAKE2B d6a3b7ff65c7cc96f9471054c673e4bb64a9fe2e53fac3968add4fd929b6f406ec74103010bf05525e25217f146e3eb0ad696427505d596619d8cf8b36825cf3 SHA512 bde0e55293aad2e4e0629b45e048e29b44ca7b2a3fab34ee3c194a421dfbcfba97705d710c38afef84a2991d2b86a5dae38b06b1b7c2b2f967ea90a884f6358d
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-messenger-plugin/metadata.xml b/xfce-extra/xfce4-messenger-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-messenger-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0-r1.ebuild b/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0-r1.ebuild
deleted file mode 100644
index ca9733097e47..000000000000
--- a/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0-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 autotools multilib
-
-DESCRIPTION="A plugin that listens DBus messages and displays received messages"
-HOMEPAGE="https://packages.qa.debian.org/x/xfce4-messenger-plugin.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-5.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2
-	sys-apps/dbus
-	x11-libs/gtk+:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches
-	AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
-	default
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	default
-	exeinto /usr/share/doc/${PF}/scripts
-	doexe scripts/xfce-messenger-logtail
-}
diff --git a/xfce-extra/xfce4-modemlights-plugin/Manifest b/xfce-extra/xfce4-modemlights-plugin/Manifest
deleted file mode 100644
index 7ecc523663d8..000000000000
--- a/xfce-extra/xfce4-modemlights-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-modemlights-plugin-0.1.3.99.tar.bz2 157029 BLAKE2B fed4099fd828e3cc50460ecad84e365fc3661475b4a7381ec017b59baf1b0e101184534dfcf362d59045ed674dc93a150100c9c3b3bc533acb47214760b9ba04 SHA512 d23c5b733012b072b01b7e10aa39cd2b5d3a218ff52806e4fece00cc891a64d9fa7fd6f1765320befe767359a15c197f7dbd663744105d8aef8117798dded32d
-EBUILD xfce4-modemlights-plugin-0.1.3.99-r1.ebuild 800 BLAKE2B 645e0f0e167b5ae9630c6882308d44f0a0fb429c7e5b1bf567beee43769b4cc871ecdfb4d82158431e07277144a51d06a713db8d88e7b67232d086da095a2e73 SHA512 0b1cb57bc7ce0f94bcbfb18cd1ddfc0d352c37d4028cac222c777acc0c12d38333a8ca04089cabee3e17ee7c87ae2bd14076f434b37efcd7062884d3c15b9379
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-modemlights-plugin/metadata.xml b/xfce-extra/xfce4-modemlights-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-modemlights-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
deleted file mode 100644
index c882e6f420d4..000000000000
--- a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib gnome2-utils
-
-DESCRIPTION="A panel plug-in intended to simplify establishing a ppp connection"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-modemlights-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	x11-libs/gtk+:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-netspeed-plugin/Manifest b/xfce-extra/xfce4-netspeed-plugin/Manifest
deleted file mode 100644
index 7c061c87d04d..000000000000
--- a/xfce-extra/xfce4-netspeed-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-netspeed-plugin-0.3.1.tar.gz 364073 BLAKE2B aea069d4fdc59b0732ec076179ecbfe5698b91ccb66a6eae63bdaf11433615f35061a29fa58f44481db7d18498bdfef433a9df71a1a52047e342dc1a68ee5aca SHA512 6a8e3a50dcf1fdce94095ecd88918a23d247541c9eea91eaaabc2d5ccd32debd871c6a73698e3328c3ffa8ef1b9c7abc9311b3339b92e77eae44deed801e68cd
-EBUILD xfce4-netspeed-plugin-0.3.1.ebuild 747 BLAKE2B fe3320327f1d4d9834432e402663a49c6fd1554acedd7df3fbc681342409dd21aaa05c21e51eb4f64a02b4f73db38558b0e2874455083b009d69386e9a68250c SHA512 7bb490345f9591eb3dd01ae1bb12a97a260e41bff8e51acd97babe78cebbb1006de63958ea3df687e8fa7ada26e83fec645500abce61dd9db3f7584089a2e365
-MISC metadata.xml 332 BLAKE2B 64c8fcadb59bd042505b4b0400ad8c83013ab27bb2b32c7b0b5349339e0e3520f99c696e03c2216d52f91eb2b65f6939067a8d22d082fcb647ae67bb5327e2cc SHA512 332f1f85179419483170516502b28e529b720f0bc8918e2675ef59da3f7eead63b87187be4fd0ad2197b3cd3ca38fde2831b99fa278d8a39a526c3a510781cd4
diff --git a/xfce-extra/xfce4-netspeed-plugin/metadata.xml b/xfce-extra/xfce4-netspeed-plugin/metadata.xml
deleted file mode 100644
index db55adfb97ed..000000000000
--- a/xfce-extra/xfce4-netspeed-plugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>xfce@gentoo.org</email>
-		<name>XFCE Team</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">xfce4-netspeed-plugin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild b/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild
deleted file mode 100644
index 3a38fd78bdd7..000000000000
--- a/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="A network transfer rate monitor for the panel"
-HOMEPAGE="https://code.google.com/p/xfce4-netspeed-plugin/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2:=
-	>=gnome-base/libgtop-2:=
-	x11-libs/gtk+:2=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS README )
-}
diff --git a/xfce-extra/xfce4-playercontrol-plugin/Manifest b/xfce-extra/xfce4-playercontrol-plugin/Manifest
deleted file mode 100644
index b54aca107e58..000000000000
--- a/xfce-extra/xfce4-playercontrol-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xfce4-playercontrol-plugin-0.3.0-undeclared_XfceRc.patch 296 BLAKE2B c4d5728d4b4eacc2d0148f46c51626bd6271ba190d47b659eba1e2425d62ff3ca13b76a9753dd8691ad58ced8abae3809e05b91db046db3815b61ca1705fe0bf SHA512 88630db08853a76a473823f7f84ddd3751f74c0e8a9a7e65105c68cbf5d9286447b9eac5895310f28b0a4c23217ea1a4f8716dd44a458b284284603e3cce6cdb
-DIST xfce4-playercontrol-plugin-0.3.0.tar.bz2 297945 BLAKE2B 65ba398962b3d6a09965a1922bdda536cde4e814b283dae9bf4b90faeae08f7dcb7f16868771a6ff968d8ce1f8a6924d4d0a1f2f49165bce53847717fe6d04e4 SHA512 31de7b67b5de512042f667970c5bea08fbacfa577c8aebba2e35ef57cd0275e682212c46afb2ae5cf3e6ccd85ea6a8b18b932b758f2409109b1d07380da2398a
-EBUILD xfce4-playercontrol-plugin-0.3.0.ebuild 1081 BLAKE2B ab192d6c4d8d2b2cd7df1dd75bb061081a702a8aed17092ce41a0beef4cd269dd8e829bd4f971c99139cee96881d68806b95699ee809afa76bf310c5f35f8abc SHA512 4862e014de048fd0bb8a4ca22b97c6b9e48ede5b787f8f1da33231a632e1f458adc48ab4795a9cd3ddffb0f790f2b621a155b06083a56b163a75571140bb72f0
-MISC metadata.xml 374 BLAKE2B 3818adafd633cc4147501366b90f4cf4220ca3496dc5fa8b2a4f88d8bc515f7e36f9556971c0b816693261b6be0eb69cf6398c2b45ada459f0d9a2cf038206b0 SHA512 fe1faab81a51c55cc0e8e84c93a823728cc6f2815d345e3e7073b72e7776e7a413557cd76246ab6b5af07f8d21fb178afff7a7f24db6b0ca5f6fc6f228130ec3
diff --git a/xfce-extra/xfce4-playercontrol-plugin/files/xfce4-playercontrol-plugin-0.3.0-undeclared_XfceRc.patch b/xfce-extra/xfce4-playercontrol-plugin/files/xfce4-playercontrol-plugin-0.3.0-undeclared_XfceRc.patch
deleted file mode 100644
index a09ede18029c..000000000000
--- a/xfce-extra/xfce4-playercontrol-plugin/files/xfce4-playercontrol-plugin-0.3.0-undeclared_XfceRc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/344199
-
---- panel-plugin/libcommon.h
-+++ panel-plugin/libcommon.h
-@@ -31,6 +31,7 @@
- 
- #include <glib.h>
- #include <gtk/gtk.h>
-+#include <libxfce4util/libxfce4util.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include "playercontrol_plugin.h"
- #include "playerctrl.h"
diff --git a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml b/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
deleted file mode 100644
index 369fefa250b4..000000000000
--- a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>xfce@gentoo.org</email>
-		<name>XFCE Team</name>
-	</maintainer>
-	<use>
-		<flag name="audacious">Enable Audacious support</flag>
-		<flag name="mpd">Enable Music Player Daemon support</flag>
-	</use>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild b/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
deleted file mode 100644
index 4cf63ad35f3e..000000000000
--- a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="Audacious and MPD panel plugins"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin"
-SRC_URI="http://www.bilimfeneri.gen.tr/ilgar/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="audacious mpd"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/pango
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8
-	mpd? ( >=media-libs/libmpd-0.12 )
-	audacious? ( >=media-sound/audacious-1.4 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-undeclared_XfceRc.patch )
-
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-static
-		--disable-xmms
-		$(use_enable audacious)
-		$(use_enable mpd)
-		)
-
-	DOCS=( AUTHORS ChangeLog README README.developers )
-}
-
-src_prepare() {
-	echo panel-plugin/mpc.c > po/POTFILES.skip
-	echo panel-plugin/popupmenu.c >> po/POTFILES.skip
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index c568b0199b57..ac8973e16f9f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
+DIST xfce4-power-manager-1.6.2.tar.bz2 1212990 BLAKE2B d037c7fa9fae435c508d6d1656d191d763e7369938dc7158c7c8910a161f98fa20926bdd088a3a65c73e20b536150b12db883915ae95059edcd10c307c344037 SHA512 d1c475ad3cf194c19a2ad1decc4c80a9f504d74b64dec71887c14c576cd5a2932799cd0068f6356a15590fa67c6d0434401ad36b7a2fa6a3b62d51290cd7b68c
 EBUILD xfce4-power-manager-1.6.1.ebuild 1410 BLAKE2B f1526099bfa749d48cbc0e6ad7a5cbaff51819fd027fa2821268031a00dc4f31b129faa1554d6c770f83ac5124144fd4b2ecf9c70ba9abc2239b8dad11fe2a03 SHA512 320fab64dfdd9ef0a95657f2269dbe6dc819189581314c3b641cfeb48e56f6aa891cbbfda0fe70fdaaf4ca2580ac6c13ae299cee51518665f96b1cd6dd255092
+EBUILD xfce4-power-manager-1.6.2.ebuild 1411 BLAKE2B 81449adf076c230ed9a2a032945ba8b20bb99f049f3e405aae140a1a1fa78e7785b330228e401dd8ebc92c39ec3a886e650b61b1f26e19220447d1890d24e8c5 SHA512 43583f76590044b0d8b9df73e87ee39edd100c73b9231ca5662e8dcd91bc292b2345bc161787c32d9cdc0a354b8105dff24303dd8116b88415ab92fb05b7b892
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.2.ebuild
new file mode 100644
index 000000000000..2307374a5d75
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-quicklauncher-plugin/Manifest b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
deleted file mode 100644
index 07287db274ca..000000000000
--- a/xfce-extra/xfce4-quicklauncher-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch 330 BLAKE2B ddec736e2cc23ce8941139b30a70eaa7761e71fcb72f89dfaa9eb59be9790a42113317fb81e7356a4d4e8e6e231f305366bf70b06cee153f9e5b4a7017e7b3f7 SHA512 e32d2730f9a78c45d387b22a1a39d96c376600abde1f91548da9f423901da0dc4569183c828282c5c62b94fe515ec5af18fcbe71508c4664197a4f20cbdf3d01
-DIST xfce4-quicklauncher-plugin-1.9.4.tar.bz2 282545 BLAKE2B 533f5fc32250bd3844e895bcfcce2fb6adfdd6e9e70459ba5f3786da3b58c869b6a8e05a2baacc60092544bc21898189442e06644dcf25df2c1322dc3814b1c2 SHA512 11db64adbef5a04f25891132e798e77a713d5f68fcda9ec5349f975f56c4f352a2da8493d721f307d23e973c02802840c2feef444921da29f2b6e21a5c79a228
-EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1250 BLAKE2B 9b22bf2d2a2d39db16f24534b1f5f49e7c8fac8a77de71988355661293fd64549226422c80e6f707d55a814ffd6e420e79b5afd8c77618f6baa5c58c5fd81e64 SHA512 4f6c3e7c798d61487c881a192cb856ac0beefcda3935135dbee2b806f11345d8eca97d1ac5e8777a2c020891f678e410df39c0cee7fe910113969fae78749120
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/files/xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch b/xfce-extra/xfce4-quicklauncher-plugin/files/xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch
deleted file mode 100644
index a6bb168539b5..000000000000
--- a/xfce-extra/xfce4-quicklauncher-plugin/files/xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- panel-plugin/quicklauncher.desktop.in.in
-+++ panel-plugin/quicklauncher.desktop.in.in
-@@ -4,4 +4,5 @@
- _Name=Quicklauncher
- _Comment=Program with several launchers
- Icon=gnome-fs-executable
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
-+X-XFCE-Module=libquicklauncher.so
-+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml b/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
deleted file mode 100644
index c61a5eb870ff..000000000000
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-#EAUTORECONF=yes
-inherit autotools xfconf
-
-DESCRIPTION="A quicklauncher plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-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 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/xfce4-panel-4.8
-	>=xfce-base/libxfcegui4-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.8
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-X-XFCE-Module-Path.patch )
-
-	XFCONF=(
-		$(use_enable debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog TODO )
-}
-
-src_prepare() {
-	sed -i \
-		-e '/^AC_INIT/s:quicklauncher_version():quicklauncher_version:' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die #472522
-
-	# Prevent glib-gettextize from running wrt #423115
-	export AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
-	intltoolize --automake --copy --force
-	_elibtoolize --copy --force --install
-	eaclocal
-	eautoconf
-	eautoheader
-	eautomake
-
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-radio-plugin/Manifest b/xfce-extra/xfce4-radio-plugin/Manifest
deleted file mode 100644
index 85d1c7a3db09..000000000000
--- a/xfce-extra/xfce4-radio-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-radio-plugin-0.5.1.tar.bz2 137447 BLAKE2B 83d3281df34b850db3d96611587ef5b6ca370e74cd130c2ed7ad72f79d8dcfa08e70e4f8f19921fc9b7b94152fc7651700aaa7f9256d6e466d5b9a030beab3e0 SHA512 54cc25c965dd6d220019382d0cc0970bffc3b9eaf315f2b055ee2ed56f818066e1fa51d2613c04b74562ec4f4786e9b87197a791c3e7867038b9b2737c540e09
-EBUILD xfce4-radio-plugin-0.5.1-r1.ebuild 762 BLAKE2B d595d98ab1ca8ce9e46ddbe65e4158188ad51d3778ef5f7c4abbef9b27b3143122c5582f37369a06e5397a68da97b57036bd15eaeae626438d847805fe34fb6a SHA512 90c5686b8425c7fc51dbaf83d26a87e0723e7a9075e17939c76bd6f44a0902da90989a2644f32460ab8c9e6ab1295cf03255ffa0357e92ad0409e7ac1c4c59e9
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-radio-plugin/metadata.xml b/xfce-extra/xfce4-radio-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-radio-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
deleted file mode 100644
index 7f5a2633f486..000000000000
--- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic multilib xfconf
-
-DESCRIPTION="V4L radio device control plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-radio-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=xfce-base/libxfcegui4-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(xfconf_use_debug)
-	)
-
-	DOCS=( AUTHORS NEWS README )
-
-	# fix underlinking, bug #555056
-	append-libs -lm
-}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 6abfe756f189..3658d39274ca 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screensaver-0.1.4.tar.bz2 617922 BLAKE2B c5cdf360cb1a9c38583a52bcb2d2735d2513c26aaebf23b4be4300266b72d780a3a0d8981c14f9753592eb1f63088f3fd8fd234efb6a595cb49262adaf54aca7 SHA512 5f074eb3c34ba731d0c135c657043ee687809146be512943f0f2892e1d06806400a5ecb1278dcb47da39ded47ddd4f9020cefc917ebb502962e16e56ee3a9b6d
-EBUILD xfce4-screensaver-0.1.4-r1.ebuild 1635 BLAKE2B 103c0f164bf21e87b2130479c963d820a03128aeed3481eb488df33c945ba7fe75c7733791e910657b2b0b44ffa2e8451d7fd97c115fcf25629c84a53618410e SHA512 28033c6d3dbb5f2e15b196aebbfbec3b91bc5107c2a859b7d0f2ae2b06e4c8b64d03c0269e2bb3d257c3cf7da88e7aa64c1adef8b3f8feeb866a9182146f1406
+EBUILD xfce4-screensaver-0.1.4-r1.ebuild 1633 BLAKE2B 0cb08b8d1e6a2ca9102543af66cdcf8e339035f5a8d67a71be3d34b03c129e5cb992d7cafbfc898ab16342c6408a9dbe738548125e0c4c0abf2cba61167239ef SHA512 07ac8a5c21bd8da2aefcf20401797557edf93a471e39c39a5c2016485c158c80b8116a9dc61d4f78895d9863b807ed45b28d99bb93df024def8e4ca6c2885979
 MISC metadata.xml 349 BLAKE2B b9a70b461f2064eeeec11db52c92d2e6b0a018dc4ed7ffb390f8ce72fca6c92802cb376f82e47a6b53bec0c1bf715e59cdea836dea514de05fb352279ff28407 SHA512 e655e51231b6f407bda45915fa7a9e1db53aa122f1609a1c4c78020ca7465ea13279bf6dc440d5d66de73aad42c1f20c4678f8100f0551211d9818618c356d95
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
index c0da1b1fec71..dcd2cab916ca 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="consolekit +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index a3de80ce863b..f6693bb8e98c 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screenshooter-1.9.3.tar.bz2 502188 BLAKE2B 93b60422eb6cef23b4d1f29fca49370cead8f74c4ee27ea4abf2bb9b4fa006f1dd9e39ccc87c1d915a5e7cc902245caff4b7778b801436a1c25893f46e35f3fb SHA512 ba59fdca3900143a50b3b858986b1152d4574d302d2e041a5287933427a67f64542ca691c130030937344433ea893a1f082086f9c02a9edccaeedbdc0a2a50a2
 DIST xfce4-screenshooter-1.9.5.tar.bz2 502423 BLAKE2B b71dd5d016ff86ea5b654264dca129fd1b9316a0d0f2926a40556448c11a51992e4921c3ff9da952ac5e2962cf5baa18df8a110127cb68e89ee1b1cb2252bb7a SHA512 e5797a6defa4df94c552e8ff39b21f4203b6795669e8145ea5ef609fc7b29bcfa846b19b253b39b12ab0e6c130c7f9e67dd5aa628cefe9b063fb9f74dd2c3ee1
 EBUILD xfce4-screenshooter-1.9.3.ebuild 1118 BLAKE2B f9574ff232b9e90d200d7cc582a5fb7b11b5cf8770a29614e9d7e79f407d83aa72cd91fff3f98f04c9b71a91e5bc77ec57a89e39d599a12ae2f3b15da42880a1 SHA512 e52ee4cc5614e9c5e30739fb4cef250917268bfb2aca746c0b0f7272c21fcef50a67f68b81993c9b2b1134c127f2fec73509380cf1da58f886472a888f27e541
-EBUILD xfce4-screenshooter-1.9.5.ebuild 1141 BLAKE2B fba9b39cc09fecada8006de0a4af25af7fe050eeccc702e02804facc5c8f5ba2b413adee88c640e969d6be6528f867f97fa6da64d62a12119cb2b076809eb669 SHA512 fb6a4f997c220d8d1427e60ec7f2d6ee9905ae583a3665e5cb04e1c4d75cc117084b0d4060172791f2b00047e7d9db80d68447e4ecdfc59ede519ccc2ec4c485
+EBUILD xfce4-screenshooter-1.9.5.ebuild 1139 BLAKE2B bad0b028025759a42bf98f911a04fc74a50600f54feaa9d8fa4252f7d808f76a72b71bb098356d9abd778e96bf1eee7e5a6975a3d71a812832e47c0b587a4260 SHA512 aa045723fe9ab7cae0baee0a357b919bcd8cd202bdb4e35990cc51f7007849b82874bdfcb234b4ca0a671d7f757e877689f6a2b8866ea22520a6e5a7647fe879
 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
index a8c8ac705445..50ab11016b06 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-soundmenu-plugin/Manifest b/xfce-extra/xfce4-soundmenu-plugin/Manifest
deleted file mode 100644
index 8902da31de4f..000000000000
--- a/xfce-extra/xfce4-soundmenu-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfce4-soundmenu-plugin-0.7.0.tar.bz2 386162 BLAKE2B 72e38d8ab206e7fcf1e5b0cd39dc37c670dfed52fe0f280c6e0355e51551aab55eb64a91da6f801c2c47ec363776326935252d5d6460bddb90c25a30a696b153 SHA512 d0f5815f70a64d8b68b7257d90697dddb465e77b0acfa4d0b75c4dd23864e4b3d2e58526932d9a5a9fdabbbdf2e8e3b24f8e5f26ad93e864dfe614139f7d3748
-EBUILD xfce4-soundmenu-plugin-0.7.0.ebuild 1081 BLAKE2B 0d9d8c444735b521e842edde387bdf790642d5536e3645cf746d326cfa7c9746c8735037d57cb44fd698169f28b4f3926e6f47e7daf98696fc78a1b74b823688 SHA512 322f203f0c33b3ecf6238d71c04e5e02999e64c777f872531f27364ca39746db053a0433b9b9211eed3619827be99d1394d5fb663556ddf31007b8d0d63beb11
-MISC metadata.xml 662 BLAKE2B 101dcb4f0543d688f8b62ad054cddbe1e1cb6a77bfb3c2a3a8128e90ee2f5803c28ea2b0066b118780548c364bb39c3435990773501591bc8fe53d0b365559f2 SHA512 ce65eea31184df547660bd3b086f6a71797587efe2009016f9914500faa1cf78ac3d6e717c70914243ce0633421f1fbb725b4a74543c91b4c69e83d467c4a746
diff --git a/xfce-extra/xfce4-soundmenu-plugin/metadata.xml b/xfce-extra/xfce4-soundmenu-plugin/metadata.xml
deleted file mode 100644
index c0f086750a91..000000000000
--- a/xfce-extra/xfce4-soundmenu-plugin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="glyr">Enable music metadata searchengine support using <pkg>media-libs/glyr</pkg></flag>
-    <flag name="lastfm">Enable last.fm support using <pkg>media-libs/libclastfm</pkg></flag>
-    <flag name="keybinder">Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">matiasdelellis/xfce4-soundmenu-plugin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild b/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
deleted file mode 100644
index c49f811ccd8d..000000000000
--- a/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A panel plug-in to control MPRIS2 compatible players like Pragha"
-HOMEPAGE="https://github.com/matiasdelellis/xfce4-soundmenu-plugin"
-SRC_URI="https://github.com/matiasdelellis/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +glyr lastfm +keybinder"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=media-libs/libmpris2client-0.1
-	>=media-sound/pulseaudio-2[glib]
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10
-	glyr? ( >=media-libs/glyr-1.0.0 )
-	lastfm? ( >=media-libs/libclastfm-0.5 )
-	keybinder? ( >=dev-libs/keybinder-0.2.2:0 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable keybinder)
-		$(use_enable lastfm libclastfm)
-		$(use_enable glyr libglyr)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-}
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index 132737daeb72..f93dd370e351 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-windowck-plugin-0.4.5.tar.gz 68762 BLAKE2B c4fdc900d16d668f06cc2c115c31df6d587ac7a833627b77145df4843497617a81acd508fbf5c54f9a443f4b2eaccf4ff86a445cbb83fbed068204c21f3354d2 SHA512 2750af17892e9083b0d359deb477688144b187b94dd0c8b50e4e88ed125631e7c6bf45a040cd036a9f09d1b8ce242a8d01a572eb9151258bb78c63e4744d367d
 DIST xfce4-windowck-plugin-0.4.6.tar.gz 67622 BLAKE2B 38a1ff76a75b3eb833be586bf93bc9bd73b7237e74cf06fd7540fef85befa4ef9ad8c8351d1d2bfad4af1f342c59b1cb0ebb94e50a3f5cc9c38c5fe9f0377d86 SHA512 a02f6f1b275484dc7ed08f3f9868af7a456c9f3b52bb893c2ac109a0ca8c4376e9d6d714f40d40c491531584486c8be3bebf3669f3186a143f6fcfe923b9f376
 EBUILD xfce4-windowck-plugin-0.4.5.ebuild 1135 BLAKE2B c01992f1f012288e33dd7bc5e0b93defa4cca50c534d68445b57ce041d6f67050aa63842779d601d2164d4f39acb4dacbe5c517485870de80ee4f7039ae9ac4c SHA512 d1de20aa74e43603af6a2ee4b859582633be8f5d26f712cceea88c64e552d271937e3018280c2747978d49ede13e9f7aca8ba16744a56b08df1fc417ab29eb0a
-EBUILD xfce4-windowck-plugin-0.4.6.ebuild 1137 BLAKE2B ca1833e482bf24c48dee7510cd61dbb3fdde7e4d787daff95dc32f1950cde31e175a27cac2fec475c6ba1ce9beb42190075ff6276fb13335504c55d3b6bc6c93 SHA512 75a6c36f206975bbfd770559bd2a6768de1b2da801fae00f3959e5dfa03d6345bef7b1b6d1cc6dc52b6971b1277fb3aec1ac6175a5832c6a6807d2b34f79aa05
+EBUILD xfce4-windowck-plugin-0.4.6.ebuild 1135 BLAKE2B c01992f1f012288e33dd7bc5e0b93defa4cca50c534d68445b57ce041d6f67050aa63842779d601d2164d4f39acb4dacbe5c517485870de80ee4f7039ae9ac4c SHA512 d1de20aa74e43603af6a2ee4b859582633be8f5d26f712cceea88c64e552d271937e3018280c2747978d49ede13e9f7aca8ba16744a56b08df1fc417ab29eb0a
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
index 393b44fd9670..48bc0eb09e84 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/xfce-extra/xfce4-wmdock-plugin/Manifest b/xfce-extra/xfce4-wmdock-plugin/Manifest
deleted file mode 100644
index 08d69b5a2e06..000000000000
--- a/xfce-extra/xfce4-wmdock-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xfce4-wmdock-plugin-0.6.0-LINGUAS.patch 435 BLAKE2B 03100011aa35b98d7cdebec604a014457d3c5e19e4f67f0db4a16dc650fa4525e76766912fcb181fd54c7dac01b956d0af44af8f2b08a0f762fa2cc4db72c06c SHA512 673e64b5da0a577781b23b3cf4a4c3f2121c8be144539970b39bd91165fce5245657aad5e53c57e33031f4e65d8e625b7a24a4abb3f18f74acf7edf50ea2f31e
-DIST xfce4-wmdock-plugin-0.6.0.tar.bz2 344743 BLAKE2B 5b425e55dfd5de6805e1a592f86c26bd1e8a655be6d89fb8f8c3722fb76746adc25643e04f22dfac14653e3f3b47b8eb1c9a8ada86b69fd7296404f8324ee4c2 SHA512 4057021d3a664200b1c096047e81611813cfb9e268193d299097430c0c499280d67d326917fd303c21177cc714cea8c81847d3445ddc93860516b55eb6a0ad8e
-EBUILD xfce4-wmdock-plugin-0.6.0.ebuild 974 BLAKE2B a783153190b6e3c15f299d38cc86241482c246af16f3d7435b9ea1e1e5d43a348158dce55120211a6a22161354b3d6faf779f1e6e3c78a9af184f4e927a6a3d9 SHA512 37b8252e44c265844d4c3e42d38a6384d35dce2aea629c4dfad49921af10c8659268ab6e178a074463a9222cab7fa62cf3932c5b696a12aaa89ac72baf1900c2
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.6.0-LINGUAS.patch b/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.6.0-LINGUAS.patch
deleted file mode 100644
index 29a3c44c071b..000000000000
--- a/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.6.0-LINGUAS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/508486
-http://bugzilla.xfce.org/show_bug.cgi?id=10969
-
---- configure
-+++ configure
-@@ -12147,7 +12147,7 @@
- 
- 
- 
--    ALL_LINGUAS="ar ast ca cs da de el en_GB es eu fr gl hu id it ja kk ko lt lv messages nl pt pt_BR ru sk sv tr ug uk ur ur_PK zh_CN zh_TW "
-+    ALL_LINGUAS="ast ca cs da de el en_GB eu fr gl hu id it ja kk lv messages pt pt_BR ru sv ug uk ur ur_PK zh_CN "
- 
-    for ac_header in locale.h
- do :
diff --git a/xfce-extra/xfce4-wmdock-plugin/metadata.xml b/xfce-extra/xfce4-wmdock-plugin/metadata.xml
deleted file mode 100644
index 359901b31db4..000000000000
--- a/xfce-extra/xfce4-wmdock-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
deleted file mode 100644
index 4fdb10aedfb2..000000000000
--- a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="a compatibility layer for running WindowMaker dockapps on Xfce4"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND="x11-libs/gtk+:2
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/libxfcegui4-4.10
-	>=xfce-base/xfce4-panel-4.10
-	>=x11-libs/libwnck-2.8.1:1
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-LINGUAS.patch )
-
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README TODO )
-}
-
-src_prepare() {
-	echo panel-plugin/wmdock.desktop.in.in >> po/POTFILES.skip
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfswitch-plugin/Manifest b/xfce-extra/xfswitch-plugin/Manifest
deleted file mode 100644
index f5be22871a9b..000000000000
--- a/xfce-extra/xfswitch-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfswitch-plugin-0.0.1.tar.gz 314589 BLAKE2B 7db630178bbe6ef7dcb6154f6aca0ba3ebc80670d78d0c87f1e4d140a23082c64118aa89d36793384a3b3217784c585bffdad505e213a78837054469a85c7d1d SHA512 58b427d5d099f9e351911cb30707a6024e10ae90f7c978aafba5824f76f5ecdc615979e7a060146ca6cab85f69f8dc10e553884e37737c4f674dfdd3d1fa634e
-EBUILD xfswitch-plugin-0.0.1-r2.ebuild 1329 BLAKE2B 31afb45b049bb28e47e181689de328fd6b8219b32292dbcdcc200a049f04a167b8f60bc48c1e9662e1e7f69d3770bf91b5320f571583b651aff1e3b2ad80a2a3 SHA512 8fd38acf0f88bd3212d0d6cc94ec0591a8163fb75e007b7b3a7b2969ea9c5ac8bf5d4d7b98215109ba15015409584b3af529fd25ec2da71b251ff59ba629e0cb
-MISC metadata.xml 505 BLAKE2B 16c9d4c25fb50b1ec189d21800850907c279ba2d1d54dc8b05eaee9f289fe7111e6200615f3e88582172d9e0f3b113f770fc53b70ae5ce817347e403cc8885b8 SHA512 44c5a790a69ac0978d234ecb7916e6ce80f08ca805caf2409989d769cadd80e301dee2b7db1a8f653f5ba03dc3dc0227e22816d410360fb619453fcf3a617f01
diff --git a/xfce-extra/xfswitch-plugin/metadata.xml b/xfce-extra/xfswitch-plugin/metadata.xml
deleted file mode 100644
index bf60f51918b3..000000000000
--- a/xfce-extra/xfswitch-plugin/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <use>
-    <flag name="gdm">Compatibility with <pkg>gnome-base/gdm</pkg> only</flag>
-    <flag name="lightdm">Compatibility with <pkg>x11-misc/lightdm</pkg> only</flag>
-    <flag name="lxdm">Compatibility with <pkg>lxde-base/lxdm</pkg> only</flag>
-  </use>
-</pkgmetadata>
diff --git a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
deleted file mode 100644
index abf5b49a3b4f..000000000000
--- a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="A panel plug-in for user switching (using lightdm or gdm or ldm)"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfswitch-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gdm lightdm lxdm"
-
-REQUIRED_USE="
-	gdm? (
-		!lightdm
-		!lxdm
-	)
-
-	lightdm? (
-		!gdm
-		!lxdm
-	)
-	lxdm? (
-		!gdm
-		!lightdm
-	)
-"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.12:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/xfce4-panel-4.8"
-RDEPEND="${COMMON_DEPEND}
-	gdm? ( gnome-base/gdm )
-	lightdm? ( x11-misc/lightdm )
-	lxdm? ( lxde-base/lxdm )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
-
-src_prepare() {
-	if use lightdm; then #411921, 526598
-		sed -i \
-			-e '/command/s:gdmflexiserver --new:/usr/bin/dm-tool switch-to-greeter:' \
-			panel-plugin/main.c || die
-	elif use lxdm; then
-		sed -i \
-			-e '/command/s:gdmflexiserver --new:/usr/sbin/lxdm -c USER_SWITCH:' \
-			panel-plugin/main.c || die
-	fi
-
-	xfconf_src_prepare
-}