gentoo resync : 28.04.2019

3 files changed, 5 insertions, 45 deletions

diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 31f40dbbb67f..8ac33440bdd0 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,5 +1,3 @@
-DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8
 DIST mate-terminal-1.22.0.tar.xz 1538540 BLAKE2B 490ff1e2a0d8c93b2ab2479c8a735867f551111585d82d353cd7a150f1fd5e4e1319dc25832628b464572734efc2fa4917b49b7d4fe5d63b78ce6ea5601e4611 SHA512 45932db8c50348386a58ee7acaf08af43e28bd495dac08b4dcff5defd1c10189163bdfd73c61015674d61f275dabc2f749b2e0cbf9981c7dfdef5a4060686645
-EBUILD mate-terminal-1.18.2.ebuild 750 BLAKE2B 7b19c0857d4811baa6bd37d72a9f90724d066ebcc3c6b957fc48df48d99281f466d16a65306deb4f06ac695e94028d34178b66f58c73ad314ddaf0a94e943c3d SHA512 ec47a5c0b80e3384beeff37faf971e9b5f14ca9bdbb79f9388db87a3c2ce457655ec45f9c3b5dc29bce2d6abca8891590ff92f636f015025c1b7eebaa9272b89
-EBUILD mate-terminal-1.22.0.ebuild 713 BLAKE2B 0d4696a0a12f81c0fadb8344f17bbec510e9a5029b3f17b179794922b696d5d966d64c6a34907c1db58ec41d89cb58227825b677568d14e41ffd7addc05d75d4 SHA512 61c9129bd7822c0c11b20d636977eb5acd6ca420a6887e02889dc2c9b2d90068906d85de8c99113e75fa5928f5fd8d0264ff995610f3d79957c906ddebec383d
+EBUILD mate-terminal-1.22.0.ebuild 728 BLAKE2B 757969571c9dc5dcc7afd3de3f112e0d547651249b8c1250fab727c79f15af231a547c6372680a59a2523efb076b77494d99c5625effb3fe7e7d3942930809ac SHA512 7092016db2a2e61ea2d42dcee4e95cafec3af87dd8bae6998ef8073ffed7867972f96377872020ac9e3187917efaaa7653b17d004a56817ece9776f8dd10c377
 MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
deleted file mode 100644
index fbcc14a77757..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/gtk+-3.14:3[X]
-	>=x11-libs/vte-0.38:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
index 284c36dd04e8..f903201bb2f8 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE Terminal"
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig"