gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /xfce-extra
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
75 files changed, 136 insertions, 790 deletions
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 2f1ae56bde17..66a9afe2a1ba 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index 2e172fa9c063..62c0ea118eb8 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,6 +1,6 @@
 DIST thunar-shares-plugin-0.2.0_p20101105.tar.bz2 686286 BLAKE2B 2b4977cd6c0a407da20608c4abf6ff6de4b053cf1bda6e749aeed797c7db36747a421ac1463216f9aa33ac161b467971cbd2ddca256f916de468af5688500e0e SHA512 88e171eb1c859938df1c8f7d323456aa1ff2430a6c88928d3614aefbab16e8a9fa3052bdee2d7f7e16c6ba2bbf78301f1c4ac7c2454b8436cde49af716c46986
 DIST thunar-shares-plugin-0.3.0.tar.bz2 340867 BLAKE2B c648b9855a9627c0659087b55f8f45d36f998c11504d32be7bf18abb40ad0dc1124ed710f55c12b35978e5727ef6a4706c1415dbb04f2d5f6259fc6dd1f06f3e SHA512 20432990c6ea241d24fa8fd1b94990ec25a5ff6213361599936f1bacf86e323c8cbe868491ff600ef8c11dff86dfdf9773258b9c5e7919bab50f332cf4a7797c
-EBUILD thunar-shares-plugin-0.2.0_p20101105-r1.ebuild 1046 BLAKE2B 07df3fb6beaee1de3f04d62d146f9fe2c4df299b7ede22f6d11c3cce3b2c7c1d9c47e3be03ce861e598d518c16be5b294226f570fb76e08cd301356a68ee9779 SHA512 cc332c4f49c1a27c4585ae104627775186b587cefb5458108f929a9c994abb951362b6c1ae174770501ab51c43082415b5c338e757134e8c2f66f1a9d0eae8ba
+EBUILD thunar-shares-plugin-0.2.0_p20101105-r1.ebuild 1041 BLAKE2B 7106ba26c6d6315c2556e465f2c488e1759f70bfc7870332a2ae7bf2429fa245d9984c7627f1aeed841f36bcd2ed99b67f4faa6d18653d3d866dc872f04f09dc SHA512 ca616bb62c474a46f857cbedf444ec3d782fc8bfcb2e0467b1bb8035f572449dfdfb2851591532102efa59a21f698b55902ad3c050906b9f49828740485fa5d3
 EBUILD thunar-shares-plugin-0.2.0_p20101105.ebuild 884 BLAKE2B 1085473fa070dcefbb6befe79cf8c2feb5530c28c2200ac58b10d8a52de5e3cd9dc05e667cc8c5b24577595c82f94f786e433206cfdceade85c67d3cb715664e SHA512 2405191ccae587a7d13713dfff647effd60064c0f9c89975066fec1e3f908670161d665d1a042e7fb0af00cdbc5fbf81a6512f8a05f4d6c913e97ff5f380aa8b
 EBUILD thunar-shares-plugin-0.3.0.ebuild 620 BLAKE2B 5f58faf3d60663b3b3ec857b888cab1b65ef9d0ca2b1f44461a85c9d593e6136c767c8b25ee24936b7b954d6dda6160a532d7075f0e9b12f5450988799f4df49 SHA512 f6906633b5b881d0426022a85e4a75ca97789afc99fadf364b6931e7bbe9ddead6421cb10bb3c61fd70d4da62501783bbb951c647b164dfc9520c50d1361d039
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
index 0f3451795c31..c2bb9f571e56 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18
diff --git a/xfce-extra/transd/Manifest b/xfce-extra/transd/Manifest
index f9ce893d1aaa..f1552d40b6f1 100644
--- a/xfce-extra/transd/Manifest
+++ b/xfce-extra/transd/Manifest
@@ -1,4 +1,4 @@
 DIST transd-0_p20120503.tar.xz 227316 BLAKE2B f3ef65fc7e26430c7edab1ebc2cf969bab1da5f6b8886997390189e5665638d42ed29833ea654aaf75c23a6ac220b8e83597c09575180a2f615b4822bdbd677e SHA512 24d052743d129837015872942a3621dc7327d70406762e4d176e9660de1d8317e3c6ae53dcb0b85d376090c33a0cb0a50550a479a2c9f6728bc44e683dbe64ee
-EBUILD transd-0_p20120503-r1.ebuild 553 BLAKE2B 26984e38343821756bfef64fb830883df8ef129893b81391fbe5a5ff54873aa386a749e19823bab608e01a7fbbb98198672ac9874f0c3c5aac3903a4de4b9849 SHA512 9f0a219b85fc8434cc51304bc70ce7cb58ca661eca67aefee5a4d8b901cb77a87ae7e8b5231c3a6f9601ffb707a75d691765db61e2dcf4fe394024d390eb6170
+EBUILD transd-0_p20120503-r1.ebuild 548 BLAKE2B ff7221c3b56215a5bf1ce93db2ebc16231c0f8671573901c0372e8a5ea5a51f4a32f867aef0af66327777bc15c33a111a221112a667a9adf4f310b61def5b048 SHA512 1d09aa8f6225bb45acf8ffd3a28b68686ba3377e0c7d0af4b4b555fe754e4b0af7ab2d3519d34097b2e2dcd2a24c991c00bf0e97bdd4a75264a0550fee7ccd60
 EBUILD transd-0_p20120503.ebuild 640 BLAKE2B a9792e60f9b3443fd415664003f79f3805bbcc9fbb4515816cadfc08ab69e174c1c854fa6e5bf7d2e0a9542f7a4a6ecd19de2961fcf6c324f5bc2d6bce222899 SHA512 800141b9da64abaec0701fbbc56cf309d0705a0e33a2c85493e34ac34ebbf0d2e9660041a9b8fa7b3cbc412ae3d7337744c26dbdedc91cf949d87de86d1f6fbe
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/transd/transd-0_p20120503-r1.ebuild b/xfce-extra/transd/transd-0_p20120503-r1.ebuild
index 4d4acfcda013..bb6a247cd151 100644
--- a/xfce-extra/transd/transd-0_p20120503-r1.ebuild
+++ b/xfce-extra/transd/transd-0_p20120503-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index e3113662b3a8..b9db90cdcab5 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,7 +1,5 @@
 DIST tumbler-0.2.0.tar.bz2 571300 BLAKE2B b4b923716897773febaff21c7d13fb8e4abfb36f9a0a02e4b777516ecd6170552d757057a228832924f4d8cb9f61380109ef52d0efaddcf69069ca5c0df4ae6c SHA512 54f83f904b32fcde5960f3343f8f4477bd30cd96a784aec5a3cb70aa2c9f924e833b2c0b429d608a36c75104d2689975d688358893127aed501f3cd8f24c280b
-DIST tumbler-0.2.1.tar.bz2 577996 BLAKE2B fc1b9dbf9fee4453f6de5d4e901fac13e38534560230cb18e51c3325f648d51885081c5af182af2621f682cc22b0abb99a02ef45ef37a7e604249baa73eaacfc SHA512 c88595312e34534cb43d304d97a60886338d92997a7d0b5a8bb22d06dfb13d7a7445b148ba4af3766df24f6c87106a7f65758debf198e46d9fabf00049b13386
 DIST tumbler-0.2.3.tar.bz2 538109 BLAKE2B 74f99241aad53202f1241b3865a51bbcfa0b503495e02edc55aed997343fac7057fb7f8f76ef2473cdce9fa38e8069bbb69812aaccfedab41d5f3fb67b2a3a39 SHA512 aefe284c3baa1d8eaf79c9bdb3cfc044ee6a1f36be34efd67541e6310aa275b5235b29f68483b7b7b5a8df699a8b3db8dc75569ec2b90253756fd6285a2e3816
 EBUILD tumbler-0.2.0.ebuild 1528 BLAKE2B 44fe4648ef7c7797cf71e43e9f5ddd6e8c297d6c3dd0f73b5fcb87063f188101b4baffd61e4ddea26b1a78818278bcbe52ff62a0801297ffca2b78f38aa5e684 SHA512 3afd2050d7ca96961d3e0e394c9db19d8850508facc9eb8698f05ed458881018b5c2a17578453a01ca8d6bf3e544bd076f786209fa9443460e351498a93b022c
