gentoo resync : 24.12.2018

34 files changed, 277 insertions, 28 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 66a9afe2a1ba..1b6ee14ed1f1 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index c16afd454ef8..fe086b6fbb32 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,5 +1,7 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
 DIST thunar-volman-0.9.0.tar.bz2 474533 BLAKE2B fff6292c7e613da47c32d92db9ffe0abd32ab2ba5c956c630208d2b3235d4f7a5e3aab5ddef291c0d185264afe6493566f4e5e0d73c60e093dd52567c5d5ff1e SHA512 d753e2aeded921e5652e6ace164845997dc3cdfbfd92561e2af822bffdf910a06850658a9f662198e4f7c485a3dc1226f97b573d28fb66e5ba490aa08f56a8f5
+DIST thunar-volman-0.9.1.tar.bz2 489210 BLAKE2B 4550c49f816438c0692c2afc2350423c9e07d165f58d9aa8f8ab56d0409e74900348ea2d188b07011a07b5c702a97f477a1d35f4d18bf47abff5bdd70ac115c0 SHA512 73d9884dc667e4f8554d2b06f7116bbe25fa4e113300f0cd32bc2229c22001cc709333d5ac5618f7d5c8a35e58fb7a61e48ecafa634c7e239e9af329dc4149bc
 EBUILD thunar-volman-0.8.1-r1.ebuild 1072 BLAKE2B 499a87f5bf590fc075e158d8359a5217446dfcd7f4e24f422232787b26357f5e14aa0bb9ca6a70393a68dd311b8b7b09c10f3f5aaec783f134985981d81b5718 SHA512 dc81052be56239ea4180db4da03a714cfec87c18517ff7dc464359302197e07251e7c15444e51301d5388e80db92fafdb2fd10dc64a86df9f315eca924408fa4
 EBUILD thunar-volman-0.9.0.ebuild 1044 BLAKE2B f8ddd807ba1e3b99fa272501269027bedd17df3070f3dec29f72f6f2edecc40513fa5e8656df4f09a4c32612a365d132702a1a4de0ab4e032f22640dcc007bba SHA512 dc3d7ad31f9c95e552377866a450899ad1a1e2196f6182c0a1763834d14ac623bef2b722e93c4662395f83ac23b00b3f08fe49dc06adb1be863126ec65d3b567
+EBUILD thunar-volman-0.9.1.ebuild 1080 BLAKE2B c36b5cdbb7098f7cda2a5c38ddbc35088b1a83e07181998634e3160ca947415dc6ec76071453a945d2e0e332714729731f69dc918f04342d4b79f26d948f7590 SHA512 5a105c7d02cd36186627b10877d3f6695d4006a9429b47dcda3f531fb5356f68b7de5a96527e578e119a33b88c32f7761b329e0fccf04881d457c559ce9ca5b1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild
new file mode 100644
index 000000000000..af502ff646d6
--- /dev/null
+++ b/xfce-extra/thunar-volman/thunar-volman-0.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+# CC for tvm-burn-cd.svg
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libnotify"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30:=
+	virtual/libgudev:=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/exo-0.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.12:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/udev
+	>=xfce-base/thunar-1.6[udisks]"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable libnotify notifications)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index b9db90cdcab5..8736b3fa7907 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,5 +1,5 @@
 DIST tumbler-0.2.0.tar.bz2 571300 BLAKE2B b4b923716897773febaff21c7d13fb8e4abfb36f9a0a02e4b777516ecd6170552d757057a228832924f4d8cb9f61380109ef52d0efaddcf69069ca5c0df4ae6c SHA512 54f83f904b32fcde5960f3343f8f4477bd30cd96a784aec5a3cb70aa2c9f924e833b2c0b429d608a36c75104d2689975d688358893127aed501f3cd8f24c280b
 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.3.ebuild 1529 BLAKE2B 518a618908af7c916a22ab7044c1090ac36c6777a86d52975c37ae72c5a3c26896773d6c5bd06503a0a397d4131ea7981074ec994b9cf41c3a0a2a15ad4047c8 SHA512 d338e2ad52357a67811a1c229052694a813c293d404073163990fe9d5e6397634f917b95bf462f306445d5d56cdc0abbea2c2451062fe262412cfc1de8995ca8
