gentoo resync : 05.04.2018

20 files changed, 288 insertions, 163 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4b095f6cbe4a..d741d120d190 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index e4f6f60183da..87876481cad2 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,5 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
 DIST menulibre-2.1.4.tar.gz 414546 BLAKE2B 4c6420e6559415dd4be6aee37af43f820f85bb5d98ce4c3b475d977c1511d4ad30f1fb3db8aff94569a3dc0afa4d75887bed8247cd8d48c673bcb106cfa11b52 SHA512 48322d7187d77a63253ee5d8d269b473e36bab4d02f1442b8e4c66070d372e3eba4247b923932688640092e16d51ea41bef42571694980099c279a3526b9e56a
+DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
 EBUILD menulibre-2.1.3.ebuild 1726 BLAKE2B 25f6a035bb3a32ff4ec22a6c0147c0b4c6e23501d030a5620a9068f223d17d34f70a09b3b27fe68dbd9ada6a2183d0c57aac7261c065ac033ba1ca0d61cc50d6 SHA512 35b0a13f101aa205ce6fce26f345b46d5fae1131e4bce61caf8630bbc1109f7e4e353da300e83b921c5edf33421b9f6d3951de38bf6c38baeb3e546eb14551cb
 EBUILD menulibre-2.1.4.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
+EBUILD menulibre-2.1.5.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.5.ebuild b/x11-misc/menulibre/menulibre-2.1.5.ebuild
new file mode 100644
index 000000000000..f05ba92dfc02
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-2.1.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 eutils gnome2-utils versionator
+
+DESCRIPTION="Advanced freedesktop.org compliant menu editor"
+HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	gnome-base/gnome-menus[introspection]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+	x11-themes/hicolor-icon-theme
+"
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 57882133b497..0e07d70c7554 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.7.tar.gz 270142 BLAKE2B b22c403abc2717ca2b4c190bdbf3aa4c789fe6db13488dce4d5571c5afee14286aaf919d567aedf952c1b94bbc3c3153512d52e984ed5a0f54266d30833f3dee SHA512 e0288684256cb5090ecf039115150ba469c8c68a8b67dc6cc7f2a5bc855c9bc4ad37c327d60b1b0a1fd990402e4f78facfeb0e47c9b805d705c5e0996a545765
-EBUILD py3status-3.7.ebuild 602 BLAKE2B 41e6103f3881ff12640ff512a091f2a6b68b823610f2d61091468f92f93312c229493c67d0898df37c791aa1a7e66161c5b4b102ca538b7afd7b9e2071b9c584 SHA512 00bef21f396daaedc70bb22d3ed162e82908f0f1b3dd555172c6c9a2473117100d08ca6952b34c2cf0569b14d04a36809d4a905a611095fd9524b576fcde20ef
+DIST py3status-3.8.tar.gz 298881 BLAKE2B fc3c55461e65e8566afb07c88dd1d837cd82b72ce68a37b51bce922386ad8aff6de6740e4b346c35e76a9dfd744683d92638df1f4878735b52dadb8ca7737550 SHA512 72e1db7bd5b7b940505b65053cb22363a6a2e6f7fcb0730fa7efb3bedaf29b91bf87493f9a0481b13e43024452d9eaa578fe64f62c2fefbb5df149e252a25fe5
+EBUILD py3status-3.8.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
 MISC metadata.xml 491 BLAKE2B 867cd38781b9fedfbeca476c0905193823ce4a1ff99b259fa53a098dbb67ff6f1a0cd29aa19e5c6752052bd3a0a8fc96a8764e9868017d4d5ef14d4d765ca212 SHA512 24fdcee0d026225e8965b62bfc5d1c1be0f0d4618e0bb9f5ad58dcb5ffdf372696ebe035d15f5208bc310c969ef93b89d9d643a6bc9abc0f6103810abff26bae
