gentoo resync : 28.04.2019

3 files changed, 2 insertions, 78 deletions

diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index 551c8d9d71b8..c5733580dfea 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,6 +1,4 @@
 AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
-DIST mate-menus-1.18.1.tar.xz 359768 BLAKE2B c57095e772610c56a02a5b6b1405c5ccc11cb590ea959efa14bd0ffb5cafbe3a678f8a681e39ae9cf607225f57becfc520ec483e6451f07b7f9e80418496502b SHA512 bfd010735acd3447700a4732da16728d429ca8ba559c6bfc6edfdaea52f4e40552882bb09615fc4f040730bffac7614bb74fe18aee3ab8ee1684dad40a82d572
 DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
-EBUILD mate-menus-1.18.1.ebuild 1662 BLAKE2B 769dee26a473f7ac70de68ea19596f888c2552f92be6a1e590caa70e352657b17f89882d5a86389141fbfc07377bf188b09325eccc70c3942e6d5f326d5da7ec SHA512 a34b7ef40a6bef926514bdfebdff1ac3a269aae1c02372c72f95e847cb1ecd5254d841c5795b8b95f912a4b566635fa2330d8115340b8ce8188939e884e442c7
-EBUILD mate-menus-1.22.0.ebuild 1243 BLAKE2B edaaef29997a53690ed0609f5c71472e713c9215b706b86736f3ad5a63ec82f3dd7c7f5f5eba746dc306e821834000c070031291accbbf406e6c6533db2077a7 SHA512 feb748cafb32af050ed2c3240586e2f78af8180cd8f307be97de1f8fa80dce074f964d15969a457cf001990b74dc74efc0cae9e7d1c01f4472a235c47629c758
+EBUILD mate-menus-1.22.0.ebuild 1241 BLAKE2B 528075625e963e20aa0ba14add0d55a10868509c1a464c281816c9972dea125fd1b2ea312d92fc90c129cc7261ec0ed85648a7c56e50a6a6154bf4ee7aed332b SHA512 edcbb1c98c76ab1d614e08be3054a8bbb1126856c29e437136498548d63315a7030db225774bd46ba9f4e5289df4df3df269a9dbd1389c1049ea30e81639274f
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.18.1.ebuild b/mate-base/mate-menus/mate-menus-1.18.1.ebuild
deleted file mode 100644
index e549475bddf7..000000000000
--- a/mate-base/mate-menus/mate-menus-1.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
-	virtual/libintl:0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-	python? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_py_cond_func_wrap mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable python) \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	mate_py_cond_func_wrap default
-}
-
-src_test() {
-	mate_py_cond_func_wrap emake check
-}
-
-src_install() {
-	mate_py_cond_func_wrap mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	einfo "Due to upstream bug"
-	einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
-	einfo "it is highly recommended to run the following command"
-	einfo "once you have logged in to your desktop for the first time:"
-	einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.22.0.ebuild b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
index 02319461b199..c7d1f30030ec 100644
--- a/mate-base/mate-menus/mate-menus-1.22.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"