-EBUILD tumbler-0.2.1.ebuild 1533 BLAKE2B 3ea3f082f65df65b2edf4918e9b8523096df6c200ffc214015fcddc40f3f468a1f77856049751d306e51d8ed9ca9d1a9e2979fd3eb0257c08e2008eedf8c472a SHA512 52889928a3ae10b113c368eea6c80877eaa3b6b29bdd74685f43a03d4f26664a9ac521a0ff8528896f41ad95f677a589d8e5f590e4e85d4f7668b6f78fcfcbc8
-EBUILD tumbler-0.2.3.ebuild 1534 BLAKE2B adbf81bf1b3ac3f64d3217a84c34ae29473d163d5b1647b6ac5e4fcc279a5a35912e57558e12f6804d4a5c38dc8eb1f865fc500250605f7734fbe2796935f385 SHA512 9a70769413bf83e13914aacc483e22d2887110ab9463bcd53bb312149adc3d5db88ec01c091de228c11ef86bd964f9b86b5d8c7362eb12b568e8ade6b8f085a5
+EBUILD tumbler-0.2.3.ebuild 1529 BLAKE2B 518a618908af7c916a22ab7044c1090ac36c6777a86d52975c37ae72c5a3c26896773d6c5bd06503a0a397d4131ea7981074ec994b9cf41c3a0a2a15ad4047c8 SHA512 d338e2ad52357a67811a1c229052694a813c293d404073163990fe9d5e6397634f917b95bf462f306445d5d56cdc0abbea2c2451062fe262412cfc1de8995ca8
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.1.ebuild b/xfce-extra/tumbler/tumbler-0.2.1.ebuild
deleted file mode 100644
index 004f4f20d9f6..000000000000
--- a/xfce-extra/tumbler/tumbler-0.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.26:2=
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6:=
-	>=x11-libs/gdk-pixbuf-2.14:2=
-	curl? ( >=net-misc/curl-7.25:= )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		)
-	jpeg? ( virtual/jpeg:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/tumbler/tumbler-0.2.3.ebuild b/xfce-extra/tumbler/tumbler-0.2.3.ebuild
index df0d29a98bfe..63805e480fb1 100644
--- a/xfce-extra/tumbler/tumbler-0.2.3.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+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.26:2=
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index 4efa70fd6af6..353f60b61d34 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-battery-plugin-1.1.0.tar.bz2 398621 BLAKE2B 461f32e07708c29f2157c8909ba48a43458c06c9622ec0835f4cf6abb0b1232bc35f23a7e945315eb2d49048b9c0023da3a27803cf95217374962531db986e97 SHA512 d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
 DIST xfce4-battery-plugin-1.1.1.tar.bz2 465880 BLAKE2B 09f257226009de387b8965e8233aae9a0c756fa2c854f1bdf346e23638a0c55b7100c57eb33111c2f8e20908350baba2a608cf7e2a7046770d5dd4b758ce4e61 SHA512 15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651
 EBUILD xfce4-battery-plugin-1.1.0.ebuild 1101 BLAKE2B bbc742ccf3cfb93277e3f5dd7eee324587f14a154bd286688ab1d715a6247e291b2a5f087086538351d5e217bd2eb0862b734331ae29390e024ca592af5120a5 SHA512 908ef23e02b60659d1478e042ff5239d10aa539db7bec59504932a054e216690a3be5a6909a50026e89b038ac01bc8107a828b56a04a8bef556670ab541d994c
-EBUILD xfce4-battery-plugin-1.1.1.ebuild 1064 BLAKE2B 3ad1f7ec6db0020b11738588a5300456aff985046548451ff9b12805b2b3b72e13e2579a033af9b8468924818fbdccc49cc977b06e3ca1b8bc6ba66434b0f0c9 SHA512 9c9a856858a50bc683497c501e406ddc722659aa7e8903d88fc859ced17bd25d0a6ed144b2aa273566ab00fdddc19ca3c2d927db6689fa72dfa441a881a83bb2
+EBUILD xfce4-battery-plugin-1.1.1.ebuild 1059 BLAKE2B d7394aefabc79e7f400fd0779b7b9cb5c777c967de14b501202739b6e69cf2a5de56a5da4c4f19b70fc72aa5592332975a7f7194686bcfc5d7b9fb6b2fc83203 SHA512 e15fbed72f595e4b8e68639313193d6e377215f16569ea16313892337e641da847ab1a8695bfa2d0e09c126f6533ba3ea3f3caaed65f6cf1f97880b33f1cf25f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild
index 70ccc4350916..d6c420f8d833 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
 IUSE="kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2.24:2=
diff --git a/xfce-extra/xfce4-cellmodem-plugin/Manifest b/xfce-extra/xfce4-cellmodem-plugin/Manifest
index da387b591413..8298fe421d98 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/Manifest
+++ b/xfce-extra/xfce4-cellmodem-plugin/Manifest
@@ -2,6 +2,6 @@ AUX xfce4-cellmodem-plugin-0.0.5-asneeded.patch 329 BLAKE2B 266428763655887f88cd
 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 1009 BLAKE2B 85bca06c75578e5c09e9f80458ca8c280d721e8b033f599b889d42807b9d434f886e0c4c262116e91e1d0f4bc4f70dccf23df964fc1c9667a0ce038929585525 SHA512 648e6cefb94d6ca702c7f37fd360935a9f964635a67188253287f8964769037da4f8dfa345fd7e314b53288770dd7a146d209140c71bd0d5599d0bb00902e44a
+EBUILD xfce4-cellmodem-plugin-0.0.5-r1.ebuild 1004 BLAKE2B 74e104e5bbb625c9d9b569ed8a07d85a4617891edd0ebbade1b6da393e5c2cd3429959ae08fa1218087037a3ce3517ad4367c83b5e7915879407c2f908b2ef19 SHA512 0acefbf545a566f608032617640ae76f6332c618fcc428e41be082103111053a56677ea5224131c3f96ed2d00e4a5d8f0e6c47e0b72c1eb396bec05688c07866
 EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 999 BLAKE2B 105e93fd02d889fa45b037f87e32711d747545c396a7ec355ff36f9ac96d79ed69daac7a80922727d47dae0a0dfbb34671818be1ac2bc29af1ec3c68ae254607 SHA512 8adbc7cd1edf5c11e131493323327a69f14c4dc4572545c8a96e316c36157a661aa1fcc6f6f05bbc0cbdde4eb33c8d6fa4e59041773d9bdf4d22ef8145ad8716
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
index d9dddb355873..ab7bfda70628 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-apps/pciutils
 	virtual/libusb:0
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 5d74263b8362..896042152c72 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-clipman-plugin-1.4.2.tar.bz2 485244 BLAKE2B 6e183b82db5c3325691d04afa110c4dd83b013a94ed9b3b1b1b7bbb4166bcb1176a6b4ed52fd0b3256b7f73816a0031ea6084f31344a9ac3187b7b5fd25f01ed SHA512 f12d9e3e37a26f9dade5b76e73ac3998030112b53e7ec7b756128f7f1ee28d19a1d7b8d4a26e0ccb69aaba2f0ab2f6c4cd5a435bd1cc7efd81c05b711480eba6
 DIST xfce4-clipman-plugin-1.4.3.tar.bz2 492784 BLAKE2B f52dc92976e0b826b7aab2b8a3b9e099bb31e3d670911608d7a39c9805b011bb4c77db1fb01379e3244682a4bcefba617e246cc9ade50ecd275ea554d928385f SHA512 28bc8e2be8dd3eac13a7988b68933ce84dd8cc756f0a19636cd5850d6e36714a73ad9650a28ebfc54d9ad3adb23c242abf89806124b4e00fe7d1701be1b52414
 EBUILD xfce4-clipman-plugin-1.4.2-r1.ebuild 1096 BLAKE2B 9c235901046b6824af441a84adea285167f9255e600931cb95b131fb5a2795efd235eba36222690ffb6de33fca02c502579db3b68b659c7a880f0a50b80834aa SHA512 616e00b26b6d64752978565c86478cea84dbe5eccc79397c18ba34a2392bae578eaffec02d957d9f953ff8a82a0583ad07480d7224e2a01570cd946b00e00c3e
-EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1102 BLAKE2B 5e08e0aa70c80df83bb94b8cbe8f8dc7bae51f0a4d4deeb9687d6f9e425263afadc854874289902db9536b4ab9318f6910acea4203d4ca15a61d7fdf42d63c90 SHA512 d616da202b46956a6fa4ad92c6d32382eaa4f6fe07b6f051011a93f13d3d3de4a3c73bae9aaee40b5e75752866cca5932f415550ba83516f23b29e615944cd7d
+EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1097 BLAKE2B 6217efc4bb6344a8dc041efe6922f63d4638e19e4c143d9522ecca07b6a63de28752991cee0afdcf1ce272422ffeb92c89f1285a207c0c0fac2ca5929b67a752 SHA512 3add80464bd3f81644b7c566e15d3e1d7b2bb4040cad0b6133be41277a159a04095500b9bc11e39deb3ad526508037858a7853ccc53fbe2a8a4fd8b78827631a
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild
index 496bd2d27d57..5188f37c5a6e 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="qrcode"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/xfce-extra/xfce4-composite-editor/Manifest b/xfce-extra/xfce4-composite-editor/Manifest
index a97f0f1f5ca1..a7b908609c68 100644
--- a/xfce-extra/xfce4-composite-editor/Manifest
+++ b/xfce-extra/xfce4-composite-editor/Manifest
@@ -1,5 +1,5 @@
 AUX xfce4-composite-editor-0-validate.patch 439 BLAKE2B 953be59dc097e8283fd40ab686e00b2c790ef3930a1a20d330b32798b307bbdf662f03697107bfdef871bbf96717873d54a5261fc1abe404fd7c9cc42c71e354 SHA512 d0f8908fdff5e1b6e0e3844ab2c97aafc1f273916e11a4d4b0222d2aca4a1fcacb0dc1a43ab900c026f1691f15c10221342f10cb5843341cf4ade507063dd5b0
 DIST Xfce4-Composite-Editor-0.tar.gz 3027 BLAKE2B 3e9238f3eef6f515425d1fd701a2086725413e6e01f921f7f85a471fe97ec2c6bcec2abc52212156672bb92267525fc734372e8cc2dbd36f5bedfa757597ae27 SHA512 27f1b754d6eff167a117ac45bd2b459c3b7a789c929e8417564d7f5805a211f4fa2d2ee049bf28f0dc0c14ee84f4608c9669b269e9df78a17308ceaff9207516
-EBUILD xfce4-composite-editor-0-r1.ebuild 717 BLAKE2B 3229ef9247c8523678bce431fa70c54a8cc91a522fa5163426cba8d7a7f433cbd925895baccb31597832f9a0bdd3494aefbd234bde7a9113c91f5b455daa7ea8 SHA512 53a03005c4de4849fe9433cf18c9c243999b3f27a6541461e84923dbcc7265a95c002396506642bae3ea39b74f97af6c030e69904f41e9c55ce279268eb2c4a1
+EBUILD xfce4-composite-editor-0-r1.ebuild 712 BLAKE2B 7cd00e0ca5f9577f68c281488182e0cdc3481013fda78cc37cb547defc6fdc8b86ff0a0fdcf1e100770ac49bcf0afb46cb311360507ccc18066bd64d39f89d78 SHA512 1bad2ab9f80d9fbce3081628354cfbdd63deccc477439f06494558d9267f3b6d8394645e00316b365692d8608995461e1d6c4b31d6f096c86f7968e4dea5fc24
 EBUILD xfce4-composite-editor-0.ebuild 747 BLAKE2B 7a7833f968d7e10252cb35dc9dc8ab1743a7ac616bdbec6a7d59922a8e93dfd4ea9fcf0465331d6afa4ba97d947254294ffc18dcd4c84e938325a994ca7d64f6 SHA512 63097c606fb509c1ead16409755d509abda23d63a522f79a7d8cb8c87c083114fd99be6ed49d98978dfdb79fc2b50c1ef9a839408814e12968894bb3a27fcfbc
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0-r1.ebuild b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0-r1.ebuild
index 1e3d989c39b4..2514df6ef6e8 100644
--- a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0-r1.ebuild
+++ b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://keithhedger.hostingsiteforfree.com/zips/${MY_PN}.tar.gz -> ${MY_
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-shells/bash:*
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 53e3a4d1f076..81442921ad61 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,9 +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
-DIST xfce4-cpufreq-plugin-1.2.0.tar.bz2 388599 BLAKE2B 938aa17df367ca4da7cb07df732a413d5cd3da2867772808baf3c1377c80e8b7153f5e659911d48a03d9e292e33af8764b9434e016d7b7f0933898971440ae58 SHA512 594124808fffaed514719a50e05e75612f5c1b7a802df5bb7caf65814c2c7412b9575ce916c8cd0da1360987d198c61ab078efd4a462e756248012999e597072
 DIST xfce4-cpufreq-plugin-1.2.1.tar.bz2 394576 BLAKE2B ad9646c079b3728680fe82256568d9a57eccb7be959831684c800fb35d00d90069e30c8c5f6bcd12e2872da527ad4ed3d3348586f0a097c7ac67bd1e307d5dee SHA512 60d0f1f36bd2c49701acaf61fc51c434cb591812662f55a8bfc21f6820d34c5b091af0edf3951c958e179019067532afec989940dae23478e792889c8f4d7b0d
-EBUILD xfce4-cpufreq-plugin-1.1.3.ebuild 769 BLAKE2B 1643ac785a317cf573ea49664abaf38560dc616ecccfe0ebf2cf01ca3c6b05cc52d68a3431e5a64ac2cea6c453ee84ea381fff30018e269361967a38084b8fdc SHA512 0c319071094e31ded5f2fc9fea624a42b8a29a844d39374f1289a1421ddf8b62d9aa51be3f4efa4d0fcabb1a6437a448e00ba25182e60354e75ec4b4449ad397
 EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 701 BLAKE2B ca0cb13ffb583b0e9c71d2af37f31ba21bd1fb5746e97cb2b5a7791aea1e5c405f6399327aa67427042f382af389cd2208b2a671f476cdfcf715867b4ee63b97 SHA512 6ddbc64dad79a472d411bb9facca9dc89feb6e18d3cbc10424b1b92c38b6fface358b61ef548c09a6b918925af0869bc861b019bb1fd84f9148cbec4df85b6be
-EBUILD xfce4-cpufreq-plugin-1.2.0.ebuild 816 BLAKE2B a2cf68dfb970b75409213304f26d941b9b739e9fea71751b37898866bdbc21e32a68ec525c1c1a98c1e996ee5303a46fea1bc88ed90f0c391d8a53884df76654 SHA512 662e6bde76b6fb378ec97ff9849227e03d5dcf40bd5de75d52068c7e854d17089908bcc862e0b2a83d703e3835c6265065b0b502d37dce2196d80f68064724f5
-EBUILD xfce4-cpufreq-plugin-1.2.1.ebuild 817 BLAKE2B c011d01f47e38d57dc9fca5af52c70a0dd4460b57229fa838591d2ba1a6d88b264f6d615a4cc06968dcebc50017086ad391bd4fb4d6dca1557e3af0f438e1ace SHA512 460066d1f32c6d8cad272a086add31461b22d71a04ffa31f9463be2852c343ac8588bd735c938c29d37324333a74f26ef86879e5a2c8814e5f1433ed934559eb
+EBUILD xfce4-cpufreq-plugin-1.2.1.ebuild 812 BLAKE2B b15cf75c445e8d7671c67a23f2e88b33829f520a5b2dd90b92657589dafdbc95177de927cdf1d68bd8c1138623e8eaca72c82cda263f66aae05d2b11f2267bbd SHA512 87426556f667c40676cecfc138c3479e3dc0eed774c8db5c85ec2f2f1ba409c75b0fe61779f15b8af82b033af4e420d86ddcc102a7cc34b570f12874727536f4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
deleted file mode 100644
index a90579733585..000000000000
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A panel plugin for showing information about cpufreq settings"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild
deleted file mode 100644
index 5e72b4997bf7..000000000000
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A panel plugin for showing information about cpufreq settings"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1.ebuild
index bf501f18b491..04034b7e3833 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.20:=
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 1806facfbe01..2f6a9a7ba4e2 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 BLAKE2B 7c39aa6fd9d0d6ecc5bedce1d99d330765c329d1fa673b61282fdea654ebd997caa118f57dd0776008584eaa2dbe0a6ae7df532ed3b941b03b111f5ae753d2e8 SHA512 3d1246958dd30638104f14a8b0078e25c05b67b42da953a97cb51d2b04e70d3f1da9d42ca4f4575b7114bce5abc4cb94d598737631536c0575b55d9a391e210a
-EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 822 BLAKE2B 5bf938e4ee62179583d4ae822fec4c9ad12795e441aa5b5d3fc4a105b106b8d4ce3e6b6ffd24beffcb49cf648729c744709fe6ff40518b50a84b596afdbe00d2 SHA512 60a5471fc1881f9b9e8abd9b6f241a1344dbf98a8565240d4bb3474b94c18953bd8608d6a9e440dbc94501e1c4510a2f303062f791ed219a85421ff4aee9cf10
+EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 817 BLAKE2B f1829a608bc64d47e0b7f2d07c6138424067ab29d8920e1fd2833f41f52338622025eafe1d2c894ee7b563dc79e625c1507aaeb6499a1eef4d748a0309f10413 SHA512 d1efee3a7f4892c07646408a79cebfda9096aecfcf1e133ba37e097f39ab63caef3c66c2284053fe968272b0bde2d559dc28c44728949de7547a63fa5cf6de79
 EBUILD xfce4-cpugraph-plugin-1.0.5.ebuild 759 BLAKE2B ad59e6bed62e9f40ce9438bb8ddb2c7b324ab31b492980081aa940c16aaf26d01d12ceb616281aa76b484ce6fd450ca069d616aadebd3177b67c86c16061130d SHA512 0dc1c5a775fcad33d3db2846f476be9e897dba4a05c1ef1bb01c1aed35660f16e21d474ad4b03b2257dd06779be747cdfd4a60214eb80f9b599ecbc10ee1f3d8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
index 376b56129b36..bd5daf4a9b81 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND=">=x11-libs/gtk+-2.12:2
 	>=xfce-base/libxfce4ui-4.8
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 1f2afd304e31..af5f48f3c95f 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-dict-0.8.0.tar.bz2 483618 BLAKE2B 8365fe96710b6350be350fff0479d71fa2d2c85403e4bbb3e759cdfca9e4ed22ccd5ffcffa71f6ae6ca43e79cbd9c6d25bd675603ffd523fc7782d5040208673 SHA512 96e59b21b91352970e33aea84fe67fa9bce5f1fab47d794a129ec68285bd03c5e26a02b03519b1834d08a15c2cb54fe3d91c64799a8df283b89f304800024cb4
 DIST xfce4-dict-0.8.1.tar.bz2 482413 BLAKE2B d7ece7a93c107315f65cf25e0ae724e99f88ec64d3289c33f5aa0a85c4865acae45e96c3047d30f5b972814079aa3e5987cf4b347bb1dea0d2e0fbc9fd272a37 SHA512 6cadc479afe5bede536915f8094f4c3ae80139cd11f4b594ee17d28373e5ee3f60a918193b0eefb2e247dfd8780d632e8b508538fd101b4064e36260fc30c67e
 EBUILD xfce4-dict-0.8.0.ebuild 1013 BLAKE2B ed4b8cf7568d5b6cf7f7de8e0072c9855aa065e30ae1c6d0b639514885d08d42ee81b605f089b51586ec9541bf511a2cb3e3ad8bf8300ff43b2fb41438ec400a SHA512 0d2ebf9908f6b19ab52d3fbcb24d5ad57bbce926bbdd63bcdb64c4339876c877a83e2cdfcabb47cf31c07d21062cdfc89e7333adcfaae331ac24aff5def0a77a
-EBUILD xfce4-dict-0.8.1.ebuild 986 BLAKE2B 2ba885e105288a266b91220a3ca3a1928fb58b61bccf7204f119b6cf689f10a0be1448491cc3afee006053c86d5a3f9750cd0ef6091fd76316bece249b83781e SHA512 f58a53816b0613c051dc8ef7405c35ea20c3192396207785335056611ba8d25178d4e4328ebcbb8543af50a14de2986ced984bb8e9fe3f65f23f52a70a7688d0
+EBUILD xfce4-dict-0.8.1.ebuild 981 BLAKE2B 2316d1a987ae64e15e9acaa150909e7b1ed9e07a4988bc2c886e889da9847d21a8c7490970bd5897ea3d8bf9741cc69eae87d5937cd2d880cf9f5132f2327bf1 SHA512 7f325831cf15d579c877233f12e5f24cd223b934a495925bb9ad2303cf699602cc68357f070eb28e3008f2bdc6abd9058e897ca066a5aaf151dbeece52a06191
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
index 8dcf6adc4ba7..b7646836a48a 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,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 ~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=""
 
 RDEPEND=">=dev-libs/glib-2.24:=
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 5a6fcf24fa43..2a2179bbd2e6 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -2,5 +2,4 @@ AUX xfce4-diskperf-plugin-2.6.1-majorminor.patch 2194 BLAKE2B 70154d161e60132b99
 AUX xfce4-diskperf-plugin-2.6.1-sysmacros.patch 626 BLAKE2B 116648fa6b865abd4e9a1ec2f42cc6d3efb8c5f1380fdd197722a50206460573e3a4c6eeee61f3f1005962c36d1cbc8371112204c4745ab4c816a1c108f01d0a SHA512 d2e42cb9c5b430d20996ca912504bbce949c4153bff12f6be72ed6b73e891194ce2d1de0f3ed8e1cefca0d7740732a01e8dd38b522deb0b29ff6b35f32341626
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
 EBUILD xfce4-diskperf-plugin-2.6.1-r1.ebuild 1058 BLAKE2B 32df565ba5cdebdd438d8278e26ddf1ac3ce5f9a50a93a4592d9ba5a7b3e7cda160ef8bbf5e5eacf3eee083d59de8be54dc68a897f4ebf910464afe85dc64493 SHA512 6b5a984d997d3bb6b48f2a4e172d465dc19434fbc836a7d9ac6212246c00a1f5ff890a5f737f47040026cc2dd949c3ef4a5a6fd0546bc828c2b2e81f479fc780
-EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 1000 BLAKE2B 30a4dbe0665b1747a1a6dbb30abc353fde200732981796e57a5aa39b4592ab568c61c35528117ab67431b7cdf6a97b96263f37a6a20d0cd531df28db6c21b0db SHA512 33a01df02451d0f000351a3f4f41327a0b7f3a008a57aba4f5c5197b4a358aee9a0ddac9714bd707435f32fa87de337f70be669f172bbb25829053f57ce82b06
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
deleted file mode 100644
index ebd46d5d7ef5..000000000000
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A panel plug-in for disk usage and performance statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${P}-majorminor.patch" )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 34f6a86c682f..194be04edef7 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-embed-plugin-1.6.0.tar.bz2 348026 BLAKE2B 5da2423f2717798070cd8f550db75567263c2632de7109b94899fd2a6b469ee6f92f0b38c8ef5a8833ceec2f9d8d5bb58aa54e06caf7494268175388d605d186 SHA512 0d036a5b3f8394edb9640ea891fa848416ef9f173b67ba2ccc55eb8bdab96619c355c3cdfaa3cd59d6f48e3de0a01c95682a2466452f8c01a631bd5d8196df6c
-EBUILD xfce4-embed-plugin-1.6.0-r1.ebuild 722 BLAKE2B 21b5a3400a6ccb814093aee9b14c43c5f85c22e44a5577d01225565297485d437f3baf52775864d71c66c91e6147026f443150c692d8ac4acc7197cd7cbb5289 SHA512 62b1d4eb5655e6c88ef93c0f3dff5c58a2530e069963e07c78f26a25e0627ef3b5e975de7dba7933c81f1f8ca4f20e4260235e45468b8f6e7cdd8845370311f5
+EBUILD xfce4-embed-plugin-1.6.0-r1.ebuild 717 BLAKE2B 940a79166509b48ade72a383a1bb22c8a2a81dbeaa89992e23cee6c34d5a90b60e294b9d8224c3d084f9c7a6c857d1b85cdefc448dc073513492a7ac8e889b3e SHA512 9e65d3cceaf6ec13082b8698cb8e946a0a02512b80aa121d4938d43b16aa2ea4f933075ffa3c650833e0b0b3755c2b7f3b3d2dea8de63167c50f389f8d3472ec
 EBUILD xfce4-embed-plugin-1.6.0.ebuild 773 BLAKE2B 47e582947e68a590141f32dd1d10b9b7f75cd3c1883872680b54ecfa3da32b09a890b38d94b56001ebf2b407c1f80e559b213e435519babe1b11523a06d984b1 SHA512 512d80e9b9f0b3bc5c11aa7fbab272df43bc8676c01b21ac6f95bacc781729f54897beb26510cd0ac0e987448e26ad677bd1e88b00420b6b0d99cec78eabd4b2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
index d4cb38cddfa1..f45d45455bff 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index 9a45c42d4ad7..93b50aa68d68 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-eyes-plugin-4.4.5.tar.bz2 369297 BLAKE2B c1e7b9e01174e3909306abfb53c9836b2817013b6cb8676cfd7717da986b68827bd286b6319853d79143b7f0b44abec75342abb7e68df3d2fb1c7424a8f763c1 SHA512 f8ac109edbf2edb066af3f13617e2c247151c36fd91551a99b334d85f528663d3764c8566bb4a8b8ad7ae2c021d5b5c46933dc63d523566055d243b440c61e01
-EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 760 BLAKE2B b2226d15c2150a5f0046fea32bc33aad4b75a520516f902eb3d27cb36c92b2555b492ca30b09d7dd2afa58e29809337837b10fac545f19920e03506b2e30b122 SHA512 bb92cf78e628962454896e55ca57943fa48807cc36cdc53a78c58c3cc59f5764c34a521b7356b3a593b3e50f5139105776c7b5e39dc3983c9da60491aba20272
+EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 755 BLAKE2B 884cf6922f717e8d3306b9267d474b7d788358cfc4b7957c6fa4f000d74618e1063f5908e0934627f34249f82b5fc1216fa0c98f0a7d134adbebb3f0ec6e9f9a SHA512 5ab925a6dad334c70765693901086675e2743a878f5bad659f84e59d2faba95c34cd34402b4ff224a169b948a1f331d1ce47573590277590012f51d093ba304a
 EBUILD xfce4-eyes-plugin-4.4.5.ebuild 804 BLAKE2B ae0fc7d46a0bb26e309ac1e85abcd6d781c2fdec537ea544fe7dd9bf3039d0a35e1e3f46c3f809757d13ba1eb3b87e9b7f18bcc302dfb1388d4e932b05b865d2 SHA512 f2c7443e3310006f141593b430e567244a7ecef5c41ea4a02fd6cd1daed8cd06680419a26ba4e274b4113ac6f339539c0ba689a7365d06e2668a17d828e8579c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
index 1d7ccbd2092b..61599258728a 100644
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 17914ab8b794..2a19fac9b812 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740
-EBUILD xfce4-hdaps-0.0.9-r1.ebuild 1037 BLAKE2B 2d5b36d13e1ef5ed4e36146ca1c2ce1c4c7be7778a5cfe28aa31570779b7fbd6fdd7c36e85c3bcaa78a07f67df945992dfb7ca261c7b129009840597bc2be2f2 SHA512 46e4e7da082fad301c41f47ed1d0bb913306c715dd6c8761f59300fa9e94437a9b5e189846002d7cb2c007cc2da13e8317479c2f60d44fcc86076be234a70225
+EBUILD xfce4-hdaps-0.0.9-r1.ebuild 1032 BLAKE2B e426c27c6e77a4fc7c9b8ba273a57f14530dec9fe9500db1c597752fd86881e1433e6e666fe7a15c993643d177ad3a8f1232037da7f174d3c458c547febd3c23 SHA512 5d3866008f82f2002f6aa1e0d770bb2e6be367b971dec4fafca97dff73ca528674b75f55d1e513bc791386b73c8cd81f10a1cfed425b9e210ac2855f15cfb085
 EBUILD xfce4-hdaps-0.0.9.ebuild 965 BLAKE2B ecda8aaa3416871ab20efa00f1ce2158e0262e89eabfd80f7c9ab463355eb48ab85efe412537d4c8b1fd95af8d90c36c2b781139010785db9763ff0ee3c9b4d5 SHA512 b95b41bedb65f5375c9119f8ccf4b4d114e70e59db47d93c53db71c2ff9e767826e5dbfe1e03c4901f249d889326a14fffeb7cbcac86b881afb629c3a4f6da00
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild
index 2c689321b565..9894b32b51af 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index d86a84d3116b..e2b94fcaf254 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 BLAKE2B 1b166dce725f92fe05273d427dd4d185e6a240c984e4e2503f092af222e7a08b8697b8031804490322bb156bc5109c82f38273278fff185a9039b26334541ef2 SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f
-EBUILD xfce4-kbdleds-plugin-0.0.6-r1.ebuild 770 BLAKE2B 35c849e50a39596e80f932cece4df2e3587d4016a7db8f14bce55cefae714e7dde719400ce3194e3d48d465d1364b989d0e835336b250acd8e155f6810e7030b SHA512 ba57ac4212752be777de9264d9d5d0f2b8c1d6403d512b7529ffc663c6d21e2506616b986ec7c0013bd2a05c92dbcc61d6644143ba169f7eb27fa5f083375d77
+EBUILD xfce4-kbdleds-plugin-0.0.6-r1.ebuild 765 BLAKE2B ab2ed5964f5d27c977f77e444237dba08db5dd7d10b13ef8065f6a721df4d32ed08eed7c8d59c2ddf08f6b6ad71a6e8a7bb18f3c6ccd90ae36bfdb3fb183186c SHA512 45e6930efc8ac9302c0001a7ea393927cc6b53466e87ce1327400dedb15bfcdb9a37530f0166f49dd3765c54deb782249465537f416a20e05244c1e7b9beabfc
 EBUILD xfce4-kbdleds-plugin-0.0.6.ebuild 710 BLAKE2B 8eea58482e396696c62d8a0a4754d38256ecb289afd8009ceb9ad4f1f93e4b4ea28de15340b994aab63c2f0f6e9e1b655fecebceb9f3f435ce8cc79aa89ac333 SHA512 41b098cff0304b49b03528fd611262be7187e336f5a91d0b344d7718a769d1c1f4f2b30682e2742a73f9ee950b6c9740bdee2c32bf803868c6ce658de88bfaa1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
index 6b6f67c940e4..248b34a75823 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://compas.com.ua/oco/file/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.8
diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest
index 721df1d9cf50..f3be6e6adf96 100644
--- a/xfce-extra/xfce4-linelight-plugin/Manifest
+++ b/xfce-extra/xfce4-linelight-plugin/Manifest
@@ -1,5 +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-r1.ebuild 962 BLAKE2B ae5e9fbc7e4670559d603919182c6625348fa393500faf2de8e8375abb67dc9a3681a62bf2eab03eef715d6d70dd9c9405243b1ac9ed09c46e4cf874883df7a1 SHA512 8bd2d9aa1b96112942e794bf6dc5600b2dc66f2dd12abe40e2add4e8c65d275f21843f411e41fedf60afa86e3ac8db0f1e5b9c54411402ce2d3b99661e040ea0
 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
index 718aa1c8291b..630aa5ac5458 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index ab6bdc3c0d7c..41cbef5009d0 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,4 +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 1069 BLAKE2B f7633a6badf98d68d209483bcfc199f699b35303116a5a392c0eb5318c08177cbe5041f518ea3ec477160599e1cd3e6f65c213f7b07195e08c4ebb4bb7d0cb6e SHA512 74db626313ad340b75b12cb5196ce40116c10e20b88b9718f6067324df2fd5806dede58bbc96af50860ddaba8908beb7cf2dca1e82569aefd67996d6f021a660
+EBUILD xfce4-mailwatch-plugin-1.2.0-r1.ebuild 1064 BLAKE2B 7830621f086ba40f94ba76b4ff6cdca34406bad154a29d3fba324cfc39c6cb3e1c361906b5d539ad8b37896955016a5fefbc9eaceee7edb08ae145f023860db5 SHA512 096ff96b3a72d6b6544f84c7a9405e36c01c025e0e7d88924dc4e6037c106e64910e469723662833909fdc8d5037308501053949e3f7be7cbe36d6917bfeb1c6
 EBUILD xfce4-mailwatch-plugin-1.2.0.ebuild 981 BLAKE2B bede900ca171d0be3d49564554d7df5f2d3a334a62ee2d279956ee58596aeb67a75b7003b9cec3630594d6dd824fa149c6daa6e4da2d811b2b5f13712ede0979 SHA512 ef441ab55edbd4b1686a2af991d4c40b9e52f84a5141e37eaed4758bb9f2ab6ec9c76bda3ecfbf13422f2d05fe53b029a82f817dbe351b79ae8cfe30adfcda52
 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
index 03835ae547af..65968cb058d9 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="ipv6 ssl"
 
 RDEPEND=">=dev-libs/glib-2:=
diff --git a/xfce-extra/xfce4-messenger-plugin/Manifest b/xfce-extra/xfce4-messenger-plugin/Manifest
index cb1a76bb46ba..44d2c6fe4e82 100644
--- a/xfce-extra/xfce4-messenger-plugin/Manifest
+++ b/xfce-extra/xfce4-messenger-plugin/Manifest
@@ -1,5 +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-r1.ebuild 1014 BLAKE2B d6a3b7ff65c7cc96f9471054c673e4bb64a9fe2e53fac3968add4fd929b6f406ec74103010bf05525e25217f146e3eb0ad696427505d596619d8cf8b36825cf3 SHA512 bde0e55293aad2e4e0629b45e048e29b44ca7b2a3fab34ee3c194a421dfbcfba97705d710c38afef84a2991d2b86a5dae38b06b1b7c2b2f967ea90a884f6358d
 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
index fc63b43f5ae0..ca9733097e47 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-libs/dbus-glib
diff --git a/xfce-extra/xfce4-modemlights-plugin/Manifest b/xfce-extra/xfce4-modemlights-plugin/Manifest
index fba4fcc77b3f..bbcff1977d2e 100644
--- a/xfce-extra/xfce4-modemlights-plugin/Manifest
+++ b/xfce-extra/xfce4-modemlights-plugin/Manifest
@@ -1,4 +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 805 BLAKE2B 2556a37aec847d0a963f29234439725ecf57f4990a857818baba9659181de8bb2f61cd75b6f02787b70914bf1caa8ee1b7793787e27a8c969dbec272fc369859 SHA512 71e77d843b330f676e324157fcf3a5ccc792ef3fd22b0cd497c34910731fd8cb18aec2d530fd247a5c4c91ff0af29eee1224b37bd6d31500cdefd698edda2330
+EBUILD xfce4-modemlights-plugin-0.1.3.99-r1.ebuild 800 BLAKE2B 645e0f0e167b5ae9630c6882308d44f0a0fb429c7e5b1bf567beee43769b4cc871ecdfb4d82158431e07277144a51d06a713db8d88e7b67232d086da095a2e73 SHA512 0b1cb57bc7ce0f94bcbfb18cd1ddfc0d352c37d4028cac222c777acc0c12d38333a8ca04089cabee3e17ee7c87ae2bd14076f434b37efcd7062884d3c15b9379
 EBUILD xfce4-modemlights-plugin-0.1.3.99.ebuild 780 BLAKE2B 12af79fc6069ab9b8495396ea77e833f368544423022ab85e65c3548c16eae71dddfffde769983e55a89cc2a13b91867e2e31ba5adc9eb064376b36dff7bf37e SHA512 1e56cc56881c2ed5a2d6e6fc3d1a156470ab4fa4c871a1a7e6570e8695236abfaffbc28f78fb23923becf5f8e425fc73fe8e3e34e171dc72f5f04c2dd4b6e97f
 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
index 4caac3e79811..c882e6f420d4 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*.*}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index 1730a0094ffa..08876246b75e 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-mount-plugin-1.1.2.tar.bz2 425997 BLAKE2B bc53f56d2cfe147ccabb3b8f16dbb6226e63dc77e724541bdac349cc17c24b216227e0ec4f8b84911ff97e8faa9b080d6118ed5ac436156c6e98971883ddd77f SHA512 95a4654b2dca87d8c86190163e908170509a7d37ca9aabbce9f397552fcd53a27912c09a33c5c259ef01799fb690714e9b9d14a962fa781d59dfce61bb69c728
 DIST xfce4-mount-plugin-1.1.3.tar.bz2 431182 BLAKE2B ba197ae9028b726e3b1e2b7fd68ebaec3e8e247322d916a1579681af9b004418d4738bfff05e7b947d6bcc5a1bd3cd1e0419f2e7421ae8cf7a7aeb3011658132 SHA512 10894069fd98fa0b709a3e743f0d6f9a8e9487b0de8495c3d177731190480f18b11b0179325d2ed47f80eeeaea10144ddce7f9cd60397dfb6a0db602bd4f8124
 EBUILD xfce4-mount-plugin-1.1.2.ebuild 671 BLAKE2B 42f6873571baec73b1fb04e38c9ea8327c7b04117c6e23ead3393378dc24266ce19c7e25a490f76315a9530efdc1d04c6b6706c40a537445d8c0bfe7e44371be SHA512 9244b1f664790dd3dade401c3946ddbef105733d3b21bb8f26040db003c6df7ca3a05920b75ecbd40ca323c6458ec6d114c8948f8ae34ef180cdd805eb2ba3d6
