gentoo resync : 28.04.2019

3 files changed, 3 insertions, 88 deletions

diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
index c44ae508eb5e..eb76e62e7c6c 100644
--- a/mate-base/mate/Manifest
+++ b/mate-base/mate/Manifest
@@ -1,3 +1,2 @@
-EBUILD mate-1.18.ebuild 2576 BLAKE2B cc156c65df6b3d72b2abb6cc0c49131d0eba04e3c9da771304aa04c51a41cce63f2deaf06393ad689cd3f6985b7c51f51d4fff3b1edd197a78a34d831b9cc8f8 SHA512 75841b52b473e25e4436099963000fab949cd89272d0f68fb664a5f155625b208a900c3463e1d524412dfe951639de597533733923b84aae3e40626011f47fba
-EBUILD mate-1.22.ebuild 2491 BLAKE2B e8dfe19753da5e4cda977c196020ccf6e54567cc82a63251e69cef7489c4a4842067f8cfe3c9e8e395f8c7419c2c1def52f5ef5ba55d51ce6e9b33f1edca7771 SHA512 7468d6f82cd813ba8366a54423d254d514f4c380ba777113070abdd6a3094c97a3d0ba4e3bee3daad1386b080bf6e3e41853a67216610b2cb7807981bc4f816c
+EBUILD mate-1.22.ebuild 2490 BLAKE2B abfd4c3d91446a8eaf4a7f197b59142625bca9fc2338e84848b6a77101969be369c6150fb9fca90561c3ee43f68c93be69a0fc15b7492b8c95ff8b3a276b7e07 SHA512 91af130aafd1f15cfef653647e00c64b15523773a6950d49d890cd361f017099a04da277d5e5097b6fb0d57ed62c557c63b7dd646d996dd52e2fb482f8081607
 MISC metadata.xml 1342 BLAKE2B da370118ca35235d9015c6fca17a4766067c1bb5393a68cbb84caa724ef970cb30925c6c5b4eb59fdc5d67eebf6c7031173de7bf868a61108cb5bb7354207d3e SHA512 cd369cf3b32404c16975cdda320043b27898838b2d5c3732bbe2a62f16332eab9f55a2c00e7f8bb1f98cc5cf7d00ec6fe40b74a106b7b72db5f252ec576aff85
diff --git a/mate-base/mate/mate-1.18.ebuild b/mate-base/mate/mate-1.18.ebuild
deleted file mode 100644
index 0a80191d8d5d..000000000000
--- a/mate-base/mate/mate-1.18.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	MATE_BRANCH=9999
-	MATE_THEMES_V=9999
-else
-	inherit versionator
-	MATE_BRANCH="$(get_version_component_range 1-2)"
-	MATE_THEMES_V=3
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-SRC_URI=""
-DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="metapackage"
-
-SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	=mate-base/mate-desktop-${MATE_BRANCH}*:0
-	=mate-base/mate-menus-${MATE_BRANCH}*:0
-	=mate-base/mate-panel-${MATE_BRANCH}*:0
-	=mate-base/mate-session-manager-${MATE_BRANCH}*:0
-	=mate-base/mate-settings-daemon-${MATE_BRANCH}*:0
-	=x11-wm/marco-${MATE_BRANCH}*:0
-	base? (
-		=mate-base/caja-${MATE_BRANCH}*:0
-		=mate-base/mate-applets-meta-${MATE_BRANCH}*:0
-		=mate-base/mate-control-center-${MATE_BRANCH}*:0
-		=mate-extra/mate-media-${MATE_BRANCH}*:0
-		=x11-misc/mozo-${MATE_BRANCH}*:0
-		=x11-terms/mate-terminal-${MATE_BRANCH}*:0
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		=x11-themes/mate-backgrounds-${MATE_BRANCH}*:0
-		=x11-themes/mate-icon-theme-${MATE_BRANCH}*:0
-		>=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0
-	)
-	extras? (
-		=app-arch/engrampa-${MATE_BRANCH}*:0
-		=app-editors/pluma-${MATE_BRANCH}*:0
-		=app-text/atril-${MATE_BRANCH}*:0
-		=mate-extra/caja-extensions-${MATE_BRANCH}*:0
-		=mate-extra/mate-calc-${MATE_BRANCH}*:0
-		=mate-extra/mate-netbook-${MATE_BRANCH}*:0
-		=mate-extra/mate-power-manager-${MATE_BRANCH}*:0
-		=mate-extra/mate-screensaver-${MATE_BRANCH}*:0
-		=mate-extra/mate-system-monitor-${MATE_BRANCH}*:0
-		=mate-extra/mate-utils-${MATE_BRANCH}*:0
-		=media-gfx/eom-${MATE_BRANCH}*:0
-		sys-apps/gnome-disk-utility:0
-	)
-	help? (
-		gnome-extra/yelp:0
-		=mate-extra/mate-user-guide-${MATE_BRANCH}*:0
-	)
-"
-
-PDEPEND="
-	notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0 )
-	virtual/notification-daemon:0"
-
-pkg_postinst() {
-	elog "For installation, usage and troubleshooting details regarding MATE;"
-	elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
-	elog ""
-	if ! has_version x11-misc/mate-notification-daemon; then
-		elog "If you experience any issues with notifications, please try using"
-		elog "x11-misc/mate-notification-daemon instead your currently installed daemon"
-		elog ""
-	fi
-	elog "Some packages that are not included in this meta-package but may be of interest:"
-	elog "		mate-extra/caja-dropbox"
-	elog "		mate-extra/mate-user-share"
-}
diff --git a/mate-base/mate/mate-1.22.ebuild b/mate-base/mate/mate-1.22.ebuild
index eb43ab877759..20802025cab1 100644
--- a/mate-base/mate/mate-1.22.ebuild
+++ b/mate-base/mate/mate-1.22.ebuild
@@ -10,12 +10,12 @@ else
 	inherit eapi7-ver
 	MATE_BRANCH="$(ver_cut 1-2)"
 	MATE_THEMES_V=3
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 SRC_URI=""
 DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
-HOMEPAGE="http://mate-desktop.org"
+HOMEPAGE="https://mate-desktop.org"
 
 LICENSE="metapackage"