+EBUILD tumbler-0.2.3.ebuild 1527 BLAKE2B 98a6901b0096560cc4b0c826b7b38088558b570900768ee5559d393360897c3c3d2c003fbd3afdbb7b337a83a8eee02bcf0c1c174f3ef9d3174f5bccc4df660b SHA512 aadb90f5ae1e770536e4d59c3b46be14b4a483b2ed1abcf72d0b2c3b784caa2d5a44335cd905bb1d18d37bbc5e184dcc1b789b3ba88eaeba876c8aabce1f3726
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.3.ebuild b/xfce-extra/tumbler/tumbler-0.2.3.ebuild
index 63805e480fb1..45e09878ddef 100644
--- a/xfce-extra/tumbler/tumbler-0.2.3.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.3.ebuild
@@ -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-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 896042152c72..b50cf82d1f28 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 1097 BLAKE2B 6217efc4bb6344a8dc041efe6922f63d4638e19e4c143d9522ecca07b6a63de28752991cee0afdcf1ce272422ffeb92c89f1285a207c0c0fac2ca5929b67a752 SHA512 3add80464bd3f81644b7c566e15d3e1d7b2bb4040cad0b6133be41277a159a04095500b9bc11e39deb3ad526508037858a7853ccc53fbe2a8a4fd8b78827631a
+EBUILD xfce4-clipman-plugin-1.4.3.ebuild 1094 BLAKE2B 53d2eaabdcc38a9b65068d4650116d26abaceb1b43acb725932bd33f4cd54551ed52e9252c5e1d0348ee47f4b35b6b4fbd5c422fdbf1195a462806a3e6d8bfa1 SHA512 330daf8ff83984ece17e7f6c91046036dc1b3db5dbd211bef5763a6238761d5179f38b2d6e8408a6a504a2c4b2f74a5c28bb82cabe226422509d153474b496f6
 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 5188f37c5a6e..7ada34ad3fc7 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
@@ -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-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 81442921ad61..a5cc181f0a7d 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.1.90.tar.bz2 366569 BLAKE2B 784d19e0ae13d8c2fb9767a2322d79bbe3e5ea0a6dfc2e2061c76501e04ba51ea7d74e7d1aceace48f6f8c4d797adf41e0f56af0315feffc59ccf0a7d5fef9ce SHA512 23a70603181c69c25fd55d523f29526b88252203f087132f271cf47376d5d04c5b81615d2aba4c2641c886497323d88301ca0a285b9c0894b0051e913cc9a70e
 DIST xfce4-cpufreq-plugin-1.2.1.tar.bz2 394576 BLAKE2B ad9646c079b3728680fe82256568d9a57eccb7be959831684c800fb35d00d90069e30c8c5f6bcd12e2872da527ad4ed3d3348586f0a097c7ac67bd1e307d5dee SHA512 60d0f1f36bd2c49701acaf61fc51c434cb591812662f55a8bfc21f6820d34c5b091af0edf3951c958e179019067532afec989940dae23478e792889c8f4d7b0d
 EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 701 BLAKE2B ca0cb13ffb583b0e9c71d2af37f31ba21bd1fb5746e97cb2b5a7791aea1e5c405f6399327aa67427042f382af389cd2208b2a671f476cdfcf715867b4ee63b97 SHA512 6ddbc64dad79a472d411bb9facca9dc89feb6e18d3cbc10424b1b92c38b6fface358b61ef548c09a6b918925af0869bc861b019bb1fd84f9148cbec4df85b6be
-EBUILD xfce4-cpufreq-plugin-1.2.1.ebuild 812 BLAKE2B b15cf75c445e8d7671c67a23f2e88b33829f520a5b2dd90b92657589dafdbc95177de927cdf1d68bd8c1138623e8eaca72c82cda263f66aae05d2b11f2267bbd SHA512 87426556f667c40676cecfc138c3479e3dc0eed774c8db5c85ec2f2f1ba409c75b0fe61779f15b8af82b033af4e420d86ddcc102a7cc34b570f12874727536f4
+EBUILD xfce4-cpufreq-plugin-1.2.1.ebuild 810 BLAKE2B 24321adaa14dc8fec66f85e481789d71845590bd458ae1c8d4bd9fd80408566a01bfb3d51cbac37140965051c7e9791b3f1fe4e5c6ee9738d9811c5e184773c4 SHA512 ab756b259b693eb55e74447f231054aa3603174bb2946b2ce63cf52a3944f6ba7806ff5ce6af61a91094cea2fa8955b2945f1831249d7a8e530510b1ac9d1a8c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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 04034b7e3833..5340e13f7156 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
@@ -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 2f6a9a7ba4e2..ba19ae204e6d 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 817 BLAKE2B f1829a608bc64d47e0b7f2d07c6138424067ab29d8920e1fd2833f41f52338622025eafe1d2c894ee7b563dc79e625c1507aaeb6499a1eef4d748a0309f10413 SHA512 d1efee3a7f4892c07646408a79cebfda9096aecfcf1e133ba37e097f39ab63caef3c66c2284053fe968272b0bde2d559dc28c44728949de7547a63fa5cf6de79
+EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 816 BLAKE2B 02a7d506a7368ec6c39700f3b87def28e20a1a55812329b27444d650f6bdd0540dad2941cde8d31353e9382b69e9d8290ac0df471770eaa30adfc6a63fb133df SHA512 72e3664cff3909d98e6fa856a400e29230f738544b1506098e685970c1c3403c6ac81fde2ce97014346726b419df0707c0a6e322adf0a0aea58721aa2392b62b
 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 bd5daf4a9b81..49120e7cc21b 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
@@ -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 af5f48f3c95f..11f28bcb08b4 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,7 @@
 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
+DIST xfce4-dict-0.8.2.tar.bz2 486727 BLAKE2B e70bed1a0adf6bf1726ef290f802b5dfed85868407d5889b2c138aef41e3f136e24995dc739e9c7bf055b6fff3362531489f694e216cfeca18f9b0d92e243452 SHA512 b22edae6adc9e965d8d59156d7b241e6454be9af1c7cd2b6264987dfe9411293987065b179a362651ccfc1f0423a41672803467e6df5307b998c5c359e487b5b
 EBUILD xfce4-dict-0.8.0.ebuild 1013 BLAKE2B ed4b8cf7568d5b6cf7f7de8e0072c9855aa065e30ae1c6d0b639514885d08d42ee81b605f089b51586ec9541bf511a2cb3e3ad8bf8300ff43b2fb41438ec400a SHA512 0d2ebf9908f6b19ab52d3fbcb24d5ad57bbce926bbdd63bcdb64c4339876c877a83e2cdfcabb47cf31c07d21062cdfc89e7333adcfaae331ac24aff5def0a77a
-EBUILD xfce4-dict-0.8.1.ebuild 981 BLAKE2B 2316d1a987ae64e15e9acaa150909e7b1ed9e07a4988bc2c886e889da9847d21a8c7490970bd5897ea3d8bf9741cc69eae87d5937cd2d880cf9f5132f2327bf1 SHA512 7f325831cf15d579c877233f12e5f24cd223b934a495925bb9ad2303cf699602cc68357f070eb28e3008f2bdc6abd9058e897ca066a5aaf151dbeece52a06191
+EBUILD xfce4-dict-0.8.1.ebuild 976 BLAKE2B c2f3d3209116d05e7d678b99b596a678ef67959bbada492860b108014a885389ce455f61b33da4785a81c8578a2809596d553eb71217d3e63edd8d0333003410 SHA512 aeac8d04c071d7ea11137647181203db5a092792c6aa0edb848fb91cb187ddfc2ac277a5b6537b3582e5306d16117363f44547adff4c31d564bbcd8bab620d64
+EBUILD xfce4-dict-0.8.2.ebuild 983 BLAKE2B c3167ab97d5cec45304004f97f2320e1a653bec787065982a70ac7e785921b35db5ff56a50c3cb55f93ee8adb81dd93296bda3050232530da5bce3c69dc8511a SHA512 b20a1ff1268b9dab60f3e754a0c3fbec9ab59577eb532d732de1bec05881eee73c4db867e8efbbacce43988a0d30b1ed6486417f12f3df190aa5810f85cac6c6
 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 b7646836a48a..1cffe3bd1bea 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.1.ebuild
