gentoo resync : 28.11.2020

5 files changed, 11 insertions, 149 deletions

diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index e49c1fcd80a1..32a777c3d9a3 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,3 @@
-DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
-DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.1.3.ebuild 1723 BLAKE2B c51fd7a13db5017dcba222763ad6216a0ade38a4f582bb489e1edfa024fed6a9c3dc1574c7a71c1595bcd8b3a10859c2e08a9d8ff07e7d230b4f50699c1e1607 SHA512 56d61fb1b722ab74129d3fddf710836908c8ad592a48bac21756bc4b537ec38e26b02025f362ab967f5a8caacd369dc78acb64b47369ff58d6de1213dcbb0cd7
-EBUILD menulibre-2.2.0.ebuild 1749 BLAKE2B 1345ab3161fd786f01c9e1620d9a6dfb39b259004fff60f080d682c9bd701acc3c9e634576dac60f1664a16d4da9d83be15cf3aac0b0f6cfeea3f162703a8614 SHA512 70a349ef2442e2ab151c4b41a4d9274bbdc0a20bc211525835fa582c22777c127ddef13e4024ec375f5e70cb27ae6521fc2b5dd2438985f0992b8234e4cb67f8
-EBUILD menulibre-2.2.1-r1.ebuild 1727 BLAKE2B 5966f2f183ac516ce90e97b9a6a663ef13f64d0ae7fd74070898f51e0ff79b7f528e9c58d8f716e68e672a9ef6a0b4eb09cbd4fe3874aa45b5f5b3ff71a52029 SHA512 0ae52b863d772525c802ee96c2dbcda790636e7d8b79aa5ffb92e72cff6e0494ac99e2e91bb047b26264a3bad333d3f5f023331c86407783745a0b1654fc652f
-MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
+EBUILD menulibre-2.2.1-r2.ebuild 1831 BLAKE2B 658b37f8e1e218b488040b32048ba99489590c2575f59ef261a8afb5edbf9b5d22ecdfc4e47e48cca992dbebc7ff024715eab51e0ab956205e3c9558875a2534 SHA512 abbcb4f26c42eb1ab48790428cce295819f803474ba2ee63b6e75a3b4ae799d623ce4d2f57b1953c255e8ee2815d14d9c614a27b1e8d35313d6a90576dcb7ee3
+MISC metadata.xml 244 BLAKE2B 074f1e921f4d984a8bb58f3ff2800ddc85868c9d33c331dfd7a19503c02563f9e291876e99a3f4bc9afd171fcd8299e5c22d46bc24ec9ca475fa88d1535fb112 SHA512 0929c8d7177ffd5ac6e346f4bbfcafa764105312388307b7a8cf240d72f385437beb275aa530b4ad0248e807e5f42fa4f5437affdc94557baa1ece5a9f5586fc
diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
deleted file mode 100644
index dd50aff51167..000000000000
--- a/x11-misc/menulibre/menulibre-2.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils gnome2-utils versionator
-
-DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="http://www.smdavis.us/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/menulibre/menulibre-2.2.0.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
deleted file mode 100644
index 5cf36a0a2080..000000000000
--- a/x11-misc/menulibre/menulibre-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-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;//' \
-		-e '/^OnlyShowIn/d' \
-		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/menulibre/menulibre-2.2.1-r1.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index c6a12203f650..809ec3163aee 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit desktop distutils-r1 xdg-utils
@@ -25,7 +25,13 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	gnome-base/gnome-menus[introspection]
-	x11-libs/gdk-pixbuf[X,introspection]
+	|| (
+		(
+			x11-libs/gdk-pixbuf-xlib
+			>=x11-libs/gdk-pixbuf-2.42.0:2[introspection]
+		)
+		<x11-libs/gdk-pixbuf-2.42.0:2[X,introspection]
+	)
 	x11-libs/gtk+:3[X,introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-themes/hicolor-icon-theme
diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml
index 79cb8248024a..f7ef72e8736c 100644
--- a/x11-misc/menulibre/metadata.xml
+++ b/x11-misc/menulibre/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">menulibre</remote-id>
 	</upstream>