gentoo resync : 28.04.2019

3 files changed, 9 insertions, 74 deletions

diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 889bd36db7a1..83b2ed76dcdd 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
 DIST mate-power-manager-1.22.0.tar.xz 3182040 BLAKE2B 3635001cab5551a29ecf57ebfd84cb6f3dff9f3e16cefdbc7811c1ce9d140e543f6054925b460714ebd4aa8749e39326663866535394664b5ec2f0e94d92337e SHA512 d36ec8d328e00ccc14b26c36ded74f20ea80578870541899560c6a744018e5e91b08ec9b4d517548404e82da6f1868ed1f2fcc0aada1223f98e68dd6e6009503
-EBUILD mate-power-manager-1.18.1.ebuild 1524 BLAKE2B 46d737ef12bb186fb6d12ab081903869c9b0588e607d0c6e99028580211b37cbccfb25dc45a7500fdeb12dc0137cd1b660ca86adbb494eefe3d0408419642b57 SHA512 235ed9ad8df77b4fed90d11b39bc9cd37b2aa58aa313c0bcc6f506a020cb454a498c6e01e4969318a45f1ff4437fa9721aed3a1655ec79b1622033737eb3a020
-EBUILD mate-power-manager-1.22.0.ebuild 1600 BLAKE2B e862da75759f53096a3e37d14c4e4a633bae945ff36a69b30fcb0608e78b0b59730b961504f07a4603a24297052ddadf2bd90cce9ace33177cebfb6808412102 SHA512 126a64b5632522be9d20f876f7fb9b70b2ae4e1c7f5e499703d72be480fbd8a33300f744202aa0e918f5fc4c213fe8ee99a232764e08ffb9b76b34c67c4a4411
+EBUILD mate-power-manager-1.22.0.ebuild 1615 BLAKE2B e35d4d5c388d5ff46dfd56c22b0ef0bd6be2da3a433cabc69b0f8b8df663f72a8b92f432c5dd2a5f429fdee14b510f83e8dcdcb268fcb56e9d6366a6688d5de2 SHA512 0f94f0813876550377a681e006123e607f0aa2490973a62348b45d3b68ab5566f55750950ab568f0ebf122a6e9ad7101219c5f0236288f257abbce6628a1f261
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild
deleted file mode 100644
index 070c84c13b32..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.18.1.ebuild
+++ /dev/null
@@ -1,65 +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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring policykit systemd test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=media-libs/libcanberra-0.10:0[gtk3]
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.17.0 )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	>=sys-power/upower-0.9.23:=
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
index 9b2c5e906964..011dc99ed914 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-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="A session daemon for MATE that makes it easy to manage your laptop or desktop"
@@ -20,7 +20,8 @@ REQUIRED_USE="?? ( elogind systemd )"
 # Interactive testsuite.
 RESTRICT="test"
 
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70
 	>=dev-libs/glib-2.50:2
 	>=media-libs/libcanberra-0.10:0[gtk3]
 	>=sys-apps/dbus-1
@@ -50,10 +51,11 @@ DEPEND="${COMMON_DEPEND}
 	app-text/rarian
 	>=app-text/scrollkeeper-dtd-1:1.0
 	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	x11-base/xorg-proto
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_configure() {
 	mate_src_configure \