@@ -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-dict/xfce4-dict-0.8.2.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.2.ebuild
new file mode 100644
index 000000000000..e6f3947dac40
--- /dev/null
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="A dict.org querying application and panel plug-in for the Xfce desktop"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-dict"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24:=
+	>=x11-libs/gtk+-3.22:3=
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfce4-panel-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index 93b50aa68d68..4917ab7ff604 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 755 BLAKE2B 884cf6922f717e8d3306b9267d474b7d788358cfc4b7957c6fa4f000d74618e1063f5908e0934627f34249f82b5fc1216fa0c98f0a7d134adbebb3f0ec6e9f9a SHA512 5ab925a6dad334c70765693901086675e2743a878f5bad659f84e59d2faba95c34cd34402b4ff224a169b948a1f331d1ce47573590277590012f51d093ba304a
+EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 754 BLAKE2B f42338c5e41abe7bfb4ba1512914f6a9fecc9129c4f04b39f052879122ab91a9d4ec9a29fe388c685f4962843193f05cfb5d2a19e881caedce413e1e5d7cc463 SHA512 5a10811da1f2d99bdca86beddbde3d43044e153c49cbc584af1316d83fee7a750f87a9489181f5e9ad4983041adc2c35d9ce2f772263b63066352bb8c961a404
 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 61599258728a..14b97b24a246 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
@@ -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-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index 08876246b75e..44c35b44b88d 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 785 BLAKE2B a1d9c72b706474aa64d2c56fe41e142bc90062d1ea4e0fc4284fc89dc02271b66a275e56988a628d4b17a759e8b962d121611668e81b872c0c3260ad10f6e996 SHA512 d1c43c681ff747e809fdd5770dfcf7e99fec042216f167fc245b23dc5d4d94d0a90edef8363c1971a7e8bc078f07497c53157ba18224e322f3c1a58a6290b1ed
+EBUILD xfce4-mount-plugin-1.1.3.ebuild 782 BLAKE2B 019b82e753fa60728bac612bb69129026d4938bebaa99fd57193dccf2c905d8aac476a54d58970e36f1fb1d06797257d2b4dd75764dd26b10c13cf5fa3344b10 SHA512 5118dfa3c3b90019177307a34bc633e2830c09cbe0b8893d23902a81518ad7d8a1e612b84bc99bc4cc68ef14286a8f76de80cbbb7091c2d0f2b1aa626641f36b
 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 acafe951fee0..80afde3a10a5 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
@@ -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-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index de31835b402c..6a9ebe34d49f 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-mpc-plugin-0.5.0.tar.bz2 282688 BLAKE2B 2ad968ba53ee391224f20ae6d62061feb9c63bda6414868daee024b948d8e5e11c0f696e522dc7914ed5d88f798f6be48bb420c19e3b4f36dcf7af3e5756b303 SHA512 b6cd8c756d952e19bbd0be3a8385b0bdd647960708537a8997589c07e512560856aa78de2ed0c6267810aa7b33c4470facd45048158e373053dc30813e8ebaa1
+DIST xfce4-mpc-plugin-0.5.1.tar.bz2 290830 BLAKE2B 464bf4e3ca12049d241ddbf5cd2e30e4e41bda2934e809f8c75f2ceaa659647918d90a6265a49d01f84e2d0d3a6cca880ee8c90dcbf377a163e14fcfe25e5ae0 SHA512 7647ecdc7058e67be26c615853059cba25944fc6e31b06bca1e48f5378d3afddc2c4b82c5c581fe8ec716e0723a4d65c7ec4ee592540936ccca331049b3e024c
 EBUILD xfce4-mpc-plugin-0.5.0.ebuild 941 BLAKE2B 0a2f6fd38fea157058dcf1a1ffa17b954e32b83beb306b9e38b39868b3c67755dc91cb4cd0876aff2c3960a391c0cb8dfc8c2bc8e2a8c0eebab55e0c12fa6d35 SHA512 77d629f1be705e9c57d5bf5ce79f06ca81ecfebbf9fe9424ab2f27bd0c0b41e1da5e807cf040a3522315e8cec0c75852cc642517ac1b028bc01962e4549214d5
