gentoo resync : 15.01.2020

28 files changed, 130 insertions, 233 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index be2c596f556f..bd3981e0c896 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index fc1c620314c5..376987f4a695 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,3 +1,5 @@
 DIST tumbler-0.2.7.tar.bz2 564538 BLAKE2B 64fc31e70be584ab04134de4f98e0302f91be213481b451c5b1563c001e240091b0721132415e92f5f60f7b0cd10099d9fa3fdf0435d3fa9e7c496f6f9673d3d SHA512 d5121da67bc2b1bf115980b6c9ef9fcaf71cdf52976227dd360afa44ac477c305a774a29be876e4fd0874f71bae3682b28c2429864283dd14b9e9bd1790a9083
+DIST tumbler-0.2.8.tar.bz2 591099 BLAKE2B 50cb9a0e8859e2f092356fd25a3ca68400b615bfabacce18f98660d761ad1e6723e075d651e99b99a1ca5209b0f6aa769acc05ecedab6ddcef5a33622f690087 SHA512 cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb
 EBUILD tumbler-0.2.7.ebuild 1518 BLAKE2B 5b1bef05bf18013fe2cea1bbbeb42f01d707a94893042747512cfe29d78fa9dabfa2184ce8ca1230e293b94a3cce874ffffab6955372d062229c1b2fa5e295e2 SHA512 b6e3251428049f5f06614c85263ab9b904c9394960af5603b6849bd658558d53543796a40c0b78d6382bb505d3dc7291829d8aff29765aaa4dc62f135af5997a
+EBUILD tumbler-0.2.8.ebuild 1524 BLAKE2B 17d7b18ed4491bd3d072b73e7c45f6d93ba2eb8c72a4ca32f695a6dfd0159ee2dcc889a3c1e114f0575bb262a2c62b41661c4960ffb52c6aa3323dcf352bbefb SHA512 130aa7b5e4546449af4e202bd5916c149a4d0f15e44e069ca3c2fe70d676412737c2c6b4de7d306cd607089bf6586ef45110c97373e2cea83947f5d7921932ef
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.8.ebuild b/xfce-extra/tumbler/tumbler-0.2.8.ebuild
new file mode 100644
index 000000000000..c9883f6524b0
--- /dev/null
+++ b/xfce-extra/tumbler/tumbler-0.2.8.ebuild
@@ -0,0 +1,57 @@
+# 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 6ec17d88dc95..12ca61360bfc 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-alsa-plugin-0.2.1.tar.gz 29375 BLAKE2B 1bb13203af1c21c472531ecddd4d65b84c5610893a434440585c1e51e2e717cd8642874e7ea784b2c5ae7e0c9203dfa9104e95485045f5749e77ea2d4d56c8a2 SHA512 d04ca015d33bd068cbd45d200181239f1b1ecc2fc7723ed8d4566fe28a8b6b28e916e2c484ef535cbabcfb81813ffc46f5fa2b1f8535fde2f4cd719cc0f65e27
-EBUILD xfce4-alsa-plugin-0.2.1.ebuild 666 BLAKE2B 5fceb002dbd5997c22db29bdc774d7db80aa0aefd6273655e07757cfca397d4ca40a756ec734bab3b5b56fff76039ae0f9149aae53746497aca41860b4c549ae SHA512 ee21e46a8ec154a15b5cdb1c5011864ceced7dbc8d28baeb275b93d267544118c32cde9de9a80310be00fabb20173181901c317bf7279f359ea95bf9cbd18d67
+EBUILD xfce4-alsa-plugin-0.2.1.ebuild 673 BLAKE2B dd4ab6b5c7002e846c838f8b11e6cf23ac9ad1488cbaffe7118884ccc703e3d20912f36b278be3f21e0b3215965a93464160279c8aa64c65f062c8216da82885 SHA512 2790d17877debbfc6822677e285385ed4b0dd160ac709e9a82ae92413360a003f44b926c4d6668e37c5527fc8b4505789968edebaafd59558e4dd76315638b09
 MISC metadata.xml 330 BLAKE2B 73c387f918e801398808c85c8f8a3ee064dd4b4a1457c04ab2a7aa75065665427b931ecc198105e0a93a8f17bbce0801966659873c1b54a3c4d5e061821880ff SHA512 4348ea62b4041beca20200b351f0f3914b99c413ba18123f70345ef007a403aadc131f15ba535b6f4efbba745e6fa5b7851d74945d09236f36d000732fd34dba
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild
index 602c1ac8bbba..17f8e414f136 100644
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/equeim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 3dd115eadc67..ab802c27b5b6 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740
 DIST xfce4-hdaps-1.0.0.tar.xz 350888 BLAKE2B bc34321f42b0f51a10ef65429cdcf5e3d63f20914aa0c593c004c830932c8a63f194a25b602784527f5da0f74302142ccbcb3ecfc2a677b004b71e5bad4e5ee5 SHA512 0efdedbccfe578304e61cccb86936b4d62e9e3de6cb9c3cf7b288983b93bd8388e1b227565ebe354aadbd58fc493b67e5c3fea02bf9dbc1b37b5d2ec419a5d7b
