Merge branch 'edge' into next

6 files changed, 9 insertions, 7 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 5dd054351fd1..9281d5178d10 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index 1a6b9cf726fa..0353b8d1b900 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -3,4 +3,4 @@ DIST mate-polkit-1.24.0.tar.xz 332652 BLAKE2B 293d964f2410d2f60047d1e01e2ba864c2
 EBUILD mate-polkit-1.22.0-r1.ebuild 931 BLAKE2B 54504db4a8f872b164970745df3a293605ac436f0714196e99fd69b304a6b917820dd970eb34d718fe413435a0dd9d6799067cbca4528b1fbda9fc7a653dbb24 SHA512 7cbf6f7750c440b6eb3bd3099c82a48f823af9e45be11d8c2ed90f4f8fc8a01af8e831c32c1ff14293d273de02f4a5c80b5c2071ce4d63421001e5a36deb0ccf
 EBUILD mate-polkit-1.22.0.ebuild 929 BLAKE2B f1eb3b90e397746647746d099aced8e19cccbdfb4b7814ddcf928bd6af10758fd7ac9e02efde28d4d9d59fa94c13e31b6659ebe0c37db8b17763ef43dfb67f5e SHA512 733e5a4ec2ea436a9b644cf56d21a13893f1fdd4c06d75f53788faa096742a322d641e93f1d382f9aa7ba7228d0cc60fa6385fd4835e49554ec9d2674e04bbfe
 EBUILD mate-polkit-1.24.0.ebuild 911 BLAKE2B c3394ed54133eda6fa6b46c008075a0d1e609a410127b046190db9f78c3f1cd14a1e7990c31342928a368a55389369c096d91cbc61590a55f81cb0b0c71f937b SHA512 e1ab97a5fb53a36b98f7f13680e2daa4067ac52fdcdd23c618f3976ced6060cccfb04fc536d5108b324b3fe9f8859be07918097a854766314043ebebef77f0ea
-MISC metadata.xml 505 BLAKE2B 280a6762e6d9c690b5b0e0383e9d7560551d131f72823fdd759175b89f04eb22bbb7c605f26e178cfab65cc63e590997dbc9fd5621afe7ec1a4dbb5acd129683 SHA512 eea439bc1d6d7444abdea4e5ce2ed33bfc4a7bc625d67ccff9b65348d72296f5dddb1c11c86efd7b2ebb84b2fc2f2ed8beab715d6016c8ec94d03626be4497ef
+MISC metadata.xml 441 BLAKE2B 299b65dc443f658b080598b7e1dad457948870b53964f1fdf532192c5c4062ffcca29660003fd45bd6ac376f00b6511b5582ecc312c312179979a47ce9c4819a SHA512 dd57c92f8a4881df822821fa48ba75ea02eac47728fd2250fd15d79758be30b4dcc6bfcc7945de9b57bb64dde4139d32797ebbb7678b0d619c41c2eaaeb3129d
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
index 29daec0e17ce..69a769b561ef 100644
--- a/mate-extra/mate-polkit/metadata.xml
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="accountsservice">Support extraction of data from AccountsService</flag>
-		<flag name="appindicator">Add support for AppIndicator</flag>
 	</use>
 </pkgmetadata>
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index e84cbe7692a4..812313601da6 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -4,6 +4,6 @@ DIST mate-user-guide-1.22.3.tar.xz 8959336 BLAKE2B 5e8b122aedee7121315eb4c1ec0a7
 DIST mate-user-guide-1.24.0.tar.xz 9029524 BLAKE2B 304209588d67f83e0d3505277a2a964c7f76582755073886ebac5693a3dcd771bde1d1547430ac94113929da0441c85f5f86a6f27cb995c252a770d44c113154 SHA512 80129fcbf628dd10d0748d0a35f9456c15a3748c1cd407aa7adf4d90e5f87d999778d136d772c64392279152da9b76912378b16a894f03dc5d11bec478ad6301
 EBUILD mate-user-guide-1.22.0.ebuild 527 BLAKE2B b5c7d5d04fd9ceabc537a9b47597dac70db2759fbbf13cca700816f68c641576357c9d4ac5bf307bca4323b9630965b3b4aff7a2f870c75429f30446d123827e SHA512 1a8cd577a9aad60bb3c7f974a9ceb06029fb70f6522156c4943a19b427836c84ee7e70c1adf7f1ded10879f81e8e0512d3e40edd442c9a08bec235cbed89e7de
 EBUILD mate-user-guide-1.22.2.ebuild 529 BLAKE2B 24f3f02df259bd9cfd944f2ecd3dc2fa10a84875440ccaf71bf2ae28354629b5a4e0d11299d32daeefe0e1c9dd22f3e9013593b425d0ebb3c350dc3c892eac32 SHA512 8f2b0dd9c8211f76c87fa19480d8e8ca16c83f668ae09f7d32e86025d001de9584cdb06567713266f0b1d5d713d307e8d59ba5dca2c938b141b150576f367aa9