+EBUILD xfce4-mpc-plugin-0.5.1.ebuild 720 BLAKE2B 4782ced30064381a1391edb76468aa38b3503ac5e12d643c7d77072b66538cae7f448862afee1841f856a6c523775bbb2c9558c815059cfb7cf94831449e86af SHA512 7e3bbace04b34d1b71f7cdce9639d30ab12551c48d4db71baa176d5ef334a6963c1221b308b4665937c0f6da830ad52a3c22bd46ff2f7b4b53c08fea3d68f1ec
 MISC metadata.xml 391 BLAKE2B 5f0144a6e45fa3c716c04e9c482be6c6f132e461f57af55bdf2f3c41590909e7c65a0cc36ab0b29a2dd0cdc2a3c4b9d8f2042d90cbe54458aa9c4175a9e7148a SHA512 cf9d54decdbcc2879e190343f71a2fee82f1bf91a34c83e6b262428e9a7042f0e54169d4d28005bf623c2d8a7ac38269e1531ec853e6332ef761a057b42fe2a4
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild
new file mode 100644
index 000000000000..6803f5bb92d7
--- /dev/null
+++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="Music Player Daemon (mpd) panel plugin"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+libmpd"
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	libmpd? ( media-libs/libmpd:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable libmpd)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index bedfca556aa2..ad98131557ba 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-screensaver-0.1.2.tar.bz2 598959 BLAKE2B 63ea3e6268cbd49ba72e43fb37c947c63fb0051ca62da9369806988ed1624ac20e8ece76b3ea2849d6e0b0049c0c10775285f1fd9b11c4856d7d842ce9c7ffc1 SHA512 9460ae8a3dec27df5e67bb078f8f52fb298769e572ae75c7a6ae4f0f5f7b93e430e505f99dce4caea0c6c885f9087270700e294150cdcfeadce5046049e44f6f
+DIST xfce4-screensaver-0.1.3.tar.bz2 607080 BLAKE2B c7bdfd5d20feffbae3b682585ea91344c4fea6885c3d7d8b38712132a0cd46710367bcf827b2ded5207a6e589888de12806c2e1ec5b1ef1dceb8fa76955d047f SHA512 749af5968937058618e4670904881e1bd4bee0b94c97629f07a7a8f00f38af25ad75ffc8a2590c70f7dbc597d60dab91700cbd2b6b47aae3458580e9de4107c5
 EBUILD xfce4-screensaver-0.1.2-r1.ebuild 1658 BLAKE2B 35dd424d48dce6c91ecd6171ac752538c3ed0986130eecf643188f3760ecda18265e669dee1ff772c7fc3a700fdd3710a3ddf79fd0f5486c20504d583d12588d SHA512 2f8082f388e9e218496843ad042d422a617e15af4001b698761176265b9b7f526567a075fe061660c7c6978e381136ea9715c3a90935fdd693ca17c08f2086f1
+EBUILD xfce4-screensaver-0.1.3.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.3.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.3.ebuild
new file mode 100644
index 000000000000..8340110b2f9d
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="consolekit +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+RDEPEND="
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86misc:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	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)
+	)
+
+	if use pam; then
+
+	myconf+=( --with-pam-auth-type=system )
+
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 6eae415a701f..6ed45abec67c 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
 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.3.ebuild 1121 BLAKE2B 829c0fdfbe0b687f6b9116cd47cbaad26c6439ecd6b986bdd9d1eb776d08f34246ab1b46db901a5bd60d1b982f5ff75a5192a779c914ac7643f7fb80c872358a SHA512 a518b3a6b8f2f8c9661d884aebf066c44f6e70a124197f197130f67f67df5f989f5ad22590f0d442c0c28f82498b2e3b94c14e613ddb960325623b5bb0d69b24