-EBUILD xfce4-hdaps-0.0.9-r4.ebuild 1054 BLAKE2B d249d994f67525000f092d22591b8a4f8cac6c5c0231ea9cf8faf512c190c2c27e596937e60b8bf16ee2ea1f37d0896c85b3cf517c2fe72037f804be49cddbfd SHA512 3acf0ad90955e45da42292280686ecbf0d77cda387fd8f92416855795909b5d2828e3032adc061d469c1b5617628cba51c733a22773f593d14b02684bb74edf7
-EBUILD xfce4-hdaps-1.0.0.ebuild 814 BLAKE2B e5fa920d432566c6a4cf8414d2130a07cd83ea7af16a5f1ce2fd0181dd477b858b2f8bb05b41be068981a576659a4207510fb3d99975ced378fe15b901d67d0b SHA512 19aaa2f75356d0eca84f2c82d266768d813d404432846f870bd7e781203257daa6913174a800f6e81295aac31f74c8527e34d7644ce4bb094e774683dbe99fd9
+EBUILD xfce4-hdaps-1.0.0.ebuild 812 BLAKE2B 7c1212db7794e5a5f274175110a51d0929f0a5c9782ff4e0bbac111e902a23948130aaef3684621724c07379ba0280c8169020cd9cb31f7e0f60feea54529159 SHA512 7ecd673d2ee4c3df5e61b62933c35f37bba522cc09236db0453bc12c99697dbc1106ca510650cec1793eab4e96d25785a53a2446e4f639642a990533c66ee413
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild
deleted file mode 100644
index 04c33bded30e..000000000000
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r4.ebuild
+++ /dev/null
@@ -1,48 +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
-
-DESCRIPTION="A plugin to indicate the status of the IBM Hard Drive Active Protection System"
-HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.php"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	<xfce-base/libxfce4ui-4.15:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.8
-	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-laptop/hdapsd-20090101
-	>=app-laptop/tp_smapi-0.39"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 28; then
-		ewarn "Unsupported kernel detected. Upgrade to 2.6.28 or above."
-	fi
-}
-
-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-hdaps/xfce4-hdaps-1.0.0.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
index a680a7fb6696..01862e4cc199 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-util/intltool
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 083140d4b08d..abab15e231ff 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-notifyd-0.4.4-r1.tar.bz2 536304 BLAKE2B bde62a773f7a702338e07fad8483d57576edb4c046b709c8644c17697ea73b72e46b8b4e2737d02bf23a554cbcac7c9725d7f19ee9f1ea511efb0943280f1b60 SHA512 546a5063673e36ef26bcdac624bfcef41a14918dbb496fb3d282613334f173b51669184b6bcfbee0f07a17863620898be2f464e487ca9755abe7285d6a43d8d5
-EBUILD xfce4-notifyd-0.4.4.ebuild 908 BLAKE2B 65dfe8a7964c2703923b9662c7c745e3a56b78905433939db41f0705ef6671150f2b0867d60f555335f08ff0ffcfeb8e75a8a130858a95fd9fc2380b5bd2723c SHA512 48f40c02a0ced75b98ae409a29e71d1ddeb8405e7ea14f4b0a93804707ebb378025609d4ad97b47951e771695c612ef0124baaeb686a5b067a7f2505fe4d77a8
+EBUILD xfce4-notifyd-0.4.4.ebuild 915 BLAKE2B 58384c17773fe32dbebf460d821d1104c6844979aab6d5fc789637ce4e98faa586c19376f7cdd4748bdc9757f44e30bd2c0652496e8832376d4fdd031c108d1c SHA512 734fe242b9bfcb52264f58986ad913b762cfd4f55cea8f5472a80a8935ed4edbccbddc753bd16f5ac3514bc2682341abd9618b8e089dd7ac2d44b37a22ddf6de
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.4.ebuild
index d0557db39248..dfb1762e9b91 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.4.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2 -> ${P}-r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index d5de96f05503..2b88c7feef83 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,3 +1,5 @@
+DIST xfce4-panel-profiles-1.0.10.tar.bz2 62196 BLAKE2B 205469ab841843395429605660864a4d9496dde942ca5c8a587f32bc7143c7076f362ea0f9a488f20df3ce8ee357c4b236d3077ac07497673b3214d8fa02c20e SHA512 efd59d585cc916cfc9d87961a58f05dad754a70f1971d9c49a071e20b96bb28e6bd5fa13508430e5c0f15976db7c438d2c68e0ae5936563388fbbe02fffdb50a
 DIST xfce4-panel-profiles-1.0.9.tar.bz2 58886 BLAKE2B 3711bfdad68701af833e8ffcb8ada151b1120168193d8508d14dcbb3eabdd5eeb9f0b3b5ecad3c17e5e3afa1b42e73e72340b8ea2fcf9efa5235415384a49018 SHA512 a9b381d357482582210e153fdf1ced8055847ace0507dafc29fc952070fc4fe8fd34aff62342f442ec7045cfe87550c56ccf5d78c0f0a7de7ed64e4c303aab45
