gentoo Easter resync : 12.04.2020

5 files changed, 143 insertions, 4 deletions

diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index cba11b6dc621..39a00f341601 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,9 @@
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
 DIST mozo-1.22.1.tar.xz 171976 BLAKE2B c4a1166b605d3fed68b71987dbf70b7f908aabc2c7266415b0d7ce4c8ccb93ad690c72ce83a708f9d3518cfba66128d2cd4bc5413432133299595cf4d2c5a43c SHA512 6cd4ed04d43ae064077fc78ed59644bf6efe4c65c26995742166c57333d470fbe95ca4f4037e786f16dc076e75d938868948e8c2e5c662f35d971b36992f1a9b
-EBUILD mozo-1.22.0.ebuild 1275 BLAKE2B 7fbc5742a571aa0160d352298152cc3152fd567387a0e8d43b9724b31395e5cb6681a9fc6e50b30fda0b342c286528641c44dff7db939ec98416e284f3b57349 SHA512 f63067430e440ffecbc47f35da67552b05f19e812c3c185820e85ea0f9f79bdef3f72a8b9af4f1ae8f8b54e86971a4842e34d1341fd811bfb81b57e7bc21bf0e
-EBUILD mozo-1.22.1.ebuild 1277 BLAKE2B 7ce23b40c20a76644dba8216a8c1689eb3aa50455536f1e4621972fa34be97e8a60e6a0281aa0975095d4886d037df2695c35c519758c9ebce47f3aaa21b6b58 SHA512 fa7495d64a0e77f4fef860380e84b2b6ea235edc31a1c6110df348bb239e75c2a45314ad59f72ffb7ddeda59901aaddcd598146958c22b01c4a5ebbfe9d58f1d
+DIST mozo-1.22.2.tar.xz 172644 BLAKE2B 15e643cfdceb1d62f7fd1499a42bb92a4dd8485adc764d304a2b3f31ffac962fa48f2af402564a6c1598fc97ae19288f4281bc19e9ba6855aeb329ec09bbe4ab SHA512 c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71
+DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
+EBUILD mozo-1.22.0.ebuild 1301 BLAKE2B f4e91911a5ef7933dd3442f42e45eb3b54dd636374ffae6a6b0956e965e371338f9147c6ef8022285adebc536f54ca5ebd633a5cec39914070d33155b81aaef2 SHA512 87fbe1e425e8b9e08fb9b33483e8e74dba9bd759d0645fc0e49bd4e63b5547b6d67e353164ba825ff5b7ad4877b0558c27af95f783b5d6bd5fb78f764fabf599
+EBUILD mozo-1.22.1.ebuild 1303 BLAKE2B 962903680711353447af25c447a33d106e7a473d5fd0960f865de2b6d757df1061cdb7cd667719aafddd0ef39834f81672364d57a93111550fa23f5d704f3be5 SHA512 cde95566d87330c7e77e8262e8e8956be84e19712cabd146ce514ee52ebb06d59b5ac18e084afd27092bcfe7063555e52f94679bd991a52f03a1d1a2fba67c3d
+EBUILD mozo-1.22.2.ebuild 1309 BLAKE2B 2507892f09969efaf078cca388ff58f5bac750754be96b918ac49fc8be91c6c80b636399201c5370d41afa6555b6bf63f3516caa0c2c404941c0fc5a965d6f24 SHA512 7fdde45c1cb47c4d05c749fdb54e06030b4f9ed310954e1b5cf39e38ed77b2ba382b58f8b439496ffdea99252e94edd82b1fe9b863ae037d09f7ec8812f6485b
+EBUILD mozo-1.24.0.ebuild 1313 BLAKE2B 8a3e31a0b93a79d03adb9d9bd89d689009a732093e17c3c9bb2dc67b17fc255ead1b1c7eee7d32bc14f46fa93dda34909a217d94ddd93ae38a9eb2c5b10f1f8d SHA512 26b99756a8e6a5c6eb6ff2dfc1c698942252eeeea8a3ec6442479198c9533b9d642a833d170cc71bf2d4612545c328e158c977bcb03e0db6e236dcaded069638
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index e6c4de3fb470..5acaed059cd0 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/x11-misc/mozo/mozo-1.22.1.ebuild b/x11-misc/mozo/mozo-1.22.1.ebuild
index a8fcc6e410aa..3c7cb640e7bb 100644
--- a/x11-misc/mozo/mozo-1.22.1.ebuild
+++ b/x11-misc/mozo/mozo-1.22.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/x11-misc/mozo/mozo-1.22.2.ebuild b/x11-misc/mozo/mozo-1.22.2.ebuild
new file mode 100644
index 000000000000..950b638c809c
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.22.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_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]
+	virtual/libintl
+	!!x11-misc/mate-menu-editor"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext:*
+	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_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
new file mode 100644
index 000000000000..ac2cdefbe6e3
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.24.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_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
+}