+EBUILD xfce4-screenshooter-1.9.3.ebuild 1118 BLAKE2B f9574ff232b9e90d200d7cc582a5fb7b11b5cf8770a29614e9d7e79f407d83aa72cd91fff3f98f04c9b71a91e5bc77ec57a89e39d599a12ae2f3b15da42880a1 SHA512 e52ee4cc5614e9c5e30739fb4cef250917268bfb2aca746c0b0f7272c21fcef50a67f68b81993c9b2b1134c127f2fec73509380cf1da58f886472a888f27e541
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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 acdd2a6328f6..e054e96d8ddb 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 66b4506d4c9c..4069714c3b8c 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-systemload-plugin-1.2.1.tar.bz2 328136 BLAKE2B 0476c6e89be950a89f54d6d4fce0cfd0b4781520edb76e4280341f1f2c34e13ab54d68a84175524dd6877242da128c409f749c2c94ea6357dc453ed3c4da449d SHA512 01e57d799731a5860f043339ff0e90e0967ac1bda91d9f500d657ea14f3a52f31d9dd68ef5293f7941ef93e26e48af72de22aef976d0ccd497c62096e1aaf0b9
-EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1048 BLAKE2B fc52e85fae8a058b79e6032b8e5b13b06f0a3006247a154aac652428b6dd67c480a9961ec02275d8be1c158d9b9013dafb3b81f2c7a3063529d7f4cd07f39391 SHA512 c961b66f2544b6cc4030af9c99a8d2bb4588a9edefaafd5d20c20646913de6c6249dff897de5a48bd8606340cb9e74f74fc8476c644a682770b1acc5b0e5fd96
+DIST xfce4-systemload-plugin-1.2.2.tar.bz2 344197 BLAKE2B c83a55c3262f313c432947dbc240953e54a719bab6ba3714014624addab9b54b5172963792afab4d53c44d30590d9fef6f8b9712eddd7e57906cbe8e9dec35a8 SHA512 92930431383c128e449545b15a6d50aa6e236685619cc1abf0b60979f8a25010eb82ac4428f3e0e7eaac1468c3b101d6a0ef5d39e556346e74f4dddfffaa446b
+EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1012 BLAKE2B 77354bf35f155ff417f0d6ec5531ddbff5f8049d03286a86fe0ce67e5da25b7229762295a735fc9aa6c477ca0496263a961806127491200759ff9d71db3745c8 SHA512 066fa804c91c28989c2c9e9a8c4caa35f3268d384269e46d385da3be4b4ae7eb83b83009f7970cf5b5e82c9ca4458bde28000ca5fa1ef9d837ce6f6f7670b4e7
+EBUILD xfce4-systemload-plugin-1.2.2.ebuild 1003 BLAKE2B 3135bc115041f3af5b64c876929f9144b0c9af334793f7eba488c8dde44f53d69baabf55133f4b45c56f99e8cb208382e867503c8f2460ec1d61a220375893f5 SHA512 81213bd42cc1c58fd252370ea7b1e425b9f1433a50b69b1eddd97642301655b1465cb2b3f5aba2270e031d2ac2ae095e94e54de95696ad488637c1c17271481a
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
index f4bbfde25da5..a69223c93107 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-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
@@ -16,7 +16,7 @@ IUSE="upower"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
 	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+	upower? ( >=sys-power/upower-0.9.23 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild
new file mode 100644
index 000000000000..fa690896cbe4
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="System load plug-in for Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="upower"
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	upower? ( >=sys-power/upower-0.9.23 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable upower)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 9bc972adfbd1..bcace1bff5ae 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 1083 BLAKE2B 3e8065b2581b00dc394840029c2107de0445d9bf1fc6aef15dc12de2cf269a9ff0cd5711395ed468c5e66b5a1908cc5b79ecba9937aae1e864c663885d8166c7 SHA512 008a8f5916987e1c8985534b0eb973589c96d3de20f413248336da09a11a1a16e57d4780e0fa00320f5924cef5a232f0d2f5b0a459d8716263800283010a1368
+EBUILD xfce4-taskmanager-1.2.1.ebuild 1078 BLAKE2B 524c24b9da5a6669c310225ba79f0bc064ff5ef2068d592eb55bcf6117391249727e692586081ed3cdc589519fe37c4f00582f19f016eb459fe028a7fe634b72 SHA512 8572251a3d44f77aaa00d8ca4351f0abe1e8f18ff74d5bb88f53aa781bb5425003a7cdf075917b289c203e6da2477e5c78a86dcdfccc5a04a711facce40d33b3
 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 a4d3ffcbaeb2..60259e155eda 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~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-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index 6fcca85725d5..f2839fd5b1b1 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 821 BLAKE2B 15170894a9b4543c84c474019e3fdc0d60d5a280a437ebc0e4fb95f3ee10b819c148f5806b28b09ffcb272d5fd81b70517184c11d23443552d527118b46826cd SHA512 74fe4988c1f655de0a164e740479b7a5f96add987c03dd10fb8e3da628ff542decf22f7fc531e2b4260e07e7b8fe93380d110dbcd24ab1785b715c941dc204d2
+EBUILD xfce4-verve-plugin-2.0.0.ebuild 816 BLAKE2B 640cadbc83173a4ddf0bc21fade9750caccf387f85efeb589e057c9e82d883c39b968e9d2db9fd8fc36a44935ef4816764c42a10d3c03b2cfc6e55a329943941 SHA512 3ee16a01639fb8a18c59da46fa7c33d2a732a6b4a5987de4f8d8972d4b70daca80c455cc7d16ffc3bed5184ecc7c2561f33626a3ec5c70d9051bcaffc2f7f019
 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 eadb984b2cc4..0c78376afb96 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
@@ -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-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index ade44273a078..22aabee74963 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 1039 BLAKE2B 3cb20b0f1149a8006ad6040fa92c09294e83f974f1bd0762d2329cbd399290421a7b0439d972ee00c45524187d8443b168a69973963f078fcd2ab54741c720ca SHA512 6386fde7dcf523d9854dafe503e84a8899cc4b9508005c8239dcc37ad51268c7376776053be3580238408b7ea4cafb67ae7a93d3b48d71793e28faf004a2fe08
+EBUILD xfce4-weather-plugin-0.8.10.ebuild 1053 BLAKE2B 6aad03866a6789c48a5e7401516cc466bea036e49139bb665ef3716f4ef94a559428cab4b17d58b61feff7d9f3109fcc5c225eceebbde1cb8efaf85f380c6afd SHA512 06ce93beed75c324c9a6b124cd62c5ac297ac7f9ca7ae41bb6906e6c681804ace6e4f87a62f8d0d8847607dd9c7696e02f96a8b03e51f7e2b7a31f3f7364f017
+EBUILD xfce4-weather-plugin-0.9.0.ebuild 1006 BLAKE2B 4a83697ea167364b446d621d0c3f2c4a1bf4cc5bfb7b34d996333ddfa043a1aea91273b668a13de64df7abcb3d20afa757aa5e90e03a9f9a9a2c6fbf2a33d0f7 SHA512 7d49847eefc0dd8db9ad434175ccfe008299fc4638e3ba3934e35f2b990520d2721c088b0bfe97575e0c7fe88c758aaeab6b7977ad17758a3a87305d1092f339
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild
index 0b33afcde916..8966790e01ac 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.10.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
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.20:=
 	>=xfce-base/libxfce4ui-4.10:=
 	>=xfce-base/libxfce4util-4.10:=
 	>=xfce-base/xfce4-panel-4.10:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+	upower? ( >=sys-power/upower-0.9.23 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
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 bd1e35998091..c12b6aeea44f 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
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=xfce-base/libxfce4ui-4.12:=
 	>=xfce-base/libxfce4util-4.12:=
 	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+	upower? ( >=sys-power/upower-0.9.23 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"