-EBUILD xfce4-panel-profiles-1.0.9.ebuild 903 BLAKE2B 24b9c21451ce442df55d73999777d7109b119731918507ce5dc468069591886e7f77b406ef7097dac4f97dc610f41e4d5d8bd6bf78180696189b2e335b69f5e0 SHA512 6f531a448cdb78af0ce782244c65df9cdf1879cdae4335cbb3c0a5117d2775f95e5cbeea0e2651cfec461e47d3e9f0f58862e7583d3c80a2cc2747e20eac7623
+EBUILD xfce4-panel-profiles-1.0.10.ebuild 983 BLAKE2B 9b8051a373419a5f7b8956e65f049605a646ce3f5a1ecd27d3c2543bfe0ebeeb80555f06ce981cca7afa7cd019a9ee7f6020fe53f7d6c66546c0c7d2fda90e90 SHA512 d9d7d6e188821f65a603f51b59c4b8808fdc9ddb6717f834533124a3108620f6b63be8707b04a8738891ee1ca6bce322f18e013d2c132d68b86f041066853426
+EBUILD xfce4-panel-profiles-1.0.9.ebuild 901 BLAKE2B b0c65b267bb5b134a30c84420779fe073f5ab3dacda8ece0df87e4eda9e92bb3a8690da9f096fb761acb487a831ef13beecb129e9bd1f619e9f19ed496584291 SHA512 635bc6d6679751ce29cb22bfc4842b1a373aa75543a0c41af69ed5756dbfbb257456440bf0e9515e7cf30d6376e2bbf1c33f8939ac7a261866bec2c3b617f676
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
new file mode 100644
index 000000000000..be439f96939e
--- /dev/null
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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_prepare() {
+	default
+	sed -i -e '/install/s:.gz::' Makefile.in.in || die
+}
+
+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-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild
index 7be1dfb541be..8c04fb6c2c5b 100644
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1
 
 DESCRIPTION="Simple application to manage Xfce panel layouts"
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 7d06d9065ed2..0070040c551f 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screenshooter-1.9.6.tar.bz2 529233 BLAKE2B db314b3b451c3f560d8068932b21049f3e9587f8e329b1efb08e25227ab812c15b76a9d9a5bd3ffa1b4663ec81508f6cda2b6d31054b72d7487a111477962a62 SHA512 17d4afb346f09f97225c0fe65ed2389733e98d58729f15f7ec2b601682d7e15a6d9c67b85840593c17298fc32c250d8eb2e8d349ccd355507f4c18b5e312ae35
 DIST xfce4-screenshooter-1.9.7.tar.bz2 536583 BLAKE2B de6376b68a7936f7ea22762449389ddd8ae1bf29f5fb062054691e4dc3f19471b63ef6201e813624cf2ec34c565ec0ac0d1de9db7d1b86296c736def5ab5023e SHA512 364594bd00172f0becb85f8643e4106b4a7b71ac5dad765850f54de011a77175801bd9e7eaab6a8bbb3b1353299fdfa25cc0a4a52d49017f9b51330377eb9add
