gentoo resync : 15.06.2021

3 files changed, 3 insertions, 73 deletions

diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 4f177969a7c6..33b28a89935f 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,4 +1,3 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-EBUILD mozo-1.24.0-r1.ebuild 1307 BLAKE2B a4e55fc8b3228628be14cd3bbacb586a80d6dc24b107b6bf1deaf98b1762520b30598ce760191f5b2dd21d2d5b5a99405dd01c020d75bb021503d652cedc7092 SHA512 ceefd56a3f567855628548e3dc41c0014ff6698bfd949492ac85abf2d9e69c193c335752b2d66e74468d71ba3fc91e396b98fe78f1c214cf03632a3c54b66815
-EBUILD mozo-1.24.0.ebuild 1305 BLAKE2B 5e236804dd509d7642779b32a234cd973a6fdc9dd8da14a5eff289926bd79d7c8d417c839398bb4edc727479a68f7e1c8d646d0bbc4f76fad0188427de03f1fb SHA512 b274d1eaefb87f5814cd73cd792112b5ead29e1a0a7c00ba458286fedc2c3afea7a343bf790844c3c1b1b4892dd482253eeedc87261cd2732ffe26eb2ce1bbc4
+EBUILD mozo-1.24.0-r1.ebuild 1306 BLAKE2B 7a74f935c11b69f25805582fa9ecbce944a2dde952edf57e400fc428172e397a6502dbd28b2f9d7ef39350e174b59bdb99cbbe0e50768534714ef6d9ccfe45c3 SHA512 e88938967f3cb8a244b36d83d7c0ddc1d719a01c23d04d447a2d388a267ee23652093a5aaa5f85fac0f8c79bfe7d0845acce4085ef2cde0c11e6fda0e6a41196
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 2ef330c227b0..b47cd465c038 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 
 inherit mate python-r1
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
deleted file mode 100644
index 44cf4f3240ed..000000000000
--- a/x11-misc/mozo/mozo-1.24.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=6
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.21.0[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	!!x11-misc/mate-menu-editor
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-		python_optimize
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}