-EBUILD xfce4-mount-plugin-1.1.3.ebuild 790 BLAKE2B dca119a1f0956ef2c5b913807a6f0d6c2da7521e1fb7653206215a96ed674bec7cf44655f9c90d1e6eb24d2211b6db5da9f02ba9f222228643b3661371049cec SHA512 26ec94e00075718b1e9226d255343a8c3d352f716db07b308919418dc4d4c9ef3fb19c03bfecc0a2bffa431e9157f5d8e1648bba8d895461fa939d84ecaf2fa8
+EBUILD xfce4-mount-plugin-1.1.3.ebuild 785 BLAKE2B a1d9c72b706474aa64d2c56fe41e142bc90062d1ea4e0fc4284fc89dc02271b66a275e56988a628d4b17a759e8b962d121611668e81b872c0c3260ad10f6e996 SHA512 d1c43c681ff747e809fdd5770dfcf7e99fec042216f167fc245b23dc5d4d94d0a90edef8363c1971a7e8bc078f07497c53157ba18224e322f3c1a58a6290b1ed
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
index 37504731c21b..acafe951fee0 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 40cd27fbe299..19ac15e617c5 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
+DIST xfce4-notifyd-0.4.3-r1.tar.bz2 534378 BLAKE2B 43f4b5d4dec5fc76bb88df0c92bad55620337f80ad3e51dfb84da46e58786c79df984dccea8f4985435864a3e8f77321e50284c113faf21380fe49837ae80e6f SHA512 eed16d863dddfe29ce6dd1e34260ae64f558bc5ffe5af837e293a9492b728a400338b950116fb934f0b3d0a76ed8fd280aacd075d44524be614bb27257b99a9e
 DIST xfce4-notifyd-0.4.3.tar.bz2 534400 BLAKE2B 9023aa482f9bb76f588a9c8a3ac254860a481c30ac81b8077ba505261de242f26119ea16eee14073577d75375b58c7fa5844710f173202fc607c931dc748e9f6 SHA512 db53b5f0a719213f8dea7eec7a037507984989b030da5850eabd07820ba2dfe28de6d2251045538189775bdeac2ee9f2035aad5cbdda92cef944b33682875434
 EBUILD xfce4-notifyd-0.4.2.ebuild 832 BLAKE2B b39a0c88e987abf03fbefe71288c1c8241882eae804a212f683c366484cb5b145c942de2d115c44188be6a501688f1663955394620e3496ecfd15e96aa5a0fc4 SHA512 b0eea25927bd67421f3176eb3af6e88d5f04a79c1f0f1e92fc7a5d4628168c5d748d5cb45a11f7cb10151edea6ba998c5fc3f0ebf2e65202dff6f5b70beefc2f