-EBUILD xfce4-screenshooter-1.9.6.ebuild 1128 BLAKE2B 4d4cdde478b6ea85895f812fcd154129da92cd4c4ea09d2a9a285e1c74c8cb742b717cd10b47658d32563696e45337aed0c0b28ece9422a9a7140632e99fa43d SHA512 74aa0ba4beec8257c7648fb6f6fe25773710db8b0b8427d6684157b03d1ff411a43fa5dc8947a2bc9943fd560d9ec4e64d2925ba6dbf78dc23267aedce5e18b4
-EBUILD xfce4-screenshooter-1.9.7.ebuild 1123 BLAKE2B 21b6efa9dade85807d38a947778b9c799cc6acd83c0fd5e6d3e4368ac7312847099f5d7d64854954a7e6c702332408a15b95459f980da347ff80c328370158d4 SHA512 68ce6a6367d0d5cb859fc3a28c919ee49b93966f4fdf7e5547cf1e7863366dcf6b4c163ec80103a1a5047749aa06483897ad40c223164b1bae7e06d702047984
+EBUILD xfce4-screenshooter-1.9.7.ebuild 1118 BLAKE2B 97f04d16e86ce32ad2be942c4949aff0e0105a3038ee206bd6e284ed045f81c8edd15c13439649f0cbd6e2e486a3735f3009ceae3772e3de00324b0e09074b66 SHA512 ef7d8cf80a4126b25bb7d78dbef819b4a53fe61c701ca94d3f427cb6f371b3309e0ffa52761f84256cd4ffba21195d1b455f3dccabadc8315baad7256080997a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.ebuild
deleted file mode 100644
index e35d86d294b8..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.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-screenshooter/xfce4-screenshooter-1.9.7.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
index 7deaa2620378..1b50b412ea15 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index f7f6e4fb1caa..e01184fd4fab 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 1567 BLAKE2B bd8bd7c18d1876e9f09151d2d6495f819cd24ef0e1d8946cb4175a15f119a5e18a69e281042b4f730471853dd4e233638db48e433d98b0a58729d1a53980fa99 SHA512 d224a63e203e96158574604169b213f5195ebe8fe56b63c447f07809c06648b5fdf5bff9ed232719887a386fed360556b55d947e48db0afa7beb3ec257287b59
-EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1570 BLAKE2B 0c6c17727009749b06a3b494d1c31e16430d183c46ffc7be253eab0ca43b98ae5fee11ef372e41cf38959a99decf6a006861def7ba60d571ab0c620488b4c80a SHA512 72267ac99b487aa32674a7662952afbe4d58106e7128bdfe505f786fc3b2a67f6eeda44ec7da1ad120dd8b206a25cb85d4747e71c3a059c405fcb75df49a581a
+EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1577 BLAKE2B 2badb690acb6d1eb461946370a8046be77f57d7f89216e53f08a6848dbe0bf503165db65322dc144f99f44ac47dfe32984c5ffd8ac8a3ba645805afdd715c8fe SHA512 65e07005a3e98bb00794a0daf34759855f6bd065f1871dc4393be6ae243714ddb0f60a760f81595577071f8238d3bc854b15846f3359950bc680d143af548e05
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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 4ede2b8abc0a..f62c925542bd 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
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 
 REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index 1e11de5d6f2f..9e0c7a87af6f 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.3.tar.bz2 362390 BLAKE2B db7ba33a1d30dca7361d6ab6be5559786891273a36e00a028a0e27084d3fb4760af18f5cecc5c2edfd9a76640130ba4a4412d2228b26154f8b85173df360fa38 SHA512 c2080abef330e9f783b3e9c008a76d11bdbdfe1a666435237b6b06a50e93191a760441a9d343f24234eb4343b550009ed9e2101dbffbec3d8f53c562d4bb3cfc
 DIST xfce4-time-out-plugin-1.1.0.tar.bz2 395843 BLAKE2B cd5c49cc6bb31003803cc47b099847dc6d88bed9e36a7372b8d76b25a75bf28079afceda14ee235c724273cde2519fadb701bfd45995b10ea93b3d6b05cb359b SHA512 03d27d98a3968daf93357556a5ca63641ceee3ce9f53db5287ce27a282d3f4a068a2c9be14d7690d4188901245521c03b68bb3fe39e1ed0e1f6a95eecc1dc846
