gentoo resync : 14.04.2018

26 files changed, 244 insertions, 16 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index d2353777d162..4e723281d599 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 2f205ff6a638..e81cda2fc1c4 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.1.3.tar.bz2 369419 BLAKE2B 6c7f38773b0c7a1b6a814b4e3576d9ecd7a5a9f1e3a401a431b2a637eca7b4a1d99aa5fe5efc07435a739594edd8cd5ff6ae7726e4b3563a4b0e37925beb9387 SHA512 fe67abc120c0715b653258abbafab19386289ce0a373e5053e544484219c3b05aafe1e84a23721f6603043db5aac24dc1230f2e7d4974ec483d5120aca11ca25
 DIST xfce4-cpufreq-plugin-1.1.90.tar.bz2 366569 BLAKE2B 784d19e0ae13d8c2fb9767a2322d79bbe3e5ea0a6dfc2e2061c76501e04ba51ea7d74e7d1aceace48f6f8c4d797adf41e0f56af0315feffc59ccf0a7d5fef9ce SHA512 23a70603181c69c25fd55d523f29526b88252203f087132f271cf47376d5d04c5b81615d2aba4c2641c886497323d88301ca0a285b9c0894b0051e913cc9a70e
 EBUILD xfce4-cpufreq-plugin-1.1.3.ebuild 758 BLAKE2B ed27bd5ca7e02ffaf6e8966f9171bd7d7aed00140b68dc3529f61ab46852f66d0e6df41726fccdf392f27dc2facec52c05523826d561566141f5f8755469033b SHA512 f1a46d9969ac3ff5cbbe21c9763ef650b4ef67b189ef06eb0c3edf130690de694ef2a5776573f6f54f83c174861a51335acb0ed544810e70d5c39ed86fddbcf9
-EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 693 BLAKE2B fabb817f143bfbbc79ca576b0924fa1b02393a419af8b42140a0f8719999333d5744483bba7b387b741c3b928388459a2d2b576a45cda3da40c8e85c8743f845 SHA512 fa42d5e65d665b298e9529066098c107a262cb8387bfae35c06a94e130eb4c9c65acbd1d31274f720a29d5faa497df28beb5bae58b49120a8545e83e52ce07ab
+EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 692 BLAKE2B 8972f6b50f9f45197209969dbedee9318862b65d699e010b3d4e971570fa7b8d5d1e77a05b99c3b45e2ae4d39a8c2dcc8ae45d0dd976d4bb5550f463f063bfad SHA512 ff3d105a4d1591e9f1408f8b7e70910ef560a9d3a5dc437c3172cf37c36acc10248e24fd6bc4dc7c468ba3401adefbc36c175517018a6b30d0ad49e0cc6fada4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
index 997ee0485015..a7ea0c085b98 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.20:=
diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest
index a17a95acc3a3..721df1d9cf50 100644
--- a/xfce-extra/xfce4-linelight-plugin/Manifest
+++ b/xfce-extra/xfce4-linelight-plugin/Manifest
@@ -1,4 +1,5 @@
 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 967 BLAKE2B 6476bcf3b99ad820c2d3837e81ca40d929f29d67f8344f020196e05dbaa6ff5d63bd266e5ec91be3c7d8fca3d92ff63023b92052b45c2532d1a7330ff1bdf57e SHA512 fe4fa1aed3e0e9d8b58a990fee47cbb1de6aa1d877aaca84edd83bcc3f5ebd6b5a64b68d66260ec4e093646f6bbb35b93f2d1f501e5ee403ff458d3eec18fbf2
 EBUILD xfce4-linelight-plugin-0.1.7.ebuild 927 BLAKE2B 589bc7b1f47cec24eb0774c410ac8bf16e8f18b9a49f638dc22fc6af1cf45f59e1b81a5cacaa551e225816a379c2569bfe52187eaa79d943f39a1ce0814af5e6 SHA512 847296694060e91c4cdc7f3a44f32d078dce70041c5fd03966d928dd9f464ba783c10a48a928586275a11b34739436c83f935b26ed0dc73f1b5c1c58f62c681b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
new file mode 100644
index 000000000000..718aa1c8291b
--- /dev/null
+++ b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index 5c516810d3eb..3f01e4c96fed 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,3 +1,4 @@
 DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 BLAKE2B 7749914cf4e8ca34e27c63033e84718c4bc8d9da11ca9f6487bf9291c145f5b062d6b7b07d03d2eb273d0e88b96946641721f6f24dd19c19db9f923e9b33ff53 SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83
+EBUILD xfce4-mailwatch-plugin-1.2.0-r1.ebuild 1058 BLAKE2B f2c03d34648d484dcb7ff47a127e68ec40e886ab6e71e76c1bd9549a66d46635b6024f9f4b76c3a0693c4067463207a5d3144263f12b683d4539f2dd42100801 SHA512 9d4eeb08dc4ef80f506c16fe1c270d3be2cfe4f897a2e407129c5afeae3702a6fef91abfb1da34c71ffeaaf7ddac48a578b58792c720c692c18e4405b9a03606
 EBUILD xfce4-mailwatch-plugin-1.2.0.ebuild 970 BLAKE2B 5c4ae61618f95602eb92a8fc04af96cd151c6d0989ecf655ed8b7528ab96418cd31bf96b0bf466a66cdda47c0d737083e0769f4857c5469782defadcb42892b6 SHA512 533d87aa68ab75bf5320b7ccd350258f770682b2cedb2d1d99a2910e1ef655f2279d65a20067496eabe2f31e3ef5e5a33cca8693a29bed28d09469bc913f4246
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..0c70bc8952d1
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
+HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
+SRC_URI="mirror://xfce/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="ipv6 ssl"
+
+RDEPEND=">=dev-libs/glib-2:=
+	>=x11-libs/gtk+-2.18:2=
+	x11-libs/libX11:=
+	>=xfce-base/exo-0.7.2
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10
+	ssl? (
+		dev-libs/libgcrypt:0=
+		>=net-libs/gnutls-2:=
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable ssl) $(use_enable ipv6)
+}
+
+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-messenger-plugin/Manifest b/xfce-extra/xfce4-messenger-plugin/Manifest
index 67382f28836c..cb1a76bb46ba 100644
--- a/xfce-extra/xfce4-messenger-plugin/Manifest
+++ b/xfce-extra/xfce4-messenger-plugin/Manifest
@@ -1,4 +1,5 @@
 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 1019 BLAKE2B e4bf66d54eba709c297c04350e95227b3bf2b3a97a0635e2b02f39b99fdb793e2e8cabc8add9bb1c18e7befb95879bca7e4f0ee5da7a8fdd1b95c1074a7dd86f SHA512 d4805a3c3d5d422f148c6d8e011ccd80ad05100ed54d3254c082e2446cff1aba39a135889b17300ba3e1f2b9aa456ddfc3f4bc64143e17001e84e34638f12d9e
 EBUILD xfce4-messenger-plugin-0.1.0.ebuild 1079 BLAKE2B 443c83e708a435fb2ab2a176eb8b7a2edfe797d2dba435ae86cc5b69d900647a07181559e438d2400f99fe1386ba3e3c457291bd6c4bd5999b8b900ae8651d46 SHA512 2f91cefb71957ac57ee762101d0483abfe22aa70ce22ae9c327687bee3bea886d55258f995769de754357994ef0c680f1e83f1a7d1314c3c5259860c7b79589e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