-EBUILD xfce4-notifyd-0.4.3.ebuild 834 BLAKE2B 02aebaccf2596d115b7e88dc7ba359c41457079ffaa0a27164766976ac8c356dc9bf8158de8d4fed3b754760cf120e8689f12e67bd3b26e9e019366bd34c8f25 SHA512 4b97ddc740511931a1bf1ae5472b3c6e5c97e96e7aabbae56d65202539432dbf84f6dc94208893633b4fdbfad422980990b781c22f92631b02f21f89c1ab9520
+EBUILD xfce4-notifyd-0.4.3-r1.ebuild 1003 BLAKE2B df39c5f94237f22f9d90b71d9fbda8e0c920cda4f8980e9a8c01b8002c17fd12321b451c45791bc7caa04703ccd37e1876daa6669ee6f6eba5338bf3220d5b23 SHA512 5f51e5a6eb1561af57d35bf4cbb39010d674d8fda0a68828a6ec4e419f8dce51048b8ce5722a3354b7525bd94c46c4f18c8e96b9cb6077b540b791df28fa62d9
+EBUILD xfce4-notifyd-0.4.3.ebuild 989 BLAKE2B dfdbf48953812fd310a956e76e2863ec60536cd75d374119688c286fae3bd5bbc4865bc850871deec77fca64d545d8e04a1897215f559516e4343beb704fb3f3 SHA512 1936da6655edc961d1709d19c26c9c28be44ad1e7cdc4291133186295c5abd0d5d0b5722ce89358f6ef6361a893b35ce74503631cc6bd279b7d968d199897e41
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..f4203efac496
--- /dev/null
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Notification daemon for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-notifyd"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2 -> ${P}-r1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.14:3=
+	>=x11-libs/libnotify-0.7:=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	# DBUS_BINDING_TOOL is not used anymore
+	# https://bugzilla.xfce.org/show_bug.cgi?id=14835
+	econf DBUS_BINDING_TOOL=$(type -P false)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3.ebuild
index a30bc99caf09..8e1678c590f8 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.3.ebuild
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+src_configure() {
+	# DBUS_BINDING_TOOL is not used anymore
+	# https://bugzilla.xfce.org/show_bug.cgi?id=14835
+	econf DBUS_BINDING_TOOL=$(type -P false)
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index d9570e1c5b48..de1994a25064 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,7 +1,5 @@
-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 1469 BLAKE2B a81cacfc4043e0e748a4723ad00ee2ec94a77b395e5d456ca3146c148c74b08c07bb41be04bf5caf0ae423c2bfaafcbaf09c77061e75027d64ef0025c0b1aaeb SHA512 1b4ee4f5931a323ea21eabe0fb7afea1522543b4c1b0c4d55f6be19c8d31a5d7d7a593d86f6c2ad6b4f9730992a3b7a009ff9e6a8662399afc6e533e06b7fb60
 EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1469 BLAKE2B a81cacfc4043e0e748a4723ad00ee2ec94a77b395e5d456ca3146c148c74b08c07bb41be04bf5caf0ae423c2bfaafcbaf09c77061e75027d64ef0025c0b1aaeb SHA512 1b4ee4f5931a323ea21eabe0fb7afea1522543b4c1b0c4d55f6be19c8d31a5d7d7a593d86f6c2ad6b4f9730992a3b7a009ff9e6a8662399afc6e533e06b7fb60
-EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1471 BLAKE2B a4332c20d2d74e6ce8715c7dfd92c5fdcf8f249bbed89308a2c6db1c46623d306b3b78981932ef8b2715cd211a8729e2fa716eec4b0d3a96857d808a85fecb7d SHA512 eea63eff8593b1c6e739ae1bfbb0ab3d7ae940329e2bf8a74ae1638f4c8096a0c9432bf9845ab56b8003b8b71e7f6c84621813d8c381b7577b0df12dd8efc11b
+EBUILD xfce4-pulseaudio-plugin-0.4.1.ebuild 1466 BLAKE2B 4b1111a9c7d31be46358135aef0d864b5c3c8e07435b956627cc5d0427d64ad086bb96acd7b765f29a060532f86f5f5cb8498bb148944f36c1106e45603c9f2b SHA512 d5f08999601dde100aac0a8523a999d5cfcb90348c702d4c00380e4fcd6c8245afa7897737f89173e8b1a29df520ca218b7465a2ebeb51435b1cd60501a6d55c
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild
deleted file mode 100644
index 7123eaf2fc98..000000000000
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.3.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="debug keybinder libnotify wnck"
-
-RDEPEND=">=dev-libs/glib-2.42.0:=
-	media-sound/pulseaudio:=
-	>=x11-libs/gtk+-3.20.0:3=
-	>=xfce-base/libxfce4ui-4.11.0:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.9.0:=
-	>=xfce-base/xfce4-panel-4.11.0:=
-	>=xfce-base/xfconf-4.6.0:=
-	keybinder? ( dev-libs/keybinder:3= )
-	libnotify? ( x11-libs/libnotify:= )
-	wnck? ( x11-libs/libwnck:3= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable keybinder)
-		$(use_enable libnotify)
-		$(use_enable wnck)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! has_version media-sound/pavucontrol; then
-		elog "For the 'audio mixer...' shortcut to work, you need to install"
-		elog "an external mixer application. Please either install:"
-		elog
-		elog "	media-sound/pavucontrol"
-		elog
-		elog "or specify another application to use in the 'Properties' dialog."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.1.ebuild
index 3e99070d0dab..dc770e058990 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 472cc225e574..bedfca556aa2 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-screensaver-0.1.0.tar.bz2 525080 BLAKE2B be1b4add2f72cf7d93bcb651852bb398c38e7d4637c03d90ea277dc3ea50147e8bca9a870b8b5fe2353fd71ad180684214cdeb0e18808f3ced234f9a03b2bf13 SHA512 a925deada7313e3d156d4b19fd38e50538e2ac429c657f9f29b727c4c20ccd83a07dafdc4fa14fca26bcc09961ee42700685097260473a5fdec8877114a8a048
-DIST xfce4-screensaver-0.1.1.tar.bz2 599282 BLAKE2B efa5addab9ed3ec92a71ee129ad36d5491107c5352999bcd42c2e147c914095c343ced7adfc9d814cb0fcd3b880efd3fa76e6f5171f62d2432639f9be6b857df SHA512 b494810dbad3ae23676d4a403a8b00da7d33f5fc0520c59cf6b612626e0b4d1f642c9ed47c24c7ea2c051d9a1077396dacb807d623852c599d1538d089833071
 DIST xfce4-screensaver-0.1.2.tar.bz2 598959 BLAKE2B 63ea3e6268cbd49ba72e43fb37c947c63fb0051ca62da9369806988ed1624ac20e8ece76b3ea2849d6e0b0049c0c10775285f1fd9b11c4856d7d842ce9c7ffc1 SHA512 9460ae8a3dec27df5e67bb078f8f52fb298769e572ae75c7a6ae4f0f5f7b93e430e505f99dce4caea0c6c885f9087270700e294150cdcfeadce5046049e44f6f
-EBUILD xfce4-screensaver-0.1.0.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
-EBUILD xfce4-screensaver-0.1.1.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
-EBUILD xfce4-screensaver-0.1.2.ebuild 1595 BLAKE2B 32f30569e00da8b078a257e6c1a2dfd5c7f9af435a3f00f06cb55ea27ca3ec09ab23dea8f8c34dc1c63229c12e5d67a34b203cc81dda88befda86e8290732f5e SHA512 f72a210038490c280299494a071d42056b8b809f6b6249a1628c7940dd8f57da42744e7239abde0a703c52018658d245cbe7a33eacbdadfaec080062963ba7df
+EBUILD xfce4-screensaver-0.1.2-r1.ebuild 1658 BLAKE2B 35dd424d48dce6c91ecd6171ac752538c3ed0986130eecf643188f3760ecda18265e669dee1ff772c7fc3a700fdd3710a3ddf79fd0f5486c20504d583d12588d SHA512 2f8082f388e9e218496843ad042d422a617e15af4001b698761176265b9b7f526567a075fe061660c7c6978e381136ea9715c3a90935fdd693ca17c08f2086f1
 MISC metadata.xml 349 BLAKE2B b9a70b461f2064eeeec11db52c92d2e6b0a018dc4ed7ffb390f8ce72fca6c92802cb376f82e47a6b53bec0c1bf715e59cdea836dea514de05fb352279ff28407 SHA512 e655e51231b6f407bda45915fa7a9e1db53aa122f1609a1c4c78020ca7465ea13279bf6dc440d5d66de73aad42c1f20c4678f8100f0551211d9818618c356d95
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild
deleted file mode 100644
index 33e37d91f142..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	x11-misc/xscreensaver
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	locking? (
-		pam? ( virtual/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild
deleted file mode 100644
index 33e37d91f142..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="consolekit +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86misc:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	x11-misc/xscreensaver
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	consolekit? ( sys-auth/consolekit )
-	locking? (
-		pam? ( virtual/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with consolekit console-kit)
-		$(use_with systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2-r1.ebuild
index 33e37d91f142..8340110b2f9d 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,6 +59,12 @@ src_configure() {
 		$(use_with systemd)
 	)
 
+	if use pam; then
+
+	myconf+=( --with-pam-auth-type=system )
+
+	fi
+
 	econf "${myconf[@]}"
 }
 
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index e61cfb963b05..6eae415a701f 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
-DIST xfce4-screenshooter-1.9.2.tar.bz2 504757 BLAKE2B 6c22e409974b6251a756f0b7addd91850d4454b0a725623dd47dd3dc29d8e3f6037bd69ef6bfcb363f4a6f2512062e80779a07b4ab1f77dc9ca0b6db5361a5b5 SHA512 fb60fe89a620122e59352154dbcace8f3e3a2f2f3f2d6cfff521651f4dc021241e9b370f7929fca55b36bbb13ed3ae0c4393a621291b51e451bc2e57b1a798c8
 DIST xfce4-screenshooter-1.9.3.tar.bz2 502188 BLAKE2B 93b60422eb6cef23b4d1f29fca49370cead8f74c4ee27ea4abf2bb9b4fa006f1dd9e39ccc87c1d915a5e7cc902245caff4b7778b801436a1c25893f46e35f3fb SHA512 ba59fdca3900143a50b3b858986b1152d4574d302d2e041a5287933427a67f64542ca691c130030937344433ea893a1f082086f9c02a9edccaeedbdc0a2a50a2
 EBUILD xfce4-screenshooter-1.9.1.ebuild 1100 BLAKE2B ba25af07633cc8c2636029d83dd4a7b03b03b1da2635c2110481b52c4ae8681809de81f6c0c9949c722a20f9c0f43d4d6b36b8ba185058199d1ac8b1cf2390c4 SHA512 373707325c3cfc345ea5b34ea81bdbf29b1efa67968cf6e12ab3c825995ac17055b9773740e15be7207d4ef377e2f10ffd1562def72d31bca93434f7919d66a5
-EBUILD xfce4-screenshooter-1.9.2.ebuild 1105 BLAKE2B 7425ab4787a4c726185fff2aa8cdaafe3d04f9dddac33628ef2eec1cbd111de07e3e0469341cb81f19c1739fb83067895dadbb4018f9bc2f3a615be22bad7dfb SHA512 05bada967a36563c6d1f3913ae9ff93ed0646a5a8369caed2fd47905893b00c71a805713135e3275786a9435d1cda525ff300d6b8005ede65b50999ec9f922cc
-EBUILD xfce4-screenshooter-1.9.3.ebuild 1126 BLAKE2B 3c5684d33d36f2af1e59b14048260275fa37eb14357bd2ede66ef55bbac5446190e093e1983e45aa0a9d31749380d6b23dd83a991a78b9f89845cfa9634587f8 SHA512 fe4ca51e5c3a719bb30649b41bb83fbed877fd38e19b054726218ef17ed066b4d033ede6898f5e9faba1d6fa54f4dd15eabdd2e5a747ff312b55cffaa0d84e83
+EBUILD xfce4-screenshooter-1.9.3.ebuild 1121 BLAKE2B 829c0fdfbe0b687f6b9116cd47cbaad26c6439ecd6b986bdd9d1eb776d08f34246ab1b46db901a5bd60d1b982f5ff75a5192a779c914ac7643f7fb80c872358a SHA512 a518b3a6b8f2f8c9661d884aebf066c44f6e70a124197f197130f67f67df5f989f5ad22590f0d442c0c28f82498b2e3b94c14e613ddb960325623b5bb0d69b24
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild
deleted file mode 100644
index a4b036e1dc6c..000000000000
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86-fbsd ~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/intltool
-	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.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
index c3dbc8cab621..acdd2a6328f6 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 6ee3cf05ab5e..eae4b5bde670 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,9 +1,7 @@
-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
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
 DIST xfce4-sensors-plugin-1.3.90.tar.bz2 474322 BLAKE2B 3d3e4c08ea1e6c973b3dc274a64826e4cd1ff75ab9eda91a822eaf1caad7786364d2c5f35b36d3b5772d0f99e7c13349f69c23f98312cecdda1d73eb87b33839 SHA512 692bcaad876323627a882f5e6e535f547e8eff59676a0586c86496abe410d395fd4f049febcd9c8bd774eed9713d5e12e3f13d5eda91c888eb165fc7bcf8c294
-EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1825 BLAKE2B a83553cc2f8da8268ed29b9d6e32c3b9f495d00c40c4cabf50458ffaca2115803bdd50b28af201664e8a5df1ee335acd525d2b41611a2cd70564f619c5b02f63 SHA512 fcbbd7a6f2b1f699578107298bb8af49d9c1fbbe4dd911c1abaf0635677731afd16de4eb99a67796adcdaa6ec13e7f6963b162c76824099760fa6f5378629218
 EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1412 BLAKE2B 97e2eb9a00ce3b34606e023f917bc89f23fff70609327be9c9948f6990bf3c484a1cab8443f6b1399998c469e431530aae1210c00a84aa4a3549e8c8a59942c4 SHA512 b0e07260882350536c16d155c7918f54e060f2f815af62c18ef2c6ec45dc725157c5dd94f52a5d0fb595a9a691e794a72f1a28c56cdc9b93c6581b89b633f35a
-EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1525 BLAKE2B 0746195fa636699147cf2b222d2002d4819f4d1a7006d2c0f130ab69f44b592250b2b0fcd2fda9b22fdbd3dd3864c7508db9779d33f4533d87a4c4f2c23cb83a SHA512 22392b48411fa32e7bd51058164cabbf160a26bfe29c224dbd885f79a1702bb4a1e2a4f446d12ef847f7bed3c805d45a2e0ec97975bd8c0a53a8fae1da86b9ac
+EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1523 BLAKE2B 05c809b077c321791d055d9916bb5130038a13f5f8ffa74537017114007bde76391ccd7f31745d498e7bb5529d6006eda3f3fcafc79839cf9fe546941a5b7d8c SHA512 a2ed8743ef0d44deb17aecc9e4a6dff35ea04b11866b86d67908c2c6a9a82e617ab365bbc31a1b9aae12cfc7b814fbfd3700974fb01aa54e39379a55c1606ea2
 EBUILD xfce4-sensors-plugin-1.3.90.ebuild 1526 BLAKE2B af233f6b7653dc989b0b91710442f3ea9ca5417b58265b4606de663e5456b10889cf45fb174c34d43d64f07004de542e773f978d244635db4ce0eadc691cd147 SHA512 5b860e0f2a3f23faa0ef7d08e1952dec7d360c3e2f00f911e3da9e3300656d9e1d4b03d4949dbdbf1b982c9cd629e365bd79fcb30cab7c65f8a39ec8215a4440
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
deleted file mode 100644
index 655ceef8317d..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EAUTORECONF=yes
-inherit multilib xfconf
-
-DESCRIPTION="A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+acpi debug hddtemp libnotify lm_sensors video_cards_nvidia"
-
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=
-	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm_sensors libsensors)
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable video_cards_nvidia xnvctrl)
-		$(use_enable libnotify notification)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
-}
-
-src_prepare() {
-	sed -i -e '/-no-undefined/d' src/Makefile.am || die
-
-	# Use flags from xfce4-dev-tools instead of defining them again in
-	# configure.in wrt #386979
-	# Remove AC_PROG_LIBTOOL because LT_INIT([disable-static]) is also present:
-	# https://bugzilla.xfce.org/show_bug.cgi?id=8888
-	# Use AC_CONFIG_HEADERS for automake-1.13 compability, see:
-	# https://bugzilla.xfce.org/show_bug.cgi?id=10031
-	sed -i \
-		-e '/PLATFORM_CFLAGS/s:-Werror::' \
-		configure.ac || die
-
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
index bae1569ee838..cb49206fd12f 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.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 x86"
 IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
 
 REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index f505c9731fcf..9bc972adfbd1 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
 DIST xfce4-taskmanager-1.2.1.tar.bz2 394704 BLAKE2B 0fc1d43aafec3301687faca4ba6f6a3bef4d3cdf682c9220522557bf9c999b0979b658b0153108308fa38abcf933b9d3e6a82a55aec19bb1e3b81c60def1c116 SHA512 72a1ea75403ef5b96d461f0e4846374f7aa3eebbdd09a1a25c49278e4909904ed6305fe6a06f3a2fc370e191421726b96924e35427253428e968665155808d4e
 EBUILD xfce4-taskmanager-1.2.0.ebuild 968 BLAKE2B 554d8b9c0edc5886da54ff4ddae68c5934a714bab117c24d690d527a2369e1154c805401d7b5fe1a72bc94ad19d8051157b3c18e655bbd2fa0816b264b80d47a SHA512 f66dadecb500abdf18ff581a4d9c1752faba35507c05bdf9fc04cbaa66e4be1814396fadd2d10d20b5c1f897007b9b00e34912f7808ef561e7f16971e6ab37a1
-EBUILD xfce4-taskmanager-1.2.1.ebuild 1088 BLAKE2B d4b86892cc62ad45fc6d9cd0d2ff4ade631fd13875db8652b40b9e76c1c1c3772284d841b0476254c0a93d212ce4fbe6f31a8a7004ce7f4a597cd478b97afb0e SHA512 59c098bc47721463c5f685e910c80e25022a67bf13fca934998e6679b12d309facd1ede02edebcf1eec750f14b76b3a519c1c4f8308aae6f3e8f4c91f00494bc
+EBUILD xfce4-taskmanager-1.2.1.ebuild 1083 BLAKE2B 3e8065b2581b00dc394840029c2107de0445d9bf1fc6aef15dc12de2cf269a9ff0cd5711395ed468c5e66b5a1908cc5b79ecba9937aae1e864c663885d8166c7 SHA512 008a8f5916987e1c8985534b0eb973589c96d3de20f413248336da09a11a1a16e57d4780e0fa00320f5924cef5a232f0d2f5b0a459d8716263800283010a1368
 MISC metadata.xml 310 BLAKE2B 72a1b36cc0a16c67ca5492863c4be9e014b5507b5ae54753adb63bc2e73720555fdb1c427ea346124541a8df64a4cda01cd1f5c492367c733ec4f33874fa4b1c SHA512 758e1edfe2d12b46877c27c2d7c52aaadce97e9fc6106a43be179ff53316ec0edab226ec1a69860081ad9491e52d5eee558bbdb5de078f0bcecdcf32b56168f0
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
index 10e673b7ebda..a4d3ffcbaeb2 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+gtk3"
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index c46bc626c7a9..bd10dbb97835 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,5 +1,3 @@
-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 816 BLAKE2B 3c826058e0fcff8d13a200da8a902f207acec3abbe5e97f382c37a49cfec3356a0c5a923c43df987d791a78f12d35d307c71789ad1ddb89740572990ee0bd20f SHA512 b4ebcd0ca85042080e6b5160c3c43f54ae42d4d0304c4d7568721267b03ef8962ff91ed11abf290a2bf25b0097bc1ed4e1790b9f2a74823519cd7f1adc1ee243
 EBUILD xfce4-timer-plugin-1.7.0.ebuild 853 BLAKE2B a9ae4a71c99b704935b1951ac806b08692cfea4d1dccf6f4399e589a3c7d6e231617fae2c01299b94939db19f634bd7876f01cd0f62e175f851e845e592a7dc8 SHA512 48c44879a3a007205cde168b6d0f6bd19f789a6126ab6b85f2cd8921f3c555019a2914e08c7d568d1d440f68c6db721dca45b2984e3723ff5120f35f33e1fbac
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
deleted file mode 100644
index 62d8e0de1ad3..000000000000
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +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 simple timer plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-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=""
-
-RDEPEND="x11-libs/gtk+:2=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-static
-		)
-
-	DOCS=( AUTHORS ChangeLog README TODO )
-}
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index e1f4c4c29825..6fcca85725d5 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-verve-plugin-1.1.0.tar.bz2 353998 BLAKE2B fa1f521e7c5a8a9640746e6c4ab96e2adcb280d225a7cc81ed3b63808b15b30e95806e00621c80e39b946314603ee695d6c40daea21d6d011e7f94c24ab99667 SHA512 7e4c01fb6ba51c86eb7ba75fd1fdfbad11c4cadb64de3c28da711b3c17d67cb521f0fc6d92efbf81d6a01e988ea6a4fc9619c3737ada17b20b347914ca19ec19
 DIST xfce4-verve-plugin-2.0.0.tar.bz2 384165 BLAKE2B 7223a2f52574a41acb07ea777a00470a7b0aed027b1084f6fc706d6af07eceb801b15bf2bcdfb9988806f18189363e34f99f929911e23c7ed702ee94c1ca21d7 SHA512 b6be658f5996857e1c5696dc66f973fa5875ba95682297ad157e107abae821023cdf7101ba5f8e5358740549e392b76bf7d1dae252f43bf1a7e8716d798ed39a
 EBUILD xfce4-verve-plugin-1.1.0.ebuild 908 BLAKE2B 484ff5f01d5c2122cf7b638fcbeaa4b8014f02037718d68e98f3db4d52953c2ba97d4c0c0d8493253706d3c145bc99be5eeffc52262dee0a2fa46b845aaf71a9 SHA512 88f6b5283817011610b1d367d541e0eaa31208b2bfb246bfd10b6cbc70ff66971c5e5b07c4a3eaa94388a2535001ab20ca6b1fa9198c40a2f72cb46b6dcd637b