diff --git a/x11-misc/py3status/py3status-3.7.ebuild b/x11-misc/py3status/py3status-3.8.ebuild
index 02e5618947c4..b555901801d3 100644
--- a/x11-misc/py3status/py3status-3.7.ebuild
+++ b/x11-misc/py3status/py3status-3.8.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
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 53606d31c635..5d7f44890d4a 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,10 +2,12 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
+AUX sddm-0.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a6436187fc684e347b00fe6141e0b30e580d04e722f96b320677f7b8f7dd5f5bf91492b05f04a81e4ef564c831d9bd84de2ea68988 SHA512 f50b3c23baaaae6bb605cb7b4eb6ff24bbfd3e5771e44a24d54f1843b727f9f02cdd2cb0aacd832e110e4350870e76bd4727492d0b0f58145d739181a1815963
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.16.0.tar.gz 3523735 BLAKE2B d460cc6d6b9273310cc339f62f2463defea8933441b0332b58da9af394593a6fcb57f2789d2090710d6cb423843380d6693d8e9ead4bdfbab0556a09cbe36fa9 SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
 EBUILD sddm-0.16.0-r3.ebuild 2035 BLAKE2B fbe965522bb5dbfa4c6c29b7b195f6f352860ffb837468ff62ab9bb33e9bbbca090791468c27fb91f68c12a8ddeb5aab2d138a763de43ec4ed1113ded22f28fb SHA512 5c866739c6a685e604d3f35776f401c4976ac9713cf35aa938df09cac464dfd6aa66c5ccadad500ac318e67bf1da0a01ba158abf2b1f9c5e7367cbc78f0c4a80
 EBUILD sddm-0.17.0-r1.ebuild 2170 BLAKE2B aab4e0891eb54d1625eb9c44a5b03a768799047cfa91ce32bb7ba00354f4b69b0fd568225230c5d64d929f2cb20bdd19e9054a55d0aed37f820243b6ae1d7c1b SHA512 b5f1b70e117b56d3235723e62cef9fca95c743c2bb95d6598275221f732ff747e27f43634a30c814a74fa71b2cdcd82936e31433bc6adb36918e23d458b468af
