gentoo resync : 24.12.2018

7 files changed, 10 insertions, 16 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index d12755aac02d..4806e302365f 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index a6518ffdffb8..b72d5bf6ab15 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
-EBUILD caja-extensions-1.18.2.ebuild 1822 BLAKE2B e2a5a6e007a514c8e7313e38c08ed02733331139d1d49f586ca539d4eb21867f1d74045084b4dab74b6b140631df58e3a4b9f010bbf72689bbf0e8b2572202a8 SHA512 58a86962559d83e42c93416af19ebcb9d5bb2474537b93d4321313cb27b52bf3939e98ef595b4169fbf24bf425fc36ba53d80f8feeaee999c21046f83fdadd17
-MISC metadata.xml 1128 BLAKE2B 5f1862fa666e61097ef40a2f535941e1305a839f012efb0c47f064fa9241c637076500a92cb3458cd8222c7c0178e105fce4ad4574ebb503f39f5f3f7510524e SHA512 9a24726888b752691db1e0edfa8ab56916111ccc52a7754ed03b23037d5f7ecfd41b632364bd739e79122ae9ef3f8cf42a435637b2edf5d02caaabbf4001e019
+EBUILD caja-extensions-1.18.2.ebuild 1785 BLAKE2B 8686ddc1483e1a1e4940552016046bc0d58f4649425e12ee700c04ed190921b26417cbeceb2e2e1b577157ceebae17db6f49347c73239966a587d66eeccf6a12 SHA512 5e5e9fcaae9e6b85f9eaad9f92abb6b00f160347a35ffa0c5967fcf50c6ef4b41e9631bc68f9de7cb4b90df572664a14db9f0c57535e73fae1e1def33e9abca1
+MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
index 5f3f1dce381b..5b174d4edf6e 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="gksu image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
 
 COMMON_DEPEND=">=dev-libs/glib-2.36:2
 	>=mate-base/caja-1.17.1
@@ -35,7 +35,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.36:2
 RDEPEND="${COMMON_DEPEND}
 	cdr? ( >=app-cdr/brasero-2.32.1:0= )
 	gajim? ( net-im/gajim:0 )
-	gksu? ( x11-libs/gksu )
 	image-converter? (
 		|| (
 			media-gfx/imagemagick
@@ -66,7 +65,7 @@ src_configure() {
 	mate_src_configure \
 		--enable-sendto \
 		--with-sendto-plugins=${sendto_plugins}\
-		$(use_enable gksu) \
+		--disable-gksu \
 		$(use_enable image-converter) \
 		$(use_enable open-terminal) \
 		$(use_enable share) \
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index faa723208381..5a572b72462e 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
-		<flag name="gksu">Add an extension to support opening files as root with <pkg>x11-libs/gksu</pkg>.</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
 		<flag name="mail">Add an extension to support e-mail functionality.</flag>
 		<flag name="open-terminal">Add an extension to support an open terminal.</flag>
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 4a32631c572e..ee198d1a924f 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
-EBUILD mate-power-manager-1.18.1.ebuild 1601 BLAKE2B 283e8689669541458cb3a920f9f9b4aa6f9c4f35e0cc63fd2159b43adf1933569b4544d4c7ea6d3f3780cb6ee93c1894fff0708b5499c2be9c4e67bba525622e SHA512 153529596ca37d31b76b2afb4a143bd2ee4614771768ceb02b6a0ae5666efc01cbb09c284961b60e185b0ca25ae0a10a12ea70b76a229869394b821e3e52f793
-MISC metadata.xml 578 BLAKE2B 2417d0111c1c380d002b7a569509f58fc365d831e0b0bbcee60742f54208cf4f8d38600e7594efd110b8e5c9528f67e979fd59f4e952bb6728c9a7a6ab685d46 SHA512 fcd2da4970ae106cd4b1157c664196edc50516886815617d16d171b4e269200a0a62d4f968a6755dc8502ac5c289afa19707a3eb5bcaf46bb7730436ca0c8b2d
+EBUILD mate-power-manager-1.18.1.ebuild 1524 BLAKE2B 46d737ef12bb186fb6d12ab081903869c9b0588e607d0c6e99028580211b37cbccfb25dc45a7500fdeb12dc0137cd1b660ca86adbb494eefe3d0408419642b57 SHA512 235ed9ad8df77b4fed90d11b39bc9cd37b2aa58aa313c0bcc6f506a020cb454a498c6e01e4969318a45f1ff4437fa9721aed3a1655ec79b1622033737eb3a020
+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
index d1f7a113de86..070c84c13b32 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+applet gnome-keyring pm-utils policykit systemd test"
+IUSE="+applet gnome-keyring policykit systemd test"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -33,8 +33,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
 	x11-libs/pango:0
 	applet? ( >=mate-base/mate-panel-1.17.0 )
 	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )
+	>=sys-power/upower-0.9.23:=
 	systemd? ( sys-apps/systemd )
 	!systemd? ( >=sys-auth/consolekit-0.9.2 )"
 
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index 422a1960ab85..ff952f0b3170 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -7,9 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
-		<flag name="pm-utils">Adds support for suspend/resume using
-			<pkg>sys-power/upower-pm-utils</pkg> instead of
-			<pkg>sys-power/upower</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-power-manager</remote-id>