gentoo resync : 01.12.2017

5 files changed, 18 insertions, 172 deletions

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() {