-EBUILD xfce4-time-out-plugin-1.0.3-r3.ebuild 854 BLAKE2B f2fbc0ea328b6d1bd2851ce1b6237eea150831387936694d0ff62684b391069ce49ea207990a96bb2fd93393a0c2855a2128dc74ec5518eac85bcbef727eb2e2 SHA512 d5b331743a6f2da1b1b3ef14e12316e889829a14afa90446d32e50a241f896f1d28846c5e54860df71dafbc472b7cca3379c0cee1cc55e72c1ac1b3fc1fe6db5
-EBUILD xfce4-time-out-plugin-1.1.0.ebuild 794 BLAKE2B 11c3597aff27e36137966da93e84396ebf67cbbbad589307b816b8b8da806881383d87f38dfe35a69f90c0d279d50e8e6df0e49ca6dba73bc20d3eb7523bfbd0 SHA512 f489e2b721ef87e1c811cb54c0d43983c3f5336a80e27cbc9d9fa1dc0638e81abd2ebe525187b9fffe0a9e7d1b12f599ba515f2710d53f0d6431cd81f1db5666
+EBUILD xfce4-time-out-plugin-1.1.0.ebuild 789 BLAKE2B b0b5948009f9c02200e71aaef83d617c27a098ee5b8426f85a5c1f2f434ee425e7d585c946a3788c1c51fdbfac4c21d70deac41bce12b8569ce38da67bed7634 SHA512 813539acf4b828aabbe5483ae8224669fa10cc34ada772b6989914decf4a504d8b5d771e8148e2ea362329a11a55a1314999bb52e5cd9b3f52d86bb101640a74
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r3.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r3.ebuild
deleted file mode 100644
index ecee95c949ce..000000000000
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r3.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.15:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.8:=
-	<xfce-base/xfce4-panel-4.15:=[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.1.0.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.0.ebuild
index ffc66edafa2c..b9898e8c765c 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/xfce-extra/xfce4-vala/Manifest b/xfce-extra/xfce4-vala/Manifest
index 6fa6acae7ae0..43ccad9c8c56 100644
--- a/xfce-extra/xfce4-vala/Manifest
+++ b/xfce-extra/xfce4-vala/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-vala-4.10.3.tar.bz2 88023 BLAKE2B fb5ec9ae0cf14d0f28c49ee04288a9fb78d512f2619e3fb52fd7ceca743763ab12a2e504fdcac78ff3c37b2e8c1aa43acd082b1101f10a2e881eac4655684367 SHA512 ef5d6c67d53edc428ed10e59c21a1264a0d6d06efbea531a15f2eb1309e632e3cd275657aeb01c5723f437b9c319b922055598f97b0ee7db45853beef4f4d987
-EBUILD xfce4-vala-4.10.3-r6.ebuild 855 BLAKE2B aa8bbe2ea0a31edabeb2c7a83f7cfb488bb7976f9c82f050c0cc412a3bfef1f7825090db738bfd8e3e8df08f1f50992b3e5427f4f69fd4fed8531520f8a20078 SHA512 a4298a976f5e1163ecd5c96fa07fe1fbf8f1bd73cdc424abb5f7c2a8cbc7924ae33551bc2f461c88ac7334494b218bd790f258fea2639db749a9566fc5e5a275
+EBUILD xfce4-vala-4.10.3-r7.ebuild 855 BLAKE2B f0ece3cdc207916fb8b9690d58bb790f3b40c1c4aee49dce9a33ef36b35fe2a0683769c1c97bf27862690b8cc206bfb164a33d1249c8c5997a034184246c1e1a SHA512 f27389a711479e308cdf1eb5943e66bfa8db954c75ac2cf601b63c941433c9f2c2463158c77b2d18f72514ae0644b32a2e8d36f63d4259c6dd288224214df282
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r6.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild
index 026aecececb0..c8e8d4cdf7ad 100644
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r6.ebuild
+++ b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-VALA_MIN_API_VERSION=0.42
+VALA_MIN_API_VERSION=0.44
 VALA_MAX_API_VERSION=${VALA_MIN_API_VERSION}
 VALA_USE_DEPEND=vapigen
 inherit vala
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index b615dd8740bb..da8903436d0d 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.3.tar.bz2 160277 BLAKE2B c4c96175f1d8a7202e8a6d207dc113ec172493eb724f7da7ef18fa3de26e52c3b86bc0135ca8cb1e650a0e9d835e065b6baa18816dee7c90c4034dcfc9033639 SHA512 06e8c0ec623538103974c266c26b8efea94f97093324b5f55305ba6832a8c9eb7fa19c636249dffbc09ed4c7e3f543d338b2bd3455c14601237b2253683f5ac6
 DIST xfce4-whiskermenu-plugin-2.3.4.tar.bz2 160614 BLAKE2B 276842ef860965d139166ea6d8e988d39694aa06ace52bc3f48d6e3d9c9d8c930c3b9e44c3d9f84aaf7bb6fd9412a5efdda39834d8c2d33ed3f048db68893266 SHA512 8e59b6d0067e2302e3bf3e7f528cf96d613586c78c2ce6040143b449bffb3e3037b0d08738450c701d57f11cc5393154221bfbe5fa43825ca5df7ddd3c9f4cf4
-EBUILD xfce4-whiskermenu-plugin-2.3.3.ebuild 1101 BLAKE2B 0ec7c8b3e67e3e6d228903a0756cd1eca7fb2d2939cd91fc80ead4d1cc1daee1696afe1f916fe16772dd579e750159af9079b7a0d264a4c56811a63bded6242c SHA512 ea0a9b10a9e1def314bae0b97f5ddd5fd4a254572d1c4d0eadaa24f3c7399d601d17c0001b7fd676e5f013c77c8a6ce43f53e40fdd2f1bb1dfed262b8248e792
-EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1102 BLAKE2B a034535ea55fc7ddc549d770305ef6013e500e485c08a3da0aada53c6cb75dfd35c6500df0c759403b43cd24ecc0caf5df4d7c9313fa50edf962ea59b750392b SHA512 45dd57417a4cf34056834a8dcdc1c268d23bcc576adbdccc095e5bb8e615cd8aa1a50923271845bb5df7583158fc5619e6ff80ac2183200fcfef8eba852f5c2a
+EBUILD xfce4-whiskermenu-plugin-2.3.4.ebuild 1082 BLAKE2B 791bb658bf695009b4b18386c6abb0672fa6a8cdc589eae707e13c0da2880d74a7c346f7b3548ca226f0cd803627a62e19e4690ec6adc4d4becb20b198b4f28b SHA512 779c2371da3b988a3c89d97940922a989cf0e338ac788fff7a026d06db926a811fce3385e747b2749ae99c34e9662809a9499b4e5dcdec2fecb661bce281f39c
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
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
deleted file mode 100644
index 530eae19a64a..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.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=7
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:3
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# fix build failure w/ xfce4-panel-4.15.0
-	sed -i -e 's@<libxfce4panel/xfce-panel-plugin\.h>@<libxfce4panel/libxfce4panel.h>@' \
-		panel-plugin/register-plugin.c || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
index 0fc87c2d21bf..203d930b0b47 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Alternate application launcher for Xfce"
 HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
@@ -35,7 +35,7 @@ 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
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -45,7 +45,7 @@ src_configure() {
 		-DENABLE_DEVELOPER_MODE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index c057051a1c49..4da414812cfc 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-r3.ebuild 1220 BLAKE2B 55e412427c75742de0ed655fa89c4bdcd170bca3da0dd1ad5daffa8c4a59672e9d8471b89c4f4e4b483cfe851e3f4c5556dc993d5663af8a6cfe29b602258cf6 SHA512 56adf48b2cdd09add9042320a09e81f1a368158e6d9c034e737d27525442a59eed297c6520f37874c5dffea27456912a93cac455cf92960a8568517a4ef2cf6c
+EBUILD xfce4-windowck-plugin-0.4.6-r3.ebuild 1227 BLAKE2B e1a14632636347dbebcb81938cdfaa0423c58f48668747b559d694106ab6e18000b489327d98f52173d2abf8b12ba0197f24fd55fe7cb0380c2e3f59f1fed348 SHA512 8e0524825756f75f7d3603d7a73bec96a8960b53204e692a8a2c88daa568135bd76390227158e34c65646ccc1677698638143ec14acf21406ce87e288afe76c8
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.ebuild
index ef49d7604709..3000c690737a 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.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 ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.20:2