gentoo resync : 10.04.2018

53 files changed, 344 insertions, 83 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 9fd05bf5e7d1..d2353777d162 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 a341d0fe5ca4..b12b7a6aeef5 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,5 +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 1047 BLAKE2B dfe575bbdde3bb950275aa9907b0afc56b4dac32c93ad5ab460a87f001f2c218aae4603d94d6791c16a9b2e084f9d0ed94da40aaea8f1296069a822fb4d05ecb SHA512 9ff012106c4713e9713c12f347a7e36c3edba7a3fbac2c9eeee3cf555a5d0688ddd5e88644ca3ff4e06ff70f94939bc55eb26902f4a45b628e605d8b788b3d00
 EBUILD thunar-shares-plugin-0.2.0_p20101105.ebuild 885 BLAKE2B 245c82a3b7387ec7d2521a668eed81a32ab40604f7aeb19efcc97dfad70cfd6f520f9071ec9b426255c5183a796347a2d5e067901d60489107f3da6ff7be30b5 SHA512 d5a32fd5ba25fe6ae2b2b0efe16505766e0f7af1c46982a210abfbdd99c2fb3370e185e1291cb8c39e983f2dd72c09d80d59ec0af94f9ca59983038feccf6b7c
 EBUILD thunar-shares-plugin-0.3.0.ebuild 609 BLAKE2B ab3381fc0bc1c48f8dc51bdff026d9d755f53069d2e606ab4478d2d312500b5288a271f7cd7c093b5ad87cb34416cfacf29f7cb773c81a3a98e51b4f202c7842 SHA512 25194e4e72ec275af1960051bce7fc2b24fd708165bf65e19e45081e31d459fa3670d169b1a8a4cee57e585aee1c24f096e7b085c419362bfa07fb277933d3ce
 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
new file mode 100644
index 000000000000..c002b2f127ae
--- /dev/null
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Thunar plugin to share files using Samba"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-2.12:2
+	>=xfce-base/thunar-1.2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/xfce4-dev-tools
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		# workaround the default for git builds
+		--enable-debug=minimal
+	)
+	econf "${myconf[@]}"
+}
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	# https://bugzilla.xfce.org/show_bug.cgi?id=10032
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:-Werror::' \
+		configure.ac || die
+
+	local AT_M4DIR="${EPREFIX}/usr/share/xfce4/dev-tools/m4macros"
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce-theme-manager/Manifest b/xfce-extra/xfce-theme-manager/Manifest
index ad743f0c22d9..57e7fc27b0ce 100644
--- a/xfce-extra/xfce-theme-manager/Manifest
+++ b/xfce-extra/xfce-theme-manager/Manifest
@@ -1,4 +1,6 @@
 AUX xfce-theme-manager-0.3.6-format-security.patch 643 BLAKE2B bfc2bd8c9e944bb4dff8cf9feb5c77f7ecd2e4d8d44a6bb3e1aa90b9193bc99ae356b2f26f6d2b2c0884c88c4b4c29efbb41378f3d4ae9a8149795e678132211 SHA512 c09365302243c594846faffa1626c9739557ec4cbc4c300ff58c7ce30fbfc3dd38d87253bafa2f6147fe4b1b74d1ed20345db28522d2197d0055ae5389c4c2d8
 DIST Xfce-Theme-Manager-0.3.6.tar.gz 339444 BLAKE2B fb4b1c2370b05c5a571487799a51ef209f3b10e1a9c8b87ed2b62936662c9f609c70ec84a497d1c75e8642bafcc9d3b3aaa663a51e1e3d1f1dd49cff04d45261 SHA512 4590f454675d9303ad9de3a3d7dc99e40c923bf7fe66195731ba7b4d42bbfba56e005e9d6c5629b4fa536fb05f221e10ade5098a171d179b9224cc4bb7fd28ca
+DIST Xfce-Theme-Manager-0.3.7.tar.gz 231995 BLAKE2B 0ea78f6d40675e1b4ee8d1bf97656739c2a1ee816ffd95480c115d0103ee8ed9abbe06d1ac03396ce171d598c083a4039c92324b1b5fccf174e72aff6f0f44f4 SHA512 3d7441adb02af53b7dcf6bddaa3004ed0ca33e258e9c9058c3cd295e6eb1507bf71937488015f57dc837cc013487e50ff2f46c34962d191117ea6c60fb606046
 EBUILD xfce-theme-manager-0.3.6.ebuild 1351 BLAKE2B 0c51639ef04e5f2690a62f86928c5a7e2c4cfce6475093ffc22650bb7acb88165905357d22ab6b2090227a261158adffa3e4c521e9d1eb5d1127c138df1c0f83 SHA512 d623c680f6a9b2434e602b4ec3e443908d8fc445adf017b6a1be332adf5eb5dd9de07c3d276718b822eaadb1b4c8e7379a7a139db01a929429118d55155375f9
