gentoo resync : 01.12.2017

22 files changed, 142 insertions, 219 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b1787ceea672..3117a63760a6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index b81d371e8239..1604fbfb099a 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,4 @@
-DIST gigolo-0.4.2.tar.bz2 243877 SHA256 553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532 WHIRLPOOL 94140dc124b8bb15225248976b2779bdf0b4aeee478a6a6de30032689c33041eae28067b7cb434584628d8f722df0262aa761c641853f64a3a422ff1228d859f
+DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
+EBUILD gigolo-0.4.2-r1.ebuild 697 BLAKE2B 82c17cd33269bdac7242876eac5275cd76ed1483b4fe8df178518f3b4abe71e80ddcb6a4303365ef0f8b1c8bcc2392bff01fd8a94cf88c4178758c7f921f4802 SHA512 089d45448d92195584fe7060b84301ed4a00b5b25782afe48481749d702ba4bf5e2889630471b7745c639c544488d391a418d0890c2b0414ed54cba6ebfc5c99
 EBUILD gigolo-0.4.2.ebuild 824 BLAKE2B 2b3fc17f704a0019585442074c56ada608d23aa21b34fe7bd45a58e0920d3343359e6f8a44f0f10fd0cd2325b01e9e1ace2b91a2f5ae00fcb83f36b524c2a545 SHA512 62954a4e6aeba2d68b10ff5b0ce52aafac9cd4c3a368181e84c4c8c29e663bb475e38f1876ff0752e543a9f34f26fa7e6d2102cbeda32a3cb264a73fdebd18fe
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..2530f306a062
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils
+
+DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
+HOMEPAGE="http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -f COPYING || die
+	default
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index b0e4e43ff1f8..8385b008764f 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,3 @@
-AUX menulibre-13.01.4-GError-import.patch 411 BLAKE2B 4f4d8ba727faf8283c3257f91330cf0987f7e9d542ed891760ad876dd5bc0a9b022eba1d8c1fe35101eb8b1981ed991dc34bcc33b997f8dd2128ac4a1a8f55a6 SHA512 36f5c0427024e348917d9de3106e815aacc595d701d8e30d6df1b84bfec6f9942150e4b094cd4125e93608340f736985d93404754d03d970f4ccd4318ee476ac
-DIST menulibre_13.01.4.tar.gz 322686 SHA256 2329b426af55936dc40c7d1bcae99f98b674d06e3757657bd47dcb93d1ac45f3 SHA512 c3311443d00901d0c80078e4f51f81cc2bafbb8048a8eb1f0594e4430e9d8d1c563f4ec6b423952d3e8523f921220bb9d6fa0e4a62453d07011ae781070750d4 WHIRLPOOL b419f3285a97918796c08d0cb7681ada8f6bd19297bdfaea603c2e6256c06d775369d683f150f9c708d26ff2220fceb97d37541143bbcd9d08387e5ebd2967d5
-DIST menulibre_13.04.17.tar.gz 337166 SHA256 84cd21d92bb16cc221d7fa7ebf801a7493cce8743dd15b65d72af23d4b421a99 SHA512 7e0a2c3d765612a1c9ae9f82206fc180d7edc06dbe294bd200d699ecdb243a28ba58030b94084bc0525540f514642914b4224d766d4c9817ee7ee9ac9074b627 WHIRLPOOL d8d87c4180623a956f3c799b506c8718f1b42dcc7554df20d7e21b612f3134451250f5e5b07db0f672df40b1478b8e4189be94ea1850a8008800fe5c07ad051c
-EBUILD menulibre-13.01.4-r1.ebuild 1812 BLAKE2B f6ae918585ba8c56ed3676ed6935fa85f9e57239c5a830702c67372bad9cdb21579cb39941d1bc91600bc368a261293fe4e7151ec506419b17fa02c5ea66ec4a SHA512 dd3870b0537a40674dd3b040b6eff802691953cba75a0e603d24a5cb39a6407b056d40184e48f045f8d47aa3a26316ba78bd528e0d73137bb92c8c78e9c2f06e
-EBUILD menulibre-13.01.4.ebuild 1748 BLAKE2B c289e40d7e76d41285905a081bf97631e766ab0954031a364402b6377171bee47f88645d0993ef84488ac9fa356e4a2b1e5df7d6100c9f8ed841b6962eca1ed5 SHA512 cdb9b0171f1e5c57fd8187c7377cd4bffdf2d3bc106edfbdd8e7e9d544f52ba62e3536b39fd6bcad9a3475c6950846326526895381f2e5a93ff31c1f12aa49ea
-EBUILD menulibre-13.04.17.ebuild 1839 BLAKE2B 9ecdf9f0b0706893cd21cc9b06b585558bb738f5f5cae75e9327139d9547ba0a4dbaf1b86788415ff8095dc583d2250eff18de5a8f76dd34d707ef4039f2e7a3 SHA512 52b215eb459f653dacc0443fad6a552ea2d3ecab9cd5ad12df3012e8a7501ca0ac0357b778dcb3af65bc1e63ba1eecfebd85db18651f05a2e2ff729399776dcf
+DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
+EBUILD menulibre-2.1.3.ebuild 1724 BLAKE2B 7bccb6467d983a0f8728c510facc696380faa5376ab540d37e9b54268e3375353583811290c0ab004b72de25b48193e472533465222dd91137ee5be22a3ffe4f SHA512 c1a88f27ef8f8a6b3247f9641c948f436d562ee9fcdff0aedd395edfced57a6832288d48e0df19bcb2ca768efe4acc587503ac08cca79f3d15f7b60c21e5426e
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch b/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
deleted file mode 100644
index 6a747ba07fb8..000000000000
--- a/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Oct 21 17:32:25 UTC 2013
-Subject: fix import
-
-https://bugs.gentoo.org/show_bug.cgi?id=488866
-
---- a/menulibre_lib/IconTheme.py
-+++ b/menulibre_lib/IconTheme.py
-@@ -15,7 +15,7 @@
- ### END LICENSE
- 
- from gi.repository import Gtk, GdkPixbuf
--from gi._glib import GError
-+from gi._glib._glib import GError
- import os
- 
- from menulibreconfig import get_data_file
diff --git a/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
deleted file mode 100644
index 05f0f7df4c7f..000000000000
--- a/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils gnome2-utils distutils-r1
-
-DESCRIPTION="An advanced menu editor that provides modern features in a easy-to-use interface"
-HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/gobject-introspection
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[X,introspection]
-	x11-libs/gtk+:3[X,introspection]
-	x11-themes/hicolor-icon-theme"
-
-PATCHES=( "${FILESDIR}"/${P}-GError-import.patch )
-
-S=${WORKDIR}/${PN}
-
-python_prepare_all() {
-	# too many categories
-	sed -i \
-		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
-		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
-
-	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
-	newicon -s 32 help/C/figures/icon.png menu-editor.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "optional dependencies:"
-	elog "  gnome-extra/yelp (view help contents)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/menulibre/menulibre-13.04.17.ebuild b/x11-misc/menulibre/menulibre-13.04.17.ebuild
deleted file mode 100644
index a91dd73c1446..000000000000
--- a/x11-misc/menulibre/menulibre-13.04.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils gnome2-utils distutils-r1
-
-DESCRIPTION="An advanced menu editor that provides modern features in a easy-to-use interface"
-HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/gobject-introspection
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[X,introspection]
-	x11-libs/gtk+:3[X,introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-	x11-themes/hicolor-icon-theme"
-
-S=${WORKDIR}/trunk
-
-python_prepare_all() {
-	# too many categories
-	sed -i \
-		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
-		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
-
-	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
-	newicon -s 32 help/C/figures/icon.png menu-editor.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "optional dependencies:"
-	elog "  gnome-extra/yelp (view help contents)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/menulibre/menulibre-13.01.4.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
index 52d55e53db32..2130496f2fe9 100644
--- a/x11-misc/menulibre/menulibre-13.01.4.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.3.ebuild
@@ -3,34 +3,39 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils gnome2-utils distutils-r1
+inherit distutils-r1 eutils gnome2-utils versionator
 
-DESCRIPTION="An advanced menu editor that provides modern features in a easy-to-use interface"
+DESCRIPTION="Advanced freedesktop.org compliant menu editor"
 HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
+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"
-IUSE=""
 
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/gobject-introspection
+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-themes/hicolor-icon-theme"
-
-S=${WORKDIR}/${PN}
+	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 'sed on menulibre.desktop.in failed'
+		menulibre.desktop.in || die
 
 	local i
 	# fix incorrect behavior when LINGUAS is set to an empty string
@@ -48,7 +53,6 @@ python_prepare_all() {
 
 python_install_all() {
 	distutils-r1_python_install_all
-	newicon -s 32 help/C/figures/icon.png menu-editor.png
 }
 
 pkg_preinst() {
@@ -57,7 +61,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	elog "optional dependencies: gnome-extra/yelp (view help contents)"
 }
 
 pkg_postrm() {
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 3c0510de2356..8dcdd4291a02 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 SHA256 71a3e5f4ee246a27421ba85044f09d449f8de22680944ece9c471cd46a9356b9 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294 WHIRLPOOL 3ab648028deaa701e60c40eaa7512b9e61058995ef65f3bd3871a65352e8c9a88f82077a8bf28a59b3af07b9c66a77a046c525176e7b4831abfaf643265663e6
 EBUILD obconf-2.0.4.ebuild 833 BLAKE2B fbd647b4424a4c4772817a8a84a6b52efec376fb789845a831550c27987c906c133a92b7d8dcd3e09c5bd31824dc9068f8e845be293a3b0136234bedf28fff46 SHA512 adcf82b95af89d829938293053d64e4fb9ad216f3e48f2c85bef8048291c5a876da749ae8c92602eb61ebc54e2fcc760ec7a82f173c85dbdda549d8d4e116e92
 EBUILD obconf-9999.ebuild 778 BLAKE2B ec6ee6736f52450bcea5a09ac3b0fc2290dc1fa3df02c12c1af08cba1e1d6b3612a329fa163eef1500df1916e0e62396413c24f673476a32242f6628096aba78 SHA512 496db8493d8265b3c55d4b99e6770a27ee0a284ec1d7ff35f729074622df799a851112292272f17c012b67dca2858e18f681d8a572dd13d257054ba66192a8d5
-MISC metadata.xml 252 BLAKE2B 185f477963ef62d3d5bf168d31f1e2419900a9b18ab32f5a4d61011d8b1320d3450957d023ef9fcf3ffad459537bfa85fad5212a229cae5a626d71f7569d0850 SHA512 88682a5bace1a5e5f445a7677dff38ec94fe11168ad66f31c720c7794a98d4547999ee7b7c5edf042ce0d8781ab8455e2c093cfe773240280770f0645de56535
+MISC metadata.xml 250 BLAKE2B 923ba29298f48b552a4e9659a0a7aaed2ad5e95749b4f5043f8c7a6fca5b973762577072789007eb6f047717189be9e6aa5b6b5964a6bf13d52da6f85399b042 SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index 92696b72e60a..18e140956483 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 203c0ca564e0..850367601680 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
 DIST py3status-3.6.tar.gz 258793 SHA256 0f7af22643cbe0a1e2ba71aaae21d0d759f22062f528e1540c9830cb1900a5b1 SHA512 e0132e8d1f46a9975ead30c2b562cc86e6d7ad542c827bb2881513e2833025aa09facd8e4b4c3896a432b2dc30ff514db76548a4ed95e407ecd04c8314f5ad31 WHIRLPOOL c9033cc67134d943e78a2bab8fe10d005991cec7fcf26d013dddf0fe3681b1df1bdd5ca269e79452902943d9d18ccdf60b833038076f9349b52ea6018b8ded9e
 EBUILD py3status-3.6.ebuild 602 BLAKE2B 41e6103f3881ff12640ff512a091f2a6b68b823610f2d61091468f92f93312c229493c67d0898df37c791aa1a7e66161c5b4b102ca538b7afd7b9e2071b9c584 SHA512 00bef21f396daaedc70bb22d3ed162e82908f0f1b3dd555172c6c9a2473117100d08ca6952b34c2cf0569b14d04a36809d4a905a611095fd9524b576fcde20ef
-MISC metadata.xml 486 BLAKE2B 9cff71ee00ca3d88fa65b75a4949f18ce2f7b92012868eeada20037e4c24a5d3955d3667166a7cfa9adc1584cc9a024b92b4d8d2ae942a1e335b376587e3fb98 SHA512 378bcd232d4250773cd0d0493f93a3c26e8323e3526d83467bfb835409a8037a970804e2d188bc71bff2712c979845d06ff5396b14a25b0b7fae67dc45e40fc0
+MISC metadata.xml 491 BLAKE2B 867cd38781b9fedfbeca476c0905193823ce4a1ff99b259fa53a098dbb67ff6f1a0cd29aa19e5c6752052bd3a0a8fc96a8764e9868017d4d5ef14d4d765ca212 SHA512 24fdcee0d026225e8965b62bfc5d1c1be0f0d4618e0bb9f5ad58dcb5ffdf372696ebe035d15f5208bc310c969ef93b89d9d643a6bc9abc0f6103810abff26bae
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index afc1f98f7b9c..ca06ced2e0e4 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -5,8 +5,9 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<longdescription lang="en">py3status is an extensible
- i3status wrapper written in python</longdescription>
+	<longdescription lang="en">
+		py3status is an extensible i3status wrapper written in python.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">py3status</remote-id>
 		<remote-id type="github">ultrabug/py3status</remote-id>
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index af52202e5492..d681c724cc0d 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -1,3 +1,4 @@
-DIST rodent-5.3.16.3.tar.bz2 10873231 SHA256 456ffaa4ef3b60af1a94dad0a35f1e3986235d81f00b257a3204074a2275f3d6 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5 WHIRLPOOL 2e8707d48b879209e225c8101f2919bb5cb327794da5d872ae5fa422bf2af39c2a828f0b81d359b9e7e06c18a5d8ff77d4249980293f62ea9833711c308360e5
+DIST rodent-5.3.16.3.tar.bz2 10873231 BLAKE2B 5eca3c69d5a0427997bfcb7af8cd187fcb9f49e98988ed16a2cb292e59686d82ca93f60f8c827669df3b168d53c1da5b956d267dc94c1b67793113ae42b98954 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5
+EBUILD rodent-5.3.16.3-r1.ebuild 832 BLAKE2B 52f7086452913c6c27c0960d278592dddf9e009d1654510cee98445cc8db00abf8901b3c86500e9693393de497281cdccc2b6f62c9883fb7b6bbfdc66d62c555 SHA512 a7940a8c160de5c612185c60ba5c9fbf6514d719c3e523b704cd2e35671e4928eeea0d48d500b4ab6c9b13a5fff8888d6cf309fddb15c7f28445828e8836a6ff
 EBUILD rodent-5.3.16.3.ebuild 667 BLAKE2B 12516dd3ae259e220525bbe36bc457dd2d0a0eedf93b45c2b3339ab4316a479a88dce637a738277d6e546abc395d5354e50a8b6bb318f570f1915a2d257a03f1 SHA512 c04d873eb8e4bb2eb476df679d71b18d31c98bd2cc209fb034699a08ac8e4618ca6110937e6d92b6b20e793c1b902f27102468038549b0f25eb98198b3d68735
 MISC metadata.xml 588 BLAKE2B 88e6c27626e7b25c9a1692ec105e765578732ab218561eac5b34f9a391e1eaf9cf18f7037fc6cae1b274d738fc2ab4bba8a87d674013b3f98110f4082e1790e5 SHA512 d7e8941ba7bb1e3a3f03e4f9c6e7a3ea0c7396701b6bd6688d6de1e8b4c6d57674ac837b4e5554a605f21acbafafae7a17276e59dc18f71b2b68cd991cd16ea7
diff --git a/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild b/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild
new file mode 100644
index 000000000000..ad96bd85d815
--- /dev/null
+++ b/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, small and powerful file manager and graphical shell"
+HOMEPAGE="http://xffm.org/"
+SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/librfm-5.3.16.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_prepare() {
+	pushd apps/rodent-pkg >/dev/null || die
+	sed -i -e "/^install-data-hook/d" \
+		-e "/rm -f/d" Build/Makefile.am || die
+	eautoreconf
+	popd >/dev/null || die
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/viewglob/Manifest b/x11-misc/viewglob/Manifest
index f382a2f4176d..d407e036c504 100644
--- a/x11-misc/viewglob/Manifest
+++ b/x11-misc/viewglob/Manifest
@@ -3,4 +3,4 @@ AUX viewglob-2.0.4-format-security.patch 1112 BLAKE2B 6fd80a43df9a2dda0e45fc993c
 AUX viewglob-2.0.4-underlinking.patch 5015 BLAKE2B 721edfc97a630d303d56ec8df26c7a8ae153e01cb35f3815b9bc2479472e24d12afe225b8f28385b6055e7a2b2dab84734d27825afd0bbbfa995e404d65e527f SHA512 3dacc19e362bf5e69348eff097daf55c25bc4b9d3afe589ad49f28f01394da29f365708a15ce4c662918daefed95cb059b9d45d44b8269118812d5945a2997ee
 DIST viewglob-2.0.4.tar.gz 324752 SHA256 69ef6c62de26b2fad82ddff3fcc72e15ddf7eed7047492218f7c6387c0e7c6f4 SHA512 95fb5ef6dc412804cbff6a961ec08bf8e114eefb9ea5430aa1be2f8b2bcbb7e76ab8392e31148d4275debd6f4cada81d1ebfb08a741b8a579f749efdb8f7adb4 WHIRLPOOL e22d237e736283027991a9e2c5bf61bf275b61a34ff3f6b645d46bb69fe2c524f14b07820e03cec526b2268e0ad88c81f9b82b299df253b79d64f1e0ffcb8979
 EBUILD viewglob-2.0.4-r1.ebuild 726 BLAKE2B ccb106673b64978a2e668b87195d9651ce56a1763db034dc3aa6da7e4130f4c1ee64d7ecc87ffa6a397eaa0907317b8a620ff01fb814319f510efdec05bc866a SHA512 c3ae299f14a0d9959c1e8556708fab4f50c474428a76cd1f5aea7ee7caf5350bbedfc0c3609c159f24ae3a7de4c19861e92c1812caa7d6a597b0ecfe202c03de
-MISC metadata.xml 741 BLAKE2B bd2f2467cb2cf2f2fac53b9a7fd78f5cda4fe0334ff6534b8533ce47c12660709ffc8057ebad43340c22a897cd45d409352761559a9775eae90031312ee2c817 SHA512 97ea2f31a88dfe6b9f706b54d776e314d29832917f630e62132a799da03b3114bea1c07a241caf87bc6f212fca45ad0322e7f6b3768c0644accd07495cd3d9bb
+MISC metadata.xml 730 BLAKE2B ca1d66271877923f1e4cb69468387dfb5672ecbfcac5769f71e1ccf389975a704fa7974a804696b531dadfc056b8fe329671dd77b0db84f208170a8a7f054081 SHA512 070d4c7e6902ca6edf386cdd8dbb59b2a6a3bd59852505f220a8da478630fdad0ff0004bac1d6055f860ee10ad7497ed50c17fc93221bc43e134f4ecdb37c1a3
diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
index bf53ae30f04a..d35fe20ba4c7 100644
--- a/x11-misc/viewglob/metadata.xml
+++ b/x11-misc/viewglob/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Viewglob is a package that graphically displays the results of a shell
 		glob, helping beginners of shell usage become acclimitised to filename
 		generation. In addition, it acts as a basic replacement for ls, by
 		tracking shell directory changes. It is compatible with zsh and bash,
 		and helper files and documentation are provided.
 	</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">viewglob</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="sourceforge">viewglob</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index 9d1f53ad3cab..dfbdd5a930d4 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 SHA256 d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa WHIRLPOOL a0c5112704b94c93e6ac1fd945222c04567f152359713e2224623291f654b68cf77c03612d16a2cc78166af59a2e6dc29835bae843e26ac96815cc9f8b38deef
 EBUILD wmctrl-1.07-r2.ebuild 684 BLAKE2B bfd80835f39b4ce065f06123b737d03f7d50e7db95af6a53228a595a42296977d2ca29ae74802a317e866e2f66886eb059fd1cbd559e1689c204a40a5beed005 SHA512 577a50aa034e7e5c7193d47b6ec353fa01f7f4778e35a1d2da557930fa109603934967f31ad81de572be30e2f80fedda5b98ad33df20589d0e049805dec91156
-MISC metadata.xml 738 BLAKE2B d4e23846fb31405889b032f9ac58a176b46cd0d9630c046b06f89092355db6971edb9f710a1f87ea02e919cbde89382f8f6f7b77ebc27ff37dbae82a2d2cb8f6 SHA512 64b8e06c832fccd5de75607562f73a1287a9948e624d6a11a229c2772856cdbe0ef2beb968913795b50bebc0fe55407a69d0f3b9181ad2e0e50736a1794c0609
+MISC metadata.xml 725 BLAKE2B 51248fb91da3dd937aaf5635c0593fd6ad53382f697fafeb12e489ffac96ea397dba3fb72a6ee0d7eefcedcd7af764dd7ab39d5a3bcb6870d928864ed0d71281 SHA512 40ab1356eedf0c9df493bd7647e789b60d38c49cc7d859605ece25743867e9b75e4083f2dbd71ff61422564e6d4172ca9ba02061e35cbef2ea885248abc8fbd6
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index de4a42db7c4a..d8d016215398 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-		 The wmctrl program is a command line tool to interact with an 
-		 EWMH/NetWM compatible X Window Manager. It provides command line 
-		 access to almost all the features defined in the EWMH specification.
-		 Using it, it's possible to, for example, obtain information about the
-		 window manager, get a detailed list of desktops and managed windows, 
-		 switch and resize desktops, change number of desktops, make windows 
-		 full-screen, always-above or sticky, and activate, close, move, 
-		 resize, maximize and minimize them. 
-	</longdescription>	
+	<!-- maintainer-needed -->
+	<longdescription>
+		The wmctrl program is a command line tool to interact with an
+		EWMH/NetWM compatible X Window Manager. It provides command line
+		access to almost all the features defined in the EWMH specification.
+		Using it, it's possible to, for example, obtain information about the
+		window manager, get a detailed list of desktops and managed windows,
+		switch and resize desktops, change number of desktops, make windows
+		full-screen, always-above or sticky, and activate, close, move,
+		resize, maximize and minimize them.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 1263c10879ce..c6b0ca368cff 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,4 +1,4 @@
 AUX xdesktopwaves-1.3-gentoo.patch 1166 BLAKE2B bf494fccc21a446f3b767e40fdc53ad87a6cd5be2b7f3743b02a9570a66b56ffaa93ff7555d42a20e2a9311bf12b2ce73bbf0f61a1e86e6055f54ad429b5aa3d SHA512 03543f5244d6c22da32d845546db6ca36cf5f9c59dde9d248ef160d2824556055efb57f4becd84541b16ac82ae1bd661272fc92e8c0ac096deb32764cc849f05
 DIST xdesktopwaves-1.3.tar.gz 49302 SHA256 185a1fe56095610e95580713eec491ad1d93f4c89015ae612f214e1ccee51779 SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e WHIRLPOOL 15bea1d6fb90e58de3190ccb284985d1e444370ad9012eb55d4bbe5689a5d7f0b37c99c2c7d422459238384d459e6fdc7557926ff0d958f9031cb31843b8469f
 EBUILD xdesktopwaves-1.3-r2.ebuild 952 BLAKE2B cbbf909d3c1cdececb15e6acbdbe5a346d3d997562fdd8850e6b6e08a3066d2ed10714c9edf3c8413ec5243a146e1a8a81e3fa92494fd181a07ada86a9c91d27 SHA512 b3ee7de6c95039ce2f8b7b08d766c4e4964667a108566647b926a7a217ccbc042a50ebea2e493adb942c376274db718aaa01e8e62bf0f54198c22eb5db9cf892
-MISC metadata.xml 664 BLAKE2B 8bec7044f956d05e6bda0ef075c22b4b508c495286285a355b2b34474026ec6a580fdc8cacd2d95fd26e176c6fa47ef12d2a6b353d94f2285c465b27c4dab46b SHA512 fe2eaa4227fcc4170929f30432521129d2259578dc7b1af2fa2bbc844b4d93c6597a4cf0c2d46911f9b540ae0e45a8c0071d634ef164138b2c2174eecb0da099
+MISC metadata.xml 663 BLAKE2B 67655f76c1b276f5eceb77901fb479938a5ee591461f0f1e4a67315f8cc16fab52b52df5fdf4fcefdec0e277dbdf10cfc2d6ada8e740f69ce41fed05299c0d11 SHA512 e070ee728003491fe3537f9c8da175c576e3f21ddf42dea6c0476a849f1b0b93b30fe4407ec2a7dbe6df04219e90c0da2624ce9f709585d43517297223f2e202
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
index 5e3210314f13..678112183b91 100644
--- a/x11-misc/xdesktopwaves/metadata.xml
+++ b/x11-misc/xdesktopwaves/metadata.xml
@@ -10,7 +10,7 @@
 		X Windows desktop under water. Windows and mouse are like ships on the
 		sea. Each movement of these ends up in moving water waves. You can even
 		have rain and/or storm stirring up the water.
-  </longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xdesktopwaves</remote-id>
 	</upstream>
diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest
index 263fae03bf39..bb1c22daf622 100644
--- a/x11-misc/xmonad-log-applet/Manifest
+++ b/x11-misc/xmonad-log-applet/Manifest
@@ -1,4 +1,4 @@
 AUX xmonad.hs 1801 BLAKE2B e8235819cbd5086141def1d45652750129c8153e65c52b9e72ee9b42d3dd6110e9d1b6e3da651ff18beb9b3c61e3afaa83fff9059a7d2113a0a445d2e07e0b99 SHA512 3d20f037dabff24c69811672850734396a4c4f57a9e33e03a15f93d8e5b4edcf43dadf9d95ab82c310dbf0064e8fb7a6a0e8e330c5b51997e0dffe719dd0cb21
 DIST xmonad-log-applet-2.0.0.tar.gz 82881 SHA256 154bdb5b857195b318837ef086ddd3091d100884ada29a146ff18a5589549fa0 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca WHIRLPOOL 87bce2156b8a5f7a2c3b8b0597d24eee5238333e6a10c161a49e3cab08f3e1cdd3facfbf60ab879109b151143823e99d2d2c3470904e361fe892f950902e7d9f
 EBUILD xmonad-log-applet-2.0.0-r301.ebuild 896 BLAKE2B 7e56a15fc788f168516c42612ac3df1eddfb37c374b90c11a1ee1d4f225c5c7c5764043b86d460eb04a37b6330560d635679eda1095695bfd3b7011227c0c9c6 SHA512 f3cc04eeaaa647a64addef0be1d4786b2cd4c04ffd569e209bbca1014a836083641bade34280e242811bb901f17e006aca9a25bb2160bb43fe301c98660b34dd
-MISC metadata.xml 716 BLAKE2B 5afe336e006907f812c05a2a93acb2738a5c8cf9f6511e985b6bdd5036f8a2a27d59c6691e5949c3ef0f8fe467d67706422ed86b3de348f0a3d520686b15953f SHA512 96c994e5f75ee8af7c4695e67fc8997bc7a23b39969a0b733011b8c03edee444fd3cafb1eb47bf440aea4135f03a322ff8999eaacaf26891b3c7b8ec4af05229
+MISC metadata.xml 703 BLAKE2B 267e3d4316e1f172ed392a1aba89398454951ce86842518f7fec94a688ac33d44bc607a60f535cd8d14ec17f0223e44ad3676aa5fe1bb1de075ecd83c9cf3e9b SHA512 56427327a3d10c6ee5959f1a5b477590e9c4ad3fa1af35cd0cd28240c0bc109d41fbcc5a5244a6ca5f991f725c2273a34353e1c09e9c2418c88ab227804a59ab
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
index d916bff47cc2..5991f7685607 100644
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>flo@geekplace.eu</email>
-    <description>Maintainer, CC him on bugs</description>
-  </maintainer>
-  <longdescription>
-	xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
-</longdescription>
-  <upstream>
-    <remote-id type="github">alexkay/xmonad-log-applet</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+		<description>Maintainer, CC him on bugs</description>
+	</maintainer>
+	<longdescription>
+		xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">alexkay/xmonad-log-applet</remote-id>
+	</upstream>
 </pkgmetadata>