-EBUILD xfce4-verve-plugin-2.0.0.ebuild 826 BLAKE2B 919757f9da256de6593d04b079b0e67f4b7113bcb28ae2e0b98213b57ddb4f6b704a9b7690e9d39e6816be8c2095b31789b4a0cd92d2f969deb293c991c5e906 SHA512 c080231e6b75808b2afe6ad85be8f92c0c52bc6f5a1f4d99d85bed0ed0d5e5a07652fb325211e812184f34ed559fad9ed249f4e64fa3b1387bb7c004a0bfffb9
+EBUILD xfce4-verve-plugin-2.0.0.ebuild 821 BLAKE2B 15170894a9b4543c84c474019e3fdc0d60d5a280a437ebc0e4fb95f3ee10b819c148f5806b28b09ffcb272d5fd81b70517184c11d23443552d527118b46826cd SHA512 74fe4988c1f655de0a164e740479b7a5f96add987c03dd10fb8e3da628ff542decf22f7fc531e2b4260e07e7b8fe93380d110dbcd24ab1785b715c941dc204d2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
index bca38884468a..eadb984b2cc4 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,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 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 14126df63a2b..09800fa9618b 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,5 +1,3 @@
-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 755 BLAKE2B a85a19b11b8e490a4eba339a36fdf8d003e0a139a9b8791a1ef503751c8b8d1d64bfed091744f5c55d5044a88e85412904a9fc26c51103041101821fa1898c5f SHA512 b0aa9c50184ac4a2e3f5dffa84890601bec73b2369205cbd46f7436e0f859abb445758319ded002dead8a8196b8f0bdb1b3163a989ef32ca7a3c26bb928fa13c
 EBUILD xfce4-volumed-pulse-0.2.3.ebuild 701 BLAKE2B c606aad5112046a6a7e3abc9759a3afa6534631f9821395cba0fdc6ddd39f7a30356d5285ccd905e2ce4d5429caf9d6bdef65190235612f2f01a3b908301f407 SHA512 0e9fe7a62583ee4283f3422a85db0d313fefada92f567743f59d6a305d7be51bc83f418fa6ffac19f4981f82c46dd3fa46d6985b705ea7ff8821b77774c5f2cf
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
deleted file mode 100644
index 86e68f933a68..000000000000
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-volumed-pulse/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug libnotify"
-
-RDEPEND=">=dev-libs/glib-2.16:2=
-	dev-libs/keybinder:0=
-	>=media-sound/pulseaudio-0.9.19:=[glib]
-	>=x11-libs/gtk+-2.20:2=
-	>=xfce-base/xfconf-4.8:=
-	libnotify? ( x11-libs/libnotify:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README THANKS )
-}
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 937f23dfb2b4..ade44273a078 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-weather-plugin-0.8.10.tar.bz2 2991350 BLAKE2B c3c71952a196d49068bac9c1de0695d2845db6931cfe220caf5ebb88919eb40fa0fc9c9a6dc640adbd82fa284449daf6ac537aaf5d258108083b2e63d8288610 SHA512 e40f794e824cc48038ece0c1336eed21b2e28091b86a4b76099c092c2e45abc5041d010d286f64fc483e8ad7c496127152df86330187afbd0872506d89f37c35
 DIST xfce4-weather-plugin-0.9.0.tar.bz2 2953904 BLAKE2B 6d8cf9b4d58b538b89ff72149e065d744f38333de9636baf0209bd49db130a3a0dd035a4c5c216bbd41302511a2784fff1d0ea90722d1d0409a44de0cfcb17aa SHA512 2a6fbeceb99d809cc4a928d0d53f92c7c638adbdc78d39dc2857b3506fb4287291702f078b547752176e0d2660a6365b62a7d8459ab88bea744dee28268e326a
 EBUILD xfce4-weather-plugin-0.8.10.ebuild 1089 BLAKE2B 1e63f72c0b9c6ff7ae193f77bb0829d7c08fb894985091e481e2c9bde190c222eb24b24606ad2407f299b8c33b7e4a665dfbdab6fdee133569c3d38b3853d5f4 SHA512 525c021213d65127f653ec5104714cee2b188ab249cc2ff4363a18277e32cb72d6c8418e147b8c045f843829dfc5db930257a6a258834dcaa66ff46eba31e406
