gentoo resync : 14.05.2020

5 files changed, 2 insertions, 109 deletions

diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index b1ddb196bbb8..2076af127646 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,10 +1,6 @@
-AUX 10-xdg-menu-mate 113 BLAKE2B e49a76bdbbe1b08782ccd216afbc40bc49b4b16cb399c29e7a6860154cbd0d6d2712f85bd2edef53e9f53a4d92d29ec9524916f123d44e930a81cca3e60a3cb6 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef
 AUX 10-xdg-menu-mate-r1 192 BLAKE2B e8614b8fa478d0fcf2cdd99b8f3a4c0ec9d82c98b550a767e552bac8105ab354de8e75e43678faa7130674b4047178bcfa45d8884f21ce4b6f3a12c6ba8a8768 SHA512 1f7be7596465c4c3116add1a73517582dc9463f0b7845ed9e9e61416e45afad0c10c6c923ab125a2542d9cbdab0f37bfcc4df8007dfc7d925ad617802278f258
-DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
 DIST mate-menus-1.22.1.tar.xz 351080 BLAKE2B 3ec947d6befefc838580547970ad7753c914077faa8cde2f37b9f3c48cd5d1223f382b67992826017e8ab16353c7fd2b4749a0fbd615668c0a4c6ad638c26014 SHA512 2766cafa35c11da6f6d5d6129a5e39c09e73ca97f72382df757091198260a342d278c53f88cddf75e174231443c1015198dfa1800b3601d5b770553ec7047a00
 DIST mate-menus-1.24.0.tar.xz 404028 BLAKE2B 18bea0a6c21444b0b568564d0c15ba0e231643dfcb9c74d6ab9a08cd57cab2289436dada030397737667f5a51c4ab39ab06fff3f585347ebb5f7afc40957acc0 SHA512 27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406
-EBUILD mate-menus-1.22.0-r1.ebuild 928 BLAKE2B 51efae7373be4fa7f6f937561ff34707879e657a755b317af4d31045032a8484c41f9f0027c58ddbfeeafcbba791fafa309102576dc064221aeaafad3a30b3fc SHA512 38ef3454e755755d8f450f4f31d5f483a34231764ad00b55453cbcb975cb662c00eeb9b77fafe180d0468a9581b4a0a9dbd5513174778202595264438985c3db
-EBUILD mate-menus-1.22.0.ebuild 1253 BLAKE2B 541d7d7179cd35e08a50bcf5d87397c8f6ce1eba0583821137b919a28aff851eafc14f9efa59f352d01f659ab19dc16c8eaaea532412c774e5eebb8300e70f5f SHA512 d6c4855fb35ee948d7e69dc4ac3b8e765596908e7b7614c002d250c3487de466baa1a56205335707b86ec1b5940fda397bc5e4ec8211e4b7abbd7b93053ea21f
-EBUILD mate-menus-1.22.1-r1.ebuild 951 BLAKE2B 31cd55939d695daa5d004253d150a3933073e466bc3347006a6282cc76e154d709a342d84cc9ef2629d0c1c15f436dcacb4a1438a4b0e6f8c43d96b5789c3c89 SHA512 c08131221ca9e2932bb89afcafe5281341d4f04cd10af2a7b8d7db0a47077051a48337cc24f3f9e1cc4404d271f6847eea2ec2df12b5e03fa4fda1a769542a40
+EBUILD mate-menus-1.22.1-r1.ebuild 949 BLAKE2B 3906ccceb56c9eb55e925b40b67181e04f6ca591124e740284a5bd8bb5db0ad47f98696e0faab9f2bcd555c9f7c4f36ac140a29f0cf6a1fe70dd11b957d294f2 SHA512 6f5e49de065a52e950c9f8a41a046e706d07586b9d794a5b8700e1ca10e9954fac941e1e0eb5b1d789d42419961f51ac300a40ad3d0d74917d8af2837e29fe1a
 EBUILD mate-menus-1.24.0-r1.ebuild 917 BLAKE2B 6ec2d65ad47a01d850f1657361df54e0a03bc70fa46534b05e7222fc4bf13abc94ca1f8521c3961d08e8bbc7a3286a4a006937b0ae8aa4d4a2ecb1b439b8f73a SHA512 51383ada42d94970a3ffa202183fb36e90933cdbd8ef137207be3c4acece229491d8b0477ab5e245a7e948b11e460891d8316834beb7d304dacfd14d1f882f89
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/files/10-xdg-menu-mate b/mate-base/mate-menus/files/10-xdg-menu-mate
deleted file mode 100644
index 06a6a91368e2..000000000000
--- a/mate-base/mate-menus/files/10-xdg-menu-mate
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
-then
-	export XDG_MENU_PREFIX=mate-
-fi
diff --git a/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild b/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
deleted file mode 100644
index c93dbf13c79c..000000000000
--- a/mate-base/mate-menus/mate-menus-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit 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+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="debug +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable introspection)
-}
-
-src_install() {
-	mate_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-mate"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.22.0.ebuild b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
deleted file mode 100644
index cce14f63a6fc..000000000000
--- a/mate-base/mate-menus/mate-menus-1.22.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit 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+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="debug +introspection"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	virtual/libintl
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
-	# usage checks.
-	mate_src_configure \
-		--enable-debug=$(usex debug yes minimum) \
-		$(use_enable introspection)
-}
-
-src_install() {
-	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.1-r1.ebuild b/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
index aa489e3e46e1..d9c99716e9be 100644
--- a/mate-base/mate-menus/mate-menus-1.22.1-r1.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.1-r1.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"