+EBUILD xfce-theme-manager-0.3.7.ebuild 1285 BLAKE2B 13f21bc5946f6973924f108898fc6192f0074c429b1c60dc5e24127fad0ab226e47c8391d633ff3b7d8f67bd519497f880f85e22b45771cc346658b1eae0bfdc SHA512 b498e9d48f0078cca4e86f1bd3cb594f76f5d137320195f6d3a642369befab9b410b875c8f67a949f1575b93368aa4c6263dece5cffc81f0199beb9acb8e7b31
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.7.ebuild b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.7.ebuild
new file mode 100644
index 000000000000..117f03bbb4bd
--- /dev/null
+++ b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=Xfce-Theme-Manager
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An alternative theme manager for The Xfce Desktop Environment"
+HOMEPAGE="http://khapplications.darktech.org/pages/apps.html#themeed"
+SRC_URI="https://dl.dropboxusercontent.com/s/bh16k3am8q7zvat/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libXcursor
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/xfconf-4.10:=
+	>=xfce-base/xfdesktop-4.10:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.3.6-format-security.patch
+	)
+
+	default
+
+	sed -i \
+		-e '/^Cat/s:;;Settings::' \
+		-e '/^Cat/s:Gnome:GNOME:' \
+		${MY_PN}/resources/pixmaps/${MY_PN}.desktop || die
+
+	local desktopversion=10
+	has_version '>=xfce-base/xfdesktop-4.11' && desktopversion=11
+
+	sed -i \
+		-e '/^CFLAGS/s:-Wall:& ${CFLAGS}:' \
+		-e '/^CXXFLAGS/s:-Wall:& ${CXXFLAGS}:' \
+		-e "/^desktopversion/s:=.*:=${desktopversion}:" \
+		configure || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.gz' -exec gzip -d {} + || die
+	rm -f "${ED%/}"/usr/share/${MY_PN}/docs/gpl-3.0.txt || die
+}
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index 8d78c545bb43..268e41132e5f 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-battery-plugin-1.1.0.tar.bz2 398621 BLAKE2B 461f32e07708c29f2157c8909ba48a43458c06c9622ec0835f4cf6abb0b1232bc35f23a7e945315eb2d49048b9c0023da3a27803cf95217374962531db986e97 SHA512 d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09
-EBUILD xfce4-battery-plugin-1.1.0.ebuild 1100 BLAKE2B ba1469aead812b4c093561d5e60ee74526562df6abbedc1ba09820c408e7304d4de612451f015bc0585f3ad55a7174dd0ae24e452a6e08a8c1f793c1c2f7ae5a SHA512 b682650c3a8c7007ef908fbab46b2cf86d831542bdb203ce966763ca195ecb4044b5babab650ec85180222f407dcf5f20bc97f7f6a3162255de7f8907c08dc61
+EBUILD xfce4-battery-plugin-1.1.0.ebuild 1090 BLAKE2B 04f6de56d27957cc189efa6d1946f7adab0321670742c4b2c79f82b8d0cbe344f8788e64a10791897c53dacc23bf930cb3f34751e98f042e10e6db7c24565e0e SHA512 7cbdcbe23e4aef35969556c39955c8a2e4b20f785ed9f1a004c52d880fb0fbd37a81946d550e376773e7e92949c377e3a576c8795be3ad93c5d46d56eac914ee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
index ce4128661f73..0482fdae6e49 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit linux-info fdo-mime gnome2-utils
+
+inherit gnome2-utils linux-info xdg-utils
 
 DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
@@ -36,13 +37,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index e9d4aad132ef..2f205ff6a638 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.1.3.tar.bz2 369419 BLAKE2B 6c7f38773b0c7a1b6a814b4e3576d9ecd7a5a9f1e3a401a431b2a637eca7b4a1d99aa5fe5efc07435a739594edd8cd5ff6ae7726e4b3563a4b0e37925beb9387 SHA512 fe67abc120c0715b653258abbafab19386289ce0a373e5053e544484219c3b05aafe1e84a23721f6603043db5aac24dc1230f2e7d4974ec483d5120aca11ca25
 DIST xfce4-cpufreq-plugin-1.1.90.tar.bz2 366569 BLAKE2B 784d19e0ae13d8c2fb9767a2322d79bbe3e5ea0a6dfc2e2061c76501e04ba51ea7d74e7d1aceace48f6f8c4d797adf41e0f56af0315feffc59ccf0a7d5fef9ce SHA512 23a70603181c69c25fd55d523f29526b88252203f087132f271cf47376d5d04c5b81615d2aba4c2641c886497323d88301ca0a285b9c0894b0051e913cc9a70e
 EBUILD xfce4-cpufreq-plugin-1.1.3.ebuild 758 BLAKE2B ed27bd5ca7e02ffaf6e8966f9171bd7d7aed00140b68dc3529f61ab46852f66d0e6df41726fccdf392f27dc2facec52c05523826d561566141f5f8755469033b SHA512 f1a46d9969ac3ff5cbbe21c9763ef650b4ef67b189ef06eb0c3edf130690de694ef2a5776573f6f54f83c174861a51335acb0ed544810e70d5c39ed86fddbcf9
-EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 694 BLAKE2B 04462feabb5430b121469f7d014d07c975723b9b657366f23fd744276c218c74197ba20a4ad8b7303ccbd94e735ceb81613632c71a723a7bec88102b301d47ac SHA512 02c087dd7f8aa281099a22adca76239bec29be3aac29c3d9e6b4ea6f601dbac370bcdbd12e07100149760456ebf25713c93ec9bb33332f45e0d8ab13296a560e
+EBUILD xfce4-cpufreq-plugin-1.1.90.ebuild 693 BLAKE2B fabb817f143bfbbc79ca576b0924fa1b02393a419af8b42140a0f8719999333d5744483bba7b387b741c3b928388459a2d2b576a45cda3da40c8e85c8743f845 SHA512 fa42d5e65d665b298e9529066098c107a262cb8387bfae35c06a94e130eb4c9c65acbd1d31274f720a29d5faa497df28beb5bae58b49120a8545e83e52ce07ab
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
index aad09d18ef01..997ee0485015 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.20:=
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index 4207f6b12eb6..9872fe07571c 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-datetime-plugin-0.7.0.tar.bz2 283142 BLAKE2B 6b65ab036a0781492b09c277bc1a9531edf5f197a98e83aa748579e58c1c765d9c8eccf860a934dd37fd45b8626e516e6deae8383a909c2335ff6f81a9663809 SHA512 a6d12a5f30fd6f5d0cfa85e50ed261c09378ff9f74897c5b30aef491c0f81a1985c033a416c9e080c1b07551666e1c6d1b1a1d75b5fac72dd71417ec23a640f7
-EBUILD xfce4-datetime-plugin-0.7.0.ebuild 958 BLAKE2B 870d6dacffc02bcd6c0cab68c12b02ea0b7747ab98f70f8991093aa01f51a30c7719c8b86cd1edac60e1786857edd890db8bb1409a28a18599fe1f57012e46b0 SHA512 2745892abbe75ec29a9e7a4d728bc542276cc69e6e514778b6ee39fa57dcba34c701f18ac6da0740c048487951cd3302d86bb9746ce0074ed70cc17471b8fcae
+EBUILD xfce4-datetime-plugin-0.7.0.ebuild 948 BLAKE2B 537488011b26a6234cd3d5a230aab19cfe04329e7edbdddecb3b362ee28b5318789fd39dd470784a2a3fa95b5303f4ad37ed3d18b7b857f7df6c1270ab02e0e0 SHA512 86d4757624b6529f3c36b1902a8fd1d064ddb1e46d17e397d8d182c8aff2d246f9f59b7394b96c4daaeb41bef62c03b4473378b22941dcfab2c27a75b59abebf
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
index 139a07a3c6cb..855c01a4fb7c 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A panel plug-in with date, time and embedded calender"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
@@ -27,13 +28,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index a0045ed46189..686a440e09f0 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-diskperf-plugin-2.6.1.tar.bz2 338723 BLAKE2B 4bf0fa9c741e3efe276c7b00f8997ee49611809f7a19fa8bbf955cff2218c2654924f1b5a324f9d659adc02d728e451e7565c5ce457ef4a99fababe89d7a687e SHA512 ba01ec30e31db0c936b2b18df7c68883f89c6c4d5b82392759c25ef41fa89de37e2e635abd169745a9790d81af5b327768eb62ec3cc369f85e2da0bedc4c7cea
-EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 950 BLAKE2B fd670a4f0ee93d53db9f347d2ced11dcfe62d1bada1609b3b86e1f25c1b698b44d7cebee2623d8c116df774ea3bf153efd841dc7695dc126d7c7eaac5c2233c6 SHA512 b2cd3969b3b13f6b773a50afe36249d10f243d15f42cbeaa6c37034a5715e7ca623441428d65bc882eb4661f30d25ea4f609b3bcec2e524b8d3ef27e7cb3c967
+EBUILD xfce4-diskperf-plugin-2.6.1.ebuild 940 BLAKE2B 05e2a87d904d94ddc6327d3ca6966b1909b30ffd30c3527a382ebd015facdcc723a0bec9acb656463fd0f80447cc98939665835cd21a42090668af741cb1a276 SHA512 c4e913b0fdf7d5a205e2bdd7f5252966d1b992a8b9b1f5be1c1f1e486d493c360675260acbb3596829d1210b41ed981b01accc79ba9a775ef776c6ced8d1ec09
 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
