gentoo resync : 28.04.2019

3 files changed, 2 insertions, 70 deletions

diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 20f228f43c94..43e43066de49 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,3 @@
-DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
-EBUILD mozo-1.18.0.ebuild 1244 BLAKE2B 905b4b829c793d2f92e1dbce3789899dfb453723b40d8583bc1a3d4436c8ca670c70ed477ac6ba239f0116291a2496860215ec3b5e8c6926b4f2cf6e252f3044 SHA512 89c75d5549f13452ca1e642f46aa6011e055fd82a435e9ee027a6a3cad5caba90589dac45e6dddb8e299eea3cd5516aeef4caab3a655c72330dd9f2e234132a6
-EBUILD mozo-1.22.0.ebuild 1246 BLAKE2B 592a0aefefe293aac4f5939dbd2273905ede3fcd2710b707da5951a91f0e3e172fa3e38ff1b718c27e07d0a7476a4b4c9d6dbaa2e9edfc1c8711d43f7d7b33d4 SHA512 a6a3d232d8ac51fe27eb3d399556831bd4cf40f339b3205ae063339c96ec3f5cec35d1255793b9c50890caef875ab696f2e46be8f97f534c0203c3cb926c7ec1
+EBUILD mozo-1.22.0.ebuild 1244 BLAKE2B ae23b51bacfed9815d26460f2c7c0242f4a3eb7c28d64e4fc53a73270268ffc684f02857fade291e1cbb808f8358516327b3ec1bfbf4fa7772f4339fc91d8cb2 SHA512 fa4dc0fb9fef1d17abe494d869739f0c80217dfdd7e12acfb312a6ea3ba1598526d9f2e4243367a913a03a8767c8a9d97be0bdc679c5a6503704b2636a3b7da1
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.18.0.ebuild
deleted file mode 100644
index 8a7e1c796b20..000000000000
--- a/x11-misc/mozo/mozo-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection,python]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!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.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index 9c950c49491a..06ccd7815121 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit python-r1 mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"