-EBUILD xfce4-weather-plugin-0.9.0.ebuild 1044 BLAKE2B 658327918d73a085fe58811fd089ff54260d441b011b5220a6fc1cd34f7809dea05fd7bf78cc23d0bbc7422b775c53ec9169fb83c242c3bc84fab6ebad37c759 SHA512 e7bbd52131ea849b95e4f50ef7476e33efb392e75c33f14561e425cabfb2dd6e92e71839657ae3d3192fb0651b8001dbbe39d1b08448156d04cdc0bc8fb0c094
+EBUILD xfce4-weather-plugin-0.9.0.ebuild 1039 BLAKE2B 3cb20b0f1149a8006ad6040fa92c09294e83f974f1bd0762d2329cbd399290421a7b0439d972ee00c45524187d8443b168a69973963f078fcd2ab54741c720ca SHA512 6386fde7dcf523d9854dafe503e84a8899cc4b9508005c8239dcc37ad51268c7376776053be3580238408b7ea4cafb67ae7a93d3b48d71793e28faf004a2fe08
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.0.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.0.ebuild
index 07104d920809..bd1e35998091 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.0.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="upower"
 
 RDEPEND=">=dev-libs/glib-2.42
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 8c78d0a7f3c4..cb6ecbf066cb 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,11 +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
-DIST xfce4-whiskermenu-plugin-2.1.7.tar.bz2 167498 BLAKE2B 415466b61bb9e7c940a5234024ce04b4d505393c3732bf77b8a706e853273070bd61a3df33bbf72747e4a8ca486cd50cca1eeaac50d023710812c6c697dad475 SHA512 ae912318c0e60b5040486a3dd9b832822a66073db66afc0a7f9344bec25486c57d164ec0fdc18917ff439bcb8715a650e1a39897243b10d33413964729865704
-DIST xfce4-whiskermenu-plugin-2.2.1.tar.bz2 145751 BLAKE2B b0addf7ffcd3bb2bf5a7498a50597ccd622d2e87b8fb4153c9d19c7388cade65d2457dec37ef07772e00b3d5bf93f23a95cdcf561960f4f60255d37611a78a57 SHA512 e5b8ab54b66397d0d956d0ddcf7ab9c7531936fa7413094d4cae99aca8f7fca4659012beceec06c9bd6f1ba7695a3e0955d1fd2f10ebf08cf5701224a5dbeb18
 DIST xfce4-whiskermenu-plugin-2.3.0.tar.bz2 156013 BLAKE2B 56b2a55160d9976e91efe7edc65f2e5df931a997b5038b8f5a9d4ae90780bdf8e92732df4891e1c8a25ceb7f0047dd4621097e34398bc2ad479f9d2a2def6547 SHA512 c4dbf7b45d6dca59b0034dbe995ada5f51a09588d2dddbcb940c8c7af0975ebad066763534ac93e65896551e1a9b10459308a4b2f38772fb28d5d7ceabec043d
-EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 884 BLAKE2B 950d7782cc57b4699a6f15304cdb60abf43ac739f768ef9677d7458901c968dbd154869ce05abedaf8786c1995e47c93844df7bab6501258dec5aa7770dd14df SHA512 b62c8c969b92a7f805f7b92adcb4174212d3502646a686ee2ec011ac0e071b8f7d62228fc182b3526bfb4aa8b122ea24cbee1c6a7689c14df908b38b076873c8
 EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 893 BLAKE2B ebbd32d93e569ee8fc15aa3524e883e046e288a4484165b67bab0c368ebbd03add962f2bfc37143d2f5868b3ea8b4e9190694fcd8daff4e50f5ff3570f10299f SHA512 d8ff9dadee92df1762156e618328f34207434d4a7956c16064cb004a77982ee050c59adb9aa607148993d5d1aa409fe0372eab73d39851c32cdb3c3ddf5b830b
-EBUILD xfce4-whiskermenu-plugin-2.1.7.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
-EBUILD xfce4-whiskermenu-plugin-2.2.1.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
-EBUILD xfce4-whiskermenu-plugin-2.3.0.ebuild 895 BLAKE2B 649dc9efbf317379e219c807e950e7ef36a12bb6891c3bd6f060d07b13744a2d388f6bce75ef0ecf9ed76d153d9e4522e9e1b95331db40b3d9112e167bd9a746 SHA512 8fa5d1952e60a77bff596621876778ff53430d5cf73f0308ee263b7b1363d58d7c15f58172942afb318cc5e8daf844bbe21c55acc1b42ed773f3df3044cbed46
+EBUILD xfce4-whiskermenu-plugin-2.3.0.ebuild 890 BLAKE2B ac27c758635f9dcaf07fb9346d2d91e0899a12abf75c71f8c8558a5f7ee4cb810e1b800e8cff530261b4799d6cf63a6163907c3485933317c238df8d1abd2feb SHA512 85f70d898919873980320a04c1a5b45648f36a6b9284ed096207451aac8880cc00f391b0365d66852572b60f0ce7e2f924e549c4eae44075fbba681b4a375b41
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild
deleted file mode 100644
index abf1e519056c..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:2=
-	xfce-base/exo:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild
deleted file mode 100644
index 0a191020f9aa..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:3=
-	>=xfce-base/exo-0.11.0:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild
deleted file mode 100644
index 0a191020f9aa..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Alternate application launcher for Xfce"
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/libintl:=
-	x11-libs/gtk+:3=
-	>=xfce-base/exo-0.11.0:=
-	xfce-base/garcon:=
-	xfce-base/libxfce4ui:=
-	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel:="
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AS_NEEDED=OFF
-		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
-		-DENABLE_DEVELOPER_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild
index 0a191020f9aa..5f9fbc17725b 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /xfce-extra
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)