index b8aeea92dac6..ebebf4412337 100644
--- 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
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+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"
@@ -27,13 +28,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	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 23ac6b64a2d2..3c2fbb1621b5 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,3 +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 711 BLAKE2B 9211b5bf6e205c2a5e2330c95dab6b9487a949448ae354378776299dbd2f22b346d807a941bc7ff91d356689f87dd9475028b6c7689ef1a3d7f79f7e4c83dbae SHA512 7b30748123b915736c7f3e72b6c1a8e5134731658fd69388e04489f9ad83fa8481949eaa00d950bf9044bb98a2078602011535bc4c33a88320b3b153805f1b42
 EBUILD xfce4-embed-plugin-1.6.0.ebuild 762 BLAKE2B 8210f40bf0048f46d9e098e8b490828f09c76ec08a90acf9936f13694b20f3b57143c9161b8b46af6a29112125503a9e89370ac8ee65fb46d799848d3e7b4e7b SHA512 af47745f14e6f36db469397f0dd87960ed79a3c0543a93f27c73d0ac3c1a41b66704633b07799de5941fc66be5c2e31ca3f4d3f048358aad1597a754c1096900
 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
new file mode 100644
index 000000000000..b4519156b1f2
--- /dev/null
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index 1a12c3615939..5acca5c4d730 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,3 +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 749 BLAKE2B 5f64e828346539d78e51ff3679aacf524703655854eb3b6235223b65868f8271279862b57e592696229a70847b6b5a5f7d89ebfe572945ba78a58392608bacad SHA512 8889821cfba6beca4622e2b423f4780ee4f7741d807d9cb0fe9c50f02b50fec155c6dcccb4abea19395218e4ca6fc97aea0c098f3cda071fdbabc9107c815457
 EBUILD xfce4-eyes-plugin-4.4.5.ebuild 793 BLAKE2B ed9766204eabc644c363c203d5a9f87b27272b7fa506b164fd7d949c29fa14c2da0b3721d3e897554e064b8feab56c65c6b25aeadb4b3df32d1341763a46fa41 SHA512 98812691ff2c40bc212facbb10303b83e751cf7f96b9fa70503eb2be7935da99068ffb3b5f53fdcde7041c511a470c66d975e48fb78b6e5ae300f9887b0b04d4
 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