+EBUILD sddm-0.17.0-r2.ebuild 2262 BLAKE2B d7f984d36aac33be92135bb71b977749221510b231e685a7bc4fda6a6d4b21a43bab7187a1d3dd8c64f100fb16e0c194f09e4dfd811429b3cb5dac71415e3787 SHA512 c39a051f2d9ba2b0df854974c342f5b14e115f40fb9293646b5807c0b668ce6f71b652d7589f5cfff920185dee582127e83b16889ed60188b54f54c4d7fd603a
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
new file mode 100644
index 000000000000..22d2fa4ae9be
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
@@ -0,0 +1,54 @@
+Subject: [PATCH] Fix switchToGreeter not available without logind
+From: Alexander Miller <alex.miller@gmx.de>
+
+Seats can't be created until SeatManager's signals are
+connected to the DisplayManager, or the latter won't see
+them and switchToGreeter doesn't work. So split SeatManager
+initialization from its constructor and call initialize it
+only after all connections have been set up in DaemonApp's
+constructor.
+
+With logind there may have been enough delay before seats
+got actually added so things would work, but it's still
+cleaner to fix the order.
+
+Fixes: https://bugs.gentoo.org/644718
+Fixes: https://github.com/sddm/sddm/issues/824
+
+--- a/src/daemon/SeatManager.h
++++ b/src/daemon/SeatManager.h
+@@ -31,8 +31,9 @@ namespace SDDM {
+     class SeatManager : public QObject {
+         Q_OBJECT
+     public:
+-        explicit SeatManager(QObject *parent = 0);
++        explicit SeatManager(QObject *parent = 0) {}
+ 
++        void initialize();
+         void createSeat(const QString &name);
+         void removeSeat(const QString &name);
+         void switchToGreeter(const QString &seat);
+--- a/src/daemon/SeatManager.cpp
++++ b/src/daemon/SeatManager.cpp
+@@ -93,8 +93,7 @@ namespace SDDM {
+         }
+     }
+ 
+-    SeatManager::SeatManager(QObject *parent) : QObject(parent) {
+-
++    void SeatManager::initialize() {
+         if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
+             //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections
+             createSeat(QStringLiteral("seat0"));
+--- a/src/daemon/DaemonApp.cpp
++++ b/src/daemon/DaemonApp.cpp
+@@ -75,6 +75,9 @@ namespace SDDM {
+ 
+         // log message
+         qDebug() << "Starting...";
++
++        // initialize seats only after signals are connected
++        m_seatManager->initialize();
+     }
+ 
+     bool DaemonApp::testing() const {
diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
new file mode 100644
index 000000000000..8ea9f21b440d
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+	# TODO: not yet upstream
+	"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index f7faee994609..23a6af119d85 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,3 +1,3 @@
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.9.ebuild 1473 BLAKE2B 754525d50ebbcdfc61cd7388d1c810b5525694488d3c2e0bbeb211786cf84a277930b6c5523e70cd1271f4dd3b1cfb4ee02e0c028fea203838dc84e700a87f6f SHA512 552060d701dddc62301e9def4e2c18b14a3ea7cb3137103d1a1884e7df4708c8938a3135d3fd0483e1298f63a233d8d0086a9feeabff985d7ff31cc01e90ac60
+EBUILD shared-mime-info-1.9.ebuild 1472 BLAKE2B 8c6ab7f9d7e776e6ba3db6afded29906ca3fbbac555a0807cc5a9bbc8742db1bddf09fdc91ff1a865589cf931cbffcee8a41f0b4c41d79095d0b92cf00acf16c SHA512 54a8e5dae7e3324b1d116c62c7f5a6c1bd9918296fe905fc4c4c5fed68e26b61d5b63f74ccb7a08431208e38efa75ff01edc5779777d865f3ce12abe4118569d
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index 45d4ab96953c..71d4fed745fa 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 366d40f6d047..e8eee702e2f6 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,8 +1,8 @@
+AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
 AUX spacefm-include-sysmacros.patch 449 BLAKE2B 29258b6d1a23291e51a5c4be6e579bca5d965b222a32caa7ffe52509d1ede342772db9b4defbd639f992ecef0bfed33d6818e59a4c0e992126898e60aa073318 SHA512 276ff68ed7c08d02224d73089a895e044510accfc160e06abcd7c55b8dae4b9443f67ad5ba36c07d51db37afd64b5a2da8085e7ebad6e46dfb60459b10f3a99f
-DIST spacefm-1.0.4.tar.gz 3487476 BLAKE2B d32732207ae0bf77f918d7bf59dda563a2a504ea36727dbd5f791de15275d5787fd0514794faf7ddca53bb6abdcb46345082b535580f756538cd7a6319d0e3c0 SHA512 bbb3d3048c62b0223799468e24abd8614a75d9118ad9d8493e7118882072fb3401f086239dc05a4a742b39b40520771de5bc9fe6735a2c5853ffb5aa961e6112
 DIST spacefm-1.0.5.tar.gz 3491483 BLAKE2B c00ff3d92e01095b854ee4948ee8827ab32f454d4fd19e496f3d4a70dad2d8a98b67f6cca53d2026d15eddca23b1b6ac5f0394a66097a4efdd0f42beeabd4ffb SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
-EBUILD spacefm-1.0.4-r1.ebuild 2553 BLAKE2B 57ee3b44e4cacd1bdec69dc226aa3ed1b46fb80137739755cb9695df7866687fe1c3e5969872b9d32e542480a22007aff8030c847b4f2fca7376b296d4b8da08 SHA512 385140f2087c8b559d4588779e19c83b78f13f6962dfeeffefacf7a4983fdf5325c89f9ece641b3de29903e2a23246ed34b405dd58afb20416935f4bcf61f80e
-EBUILD spacefm-1.0.4.ebuild 2456 BLAKE2B e7a80963463f101034ab888302cd718bbedc4a5eb9b712a00e8105d9c354226831ef4651df7cee3173dd976ef6f762a2ec5f528167310e138671a7aacb0e84f9 SHA512 b6466744c58725327cfb47e317d809851bb5fa34e82eb9fe7ec472a7f9a9084f68f612f85e5a0dab2e60c3f7837692416c4728d36234cb7976ece256286fd27a
-EBUILD spacefm-1.0.5-r2.ebuild 2520 BLAKE2B 79c173dac5cb6b3579ecf6ca7566629c5074a64b93c13842d2642a3c8b4e178b5239a58ee9de002177d2860beebd20a616c41bad54b8be33cbea03323a0e7043 SHA512 e7c076c181bb3ac05d096e77d88cbedc2c803b714abdab52461ce195aa8e9441adf7f7b8a3986fb8db025e38e24b0b63813b2668236775829610311a55c6f423
-EBUILD spacefm-9999.ebuild 2454 BLAKE2B fad9f063f5adf173dfc72f7d507d9e8745d43e646e2a08df931a2cc67398b121bd8de0922655c17e0704c1910befd8cb885ec95ff6f9cc82c902035903358375 SHA512 5da5de98185ba9fc9e6eb74ae37c56c6442b5a25483de205563b285dd36c2c6b3dd6407b891a95d6b4d348883522f4936880c5bed7327845a887e864c25f58ae
+DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
+EBUILD spacefm-1.0.5-r2.ebuild 2467 BLAKE2B 4da4b06f00fd300d98589abe6ae1314cf32aeedb8240a7bf0bc50b75fe2a92125f8c6ead158bc1a680db52154363ecab4e696da619c17248b6572f96568f997e SHA512 a3201aad465c716325eb234fee9f9fb295c9e145456ef2fdab51bd72508b9b6fc1ef147cdf62de181cfccb0c42b4d4d143aec7e53bb371a62b33fd170ac32e2e
+EBUILD spacefm-1.0.6.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
+EBUILD spacefm-9999.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
 MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
diff --git a/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
new file mode 100644
index 000000000000..3a586bba4395
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -30,6 +30,8 @@
+ 
+ #include <locale.h>
+ 
++#include <sys/sysmacros.h> /* for major/minor, dev_t */
++
+ #include "main-window.h"
+ 
+ #include "vfs-file-info.h"
diff --git a/x11-misc/spacefm/spacefm-1.0.4.ebuild b/x11-misc/spacefm/spacefm-1.0.4.ebuild
deleted file mode 100644
index a737494cf829..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	>=virtual/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 75f58c0e831d..bcf8d506218b 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils linux-info
+inherit gnome2-utils linux-info xdg-utils
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.com/spacefm/"
@@ -32,9 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -47,13 +45,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 
 	einfo
@@ -83,7 +77,7 @@ pkg_postinst() {
 }
 
 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/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index cbea0f7944a5..d7f32ee9c498 100644
--- a/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils linux-info
+inherit gnome2-utils linux-info xdg-utils
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
 
 RDEPEND="dev-libs/glib:2
 	dev-util/desktop-file-utils
@@ -21,21 +26,19 @@ RDEPEND="dev-libs/glib:2
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
+	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
+	!gtk2? ( x11-libs/gtk+:3 )
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -48,13 +51,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 
 	einfo
@@ -84,7 +83,7 @@ pkg_postinst() {
 }
 
 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/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 25aedc589950..d7f32ee9c498 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-EGIT_BRANCH="next"
-
-inherit fdo-mime git-r3 gnome2-utils linux-info
+inherit gnome2-utils linux-info xdg-utils
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+	EGIT_BRANCH="next"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
 
 RDEPEND="dev-libs/glib:2
@@ -22,17 +26,19 @@ RDEPEND="dev-libs/glib:2
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
+	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
+	!gtk2? ( x11-libs/gtk+:3 )
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -45,13 +51,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 
 	einfo
@@ -81,7 +83,7 @@ pkg_postinst() {
 }
 
 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/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 7ab901ea4947..c6fa500b88e6 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,4 +1,4 @@
 AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82d3fe2db57ece7a4e564d99990de901e6a01e7b8013a840717a67ef798d34a08c9ebea03d4 SHA512 5e9685e8e2d8933e9b3bb2f3dc92ad677f38b63766bdb407cef7373590ed8d0e73aebd1ed6e489b39c8b1477c50657df499a7b5e50c09df1e675448dcad7f62c
 DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
-EBUILD sunflower-0.2_alpha59.ebuild 2229 BLAKE2B a15b22475fe10ab3c16dc740b2fd777614243141cc014eb2b2a9c64c3420dee936d6e5e250bf6218222ffb8738aa73a9c43a0af7ebfa56d4ff15d6bb30678f27 SHA512 7f9dd3d6cc75f6c4a24bf6a37079c10d5c1759a473a1f6dac861b9fc03d581aacc8210e9227f59417bd6fc2f1b5c817539329870f6f937b21d1adf75b2aa8ca7
+EBUILD sunflower-0.2_alpha59.ebuild 2181 BLAKE2B 227baca89b619f4a135b4512c89870fd6f8da2f3a283ca92da0cc6ecbb1e2302e1a08406bc9cdc07a4d1cbeb78b91cecf9b8f7dd1c425053bb7b32807337d3b2 SHA512 3797f36f11bcfc52ca8609302535ef9630005a9ba3ef44be50e2cc9aeea70ba226c1f6d61af3b1a9929c7c168b35c0b23dc038cf5c20151c07f55bbb16cf347f
 MISC metadata.xml 246 BLAKE2B 7099b03dbdc83bb431d016b138aaaca822d446228011fa4250a0e25dc6ee04c19cbe8751a37c46344f9f7e4be3009d07c4a32b56a624d29ff139c33077b204d3 SHA512 01388829c888be4f666cb2b98b60d02645f4546bb87d5bf0064f3af8845c324f91b658a4f003cf472d1da25811f5006bd88bae25e01377330e2f8949dd9fa75d
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
index 9d84a9408426..848b84a56f6f 100644
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime gnome2-utils python-r1
+inherit gnome2-utils python-r1 xdg-utils
 
 MY_PN="Sunflower"
 DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_PN}
 
 src_prepare() {
+	default
 	find "${S}" -name "*.py[co]" -delete || die
 	find "${S}"/translations -name "*.po" -delete || die
 	rm "${S}"/translations/${PN}.pot || die
@@ -71,12 +72,8 @@ src_install() {
 	newmenu ${MY_PN}.desktop ${PN}.desktop
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 
 	# TODO: better description
@@ -87,6 +84,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index aff0bc13025c..32d93b51c150 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,4 +1,4 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1123 BLAKE2B 36fe4f1f897ecc59ea9fde34455e259c914578d9f2f59b6cd86d9cfcc9c8b03ab780a9a950dfd8b37d17769976978824fe4391038bfbff2db0ed3d4d0310512d SHA512 c7398644f4ed1c973dfe895264524cfa5ed7867f040931eafa457899ce999730bf3c911d345102e09ca07dd11d79c5cb4714fec3356ea998bd448c874e8928f2
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1122 BLAKE2B 577885776234f0d6aeef63a39be55b63276a235ceb982ae2ddf23c0009bfe58a8885d83b8f3a47f93443be33b5e68741568d44429ade2887fd25a250712bee7b SHA512 552c83d6480c78b59804773150434e25aa9923ca397a3e0d63ad16d882c3a6649b66bb2ad54cf60f85cf324e6fa9c7c88fd4526070dfd1157f8aa34ee17d283f
 EBUILD xdg-user-dirs-gtk-0.10.ebuild 971 BLAKE2B 9306d5924f7f693a53fc7f20762bbe08e019ea20631ae81eb240011ecf00b44a96302c33cafbcf0a102aedeb33b4df9403babf2114ba0740b4497795b5234a18 SHA512 a0329ae6018e58854ee3af912f16b079f919c3a90628d3cdc683774b7a5ec54baf8149746d16eb75c0628e093bfadbfef0df7700886783d0b660877194a49f0f
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 352945dd1d20..0097701ff430 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="