-EBUILD mate-user-guide-1.22.3.ebuild 529 BLAKE2B 24f3f02df259bd9cfd944f2ecd3dc2fa10a84875440ccaf71bf2ae28354629b5a4e0d11299d32daeefe0e1c9dd22f3e9013593b425d0ebb3c350dc3c892eac32 SHA512 8f2b0dd9c8211f76c87fa19480d8e8ca16c83f668ae09f7d32e86025d001de9584cdb06567713266f0b1d5d713d307e8d59ba5dca2c938b141b150576f367aa9
-EBUILD mate-user-guide-1.24.0.ebuild 513 BLAKE2B 4d3773172b93b54f9ec71473fc0413f94d52cb852805946368d7b6d4430ef43c109139ac42cd81dd3fbda110521f9b9c18d2db0f14dcfad857ab6d03cc135908 SHA512 8feaaebcafc93701f26b74ff288ff03830eb4e01189fdb74e6f8b883343224e8daf10f3bd8320ca120ff48ad5ea7d90063ddd8cc49632382a98ad583c8a6b3ba
+EBUILD mate-user-guide-1.22.3-r1.ebuild 534 BLAKE2B 289352e948d160f8865d518fed99d39acf431137607aa656f02a04716603a6e8fabf11272e300f34232a84e54e66867c2cffe8e2dc4046847306f132f54a14a8 SHA512 39730d5af04f6bbb64a0f1daac657c4a1a18174ddfd67a2515f3c599adbeefb3d2910ba15edb28b0a3b48f89155f2db8c879a66db33ee8a3b224fc28e5626beb
+EBUILD mate-user-guide-1.24.0-r1.ebuild 517 BLAKE2B 89e310e87171d26eb4cec1e0d2060991e23215ca7cfa9333563dc57fe4f877a35108246f24589e2d3469d7a6760dddbe1ef78fe71f89440a4029abba930eea51 SHA512 91c2e240e4c1c1a04a4aa0fb59f403fc7efb818454d028bbde5116f14fb8abe5a58dc0490f97c06d3f5ab6e01115dfc496600bdab8606c459f4a500e4f8cc20e
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.3.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.3-r1.ebuild
index 8ad03779e476..f0c0f0852fa0 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.22.3.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.3-r1.ebuild
@@ -18,11 +18,13 @@ SLOT="0"
 COMMON_DEPEND="virtual/libintl:0"
 
 RDEPEND="${COMMON_DEPEND}
-	gnome-extra/yelp"
+	gnome-extra/yelp
+"
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	app-text/yelp-tools
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
+	!!mate-base/mate-desktop[user-guide(-)]
+"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.24.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r1.ebuild
index bb1249647ecb..deeed05b7a11 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.24.0.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r1.ebuild
@@ -26,4 +26,5 @@ DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	>=sys-devel/gettext-0.19.8:*
 	virtual/pkgconfig:*
-	!!mate-base/mate-desktop[user-guide]"
+	!!mate-base/mate-desktop[user-guide(-)]
+"