new file mode 100644
index 000000000000..d4dfa5f9ec10
--- /dev/null
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+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
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 5cc36e6eb3d3..5c9243a29e1d 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-fsguard-plugin-1.1.0.tar.bz2 360463 BLAKE2B a83bfcf9d2847a2c37731c6549a51d1d6e18a5a8d689e5c6b7bd3270988cccf25007aa6b47bd70937f61998c676e08ab071caf41b50631d031e5c11fb8921932 SHA512 c5e49a045f1987d57c6e6d120ad25785d2f9ad4e97d07af3d40ab88c268b5b8417deba40e0277ecc1725092063fa2a7f94aa163579f04a419aad5b4e47c79d7d
-EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 979 BLAKE2B 733f083d7c03fba9acbb99e8fe0789053fe65385b37b6fee3af2aeb22b9faed6f4ab51893ef76e2c0107e4079a70e4b928f823f07d2962c0a2337d3a3ca4522e SHA512 aec823b30378cafe3a143d2cc62a83a8672bcc008c3c4b57557062f52eccce2bafe3e27595345035510e9187e9ac6a4f4642c0aa5fb17e42773910a59976df05
+EBUILD xfce4-fsguard-plugin-1.1.0.ebuild 969 BLAKE2B 370800ce5f33d089f2f3a257e64e14286b721095f4dd95e996676f787fd13f7046a443bb9ff6c9a1e1a061545e43a53a0c8005f0c8d16ce624052a28266409fb SHA512 1af20fda4e24e1469e91aecc4dc1c0de82e1715cdcdf504d86962c290356118fbbda851715cb9dbb265e4fcd56d48c36c68bd3944b3a7da23af33af74892f604
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
index a1ba0dfadeb8..8ecabd1c0104 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
@@ -28,13 +29,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 9b596e9c077b..17914ab8b794 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,3 +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.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
new file mode 100644
index 000000000000..2c689321b565
--- /dev/null
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils linux-info
+
+DESCRIPTION="A plugin to indicate the status of the IBM Hard Drive Active Protection System"
+HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfce4-panel-4.8"
+RDEPEND="${COMMON_DEPEND}
+	>=app-laptop/hdapsd-20090101
+	>=app-laptop/tp_smapi-0.39"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 28; then
+		ewarn "Unsupported kernel detected. Upgrade to 2.6.28 or above."
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index 692db365aa97..d86a84d3116b 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,3 +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.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
new file mode 100644
index 000000000000..6b6f67c940e4
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
@@ -0,0 +1,37 @@
+# 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 to show state of Caps, Num and Scroll Lock keys"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin"
+SRC_URI="http://compas.com.ua/oco/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfce4-panel-4.8
+	>=x11-libs/gtk+-2.20:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+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-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index 97d60f83b5d5..198d571a1263 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-mpc-plugin-0.5.0.tar.bz2 282688 BLAKE2B 2ad968ba53ee391224f20ae6d62061feb9c63bda6414868daee024b948d8e5e11c0f696e522dc7914ed5d88f798f6be48bb420c19e3b4f36dcf7af3e5756b303 SHA512 b6cd8c756d952e19bbd0be3a8385b0bdd647960708537a8997589c07e512560856aa78de2ed0c6267810aa7b33c4470facd45048158e373053dc30813e8ebaa1
-EBUILD xfce4-mpc-plugin-0.5.0.ebuild 940 BLAKE2B 7d95a73bb9b3b2d4466452d0516cfd08078f7cdb939dcf4eb818b41e096599f1aa530381573e4ea7505b76746b4ab0d4232efdc7d216d7fbb92c7b6dd850b1fd SHA512 4fe366f1786a5d541024437c395d00531a6dba1954e7b97a325bd2712775780ed0b0fa95258742d1fb48acfe464392b9130f7bd5973dae4d7dabfbcc8d024579
+EBUILD xfce4-mpc-plugin-0.5.0.ebuild 930 BLAKE2B 7886e4b8f62d94b45d30843ac476aba1da237743b3e8fc3133b30f5cd59a676502ae4d8ad94fc98243a569547f11c7c9eba8bced9032a213c85058060c4301b2 SHA512 2b37534ad16d416997043d4382a7296c32e6abde2d4948bf078a36650561e157cfb748e82b708ebcfbce18e0712d8b87b56622429aaa8ec30694158bc83c61b7
 MISC metadata.xml 391 BLAKE2B 5f0144a6e45fa3c716c04e9c482be6c6f132e461f57af55bdf2f3c41590909e7c65a0cc36ab0b29a2dd0cdc2a3c4b9d8f2042d90cbe54458aa9c4175a9e7148a SHA512 cf9d54decdbcc2879e190343f71a2fee82f1bf91a34c83e6b262428e9a7042f0e54169d4d28005bf623c2d8a7ac38269e1531ec853e6332ef761a057b42fe2a4
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
index a27b5b5f7a28..82a39af36596 100644
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Music Player Daemon (mpd) panel plugin"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
@@ -31,13 +32,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 94989d72ee3c..9266a003572c 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-netload-plugin-1.3.1.tar.bz2 367844 BLAKE2B b68cfefd2f54f8ee5868d6dab5dd4818b5268e4da96d9e53b55b354d170c56d72ef8fc7f360a1c97e1700795935c81ef6d0c982578fd8237c83ce04d266ef780 SHA512 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9
-EBUILD xfce4-netload-plugin-1.3.1.ebuild 924 BLAKE2B dc1d0eceae2e9c4d9ae74c5ce17a14e551eb0b8f0b13bfe8697aff636809a0cb9896f578a7cf3aa070aad1d7d0cda5e256a3f0dcda36576e8bf8394169cbf493 SHA512 835a8a7322bd070302c9dd12e10a6fa829f19fda85d057f4897f202631192eea2ed132a961ca0941f70f2f17d0374c1e0bd15e6d6d9da1264afa585023cb65fe
+EBUILD xfce4-netload-plugin-1.3.1.ebuild 914 BLAKE2B c5279e27a22161f36c08a7e9a24b11c28aa8949e74c6143da4a763b8ae402f59aef3314a77926f73b5021ced9e9a532b0c433457a09407d7719c6557b317bc33 SHA512 e85f963e131cc9d770826839e2d35d9e32a784ab0fe09c6ccbc68192ab3b19b81382c71f2b9b835bc2179ebb96f70ae461f90df5b1157e33e1dcbc43606f392e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
index 1107f6b20c77..51f79e78b4f8 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A network load plug-in for the Xfce panel"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
@@ -26,13 +27,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index bb367afa68eb..96f2569e4578 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
-EBUILD xfce4-notes-plugin-1.8.1.ebuild 809 BLAKE2B 0908c9d2b34a9e22c202878fec0090ab34b44fe798b5c95935a44c3a0e0d25afac56261e9e861b15e896bbddcc881aaa4f4bf80e05de352703bbca95cf0fab13 SHA512 903611bcb9fc2076a4be39e85fa3d52c498d840fd7624601e625669c8eb01808dd0c47e5d4cffd993d50831e85171ac3f8be0e7c035b044441ddf888a6bc4ba3
+EBUILD xfce4-notes-plugin-1.8.1.ebuild 810 BLAKE2B 1f7901c92505b833b2e906eba5cd84e2d167e1ab0a7dce7f193ca7e15b0b53162f325ee9eb59993391cfee088ae3c8719ec70b7bf87e04958bd2ef5316d1fd40 SHA512 8314efae771635ad6d52b2613d04f34fdb269ad94e50bdd4822ae982eb97dd4f34552875ac893237a7a7daf6b3df66d99f1294ee6780d1c91948f04c8327126d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
index 6e7d3ae34d4a..a585f9b18d55 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/$(get_version_component_range 1-2
 
 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:2=
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 6524d699e023..1bb7662986aa 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-notifyd-0.4.1.tar.bz2 524411 BLAKE2B f90c8241e484b256cfc1619f6bc9b1f5ad0f375fe3efdcadfe8f2acf740697f887a98044bcceb15a70cac9529cf9e1119192875682d0fb59355b4a10b3e479c1 SHA512 3dd12a8d27d950c2ffe7a4bc0eaa3b44f4a783273fc90d95304ec77450e88241ad39ca13366cb2a0c666ff6afb9ad58f6468e2fc38b8a87a2737614cfedadfae
 DIST xfce4-notifyd-0.4.2.tar.bz2 528521 BLAKE2B 8e59e26fcd453b65522b89c24d36857f6ac66c1b6e6a0ef0167b3f9f8dc4a087185d4b5b770b4e90e614e369ca147b924ad3f3ac0a1f3faf49c02b9e1ffd0a30 SHA512 1cabf478928cbcc13e9f03b2540470c5568bc665b196a8617a0e3b52ce4fe3bd9fdb5e199c4e52afe51c4edab8ba949c4551f65ce77c5fae7fddccd0086fb601
 EBUILD xfce4-notifyd-0.4.1.ebuild 851 BLAKE2B 083e07fc28ce734d456396eab4f7fda979f9a1fa5fa67110709d3be690b84f0e05111d289857d61c7b03dec0f15d0b9ace0243fc9f25dafe10704f18d816aeed SHA512 f8a266d49a9295853eb30fddf2783411141a801ce468a7a1ac1ae9bcc01731bc1aa447448218b92f17f03084d293666a01c65c42e92c28c100399decf7b2b347
-EBUILD xfce4-notifyd-0.4.2.ebuild 818 BLAKE2B 56378a65c4302d7e24e774c8b3d0e55b3fbdb7c3d41e130d3ad86ffb88a8ff8224916c003b40966a8f46b0275809836e1fd204a0247e01f92fa1d340dd73608b SHA512 e8adae74eff893ab66f227fdb633554685ab721ed4be345faa6bfd7eae27838daa3ac84fc5853791aeb275daff326bdd3be35c2ef746bd49081c67d4cde76df8
+EBUILD xfce4-notifyd-0.4.2.ebuild 817 BLAKE2B 42d3fda3f688de7f15570ef564b3ca336513b41aabcff1f04de8e2afa1a4d99b487408ed78b6ac0bd295f611b7c46fe4decc9a47daa102109b856ee1e00169af SHA512 47aeccd4c5dc9ac9b1a20ae24426c78a3409db40986df001f3bbee6ae45b4d6a404ea671fe00f9803d77a29ccb942cd23139adb51cdfc94b40e47d3533766d88
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
index c0b5eda1c135..a2492c22e421 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/Manifest b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
index e9d7aa0c38ec..4da445a6ea38 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/Manifest
+++ b/xfce-extra/xfce4-pulseaudio-plugin/Manifest
@@ -1,5 +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
 EBUILD xfce4-pulseaudio-plugin-0.3.4.ebuild 1458 BLAKE2B d6ce8d514962111c43f3fc76769dbc2bc1d66e7534c5f4024151130e546c1b411f354889356a9983f28bcf223d381986c6754db9c78f8585a80225949d113ff2 SHA512 5543f10522817ea44c0ac42f8944f7e837bb0647652a5217dc3d2400a02879347bf2299ecd15eea2b9cd8e8fc5f3c66927ac9c1b916819fd0f3ffc0d1bd00a90
-EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1460 BLAKE2B 54a7cb17c1c53eaa5c140f5e5d033cf1cded917799a942f160e559c53586670c6e43122bdb7ded231af69feb03345fdf263bda43ff35d28d806a4fc2f517ff97 SHA512 30e137593af98c53b0c3f0c96f9d230a20e4ba4cdb4c3aabc47b141494b5c7678601d89c8f59c8ef8248c4b90daac99af27aa2e956502203ccdd6d60fca6ce22
+EBUILD xfce4-pulseaudio-plugin-0.4.0.ebuild 1459 BLAKE2B be7ed1cbc2d4c375be3c6d40eebcb272ed4f81feb2c181b49d3785884bdd6a6892d849a9672e87b64f7821e99c97f9882a63b6d3d768e90dd4b07f5108112edf SHA512 c01bcf1633270911d37ed6e5d9947cf89764d6e49281694ff475dfa22dc78c831e30a9e8634fb188ea4c245e26a7834f44c3c7f8c101e5a2bbd6a716cf13bcdb
 MISC metadata.xml 586 BLAKE2B 57900ad6e29515182780ef646d7861d3858150ab61861bf70c1a106221e20d7ca93f7bfd36e4337204a0abe32e515f60affae94342b6b76cdf6d34815e0130d8 SHA512 63bb2c2bd9a71f8d53f17cf5894039afb4592d8b5687e6daa4485a566464e3fe4f5ca45306409547f7d828488242fd760ddaa0587733f69067717ceffabba05e
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
index 4dcbd980caaf..2d7b8b620bfe 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/Manifest b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
index 453a05d1813b..8dd1d055718f 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/Manifest
+++ b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
@@ -1,4 +1,4 @@
 AUX xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch 330 BLAKE2B ddec736e2cc23ce8941139b30a70eaa7761e71fcb72f89dfaa9eb59be9790a42113317fb81e7356a4d4e8e6e231f305366bf70b06cee153f9e5b4a7017e7b3f7 SHA512 e32d2730f9a78c45d387b22a1a39d96c376600abde1f91548da9f423901da0dc4569183c828282c5c62b94fe515ec5af18fcbe71508c4664197a4f20cbdf3d01
 DIST xfce4-quicklauncher-plugin-1.9.4.tar.bz2 282545 BLAKE2B 533f5fc32250bd3844e895bcfcce2fb6adfdd6e9e70459ba5f3786da3b58c869b6a8e05a2baacc60092544bc21898189442e06644dcf25df2c1322dc3814b1c2 SHA512 11db64adbef5a04f25891132e798e77a713d5f68fcda9ec5349f975f56c4f352a2da8493d721f307d23e973c02802840c2feef444921da29f2b6e21a5c79a228
-EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1238 BLAKE2B dde30df4b39c51020c51c09fdb330f8844cddb79295eaf4eb830637e98b60e77def98222e3bd21ecfbbb3033788602f59a886100a60ccef583c12f4849e9bf2b SHA512 3fb052658c2cfaa71e031cc6a9d44ca8c05ffca0fd1444d0a72c33d7b15e086447bd0f5074a470beadb5b3bffb38e5df56169121c9a539d3aa883e88536cbc4a
+EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1239 BLAKE2B 4fefd0971856534469a4959a2b666a674cd37c4e2d7ed3cc8f1045f1876d69487ecd017eecabae381e44309a5e81eb5f657f2caeea916bf2515ac3458b333064 SHA512 fab8738baa67f0c9ec7d5029968284bc6283afb099fdb57feb86e3daa94ef85753f03bc24b85928011ae6b7ac8a4fe2fd3549e537fccd1f7ab5802cb0be651ba
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
index e2c81a70c9f3..e4cce727609e 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/xfce4-panel-4.8
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 6e2e5c4ee1f7..dbbd98b586ab 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screenshooter-1.8.2.tar.bz2 492524 BLAKE2B 88b0ea17331c9ffc25928df29b708d6f9cbbc844f5048f40bf29e22925e6326761a0a693601cfecf950bc61f97a0e9873f3d85e743a3e497d2fe19d6fc2f26e1 SHA512 e43dce108c7bacfeebdc39b0c9948b348c77faf358fb0ab5f26d59c96980f1c5473ef87895fe53387340202813935ddad6e200010e61aa27c2c56b662ee56b1e
 DIST xfce4-screenshooter-1.9.1.tar.bz2 514979 BLAKE2B d66aa03561aaed01181710356fbde95d390575a87676eece6bd90b32e107e8cbc7b065a8c91b6badf8e9041d027280f8777dcfefbcea6f09cb1e096ffff091bb SHA512 e95385f65dfe5fdd1d7045a18c9404ab400db9ddd06a35de2b11c0a955b390a6d278903a3558c135ee9744c8062860f491339b5d035f53cac74a49c366bd8bb2
 EBUILD xfce4-screenshooter-1.8.2.ebuild 1002 BLAKE2B 23a513df1150fb195312752eb11b6b01dc4cffd83afa0e8e35ecdaf490080814d81a4502081334977d8cbed079e99162c3479f84eb864678573c4268754f897d SHA512 1ba9af13f28ae2bd44bb894ba2db2e9deb3533147c00a8f4d5c28fff5f149338116bf284b217ccc3f5bfe16135577be6b6ae3f8f8bc738bf19104e3d65fe9f25
-EBUILD xfce4-screenshooter-1.9.1.ebuild 1094 BLAKE2B 275f1f27ba7c562310e99a1b1bf41f5ff66dbdff2d34e41b4c306b30e5a1cd9a34d3ca43ce8683ecf8267a51ffe6b839daa9da4e49063531c6152bade381b5c3 SHA512 939057ce3747a3f221ce2ebeeaca1717732c5b42017948f4ffabbc1be51327599ce50f757b75a902b068167f51e88626f7afb8165292e849ea79330f3673c283
+EBUILD xfce4-screenshooter-1.9.1.ebuild 1093 BLAKE2B 2e2664d8b1cf61fa20679d55f6d6a391a145dd7f92f1ce5dc26c0e1ad04dbdd8d75c4f23298ad050a8cf5303cb301a6ba3171f7722ea86f579c202437874fee1 SHA512 74be15d1a18b89a360cee43f8484af97c8b861bc1d6957efe8692c39b12cb3e1f43238d1c89971cef2a1e2281d2a1ed84bd4b7cbd16be4c519f412018bf9ed18
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
index f840139d7e4a..7de62acb2b78 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index e7d37fcf4b6a..3888f34719fe 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 BLAKE2B 1dc663f726f6079fc030ef08fc9384fd4ccf3b05786bb899c7028d9adb66d85e3da4d9aed5a29cc5b15c0bb258538fdca31cd2a9430710c1e0a383f8eb8d2353 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60
 DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
 EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1863 BLAKE2B db1313175b658c66d6155510f1fa892bb7fc00ee2f736a030d0993a19824c2c6a20d311afee8a618bda0bd5fcbd1b23a7f7c4b97dbc37f4c92776d2c28e3df5c SHA512 9656af8b47c27dbd9021448778fd89e912603f8c8f0237c4cadd3ce611821a90a51dc3605db009949a444543f3d411cd8c950b98baab7f15fd7dcd06d2203745
-EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1452 BLAKE2B 1386ba1ea08523384ed24d11f7b86af6e722287455cc0fc0824b8730386c3c488dcfaf6cdb4b796f7ffedc1faee7b5fc401d53fc8a86ed3b382671432272075a SHA512 c5a79eb4079d82d5c17af799ebbc48278a88064d345b876ec0783c5b045ecda579912a84424503a3531cfc923d1578ffa04081bc9130d5b648ac0d3941fa5977
+EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1451 BLAKE2B 0723b371c026cf4666c57e4fc21bc9103bcded68a61fb4d13c26014ad60d9b34e5492b5241e482f70a202de7a3d53ce85b3667a09433456a710d8d18b2425133 SHA512 16e01ad254fa4fc2c8d0bd4976503c447430ed7bd024782d5acf036d2447bf746c9a530991c1c45c81b3d22c725a9431bc32d821812a21b540f3f5856d1075de
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
index da7e23330f6c..beeee35ead58 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
 
 REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 0ad9e0023817..865d58f91462 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-smartbookmark-plugin-0.5.0.tar.bz2 280988 BLAKE2B 783d495aae351454abf1a3d9bd43c0656baf7ff94bf3015ad300a103cd17eccfdae13385b025d293bd9d7a65b37c0a19aebf3cbca8276ce36d1e41287359d62c SHA512 0514a1159cb5218af73d28897a218c369a64b9c3a7c286c0bf45ad404773ccaa49af5c8b0492e38f56f8089a2ec79b0434de93388d960b993ad67cecef5315cc
-EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1107 BLAKE2B aa69ffb82fa46fc74ae27727a98e634099bbdc1d379135ced448c1085fe069d607666e4786b0e0ae76d48864b6caa0776d45d428693a727623f8808ea2db394b SHA512 1e9b860528efcf0050bd40a98bd3d7bffb74e7e2e6cf71c466f46744875697989cd7ee22179cbf678bf830c990fa9cf6d445939cc103741560efbf8b838c127a
+EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1097 BLAKE2B 0c53c2e135e88c2b7da282cc3ab9ee6ab7931abf485b0d13eca0f3bf0c174d136162f735841d6de44fc09b347a78612f7b210815e84a0ccb474ece98d52d1e02 SHA512 cb59896980619f0cee5955e62a1cb0324f0c1f592de77d740126b29528a560658d0474e43b140254d924bcd597e89892d79558c420cf7c2444063d0ff95d2721
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
index ff72d5c5eadd..4b4c62583b5a 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Smart bookmark plug-in for the Xfce desktop environment"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
@@ -33,13 +34,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 70f12d907aaf..f9a9b42122da 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-systemload-plugin-1.2.1.tar.bz2 328136 BLAKE2B 0476c6e89be950a89f54d6d4fce0cfd0b4781520edb76e4280341f1f2c34e13ab54d68a84175524dd6877242da128c409f749c2c94ea6357dc453ed3c4da449d SHA512 01e57d799731a5860f043339ff0e90e0967ac1bda91d9f500d657ea14f3a52f31d9dd68ef5293f7941ef93e26e48af72de22aef976d0ccd497c62096e1aaf0b9
-EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1047 BLAKE2B c032738e3c810691ae861a536f3f244ac59e0b80eb627c31d5861ed4e6eef5c2a6651a52df7529296429e68516b9c1f43d4c6f8cef9fae4985ef10855eb382ce SHA512 023f8ec82ea381476792bea8624217df53450a095d8a96265a2ffc9339732dab94c5e05966eaa39fa8ad0c4d17943b3cbab23bfacb975143a0005f52296d4091
+EBUILD xfce4-systemload-plugin-1.2.1.ebuild 1037 BLAKE2B c0c6182e7a1b5166c7c6e8c0ce4f631090792f302a618abf7d97abece905d5c13ccb6b77a1533979fded3bd9fa644561eb8ba6878b5039d8cf0f1c1e68e41dcf SHA512 e5d96ef2ca7225319d51d03d417d320b980d340474e253ff0b88f02d60dc30604218d818fc83f326af0b9ecfb1f311d0fcdc5d1c3db83ea5f0b67ee8deef401a
 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 875c05494ff1..40ed8a8cc98d 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
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="System load plug-in for Xfce panel"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
@@ -31,13 +32,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index f543274dcabd..67204af4d515 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-timer-plugin-1.6.0.tar.bz2 325662 BLAKE2B d6eae55ba20b3fdd59ea3e62ee96409927bce966453f24df76512ee3a1362caf7bc7813cc4baf90d43c90bca3628fb547a96eec2345b0c9160f0ae1626395c1d SHA512 aa2c6760945fe28fb1e8189b167dae176137164c017acb7057c93eb579147ef31134a840b23c78e3d1914c89865a0cc7b428e3561449f7ae01eb2d8a0fbd5815
 DIST xfce4-timer-plugin-1.7.0.tar.bz2 381222 BLAKE2B 3c273d818b7b04cf2ceeea3b72837ccf43ee0433ca458dbbb3aa68015ee28fb2e61ab3b5f36b341d087f00e9c4ca8e9be5453e735251bf9c9c1e910ce8c6d2f3 SHA512 b4d00396f5be37d009cdb50baea8804c4b06a6f0b821d66751fd07ca21e186c01bafeec5170209b5de69559803e0ac54d9b56266f193b65ac056cdd52bf5228e
 EBUILD xfce4-timer-plugin-1.6.0.ebuild 805 BLAKE2B 6e30619b335ecf22c7879dc1a13226b4117d1fd1f0120c18f4a3b7185d98c0629563c6cc8dd1c3dc02a87950d44d6b8c0e02ebf08821ba153849e5cd85ea17b7 SHA512 45453d6181723a8f9f934887b191b934cf5d75b236ff112d3056f52a9af8d0d8cfcda71377ef26e75e310db19dfd0e18c99e3c5637de30df19ff4a449ab400bc
-EBUILD xfce4-timer-plugin-1.7.0.ebuild 847 BLAKE2B df0e9d44debc57bdaaed5421dee03503809537c32801706ccb8bf484dde6993ea51339f291a2de0bd8ebb658641983e9e47f5ae2a72af7e64e386595ce045c6f SHA512 655c600c2328ea5d08a27011e5c2b2b5db0e577100bf339ec667fad02b3f72b76325ca3b22176bb875bc93afb6218c97ef747b0fac796200dc79e373d985577c
+EBUILD xfce4-timer-plugin-1.7.0.ebuild 846 BLAKE2B 89143cd1afc24242413351c2b8d2745f4676ca2edcaa4a14c6705a661d8941d178ed282ab5971e79e6c9859e54469b1ecfa1ec3318f0bd7f25373d16f43710ff SHA512 0d911466e441565e62d61f68c8ebe600b8d52452ccc5d15cc5ed4ea20f60ee9bd11d9d9e683d6ab82b5ee223093c9616633a274c2ec775ebc62b836fa956d3f6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
index 1c42fb81f8bf..a7acd4cb24a7 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 #libx11?
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index cdaa0d933760..817f0ccbd48e 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-verve-plugin-1.1.0.tar.bz2 353998 BLAKE2B fa1f521e7c5a8a9640746e6c4ab96e2adcb280d225a7cc81ed3b63808b15b30e95806e00621c80e39b946314603ee695d6c40daea21d6d011e7f94c24ab99667 SHA512 7e4c01fb6ba51c86eb7ba75fd1fdfbad11c4cadb64de3c28da711b3c17d67cb521f0fc6d92efbf81d6a01e988ea6a4fc9619c3737ada17b20b347914ca19ec19
-EBUILD xfce4-verve-plugin-1.1.0.ebuild 896 BLAKE2B f649cd4538603ef4ecbed79a1f53ffb38221b656dcded9a6b4afb9e02b363e548f92b4dc87fb2b37f0407878682a1c6de6f94f811d84e7d4e0df2b9a481c9e31 SHA512 526b4b72d611afddc3a29d6c76495166f470b9d27a525f00131f058387600a55cedc11f154f4655e741e10b3ceb5f38a21067673f13466d521d929a45fb12031
+EBUILD xfce4-verve-plugin-1.1.0.ebuild 897 BLAKE2B 3b1b5ff0ac6b15db1c28fa6bc68f31094b9cff4df58813eb3fecad0927f2e641282b005b8da12448135100aa24038a78205c28e1457389e0fe7f79d6776c6fa8 SHA512 dc44e764fbdd5a9d2d62d4a8aaf310a8a11e051380ae5aa2debc181ea0273cf79815fccff867ab4f7d27e680b851f4f25c5b642762a5a23e69bfec192ceb9140
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
index 769e36f513bc..4dcb7c9aa155 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dbus"
 
 RDEPEND=">=xfce-base/exo-0.6:=
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 38b878194a20..b32e8bdec2e8 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-volumed-pulse-0.2.2.tar.bz2 312703 BLAKE2B 6c88c8f4023f5200c7b5b976ee4fff94344913f313ede29334d3f3b291d6862f56fa11e22a90c79019bcc137e1c77feac84ad14d067f4ce13c86ce58484480ea SHA512 6e452a603ca19b8fc8470851ed9570c84a8208bc7695493cc8ad6425ce6176427a264e39c5249767fe93bdb172137a0c59ef858336f28a574e74bce8d9d35bb6
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
 EBUILD xfce4-volumed-pulse-0.2.2.ebuild 744 BLAKE2B 3d8c2e9327b900a25d836b1419ae5b05eefcedbe11571cfa7d9ee8cb41995c8d52f8feb821da0190a5f31d0e86cfa787af17ff42d5d4d9828c000ec388f4ac96 SHA512 61f7c0e4bcb0a14f1d1625c314878e73b6e369433e9158c31d76334035ff89051315f5260e8f86448324b34290a720241a57f2da1007349119e70195ad37a06a
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 692 BLAKE2B 1f42c586f4e587643c3423b19bb72212d7c99903880a5a67906d3def07897882371934f1921de700b58c8bae69bfa451ecdfd9a7e978c3b3004ae3b83f6debf5 SHA512 d22075dda97e85452cffc80c7a0a5c76b5bbd30f1fa0f4489b68b1d3ae8ba9c40b0aaceec61bf742581b7b635a4dab76a7f0ebf88e36e006802b6fee3d7f8138
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 691 BLAKE2B 32979363978af8b1e5a36ca03cd5c42b66fd9385bdc3de4ed634ab09a703ac5f7510765c4a9adb7ddc9d8c5e474b78c2fefc8fddf67bc0236afa752a30d3d3bb SHA512 79023bccd373a60d5ab3d0da6964d115f147419b0c6fcfb16dead89ad9e4a2633e52e2d449055be1c831449f6fd9d26c3663cce4489a0d8b5dad0af4425c2e68
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 7625362506f0..5fbe847414eb 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2=
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index cca51d6332a9..bb659855e4c6 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-wavelan-plugin-0.6.0.tar.bz2 303220 BLAKE2B ce2a8fe3f8cb6ef312459ae73d2cde1a87052a5a9b45e06795937656bf926ff3f8dd73ad0e8d1770d6ded7761cbc787b21ef0ca1b04580ab3dd4961453ae0ef3 SHA512 50dd069902d69071f0d4ab7036fa451ae6cdaca9fbeb56255d58a5864d4e4b3749267b1cc4b411e1073daac9678554f3d483d30aba759ef161425ba3cdd0306e
-EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 1001 BLAKE2B 05878553138c43195eb0a5c836af0d0af38af9c81e1ea56b801840f56e458898592d4296fc057186c4ee60eaf712853109d9b00c5ef55cdbdf0088659075b594 SHA512 a4555728aa667f606c88d3cff280cdfb14c60ce24aa3e070894e6e689f3379a643f7514a01801d4777c311040b31c90ada237fc6629a3f2a73db3f9516e33041
+EBUILD xfce4-wavelan-plugin-0.6.0.ebuild 991 BLAKE2B a8689f00574c12244708ca99ed720782ecd00928c9141690b70141fcf4679de4feb792307852eb5e1d040802428884f1f57edafc817dfcc6092b7ff1c23d9b07 SHA512 168ebf81ff63ce5f93ed84e7cbac4c33d22863bed6cbf1fd8aeb166abfd762e9c885231ecb68f983ba05775715f6b36d576e4d29d6e743a24173fe63c383ad8f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
index 6e7a2113f376..73024fafddba 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit fdo-mime gnome2-utils
+
+inherit gnome2-utils xdg-utils
 
 DESCRIPTION="A panel plug-in to display wireless interface statistics"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
@@ -29,13 +30,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 0e95e5bd4641..51b5626be80a 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-whiskermenu-plugin-1.7.5.tar.bz2 164129 BLAKE2B 904cc32ec73ff8984773256e1efe5cf1dc02eba0b6dd76e15ebecd5507ef4c1fff506888ed2cc3d01674a8773ef7a250da6baee26746b6d34d61b8034071e7f5 SHA512 28c0684642577af656ec95b6977f1dc88d81f690125ad42d0022ebde456dc6da02081028f8f80950f40c3e6bea0f6b8e0fefe153e2de6fa9b77d1d5555e4e89c
 DIST xfce4-whiskermenu-plugin-2.1.5.tar.bz2 166227 BLAKE2B c7e1a460692495a19a76f789ab69c3ce9bff91a4fd6507202cf4e78950b8f29ab2585b5142ecab9d009b3e08fe8161d82c51a442c055f63b7012fd73fa972136 SHA512 54e308b516ef1694f9649578cb8297f830132e456e1f498183074386956873f7f9f6ea8a0167d506086a87ae17acfbfd8a2b34eb6f0acb97f896872f8799b1f1
 EBUILD xfce4-whiskermenu-plugin-1.7.5.ebuild 873 BLAKE2B 6088679e00cd89a08a3693e87c8331bf8552d1fd25fe16f0edc9b284af2008b4e6a21fc57183a2cb02e1c2bf943d11e13f32729c64080f10e892f6211f0f0a01 SHA512 9bab065373adda0f0bb524d2b6226f391e1912d6c766e753ef05bbfba672f04c7db6eec542499f1c521ee95130d3dfb2fd9287e4e47fe72bccfc4de3f37de72e
-EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 884 BLAKE2B f93c0b596014583b220d0403048a2b4aab790dea5f428a86aa99dd41c2f145f899e26ac790725dcecf336ac49e9c87292d2b8ce25acbe598f1ea1e60d771fbf7 SHA512 e978abf3ef27c3033588ae173a4286ff38ca263d3cf916369d7c862f381995bdf372b375a31597c63b975aaf67a0119094626ebb5e24fc7e94bc18957ad925a3
+EBUILD xfce4-whiskermenu-plugin-2.1.5.ebuild 883 BLAKE2B 8896c5d73a7036811fa1211a48f338e163e7b961fae393c42d48bd4eee250e44a04a162637c3aa664e08985f93b874dc6c80301de839635f0044f5bb0b930500 SHA512 495a707785c7a8f001bd242e1ac381f7f127dde685ff4d4ad8c72d16debb43abbc4c88342d84f2245b3391c8b72adf732de4c44ef53678fa984484134d193296
 MISC metadata.xml 2083 BLAKE2B 4e8d91617b37e4f239098a391229bbb4e3a58906e89586b7b3b24459e419bd2a83db41ec0707e5cb1fee21f14f07d98557682566f1776a178baa436874351bec SHA512 8bb378a95fda0f395ce115761dfa52889f1a2d024cca07d0547042c0611b49949c91867d06405812b5048bd49de123bc216802d1193d7b4baf91a598bcd84313
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
index be424cde4929..f3a05267f59e 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="