new file mode 100644
index 000000000000..fc63b43f5ae0
--- /dev/null
+++ b/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
index 4b9aed962d70..664ebe8cd5f7 100644
--- a/xfce-extra/xfce4-modemlights-plugin/Manifest
+++ b/xfce-extra/xfce4-modemlights-plugin/Manifest
@@ -1,3 +1,4 @@
 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 794 BLAKE2B c0ce74343dfc6c6b51f53bc3efc36a969f71b284ad9c1cf7854b384268792a6b5dbee7248dd6b8481634141a587ff1a25fdd06aff15d6475d183000022ad5df0 SHA512 1c19ca9d730e9d97fcbaf4610b6d80f5f5fe78ee41ee73f214e3e613f86b997c15fbf35a394a5e670a30a80634dbf23aff77997b8a43068fa79d2ee7cd38d374
 EBUILD xfce4-modemlights-plugin-0.1.3.99.ebuild 769 BLAKE2B 0dc3fe3423caa7273666fe760e28f8a16413343951ef9a730d54cc7a4d5efa2a8c6c32f532a5588b7bf0ac21966dfa3df4da7c89c801b924fc048b9f47877bdf SHA512 b3f797387dbbb2d0c59345434504ab7135d8d11dd5ede68dd6fdd1e919743d88e2fc22860324afc91a90813abf53e7612e861dc499c842acd66ac9fb9dead5e7
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
new file mode 100644
index 000000000000..02d23ae0b33a
--- /dev/null
+++ b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="mirror://xfce/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-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 1bb7662986aa..fffbe198bf8c 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-notifyd-0.4.1.tar.bz2 524411 BLAKE2B f90c8241e484b256cfc1619f6bc9b1f5ad0f375fe3efdcadfe8f2acf740697f887a98044bcceb15a70cac9529cf9e1119192875682d0fb59355b4a10b3e479c1 SHA512 3dd12a8d27d950c2ffe7a4bc0eaa3b44f4a783273fc90d95304ec77450e88241ad39ca13366cb2a0c666ff6afb9ad58f6468e2fc38b8a87a2737614cfedadfae
 DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
 EBUILD xfce4-notifyd-0.4.1.ebuild 851 BLAKE2B 083e07fc28ce734d456396eab4f7fda979f9a1fa5fa67110709d3be690b84f0e05111d289857d61c7b03dec0f15d0b9ace0243fc9f25dafe10704f18d816aeed SHA512 f8a266d49a9295853eb30fddf2783411141a801ce468a7a1ac1ae9bcc01731bc1aa447448218b92f17f03084d293666a01c65c42e92c28c100399decf7b2b347
-EBUILD xfce4-notifyd-0.4.2.ebuild 817 BLAKE2B 42d3fda3f688de7f15570ef564b3ca336513b41aabcff1f04de8e2afa1a4d99b487408ed78b6ac0bd295f611b7c46fe4decc9a47daa102109b856ee1e00169af SHA512 47aeccd4c5dc9ac9b1a20ae24426c78a3409db40986df001f3bbee6ae45b4d6a404ea671fe00f9803d77a29ccb942cd23139adb51cdfc94b40e47d3533766d88
+EBUILD xfce4-notifyd-0.4.2.ebuild 816 BLAKE2B a3de364ed07c591d2ae21f6b9a3719b027d00097327b423658413d6db91274608c05586e26c227020f1b31293e66a2111cc119fe5682edd103e6c6de353bbabc SHA512 c037a7878b6e3fd752b26a6b2da6b6011b8f55a2de586187bb6ab403678a5abd903b8b08a97d77ce1f9bc5ce466bdb61911e70358c5e59f13c925bdd239e3f0c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
index a2492c22e421..397dccb1c08e 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index 4da445a6ea38..21ea0173ecbb 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-pulseaudio-plugin-0.3.4.tar.bz2 400380 BLAKE2B b8cd4df84f3119d90a7671d8217eaeb83025206d9bfdc5aaae2281cd7c9b13ab03fa8a99ff1eb352f2fa01e889bcd3a505b558ce9884c46b1136bc75a6fb22e7 SHA512 2dfa6a4567caeb2f336b1d9e32cedb5f03e363253549810e768bb51746cd1db362ebd0990098e461a71b8206d81ff877291860a3568a288fe2010498ad486c78
 DIST xfce4-pulseaudio-plugin-0.4.0.tar.bz2 391068 BLAKE2B c06b05fbb910e7a1d13fde976f6b8b3f0d22de43223bdc8472440c52868cf1f3f37359a81c96efb2644ba202382cb53c2780214d3fe1af7977ec2e9d2f5e8c19 SHA512 28e2185ffea3f6e3e7d07e0cdd5062d423dddb2f7ee4a1e2f2965d4bf65e11cd0a409403ffb7d6afd89206dc37cf5700430ad6a53967395e3a58dde6dd13503f
+DIST xfce4-pulseaudio-plugin-0.4.1.tar.bz2 391791 BLAKE2B 038eedbecbc6ba4845f1be86938aa57165f55e1d287f914deea998383fad5a019d1ca7500c7366d76692c1b59cf87214e2057833786318cb69c326eea2a69ea4 SHA512 e7b778c78ede9ad62afaa379941ce03636a79dd000e40e748079d3e0f3c71f2e68e32cf85e527be4e1192074652714db4b7c5707b727066198c2ea43184a71cc
 EBUILD xfce4-pulseaudio-plugin-0.3.4.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
-EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1459 BLAKE2B be7ed1cbc2d4c375be3c6d40eebcb272ed4f81feb2c181b49d3785884bdd6a6892d849a9672e87b64f7821e99c97f9882a63b6d3d768e90dd4b07f5108112edf SHA512 c01bcf1633270911d37ed6e5d9947cf89764d6e49281694ff475dfa22dc78c831e30a9e8634fb188ea4c245e26a7834f44c3c7f8c101e5a2bbd6a716cf13bcdb
+EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
+EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1460 BLAKE2B 54a7cb17c1c53eaa5c140f5e5d033cf1cded917799a942f160e559c53586670c6e43122bdb7ded231af69feb03345fdf263bda43ff35d28d806a4fc2f517ff97 SHA512 30e137593af98c53b0c3f0c96f9d230a20e4ba4cdb4c3aabc47b141494b5c7678601d89c8f59c8ef8248c4b90daac99af27aa2e956502203ccdd6d60fca6ce22
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
index 2d7b8b620bfe..6d8e2452d19d 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
new file mode 100644
index 000000000000..4dcbd980caaf
--- /dev/null
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A panel plug-in for PulseAudio volume control"
+HOMEPAGE="https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug keybinder libnotify wnck"
+
+RDEPEND=">=dev-libs/glib-2.42.0:=
+	media-sound/pulseaudio:=
+	>=x11-libs/gtk+-3.20.0:3=
+	>=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.9.0:=
+	>=xfce-base/xfce4-panel-4.11.0:=
+	>=xfce-base/xfconf-4.6.0:=
+	keybinder? ( dev-libs/keybinder:3= )
+	libnotify? ( x11-libs/libnotify:= )
+	wnck? ( x11-libs/libwnck:3= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable keybinder)
+		$(use_enable libnotify)
+		$(use_enable wnck)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version media-sound/pavucontrol; then
+		elog "For the 'audio mixer...' shortcut to work, you need to install"
+		elog "an external mixer application. Please either install:"
+		elog
+		elog "	media-sound/pavucontrol"
+		elog
+		elog "or specify another application to use in the 'Properties' dialog."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index dbbd98b586ab..a31cbe2624e4 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screenshooter-1.8.2.tar.bz2 492524 BLAKE2B 88b0ea17331c9ffc25928df29b708d6f9cbbc844f5048f40bf29e22925e6326761a0a693601cfecf950bc61f97a0e9873f3d85e743a3e497d2fe19d6fc2f26e1 SHA512 e43dce108c7bacfeebdc39b0c9948b348c77faf358fb0ab5f26d59c96980f1c5473ef87895fe53387340202813935ddad6e200010e61aa27c2c56b662ee56b1e
 DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
 EBUILD xfce4-screenshooter-1.8.2.ebuild 1002 BLAKE2B 23a513df1150fb195312752eb11b6b01dc4cffd83afa0e8e35ecdaf490080814d81a4502081334977d8cbed079e99162c3479f84eb864678573c4268754f897d SHA512 1ba9af13f28ae2bd44bb894ba2db2e9deb3533147c00a8f4d5c28fff5f149338116bf284b217ccc3f5bfe16135577be6b6ae3f8f8bc738bf19104e3d65fe9f25
-EBUILD xfce4-screenshooter-1.9.1.ebuild 1093 BLAKE2B 2e2664d8b1cf61fa20679d55f6d6a391a145dd7f92f1ce5dc26c0e1ad04dbdd8d75c4f23298ad050a8cf5303cb301a6ba3171f7722ea86f579c202437874fee1 SHA512 74be15d1a18b89a360cee43f8484af97c8b861bc1d6957efe8692c39b12cb3e1f43238d1c89971cef2a1e2281d2a1ed84bd4b7cbd16be4c519f412018bf9ed18
+EBUILD xfce4-screenshooter-1.9.1.ebuild 1092 BLAKE2B 80ed491a7decfea1b71b3c77f57291e149ae09f15a126a7cffd1cc3c260cc2618c921342375a6150d8821d2e51ce92b44d9beda2c4b6ef88a3ca26a1ffe3f467 SHA512 0d1a90a114e4e1a41231edbac3059efe5f46b18466d7198186f167048938f1e3c71a382f8413b8dbc5fd2c579da045a149051e731f9319fe476246178b2c0990
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
index 7de62acb2b78..2de69b1cfb97 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/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-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 3888f34719fe..25299969c3e3 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 BLAKE2B 1dc663f726f6079fc030ef08fc9384fd4ccf3b05786bb899c7028d9adb66d85e3da4d9aed5a29cc5b15c0bb258538fdca31cd2a9430710c1e0a383f8eb8d2353 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60
 DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
 EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1863 BLAKE2B db1313175b658c66d6155510f1fa892bb7fc00ee2f736a030d0993a19824c2c6a20d311afee8a618bda0bd5fcbd1b23a7f7c4b97dbc37f4c92776d2c28e3df5c SHA512 9656af8b47c27dbd9021448778fd89e912603f8c8f0237c4cadd3ce611821a90a51dc3605db009949a444543f3d411cd8c950b98baab7f15fd7dcd06d2203745
-EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1451 BLAKE2B 0723b371c026cf4666c57e4fc21bc9103bcded68a61fb4d13c26014ad60d9b34e5492b5241e482f70a202de7a3d53ce85b3667a09433456a710d8d18b2425133 SHA512 16e01ad254fa4fc2c8d0bd4976503c447430ed7bd024782d5acf036d2447bf746c9a530991c1c45c81b3d22c725a9431bc32d821812a21b540f3f5856d1075de
+EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1450 BLAKE2B aa20ae9de9183d0b9347678bb6a9c253d55174c1f19d782d185010ccd0cbef681c11d161de7e9c00a3c399ccb30079a6c82a25a6408c68968e3b3f6a80ac9160 SHA512 186e8d998f456ee72c93416d75d5c4ad9fbd0fb236d0a0c1be9963579238cf2b872e61f4d99a1d875a9add2daf0bbf439c84df076137d7731e2e00f294eee294
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
index beeee35ead58..4ef22bc3d0d3 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
 
 REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index 67204af4d515..745ce0117d42 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-timer-plugin-1.6.0.tar.bz2 325662 BLAKE2B d6eae55ba20b3fdd59ea3e62ee96409927bce966453f24df76512ee3a1362caf7bc7813cc4baf90d43c90bca3628fb547a96eec2345b0c9160f0ae1626395c1d SHA512 aa2c6760945fe28fb1e8189b167dae176137164c017acb7057c93eb579147ef31134a840b23c78e3d1914c89865a0cc7b428e3561449f7ae01eb2d8a0fbd5815
 DIST xfce4-timer-plugin-1.7.0.tar.bz2 381222 BLAKE2B 3c273d818b7b04cf2ceeea3b72837ccf43ee0433ca458dbbb3aa68015ee28fb2e61ab3b5f36b341d087f00e9c4ca8e9be5453e735251bf9c9c1e910ce8c6d2f3 SHA512 b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e
 EBUILD xfce4-timer-plugin-1.6.0.ebuild 805 BLAKE2B 6e30619b335ecf22c7879dc1a13226b4117d1fd1f0120c18f4a3b7185d98c0629563c6cc8dd1c3dc02a87950d44d6b8c0e02ebf08821ba153849e5cd85ea17b7 SHA512 45453d6181723a8f9f934887b191b934cf5d75b236ff112d3056f52a9af8d0d8cfcda71377ef26e75e310db19dfd0e18c99e3c5637de30df19ff4a449ab400bc
-EBUILD xfce4-timer-plugin-1.7.0.ebuild 846 BLAKE2B 89143cd1afc24242413351c2b8d2745f4676ca2edcaa4a14c6705a661d8941d178ed282ab5971e79e6c9859e54469b1ecfa1ec3318f0bd7f25373d16f43710ff SHA512 0d911466e441565e62d61f68c8ebe600b8d52452ccc5d15cc5ed4ea20f60ee9bd11d9d9e683d6ab82b5ee223093c9616633a274c2ec775ebc62b836fa956d3f6
+EBUILD xfce4-timer-plugin-1.7.0.ebuild 845 BLAKE2B 479daaf42de359a647fceba3ec6d3b483860792870c25780e708b08f3ebd25ff8f08544f846bd877a69d6f447ac2b0e92626e41d7ad4b34ac65f62fc9b9804a3 SHA512 05be83184f2695c2e102c66212f1d76b310d3844886a9bf087e90b9aadf0c6e8d220bfc4e15b9c9a2c441e6b1f3cae83e36a4f8aff6fe7564082d45e364b38fa
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
index a7acd4cb24a7..424223901c2c 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 #libx11?
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index b32e8bdec2e8..253cf1603c05 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-volumed-pulse-0.2.2.tar.bz2 312703 BLAKE2B 6c88c8f4023f5200c7b5b976ee4fff94344913f313ede29334d3f3b291d6862f56fa11e22a90c79019bcc137e1c77feac84ad14d067f4ce13c86ce58484480ea SHA512 6e452a603ca19b8fc8470851ed9570c84a8208bc7695493cc8ad6425ce6176427a264e39c5249767fe93bdb172137a0c59ef858336f28a574e74bce8d9d35bb6
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
 EBUILD xfce4-volumed-pulse-0.2.2.ebuild 744 BLAKE2B 3d8c2e9327b900a25d836b1419ae5b05eefcedbe11571cfa7d9ee8cb41995c8d52f8feb821da0190a5f31d0e86cfa787af17ff42d5d4d9828c000ec388f4ac96 SHA512 61f7c0e4bcb0a14f1d1625c314878e73b6e369433e9158c31d76334035ff89051315f5260e8f86448324b34290a720241a57f2da1007349119e70195ad37a06a
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 691 BLAKE2B 32979363978af8b1e5a36ca03cd5c42b66fd9385bdc3de4ed634ab09a703ac5f7510765c4a9adb7ddc9d8c5e474b78c2fefc8fddf67bc0236afa752a30d3d3bb SHA512 79023bccd373a60d5ab3d0da6964d115f147419b0c6fcfb16dead89ad9e4a2633e52e2d449055be1c831449f6fd9d26c3663cce4489a0d8b5dad0af4425c2e68
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 690 BLAKE2B 18e0b227cafa2e026c5ce41346685dd6882659cf00183a0a6626f26f39de4d31c8471719ec8aa30842bbe5920b999901782098e551c073d3940a6f963d3242f6 SHA512 0fbdb96ddeeaed187fbe7a8540d0d9dfa9bc6106c28763dff14576a96fa6de4ee0a738f3062b01a5e3419a7b685cf52ae12ee51ac6b23ac936ed24fc1e428ea4
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 5fbe847414eb..9ed5707226be 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2=
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 51b5626be80a..4ea99d8d1787 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-whiskermenu-plugin-1.7.5.tar.bz2 164129 BLAKE2B 904cc32ec73ff8984773256e1efe5cf1dc02eba0b6dd76e15ebecd5507ef4c1fff506888ed2cc3d01674a8773ef7a250da6baee26746b6d34d61b8034071e7f5 SHA512 28c0684642577af656ec95b6977f1dc88d81f690125ad42d0022ebde456dc6da02081028f8f80950f40c3e6bea0f6b8e0fefe153e2de6fa9b77d1d5555e4e89c
 DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f789ab69c3ce9bff91a4fd6507202cf4e78950b8f29ab2585b5142ecab9d009b3e08fe8161d82c51a442c055f63b7012fd73fa972136 SHA512 54e308b516ef1694f9649578cb8297f830132e456e1f498183074386956873f7f9f6ea8a0167d506086a87ae17acfbfd8a2b34eb6f0acb97f896872f8799b1f1
 EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 873 BLAKE2B 6088679e00cd89a08a3693e87c8331bf8552d1fd25fe16f0edc9b284af2008b4e6a21fc57183a2cb02e1c2bf943d11e13f32729c64080f10e892f6211f0f0a01 SHA512 9bab065373adda0f0bb524d2b6226f391e1912d6c766e753ef05bbfba672f04c7db6eec542499f1c521ee95130d3dfb2fd9287e4e47fe72bccfc4de3f37de72e
-EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 883 BLAKE2B 8896c5d73a7036811fa1211a48f338e163e7b961fae393c42d48bd4eee250e44a04a162637c3aa664e08985f93b874dc6c80301de839635f0044f5bb0b930500 SHA512 495a707785c7a8f001bd242e1ac381f7f127dde685ff4d4ad8c72d16debb43abbc4c88342d84f2245b3391c8b72adf732de4c44ef53678fa984484134d193296
+EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 882 BLAKE2B aace5f408b1b9e669414a1e9e42f9611b3c75e368ec1a35e54ea84eec069cb0e1ef151ed70db971f4d1e9b6901ded300b136271274f88db07d21071f8ea32b15 SHA512 1078c943cc24939c9593466180913145b473c13da08c3550fd73b1a949b190d8d6fb19d012a2055074073c4f283e7b709668055c37e534affa70ba1d8a239579
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
index f3a05267f59e..22a86c70fd5c 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="