Update metadata.xml with mate herd

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

36 files changed, 299 insertions, 260 deletions

diff --git a/mate-extra/caja-dropbox/ChangeLog b/mate-extra/caja-dropbox/ChangeLog
index 2e6b2f37154a..2807c4550234 100644
--- a/mate-extra/caja-dropbox/ChangeLog
+++ b/mate-extra/caja-dropbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/caja-dropbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/ChangeLog,v 1.5 2015/04/08 18:13:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/ChangeLog,v 1.6 2015/07/11 22:51:14 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> caja-dropbox-1.8.0.ebuild:
   Drop old Python implementations
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 43bccb1ff876..50fe85a1b355 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -5,24 +5,22 @@ AUX caja-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a7917
 AUX caja-dropbox-1.8.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
 DIST caja-dropbox-1.8.0.tar.xz 310592 SHA256 bb26151cad68e910979af6dd8b323434462a2457998ad67529660135c0caa513 SHA512 33c0804ba756ec50b531e4992b74577848f52fef60b8c69b96f307a2b8a57fd42ff951d6d3fdd55a6b1e260c4f46d0a26f90f730a88dc45a66e2d78888492fbc WHIRLPOOL 3b200e6a1b5e6f9926566962c48b9585fa0f9cc1ccc8ee89e45489d87c41cbf50a2b1bd62036140ba7492edf5a2812b918c4c4596b17c4674e0821a72d29550f
 EBUILD caja-dropbox-1.8.0.ebuild 2258 SHA256 21ac46bda570a81de4b65940c2bf7dd2be675547d29b615482ff17644eed54b2 SHA512 9f4640d1ae015afd4eb42bf3d62de33b973b5e4c0a1d785fb8a98c474dfd458c3b6c257e675afc4df9887bdab2d316e7ef81c1d95580281389b5af68482d8235 WHIRLPOOL 8b79d30b8567f78e647773ef2938323e00313b8b8e369f95bd43d3e05b92c1ea53bc7be0459a0f5988edc528c02040e7471394450f74156654435b99b8bf8b46
-MISC ChangeLog 1088 SHA256 ef83bca27b7754d26ea4b3290404ed0afc6711cd82362dd27f6dd5fb67a7ed22 SHA512 ee4328de17c48544b5edfdcce6b75b70d139e5625ecf73f383d68114bb133aa570b698ac202ee03f52a82e89c86ce274578f6e5c258da2e8d2aad67136309b1a WHIRLPOOL 05a3ead474b5513a15a994795d0ece6da87ff83cb25815387e2ff00d1f91d20986da37f3e70a0d182b17d4eeea706177f9f22c39f31deb001b3d880ebd9b06cd
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1194 SHA256 b006b807496731fec3d8a5be53c600c4cd1861142ead95ef0378eb41271c5f88 SHA512 97f3a791157ad8235c28fb8d49a86c145214a788db7502d7631c66429e7b81606b5835fe4b9b7c941727b46abc08cf22d613ed215148e8dafabf24aed7cc2857 WHIRLPOOL c2855139332a7eb2cf4a2efbde96a77a2fc81e303cd289ad59b2fa92863a6452df0cdeb30d5d687f3479c16575bc6a2d3e1b649f60316d7fd4c821b9b1067072
+MISC metadata.xml 263 SHA256 f0c6fe36b36ad3b31ebf4ec4942b3d919cf22ecfaef865f7db06a84210431d46 SHA512 b1584eb694eaa1b44bd08248244135adedfd08e14e7bf6e80e3d360a836b28e6bdba969a6562597b8d9c1252f06f6779c3bc57a4d65a323457a81d5a0244fdad WHIRLPOOL 0cecf7185350c35ce3a284a79827fbee923a140e4b616ddd3b5e8cace9ce30a97784aff506ac7a57c668e81fe65eb17159594d72da841f4c24a69b73fbe12ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJW/hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOokAQAL6dbmSaGcgeEuTUqx7s/qPC
-hKCcX36+99R3b65Wo9sslfiWbGGgTTAM38jUMgVwlViBGgzJsoxX7X8oMpmPuUjo
-yFBS6TTgVtZrqcQgSiGkJQUL75mj40nB3nyevqy9xFf++k69EvgFKtR/a/3jvhsT
-5RV7FZNe04tV3zisCumGKrWa9vcLJ1XNO4aLoX+v1t3K1AZYHLqoVySaPbpAiZdu
-HNUmaKvZaqLk7lvBmjUyjaOgxdPOK4pbhKe0B19FXW54haDJ0vZU8Vr4WI54NHVP
-B5FPhJlFNfW107ckG6g0FzbXDEL9z8X59uyFStKxIQSxNJtK1m8JZ/BnD+SM/xtz
-Uy5qvFA5LPBJPd+5WNlRrW3fTMLfNaq/5bUfxrnWuXCoKcQkMB36ddxAk0XUD+NN
-PZEJIs7rjdwgogqlJaH+mqYF05LXP2sGm2k5kOcHn5j1HG8z/aFjS75xeaAxkL+c
-4feoU8A4OSLBOnG8z7LgSl9ic9nDSRtth18oUFA6j5puNs7YTRzM2ZnVCsjqOIRW
-p6uhoyXyZVWo3nM7jON/Wtr67k6Wg7IFlJGNDbov8KGnj9QfxrrQMWDJfm3NP8U/
-KNKl0X7gwN1Tp1p18SF1xo+/bG5yfe+suGguvrKV4VqDI0zOBMs8eRI/c8NohHTi
-ZJytevwDfCsRCbXewXDT
-=btJA
+iQIcBAEBCAAGBQJVoZ3XAAoJEBzZQR2yrxj7YlIP/3jqpyL/iSZ0hLYfEh+tj5I0
+ypg/aBveSMvCXUD5oQxaC9Mf4hNoFtDaxBpKTl6Tnj0krwvOb0HNiiNT4Wugp7/M
+SFsqEjY7J/f88rAfQ2h9EbhMWd/Ue8Tz7WbsYGJMaCxCvRP9vixDqNz47oiGmRdG
+PYW5lkIsZAgX46RdrAaVmoTLaA2zZila6Owzsc+VBBJiV/skgXFxGyQeR1sAG1qb
+OjqNCLpuXTuGv+49edg13Z1aBsGYghi2/+f94Jf+EYhjyGVPTn6kGSwyEoIKeHZf
+7Uy/1MOvNsq3ON5zPxHXZoNekLH6w0Z7tyVOVHAA2KmFTgKsyikr21C/K10UWPGb
+Lumhef2KGlUSD8VtcjLKidj3W4nwe4AV4KLcIr2TvtaMauKBj+QRxxoChexoyLzp
+QXwsOjvJX8SN0st8ULdpjuITlX3fm+kANTDNJpjQBe2IOMILk8gZANknL38RiVWR
+xq/c9rhNLv3ZfPvQEBexfhfQBvr1jarXorH6rpWAAqUp66QGS96/iHWFGE8XgBWv
+siRd3J628T2S8H6SoT5nSlYM9o2G6iXpj0bsl6MpDjOYSCQ/v4jDcAECQ7acefZT
+ysNkDymI0LkGPWYeBDtxCbUV/uef3E6IBoQrgT9h5ZpwOMMlDh6w+Ggc0nGtUlYJ
++3sLk2aGhVX+VT/+LJP1
+=+Oma
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-dropbox/metadata.xml b/mate-extra/caja-dropbox/metadata.xml
index dca1781cb290..8f12c89e5cd3 100644
--- a/mate-extra/caja-dropbox/metadata.xml
+++ b/mate-extra/caja-dropbox/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/caja-dropbox</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/caja-extensions/ChangeLog b/mate-extra/caja-extensions/ChangeLog
index 5ad8353327ee..ca89c68720c7 100644
--- a/mate-extra/caja-extensions/ChangeLog
+++ b/mate-extra/caja-extensions/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/caja-extensions
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/ChangeLog,v 1.4 2014/07/02 09:47:20 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/ChangeLog,v 1.5 2015/07/11 22:51:41 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   02 Jul 2014; Pacho Ramos <pacho@gentoo.org> caja-extensions-1.8.0.ebuild:
   x86 stable, bug 513714
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index eb2f560296bc..586d7b0cb5c2 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -4,12 +4,22 @@ Hash: SHA256
 AUX caja-extensions-1.8.0-sendto-options.patch 12563 SHA256 1e00f86c960d28b6495c7a514a3897bc7f1c2e204518b6565fbe0e99f3a274de SHA512 95f78cc155aeb6576c4f938f5960516043897d0353ebf8ecf1fe130dc3771708c4838116efc0de4e8e4cc17bdf76715bb50cac9c4fb5ace0ddaa3348feb100a4 WHIRLPOOL 58a74ac39898c8bc4cfdcfec303a7812db11556a8a7bb37ff546c7a6ca1c26161ba08d78d4eaad5aa64dec414ae4c21107c454b7305c303165aebdfc647f179e
 DIST caja-extensions-1.8.0.tar.xz 343784 SHA256 71b4353236b4f13e1984a8497ff80ed63d74141833ba47a32629a5d3505bbc91 SHA512 1a59bf3ed7300d790f47494d0bef677a760fa069aaf76c2f35eb4d17b67be0fcdfa904e3a05d45ca1ff9f3016961c689aa620d37f020ed199ca2ddb3d8dd3663 WHIRLPOOL f192f8e966de8272ca65d7e856ebf26bfdbca8cf559da7571c6e372b5c9ad3b21f1e08691014546ed4cd9b6b60a5840b8a02c53d9d7ed34a8876a873771dc2be
 EBUILD caja-extensions-1.8.0.ebuild 2069 SHA256 11a12b0e28f76dc5923ef4de3f3a13f3a5bd038d13bd5e69d5cccb5deba4d203 SHA512 af34d8ae5a1b64272035e16e05adb55b18466232e57bc9aef5d2e84d926e7c2658d00b34feccfed0df4d94083521aeb3fa8f121c5e004e43467a652b51def554 WHIRLPOOL 28ae98efb1fd50b383f9999a3607f36d27c2c36fbb5a802d3d8c570fb3b20dffa97d2c6b9200f3553a4a7dfbb6631143477e6330c41ce9200c140bcbe7705c6c
-MISC ChangeLog 862 SHA256 ecc44cba7ec396b45c1f389ae9bc2ff354f5498a9b6d9d36e20dd4d3fb661b45 SHA512 8fb4885899c4ffdf3d5f6286518e8c1358f7a57f2687f329bb2ac50fcb50c7df42ec921ed75d5971c04fa223d0182c3863aab9e1d8ae80aa95708e1257ae26a7 WHIRLPOOL 8b78c0e19a2b4d9cf232e68cc9484199dcc760093146891f9f8562bd52a6757b7027bd6ea97bb522fe9d004b05bd0ffd2ad66e3cbdd09b547340f0a91f91e73f
-MISC metadata.xml 706 SHA256 c2c6b441fdc1fe10b607bd29b3806bd23731e7e7e8d8790ae2ea57bc101469ed SHA512 3f4f3ef4d1469c16702347478040c577399a1b15e0fc50e0c8cc0a185a3fff8edc6d4f250ec86f3bb8383974457bf5f1abc70557186676e8460d9a2634b6d371 WHIRLPOOL 15f22542ed634e59c57d4411b50a6cf75c0dfd87437faa3544a230aca8cdad111c29e10f1c0da0bb6f6d1bea83fc55b83f897a48dbf425f2b2fe7e00c18ec187
+MISC ChangeLog 969 SHA256 ebbddcd8a3e9b27d509572050f13e54d2515df1e02cbb4a7dac20600a9f5379d SHA512 823cdd2f958e2fa8d4aa777c61a241a204c50c65a01d0911c7855a9ba3aa50ca882020fe71605cc65aa04388242f3fa771bf8561bfcab267337630c2067cad66 WHIRLPOOL 93d8e50646d2d4360c9ff4faaf7018743abfbf23c6f6f550e9f335a3d54e98d34185be63bc5ed095aea75038b69b09d19340360308bb33eb027be4dd9b0a7048
+MISC metadata.xml 742 SHA256 3e78dc18ccb97ad8df4afb39eb311741e5cdabd8dae4b5d414d9b4c8cfd1686c SHA512 baf8cb4a5b473980833264e273ce4450e2b65a26cd0c8c721a93c3296559c3cb7afe9710c6fc9ea7fda48a936b3ded6c900220fdcf8317116259f027327c9688 WHIRLPOOL c59c7956c71022e2cd2d499e3208badf42e160c13e839606669dc28532a1c73930e441e7c587354561b38f1fbda2ebb864c01328782e7437f1e932c9768cf3ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOz1SoACgkQCaWpQKGI+9RzvACfZVf8ItBodaFSUY9WRtWLpcff
-hxsAn05Wjd7oOwOj7jMRgPb3iqE35P0y
-=ojwB
+iQIcBAEBCAAGBQJVoZ3yAAoJEBzZQR2yrxj7IoQP/iK9ovkGWGReYyrHSnseMSza
+tGGHLPGZgMOesOycczBqxnQi8GEdFkuZ1GUQg0o1fwDfrQBAPG29bK3O4W6QDvDd
+Nim06qtIW+skl5idZZcnh8nyCxxj9uBg3XhfmNPNJGlub4AbyWV+ocAkWQ7vea/9
+5pYZf39yV5/TqcSnRHtSAbiJ7QV5movDjzsRfm2cI6pUjFQ3qTBwzB7IYByE12wn
+xCUkT0rLT2O8Juh1SV0ykdIxd9XOZRTxAd9uWJYaRi3Zp4YZIOwHhYPEcG2FKUCX
+1eKryd/UMIR2/5kqhhlSdYMtJyB5mil6mMHBDIhjIoEJifzxF+z6aetmrDmQs0sI
+wuZcTnpfHFr2cc0GfLnTN/NXbrHlfh76UbUDKAGPxCRHUgMvLHEgf8W9JR5eTC7e
+2cv6uRx9xFxsGBlO/tmLvVybCEO5+AU+H7EwoaXXe0Vdd0oFBjsbNCCR+6e4aL6E
+kQrj6lLfXlulRny9voSgJpVhWi9Nm41Pif26RX6t14b9zGKIn64dkYpgVtpvvOUD
+8jMtGHMPupuEXSilrNGrbrqLH46mrR3P1mdEhD2T/E5OgqFiYUWeMxGwnnAYDLKw
+AHYJB2NkW0PjMDiKUqfKw0jylxBCwK7rdyv6BYZmBz2P5qwGwXfDYdVHFaqII0zH
+0L43oTqEZ4xtoNfCic2y
+=iJrK
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index d4d11f107762..d719a85807c0 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
 	<use>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
@@ -13,4 +10,7 @@
 		<flag name="pidgin">Add an extension to support <pkg>net-im/pidgin</pkg></flag>
 		<flag name="share">Add an extension to support sharing files.</flag>
 	</use>
+    <upstream>
+        <remote-id type="github">mate-desktop/caja-extensions</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-calc/ChangeLog b/mate-extra/mate-calc/ChangeLog
index fe53cc8c321b..c71005b80384 100644
--- a/mate-extra/mate-calc/ChangeLog
+++ b/mate-extra/mate-calc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-calc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-calc/ChangeLog,v 1.11 2014/12/20 17:26:10 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-calc/ChangeLog,v 1.12 2015/07/11 22:52:12 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-calc-1.6.1.ebuild:
   drop old
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index 6447bfe0dadb..c03cb528e33c 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-calc-1.8.0.tar.xz 753972 SHA256 13d56287430cbb7d60a74666ba752a1a8ea9692125c6a02f97d0cc98d451d99a SHA512 92cd2e5ee8f6943b70ba1402909698f0ca922864bf3553d04ba3212673824b3f1f2042786f77814bf004e93408f46b7be438ddbe1046884f834abc90606bdf11 WHIRLPOOL 7743c0d132d3ca4b71072bd61e152dd44f9688e5f55efc2fb358c5ff238594488f03d4501d0efd6aa687df3925dbe3a265aa2d910a9670446e39c113436f3520
 EBUILD mate-calc-1.8.0.ebuild 872 SHA256 9a23b7ce9ad8bc9ea9b8879c89a0bc132c4728480d5bfc66c49503a5bcba7b9e SHA512 89868c42421bf3856a291188b120bbfe678ec30670a48708173e57360fc8d2cfef7f4668b93b9a242d0f6d83ea5b420c060615a9474f566335844fe169c96340 WHIRLPOOL cec24db9541c50b0636b1e5d4da3a595791f83e9d69eacafe216af651723d6af7f6fa774776eb2f77a5fcff16047e0b7af594821a2c8d382411d64bef52c5783
-MISC ChangeLog 1756 SHA256 91bc2ad557a1d5ca5bcce134507621210494580cd385d85ec4609951838c2a2f SHA512 5e534a7cfabef3c5f80ff630311ac5a8f4059148b82798f581081b2bdaadd2a93b462a3085ee2d40304e09338e2d63c14a3bfea6890fad53be78d06c7d545bb8 WHIRLPOOL bad785660c087b41b8349a150a6a0f51ee514cc56f0c8b0be3418effe7aa4eea865b7231732a8273b0f8f1887f5e21b63e1283e9e6ab1f2d91c4e6eca06a6fb0
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1862 SHA256 407ed2530d285567619fbf44bc79bc8ee70f2cc84ccbe2798b13768e74e7c4c3 SHA512 484a13dc7b390100c4b00bfe441c6eab6f5af63ae55181c4daf4992e0de103d217e2c926246afad04adb5b23e393e9bfcf2a7634a673c398e3d37b49c6978124 WHIRLPOOL 27619f39cb82294ffb76f09d4d2deaa2634ea3cdbbb5fd30ee61a9c4d463943c7560e995db3177fceeebb3b826354d9ba597aaf819065e1690b1e49e43eb7214
+MISC metadata.xml 260 SHA256 a78d2bc475f9d9470ba779387b9d552a92c6c81e2d4d7ed58bcb910155b8bd60 SHA512 8b84f2d2fe0f811dca46ed1c277c145a794787c6f9b96a98f248b30b43875a20a862eac9354446e8063c934ad7f763937135c4e8aa83ccf44b4fde47fe36f4f3 WHIRLPOOL b66c5abf2d4a61de81b072177ba6630b4ea346ee5007ed57c21cef1233d41794de24686eb464d19b88e2ed9fa9f68bcf81b698c2da5b360b4786af5450a6b305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbEzAAoJELhOzYlK7nn/LTQQAK6IknupYM3FnV+SFQse/JR1
-Sq0gAG7EcEIB8zILMF0gL1/LPkKCwbX0TUS6/KJs+6fWAN4C/ixM5xabbsc4YeLl
-pP9rMDRL7RmQ384SQXB+Y5IkSHpWawIEEOjsnZt0x8UhPrDKPzitug4wUCqwYHtn
-0u9LCKAmCHyZW4Z8RktYDTKHWQWWeiPmGa0aZ5sY/JlvAbBteltoKichDfqELMqp
-caJBzU8zwFwwUD7dQRNcU6A3CqhjkgTwb5BwhLMKGXmzSMJNeh7L7z9oPxAqxUoR
-mnqcM7F1WAqr0SbWWjDHqsXnR2WclL81O4fsPaC7PdzaufC5uuf9CVDFeFB1z4rh
-Y1jvOBE+3CuEi3FU8oYrw7P9KcWKEzEAdwnb0GeayANGCvFCmQc1RwArrIi26erR
-DWm5VLBDNvpIT5d2m5UlQV+GuEC9slmHW+Zo9sQClXX99ck6d4E27zWMOZuNPmzv
-y2PhI+LZ3cMce466ogVs1cOPacRB6gqrc+uWAsI1kjFelenTRHWwka9JkbCCD5Sc
-Jl5MrfHZEeFcj7TS2BYa5LSVI5bDvXsOzdeau1nXIsoJ2YZj5sLERMtiuK0spKlR
-76ZFdj6abVoArM5EKu/EgTOAPGoTNmwbJMm0LinwAhvCVcDaLwb7As+v6Qsqv9Jw
-igmNa58jmkXavl0i0Wch
-=jRdj
+iQIbBAEBCAAGBQJVoZ4RAAoJEBzZQR2yrxj7+igP9iTHIHviuSZeUpPn0TeY4oZL
+6kPz8H7/JVl3NV+dwBuCppPIvjHGjmsRnLh9GzvT5jyeswni8LOahNJhCNc0scAU
+1+iH9slJXCGAO3eMzWgD9iep5izr5GG94gnDwdebdWG1A3BQRKH+eT2AGGNqFlCL
+ZCDlsKY7foJKUTWQ5ZAolqqctcJ5gajIQl2wZfMw65XMSNK38wNTgpcrKrzw3wwD
+hN9wDvL4nGEKC28oXfFA2luQaUDqDEkH5VKQzinHLwDyJXQMDpkJGTruOwfIMxIE
+SUxr+pfLyuPrpeijlXf3Lxo/4jyBAaOcWEXCcmZata5O1CvYbpwPsLmSMwBA/yY1
+9F3xu+2osiy2/6R96a5enouMIBQ4+s4TnlrHXAmitjQJ0O0in1GZdDFqp2BfGC+i
+kV3SUVi71kIP4KsQi2QsgMd4UbjqlihUuh2XZVpoADSf98QxEnnJqme+sXCfhDrG
+jhzUq3AJxM/+sGhwHxmmxNfQ1oqX783wjhqqYEhhFguGge4wyxrf1OlZ7dwrhC7s
+N/bBVjICGj4TMA9t/uCCZfepN+XRwvq30VHxy2VjTXtZNj1wDw75qjzGemYTTWuf
+lIjJQzzEg7eC7bUZGvsCRKtROiiZZ56RgEi0SITO1AyFI7lENeCUNkgowB5N7doW
+FYxKoq+ACXmGZyUVXFo=
+=zAtv
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml
index dca1781cb290..815ce85792d7 100644
--- a/mate-extra/mate-calc/metadata.xml
+++ b/mate-extra/mate-calc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-calc</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-dialogs/ChangeLog b/mate-extra/mate-dialogs/ChangeLog
index c30e453bfc3f..8cfab0771dbb 100644
--- a/mate-extra/mate-dialogs/ChangeLog
+++ b/mate-extra/mate-dialogs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-dialogs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-dialogs/ChangeLog,v 1.9 2014/12/20 17:28:00 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-dialogs/ChangeLog,v 1.10 2015/07/11 22:52:30 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-dialogs-1.6.2.ebuild:
   drop old
diff --git a/mate-extra/mate-dialogs/Manifest b/mate-extra/mate-dialogs/Manifest
index 1e8b22c6732b..e095f7919fc8 100644
--- a/mate-extra/mate-dialogs/Manifest
+++ b/mate-extra/mate-dialogs/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-dialogs-1.8.0.tar.xz 2786956 SHA256 1db39f743846377c1b5e065c1199285cd70509a26ae2fbdec0884b06f00bcbda SHA512 82b54e034e9ec4d8b1819c5ca9817b9f12fd2273345a26aa9d75b5d1ee307a8d2254f5ba3e4a7a3e8e482344a4be71d95bed8a9f6af9e691babcdeea1f2c0fa3 WHIRLPOOL 12aacb04567b23c089fb2879817d2b2583896dbb5b6290ba4284487c9816ce0629a067990c0fd13698cfbcc502c70ad9f0faf3c9e06de10ed3c07637ec4e7827
 EBUILD mate-dialogs-1.8.0.ebuild 1136 SHA256 be6caa62022e79829db914356afc2d9114aefe178de2197e57201cfd080199f5 SHA512 95eb2741f3aa556a919fd6e75ca879d68c8b12952eb17c57e4570ef2b2764b6dfefb884eba3e72616dfb7edda10708f3fd28b6aab25d44c7c7e4c3783f5e2b12 WHIRLPOOL 9a676e5ae9bb40c10564bcc0c3342260050cd9c5c5d0d08ce5df04ce0715ea3c0b8a178d4650e33de18ece7232e5c5bb1f5155adfca6c7d8d859368c25d4c023
-MISC ChangeLog 1459 SHA256 237d6556ce220eaa90d60f02194ecccf6dc57b8e12b67d4e592a5f98b8f993ea SHA512 6940f5874aad1e19d79e1749a84e405b5326bea3e37c73a0800198b754851ad2b38bb6e8d72c87d1ee908909187ceedf595d35a4d1a5d0b1c5ce151984958e48 WHIRLPOOL d5f74653681645cb3a4d2c5253610e131459ecceb237d734cdedd3da9a061d0c34500b15ffe8354ae62365eb5a4eb538aad002a7aa7018df30dcf3818a2470f3
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1566 SHA256 6efd2add24ae250fce245901a6b54fb269bc7b12317c85569a697554bb9f80b5 SHA512 6ee705161a05b172b5f246ab3a468a077dab2fc01898e4390f09d233f9fbd261b92f2d2346d64eb9c67b572ea93b54273fa9b354eaf371b181fecf5dd4cb1e7c WHIRLPOOL 7b733b81c164db771c49d0688b3feb5347378220e84f2e9c56d60440e63152c47720dab2b8ca26ce8ed340c02844e4f51194056d368e31a230e29e56866a9b9e
+MISC metadata.xml 263 SHA256 f30f4574dd4f9d97ebc936428981bcf6f970f402824ba43b26503d23fc83588b SHA512 6e9ceffd2fcea2dd7a587df7db0148aab91624f78c8dc5e52cd19aed7aae54c0c1cfbc6c4d0ef1655aa2eadeb4537f00d171b32feea1a126785f80a3771831d2 WHIRLPOOL 714fc2c077511c41802a54e43fa04e89e7a7e8ec613bf210aa6d0bde6bd8f4ccba2cb7c094f0a6063be6e404cc4f17fd77981fc0c76cea2fff67c2064a6075f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbGjAAoJELhOzYlK7nn/CBsP/08B7WK1yw4CTUg3krjSkwcC
-uw4J0muVAp6rNmm+xUinuVP99/ujSr8A/Q5v0z+LT2H5o7Jl5OU0yRm46h48VHgA
-0d4hGUV8ZZceqIxPocElqQj42IOaSlzeelynXhTyfJXJZwsjj0JuQLA8vLig4dYv
-EdphKvYloVpJirzb15zJfsPWbq7pULoBi95wUejKpz/f+Wl6dJbsg42T4dNj4w0B
-dFNWBw72UTPLBRqeStW6z7P6Flt6j/HRBIP9XS4MGlREB8KwgyGkNCAtyRr3J6GV
-gAP+AY3lTfDYUoRno/7T5Dg3ZKn8yoNx+yVsgKknnV2uDUrldnJRMwF2FdYC5qhi
-gXCn8Z3sdcTem6Hm9I05HYx3SAAE4QihD+XSK0AQ4HkCvdkh9DmYvUw1yspZ8PtT
-AtjThZ4pD4Mc0Lk4qQ3wHmBl9IzrO9VsnrbdoooBXpFgJUSJaFcsdOCXrbKYN4n1
-EqKr7JbeevHx+fSiTFPnHb0Grc9w8XitVbqU4iDJdAdYS8IAPpc/lewnt5rw5Qls
-ZOrRaks0oY2RouY/YwYhnhcqsrpQGJzs7LL6kp7MPndn8KkB/0Cg6zhynpM0LTqi
-Hy193En01kV5ClCsaA1S27g2plX2UytC9o5pFw4IAjxo0uPrHXSfHJ/y+ansVGEJ
-AM3j6jwYMhv69nNvkFPc
-=gU4Y
+iQIcBAEBCAAGBQJVoZ4jAAoJEBzZQR2yrxj7dQUP/3vIMFO0kFvVon/hWj7jBz/2
+ojxi2s6cR0Gyao6YHMXHhsgpseQHqGP/FBsO7i84gED+m7dDLt5ZuQVYYoS9EA0b
+KmaDiBZ1MWv/hTfIje8KeCVZv9FXY4XjQM7snly3VE9jL7t8965hVfPX7TlHydsj
+eBYD0u0LTJm/miGPSPB/ul+2JdgXRYRm75aKw4V7UO6xTW5HpiKBumhVSmNr3bV2
+aFeJE+7WXGTyn1OL62Fr+URYa/nrRlVSWQYCZFjzFgPfHUOvzXZPUpg/LqRZyjBr
+0kb41KCpiad7r5x9rDGKQv4zdXQxzhXq1qaTcWSDV5DhxsjeI1p5M9/I0XuUjX0k
+qa1mW2K2/Kk6Lg1EMwRd973MJFVdQjPYiYJGy/9S78zKBwaBqzjNcHqmVSvgT/Cd
+tfG+ihxePAJsoig+gm20VgpFepwGl949hj+Cm0oEcVI24ph01UYbcxrXWJ7Q8z7m
+utqaVYy1kGnLyKdNch/3Li/DOcRe3RGmjQIsp0Oqy6c98ln9O7hUevyLSwSS6kAV
+YFj7cnffI7YetHttUcTYzdbgXCA9rVeE1M0v+cO4tYlDNWY2Hrnn0J5xoaf1td12
+s8zY4Hd84tAMiCUJ6Lpw0CNCJjBXRVxZo548KJx8g2/Z/yuWpl0UDnqLIcEuhsei
+LlztrfdI40pMmGNfoo5C
+=DeVY
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-dialogs/metadata.xml b/mate-extra/mate-dialogs/metadata.xml
index dca1781cb290..e05b855fdc01 100644
--- a/mate-extra/mate-dialogs/metadata.xml
+++ b/mate-extra/mate-dialogs/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-dialogs</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-media/ChangeLog b/mate-extra/mate-media/ChangeLog
index d1dd5f50511e..f3c22f52cc28 100644
--- a/mate-extra/mate-media/ChangeLog
+++ b/mate-extra/mate-media/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-media
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-media/ChangeLog,v 1.8 2014/12/20 17:30:33 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-media/ChangeLog,v 1.9 2015/07/11 22:53:01 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-media-1.6.1.ebuild:
   drop old
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 1aa0bce345c2..5ca4f31e7c66 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-media-1.8.0.tar.xz 939728 SHA256 a264f9afcae7dff50aefb813616857db10ed62ac30c4071e690485ee9c6e5f61 SHA512 c41f35e3827246f16eea8887f9e3226c32dad260af478b8923d9d80ea4b9eb0e6ab87f975e2ad4838bf567494d5c5c1039f325033d5244dd677f73ef00ef865a WHIRLPOOL 771705bebee18c901c0def8bcc3b0a843cace5ce7c88558d8f008c520c46aa695ca6dd1071edbdf9bc7246aa72eb41e5e8c427805806bad7866bfcfc0969bca9
 EBUILD mate-media-1.8.0.ebuild 2615 SHA256 830170021f7605dca1ac39181099d117d6cb62ac2cd47320032f14024d2ac8e4 SHA512 f0d1e0cdaf7775f765c50445891ff70e79deec625746a083f8659069570a3ca0c8725ae398bc25c2348ad54f3aea6e545326df26516a16b30adefc5aac6c9933 WHIRLPOOL de1d60c684cedbf8223f13dafe2534346bfd10c4a9c1095dac6228cba840e7e4d8391e11e983065ab13a9e1387932fa821b28ca83ee7df93341d4482bea622af
-MISC ChangeLog 1222 SHA256 6d7ae3a7e0096ff3707159f7e623cfe9caebf1699133a7d88d232e1e06fbc0b5 SHA512 42970c914825fe71e78648f3c7543027bce4dea67ffe21fbce6aad4c93272f45aa5b609cb1bc465c7eba512846c5af2f3fbb4dedbef0f2bb28a29d9933e0d84d WHIRLPOOL 3e53f06d230214564d5906a9798ab59900b18321d9c56d2db8985114d976a59eaeb3abbe02c6787f05616b0740bef2d302b8d7119c57800eb5e4a5a1cf22bbf0
-MISC metadata.xml 310 SHA256 18467547b9649f93be08bb8bcd2d670a3e6c13554b633a9c12764550aa58a0ad SHA512 e9cae6093bd9e83581023dda83e7b91c18678cd2b43db409534350856fc4238a70bb95aa06f8802c666bcf260cdc822eec79857e4089337c10c388cfabc0bc2b WHIRLPOOL 9e10faa65d93fabe352756e033f9f5f49cb6f5095e56de30c2554b2ea67cfcea7317b950825f27eb88c8570d855e57fbf7a4899d1554763a5e296d1ac6221cd2
+MISC ChangeLog 1328 SHA256 193e9cb0ee22df14db961205407f4c6522dca8502e759035e7e07eede5710816 SHA512 baa07ce29f177d6eb1c03d0de0e14b1f18695e96e3b2106d739b10b909551c731c20a52fe2189e0d39d4e5395f4f267f96f549370cb63708e472e1260c107797 WHIRLPOOL 313e85a8b58586b257565205de411394e19222b5a22d6f60921c296014aebc5017aeb569e1e842879e7d1efa021c5796ded55c9483545d566c775fa20a7187d4
+MISC metadata.xml 341 SHA256 156fb59fd240bd185d43ea6ef1950ca296b4f44a90744c9ca0c318ea0bdbd3bc SHA512 b0abf46c4ca8047fe62288e1a33624edd7c57137edc2c4b8af0e969421cdd89c71f1953a92a7c1c063d12b661a3fb4625258f1dedb14d1f07e5b4527cfc9b586 WHIRLPOOL 77bce3ab987b436945a23da080cc1b149419acf74168c18a0a181b36add4d5b60c18d5598d3f71a7e7ad4b413df7baa5031f90900666594d24a614a2679a4768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbI7AAoJELhOzYlK7nn/1JwP/0yjriYEOfI1pkZCxpAdWD9h
-Em4qTbJxqBTskpIZiKmmprU9ACnd/d2N+C+60NvUTpyTIMXVb4gBlOXKdXLUWzkK
-UuTvzwNOVcTOhbZ9sQ6jDqVMCVIJumdud6yOqgFPJWdIxmdhJjHctfKZcGT0+fCW
-ZUnG8fhX5crM7yjEEToV/YDQ9oLezRxU25KX9+agYUZQ0j1tavd6NWZ1t9mhyZpJ
-q2thgG+EHMyskUuRQgrjxUbYaRL5XFGGa8x/HANjNUpuMbCdLMd271rPGGz6i1GE
-xAhHtG1+n7YKmrEAvDtMiny4xt4vjZ3pD/sZr3tqyIX+GG3RtqMNS6KciTCkOxC4
-scnmXM/DSgdpVgz9Y7znSwBOhtJ3XNaiEh+cOQvZbYUv8xYjqQdG69zZH9Hc+Rhq
-4VUECyVq1MFc2uSkaXmmrPa77k1UhxUWus7X/+O8Yd9IPwkomu0P1xTpgfaalyE3
-iye82sWwz+k6runlPUIjhIa0tqTPFOZmkqwd1D7YPfrMZvGlZ7t8spF1kcxW5+yl
-BHJalQAl+dWK0S8ann7LLZcEkf1r41BPst8KlBOT5qFRfw1bo4q0nyV4qxdw4E8P
-21mIsstTIstDQuFgBxZZOsNYFTp+iDxp5mRd5wLy8dSOSRLayMNZDAOr4BaSTr5y
-V07kaXgppmzzChZsYNUu
-=BE6j
+iQIcBAEBCAAGBQJVoZ5CAAoJEBzZQR2yrxj7qNMP/Rp8RHrGy9+Dt/NNwefP+9w2
+bRGkdcIzwMt5xZKFGwWf88uqpUywAQ3mP8DM3pXUv29K/3rAZmCz0tKK9ju7srsQ
+7fbplB/xzAfVAng2HfXy6y/9ovWD1V4X4zxyszlGZKaMetxlycCemYPbujv7AQ/S
+pCC4tLYK2cSRXu+3ADXhycBmiTrMiJNVShD18J51Sxg6fALYWg+/aBJQqfTStGFS
+nQAKrCzKizvrBAf4YSaZss8leaqHnBHgaC53X+Xe4vZyapqE30DQyoInDDRI5pDw
+V0BBc2K5N1GsbKlU6vtx2yW1Z6OoSfboOr0PXMkrdOA42LYACLnSfkr2zrQ5bS8W
+HtOcRpW2rrlrQe1qRhO4ERjNY4KJuyWbcwyeW6mOuPA9HrAd5Gskq6Ve90OWCS6n
+B5TmX1FYs1dRgKZ5VNXvTCZqxFs7/O7W9ukzFDgiqTcgiOWJuRrLjDYEkF6pGZTv
+NdfumD45NUJmvLCag9do8/QbkntEZ9IHwsmsCXHTAiwcfGOSY1ZtPPKX7pKfsYus
+d4X4HUqGLRlV1cy3cttcg2otISL/T21rYeypgLzNEMOwgFSLafCEut+X25VDwnq3
+Dj8ihbR53tBURUCD9EWryV8BpQGTlQ3dGj5IDBvwMhXkjJaRmAH0pxYtxrCtesQ4
+kyzU9NcgVzSjFVYvPfwK
+=NGs6
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml
index 8529be0d3b27..032165d8cc95 100644
--- a/mate-extra/mate-media/metadata.xml
+++ b/mate-extra/mate-media/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
 	<use>
 		<flag name="twolame">Bring in twolame gstreamer support</flag>
 	</use>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-media</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-polkit/ChangeLog b/mate-extra/mate-polkit/ChangeLog
index 4e6d4bfa1c78..761af412c2c2 100644
--- a/mate-extra/mate-polkit/ChangeLog
+++ b/mate-extra/mate-polkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-polkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-polkit/ChangeLog,v 1.9 2014/12/20 17:32:01 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-polkit/ChangeLog,v 1.10 2015/07/11 22:53:39 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-polkit-1.6.1.ebuild:
   drop old
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index f27def54a757..6d09a6118c27 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST mate-polkit-1.8.0.tar.xz 324960 SHA256 bc01640c63f6248497ca78c3d8df8ff608d8bf1fbfce7c11416b014a109aeccd SHA512 6e7324c539f86a906cd192f8e6a17c417717ae80c0b9d8d46907f1e911f364f73933365520469bbed3201287ae897d8055a7fa14b103ade8e6c7cee9e30912cf WHIRLPOOL b3243bd5814e2d156fd85a376294f1c102dd8661e8716e2007291a9513429202b11ff15bbb53a5b33ea5a9cabac559836374778b99627767973f935a05617d6f
 EBUILD mate-polkit-1.8.0.ebuild 1356 SHA256 51cfcde318f841bee07677563b653b03f3888c85699f7eae55fa7cfae90b183e SHA512 d973cec1db8af0012bf7e23119c83b148cc72bcc32631b7fc5716c0143809f6f0cf34c6d73c406dd0cae432f7a97cd631ab17fc39a5c028dc3947187f6dcbc13 WHIRLPOOL 331dc2d921aad232d2c27b559a5e59641c555c89454a418f4e174e8d21e1147414f571b9cce3b4c248360e6dd53919860afa3a4ab1bd85be480ef99f3e814294
-MISC ChangeLog 1474 SHA256 a637bd1cf005c2f76dbc6c021a18229af8bbf282d3c09bac0d8bb1cc345dc571 SHA512 8191abbc2d843eb3d8c68a7eb561b9a6b23fc7b703bfd9dd4e326e902e1a88e8944088973cdc52bc039e4d6ee03f18641acfc47d4fa6822dc548511e2cdd9da1 WHIRLPOOL 9761b7b018f73ace91b83030184bfa6f33cba7a3e4d351003aed43621843400f85b776c6df16c57b593e804571d568c08b83f0cee3624d0dde42daaecf68f9a7
-MISC metadata.xml 319 SHA256 212890251e1cb3ad5961f9318c20a5b9566e8cd334ab796e8b4384914b74d7ee SHA512 76abb906598cd599767273fd0e824e5fc47e270e6539aa0c0436879ed81821cb233d021a36678bf941a7c4e2af06cbf3c0120f67ed0b301c27cdb9b8e39167eb WHIRLPOOL 03f0b503a1ffb9e256bc4e7fd9e3845a7b87f7062e74525f23a297dd8331f39b8a84de629d4a9611d13d3f162f47290235eae2a0e9f23984599d56a006c6edee
+MISC ChangeLog 1581 SHA256 d721ea4d433139881628123348e571d20d5965598a3ddb55dce20d9a0fab0b95 SHA512 d75dadcdbb7a342617c496f3fe5e89322abe5bcd78bf556f44a434eb40c71ac61a473044d7dc6d72be40b7515fbb471fa44257274a232ce235cbf0f739885c76 WHIRLPOOL 5d5310db03ed5ca02a77383048c0846bbd57bbd659a1e46bbc3abc9df763cc71be831406beb9f6b64699345b111dc0153ee39d81a96d78437b8e5d7b2f9e9c03
+MISC metadata.xml 262 SHA256 e519aee5184522216acb477db86e0b1472433dee5c0eb99038fbbb970f4bb443 SHA512 24f3ec0210198272a574326aae569913021dfe75176a5361c155b8a132f09d2d2b8071542fc8dca3e18636c3ff58f53f5f8a1978b3ecf31b33ddd270db2ac674 WHIRLPOOL 03a1da40e546707b61833f6cd2d744a500e9dab8fe08ef0f032b652f47d1de88a9888fd25b90dab1fb0222b90bb06d9182e384daa564b9a6caa9be74c7cdaf77
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVftEpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCg4P/RdoCllgqkMtddektQKSxgJW
-uzCrpshrPU7Hm9OTwIowbxHdfOFjesCMOyuh5Xcq7vNTuhRvPDAVcAGfUoL8iSDS
-2ts4HWCEm7hQNVfc0ntGqvwfRIgLHUnYYTnYNWPvLyA/wP63zl6URvaesho8btNV
-rGC4zC6eCCveCkEd9hRB6iB4OWjgALD/7as7Iu63D+89X8+DFEtkGtHekw0oj/Ce
-PdnZyK+TFFhjpLo6z4/VRAt8OOfwII42z3HnnpF2NTWLlaJWIo4Y+Qzy6CsgIUcW
-SBavjgfBnVXNdSHQHtq1yniOE+UUYRxjiHbpVS08N3paUm6axyE6dO6L6Grg2OZM
-jFAzU/7Ra0UydDhkctnLa5urc2B1WwrIJIVcVKcuxvN494GVqn1a6Ubd1hyidRBf
-yk32WKFhgz0B/+TUPTeH8VUoKj3XNh4un9uywbBAZ3BTmn/hXpvaefj12uHWrMkz
-YxlNO1WpDFXPr/Nq2gs9Xz6TCmNGSnsWaLz8JL/YxStPywOIvMX+caRiD0jg/FOx
-qd7OCgFES3lOOlsWbgA5nMKxBvATFjHUObYzCEcr5GyLshD+ERP2FTBznEovlTHn
-KQQK/eoX9IY7lZNn54cZ1wYg9uixBrkHNYLO5szqRacHIF3doh56R/u48w4qFNQt
-S8ky/WapymPmg72FOLQK
-=qSm2
+iQIcBAEBCAAGBQJVoZ5oAAoJEBzZQR2yrxj7qfQQAJwftWo+sE3CXfI71cy26JYi
+eUhqRAfsBB6JG726r51ikpSOxNrzlJ57DpU6WZdcIVOO2HQLhVFGUQlzq2Kdsr1L
+cLlhxHsvPYZwOUDVm8lpWPCiIZR7Ylq0LsY2Or4FCI9U7MVK1hZ7IlWWg5yb1y6q
+Ydj/RIIdP8ImRVFnXEcWfUXozrq6mzrX38sts/jqypDEPxoec13+blUyQ6V/iGRF
+PQTsD5wJPPdm9Q+yIaAS6TizmiuSyb4gi7JhoOJ8QbTZc3GLZ4MSj9nVyYqBm7Zq
+XOcfJ1pBKnP2IObUAtQvyXFtnq4nPVAqs+E32or33PFnQYOO3Mr/sYlcjs1oAAUY
+JHSMVDMPKSPqInK2VJFCxO6J5AQKxaKut6h82WTDe+MKAPuncqjUctWMkGLwnGJa
+zTx0q2vw/P+h6uy1XmJ8HU/6Ff9m+3Sk4DT5KOW2Hq5MTSsrR31d3LvAHY0rUdRU
+Sm4d6wH1rId2giu2fOzX2hwycFU5bIzT8s80p7LjFrBEioaMVZw/jYDnabrBQKwT
+s02dMSLANYbG9j6YnB9FYVU4YvJWw6adePFQKMNisYD9wVOSsumZByw00LgnGsMU
+pt8ZqktQ8KroYD5tprzfYsQbhvdrxTiebv0rhlyj6QWAdKr3qhBHOTkifX7Hh5TE
+3665Bc+Gf7/IfbAmIEcX
+=2YxV
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
index cdcaa4c5616b..98365c2ab31a 100644
--- a/mate-extra/mate-polkit/metadata.xml
+++ b/mate-extra/mate-polkit/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mate-desktop/mate-polkit</remote-id>
-	</upstream>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-polkit</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
index e52d878db27c..5f28c107d5aa 100644
--- a/mate-extra/mate-power-manager/ChangeLog
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-power-manager
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.16 2014/12/20 17:34:03 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.17 2015/07/11 22:53:59 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
   -mate-power-manager-1.6.3.ebuild:
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 63605fdb656e..66b95061c85f 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -12,22 +12,22 @@ DIST mate-power-manager-1.8.0.tar.xz 3339588 SHA256 3d83b7736b0b6256242db3b9efaa
 DIST mate-power-manager-1.8.1.tar.xz 3341892 SHA256 6fa72d4e6a018a44144d06b68c8f67e067e3847ad83b4b8a8aaa0e2a8c9b6147 SHA512 1715d4f5515245d1fb4543dcce60b1f391ddf78bca50b28fd9097330ea42080873b0bf956a7510adc153679da239092035c62969e2f2afc4a635335ffcb714b7 WHIRLPOOL a6ef0581e13d0414b52f4efd3d9e60ca97a885639d3288ff00d1382d5b1bb6d9b04590ad92912a0123ea248f7d6f138dc680bc9d83087f99d4361d2ede10ec20
 EBUILD mate-power-manager-1.8.0-r1.ebuild 3120 SHA256 432039afbb29e8171ef174833d95dfd41ca632987b0f58dabeb956fedd5f68de SHA512 781aa30ae2b06571014445b0b7bd32900bef7535a3ee1ffc0b88542e9443cfa4ebc27b4f982843fd2985d7991201a6c1e65f7bb7f377741bd0868d485889399e WHIRLPOOL 541db568dedccc3dbde6315c088171535cccd3e0301e4667fa0603fd71876a69388f315b6bc1ce362efc594b6dbac0e6296b264f15d76b5f0ad82fc6ed15c34f
 EBUILD mate-power-manager-1.8.1.ebuild 2492 SHA256 d7eb94808bf7481d1705d6342824ae90a8004aa64875564fd8ae45ce8ad68757 SHA512 c85c7c70103ef40d4329f9a2a2f587dd0d5f7ab8f0e25663d9716000514eda7d6f774314858f71e2dc4bca8194bbff129589fca8e3147321afc749290138c2d9 WHIRLPOOL a8ff0bb099476d840fa072d5ac00448016139568969ebfaed1e6e7d9a3a45f444cbdc28cce9dfe7b25c7a87f3f12cd0d146d35b8599c9c8030479dba3c99da67
-MISC ChangeLog 3353 SHA256 7e0ec2c5ad39479f275f84762ac0c6ce06b96cb40bd688b2b60ad75f77133e6c SHA512 c9bc8592f665f1164d4c4030240377d39d1145b9b815c357aba29d5fb8c87d0943b2762328accd434aec57aab4ba59a27fc38ca780298c7c79bae7dce8ce7b0e WHIRLPOOL 779e23b79a020c0b085d9aae124d0e8af84ade6da0887fb5462fc63ea93d9e6f8829d37c7a2249d33e1118e268354307910614a62f1a30116422d8b718a12310
-MISC metadata.xml 468 SHA256 138877fb0154af1e9e2ed98f927a16daa6f49d3a8312b8e469fc92fa54232ae8 SHA512 318497639aa45f81e65e89d59820977fe89a618dff7844c13bf3a1d875ac9407f8b190c6ea6d4e9aed6f97b1bc96b7f821d1222fc605729af8c783f620c1358b WHIRLPOOL 2112944a997e20ed2609f0e9d1f99ae80c2dca2f57631d953fdc38f68a19905dd137584a756f07dcf79b26dc16b8780dced00f2f87e394a46cc641ac0d9c377f
+MISC ChangeLog 3459 SHA256 3dc468469e87bc388f39539a07aa858b806c4c873a0f0fb51c8b30d93283a208 SHA512 24b8ea39b27f647acbd678c40439a6fcde423f8fb9d762e68e1c19e3b0b2de06d0cbc5e0b977a8fde665646d0a61694efdf1e459af2f07bae1d9ed7a07150967 WHIRLPOOL 7e13bbc6f98c04f3b3cd657f4a76766f76834fce48489e7566be57346bd2b7e86ebebff15eb2fd33db918b2735015260d9cc998d7d2da0d8788c1fbc15a4a1c6
+MISC metadata.xml 507 SHA256 09fa6b61e393e6cf01fd7285574554d21f3c873b114f495ae6bcc30a0d36f3cb SHA512 fa6565dea69221c6fc48cc024af8ef303450c483f5f00283da84d02b1d9f7f9959024fbf0d808d3f479615e64d1169cdfc1589f17c6e146d709b46048e7d3037 WHIRLPOOL e8c6a0a7595a1277f19777dc1f9d9f74157f40f6ee8c490375ce4e9f8c46a5496666ba484204eb539a680ab907755f2661e463d2a7d6f5cfc795e00ddf0a31b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbMMAAoJELhOzYlK7nn/lucP/0c/HRRfBsRB2zYjDSYWFFlo
-B9jW+CB6LzuPKSafq163aVg6LewddxRztmQilfh0QCAKmv5Hqb4k9IYX/m76Y/Id
-3TnatZ41mGv9Q+9TV7owFedWfn7i9y9us022c29kUjiXWPQhBG9caGoeXB5i96mD
-Hn1FRWfOILGjbM+abGCs1aNN8dFqEYjugSV7C6OJQpVclqeih6sGia8GjUe3+dze
-YreQRxJXDhuVbwU9GZ6MpmdAnxVvxIUUbptGWxvOqgxoSfyEvB71E35ZITyJBg7n
-yzXghVANLvuQ6gGP4wptBTaeyHT70y2YWp8OpJGR/BJGBS46ppMkx4ski044uIL9
-U549jwtgh9tGYCIaIuM1RthlVgKLLDmeL580zmHdObyl1sU6Pqek+mNuuw5OI3FK
-mY9E89bN1yD7PkEFqlI7qslxZ5Lxwtfj6234UB5KV4PI99wR7/8yBS+LKb8puw+8
-3txeGZtW61e32lzIckqWI4sdgiUxcMgnuEUl4y4Bdaey/kF3GyQC7b17jz+9/d7a
-GrbhHy85Vmo4aVejQFgJySbqLS+L8BAy5v4XmV1uq+GEm51ipvBc45cjRNULvmiT
-fQF1mdHYcp3GsAffFlbbh4i+SKb2yCiDvkYTOqYiK9/ktSp5lVDYO8zN/5w2Pylb
-WXP55UsQ2+MT+SNLtJn6
-=K8M6
+iQIcBAEBCAAGBQJVoZ58AAoJEBzZQR2yrxj7PDUQAJ6mWkMc5CiPeWyQPfMNrkKS
+9n7CPrBnTD5DB7tTk2Cqza6eg4d6+xlTWLDb0iWaGvB6cnKfiYsoqnyxP4kHIs56
+HFwwW87vMmEyfz8n3xpMW0bf1CaCWJYe6OupEt5YbQtrL+2LVpt9QbU1JHEuRIzX
+CwgThhrnt6ftgu7l+jguO7jA6QqZlfWITOj6IlhKGz+c+qBEjP/JHPDNDLELKWw+
+5Tnu6m/GUAc0hJd41TLDMHmR40aSjaQfhEgCgBMmCeBkyjhYpV9gm2TOP5hR8nZQ
+un2fSSOL65xM/cJBpZ7IxUayVlyUcVn0tUeYSPSBsK8t5SaRJPjW9o1P/iNut69Y
+seXLFZOnFTevwo9+cVr9biVz56Z4Nja3KN7NCVMr8dNyr+SIbSG6+6Qf5Pmadk7S
++PuhLBwGzlgGa625/XiFakS3dTCHlKwP2uPHiScdZtifGezl5tKaMRPDXzvX0Y6Z
+xn/KuI2GPQ0tR/97SB3D5RsW6CtLlZfC3EeCaj+ev2ff++4BgyJ2vIpRugw8F6+7
+vBhEJehFKNkD5rGute+BDkZVmAujwhRrHpLcR0jPj8CShTJWX8s/6qR27KRn1Fnp
+5V6UL0sN02FjbAkMDVJmWaPWcQFGv3bqIDZjnmOKx+1KPnm4lXQFZF/7+UufiGCy
+SRmFpBYte+Vmx/Ti6sA+
+=yinU
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
index 2b10e885f171..bfcc2940094c 100644
--- a/mate-extra/mate-power-manager/metadata.xml
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
 	<use>
 		<flag name="applet">Enable building of the MATE applet.</flag>
 		<flag name="man">Build power manager's man page.</flag>
 		<flag name="unique">Enable single instance support using 
 		<pkg>dev-libs/libunique</pkg>.</flag>
 	</use>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-power-manager</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-screensaver/ChangeLog b/mate-extra/mate-screensaver/ChangeLog
index 0045fb683a68..4e48bd1270b3 100644
--- a/mate-extra/mate-screensaver/ChangeLog
+++ b/mate-extra/mate-screensaver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-screensaver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.16 2014/12/20 17:35:40 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.17 2015/07/11 22:54:23 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
   -mate-screensaver-1.6.1-r2.ebuild:
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 2aaddb48e4da..a34cfc936f90 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -8,22 +8,22 @@ DIST mate-screensaver-1.8.0.tar.xz 4869084 SHA256 93979d0a6203fa0b59eb5477bdd5b7
 DIST mate-screensaver-1.8.1.tar.xz 4874424 SHA256 a3dd1fe9e8d05b7815544fa186c43a35271dd8b512d6b0377038df02c28c9d62 SHA512 e2bb5b4efbd5818834d0e9f9bf13e9f362f1251bdfc975fc93c69ab90163db859ebfc089e056fa73801053cd396d661954bb6e906e02881452b01a0394d7d2ff WHIRLPOOL a46bc84824205bc6a257325dda507b38a83751c30275052e921c3cbceb53a9243caed8704f0e63888f5fa927ff2a0b04b693e5c7fe0514e709fc356a7756af57
 EBUILD mate-screensaver-1.8.0.ebuild 3416 SHA256 c5930c8377435abd88450ad8454e3b5f93decde30a19d79eae7820edb7f8f70d SHA512 ee1588c75afca286864ec97cc9a3ac243f50b807f59bc1e8a8ca5d116922fa557b0e1f75a2507abaa483c31c3cec94042a411237c7c21c2dad42939c113155f9 WHIRLPOOL faa989e9f64b82ea4eb7a983d8506cac4ea5b1f9c3780aca3e9181befa0df1fbc5039dfbb95843df0e7417b5146c1aa00307520a11afcf2a12ee0a781b63ad4f
 EBUILD mate-screensaver-1.8.1.ebuild 3429 SHA256 b77a535cee0b60a95ba09675ccd4b502d42d290e48ce9d2f73367bdc89e44ffb SHA512 6c9e32f06d9d91c05160a93bbf32b3904445a15a1c28d05e5a4f41a9d8428780648f01a23faf4f42b8969a5430e952b2743347f7dc33e08aff7bd4888d3c051a WHIRLPOOL d549610f79e4dcde2b6844841010775af38d4f7ae83cb860d29b4a1467ddcec9f7ed0cace9e763f7b2f7acf915ea06d405fe9ea4be8e7105872fbe4598ed88d7
-MISC ChangeLog 3055 SHA256 0d781956b2f484ebaa9d45df80d5c11a499a9cade6f8421d94250ad4d98b473f SHA512 c3eca8a9a9567c2db9dc0d3fe6187ab2badf6760e822524ee0c7c10ae89a9f0e0331a64787b48f848be2132131b41498da43532dbc8f005f7c10e3a8bec99512 WHIRLPOOL bc9b39e6625cdc1534d8add95b6c3c803ccbfd8b39a67a453bb66ce0eb8d8b7a0fc7a396301f4fff22e50d3cef426b346a2428d15e64a31a5d81ff77725b83a3
-MISC metadata.xml 333 SHA256 65924dc5eb9352b23b5cbd440061640d0651dc0300fc43085b33d3606e710b87 SHA512 e4ca39f2167d40427df01498ba04b05ee9c109c6c9f02cf192a637179fc3c3a642b2862488613d18a5942a9660b56c293fe4c0d582fb64267064b90dcd7bea7d WHIRLPOOL 9b85f9a29c79be7448cde034436d23bf00068bd545905a310f777902ce5346e765a90937c584b004a2addafdb440f354629ff6ce757270f847d9575430fcd063
+MISC ChangeLog 3161 SHA256 da90e31b60bc062ecb24b3bd89758752c3ba554927bf4d3ffc8eb843334cf376 SHA512 cd189ffec33bb9eac3d2b2f4ac6a2f85f5f46b000945cddbe1cfd1d8fa189f42642b9dbdb4bc9e8e0b71987dba25ff974df6aaf7fcecc843e8bfb10fdbe000ba WHIRLPOOL c5164d94a50d1913699b595e6fa4b23397bd19835964afdc606173b54ddceaaa2fba2f9b3497de976eb66fc1f919a811cbd1677921a9985e2523acccc824b786
+MISC metadata.xml 370 SHA256 07fb28280997f4fe7e601716108ae8f7c24abd6c708e6af02e9b768d1f34a17d SHA512 23272568fa455380d4752bedef956a4349b524d85dd6c33740db9b8553ef8f7dab7210285ec38ba603ba602d96b3693153fc152a8f5d17d09ae16690af310f0c WHIRLPOOL 958f1f74fb0a5f83934f6d5be24aa88dcaf42447b8c90d0dc6db423576cd1f662046790b7b685b2b4982261938b0dd30c5d94e10751b205c1167879772534a9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbNuAAoJELhOzYlK7nn/hm8QAKipE2BF71IPJdUue2HBaB1D
-hsQ7r90pWFDcwUDhaXs+5xl6ymfgJeUgox7qARMz9QETaL2UlYB9wI5KXpU7RVBC
-YlQv3q2DrKo++kOqIJwjXvpzV44vgaMubmgGTpA1JyHWajVWjPhZihHO6QDQgXkI
-4lOGnnD8b/Cu12LayQR/0YpYfzyguYISYGaeko5Pe/0n37QCVL/Lchd9ADW/mOMW
-Kx1oLFC60I2dlmAVnipI3v04IIG9e0faCe9Sc6fEw1e1fj+fjNs0FZD5+3VQJhbE
-MYf2cT8bzCQJPuADWg8wTZuAD6/pu5DfdZN5VHDs+h9fdgK4uK0dj2h06q/6WC31
-5XaP/LfCIiFohhm+CYLAI69gRrWv2K7wz2Cv7F1ZE9FTxg1TvXcFLs1aOBFBLc3r
-JsMPFPCknZnDRWXFj7k4A591TKDYgWElY23LmlgS+fe/qfSzverdTOFy8p2lDrHC
-XEjiM01/qADDPPJnlfSvTSBZKuutOH9dJS1nTh/PxV57/snwkiY0e2qg4BPokWki
-pqYr9RG+gFE8lrQs680G39f5ZeJMvqfPhgaeWnoZgqjErWv8PO5NDprLtqa3g25h
-cYDL2QDA0dFKYbTh4RQL6wApHWKEPnKLPMDvmtb+R6tacuduY6nSyehTLfbFN87W
-Lrj+AmNCBIIlilHuh3N0
-=4Vcy
+iQIcBAEBCAAGBQJVoZ6UAAoJEBzZQR2yrxj7g0IP/0CoDXpZvF7kh4+lLVPDMJoS
+EbaHNaSZpgQxPgBwM3qdsdq7fjJTL24T/2hri8kvFo1NkzL5ltn/G2QSk4M32vK7
+N6evJ8VsglwQ9supdojYKjfEsHaBGgKpmJfdWnA2A5Y5JYPbtAcSMKSotiBbKLiG
+J9JXSuSCqVaW7V1ZrmV4Y/61/iyVydj11OaU2UIqu9er+7+xjDjyNJAvjq0Efz+x
+3QQweV1De7NoxAy8rUJYe+AOFPQGtWlAgGCl7o2GGOBP4Qd5ouJjRQPmM6Oa+oA5
+hlVtwHL6RbpLXA0fcOoccf/GlnGesbGyoWU8ykk1c6yxCmQgGSSDO5YST5h46y/G
+C+N7q1pileUIElu8eOdgZvaSMWDrr20UsSOTmzTafLpvMvT3T+qI9g+Y+n2iYfkX
+XXFWQqHGdB4yMsTv/whtZwfMDdxYoay/ke/CfmcC6WWSkcWtjzAyy0chc6KCSfvB
+iAfeaNiybwUOw7iE1oyIYd6/jP4AW7JW6+sG/5A4D3ijc1e/cT1oL7nTD3hu0YA0
+0GvUdd922d6dUHF0RHujTpLQXgigolG4LPRhDqOYcAtR9IieK1VuS7r9A+PinN9p
+nzRK2YAP8HJZagTnJoy1MsbEd0FI85wKRZUw8dfEMnqvUWcsrep9PLyC/lNZv4qB
+gt3L0O9dVgrgM3IvZg9U
+=vJ1s
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
index 444f546fe229..96aee56156f3 100644
--- a/mate-extra/mate-screensaver/metadata.xml
+++ b/mate-extra/mate-screensaver/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
 	<use>
 		<flag name="consolekit">Enable support for 
 			<pkg>sys-auth/consolkekit</pkg></flag>
 	</use>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-screensaver</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-sensors-applet/ChangeLog b/mate-extra/mate-sensors-applet/ChangeLog
index 9176944db888..6d79cef640ea 100644
--- a/mate-extra/mate-sensors-applet/ChangeLog
+++ b/mate-extra/mate-sensors-applet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-sensors-applet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-sensors-applet/ChangeLog,v 1.10 2014/12/20 17:37:49 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-sensors-applet/ChangeLog,v 1.11 2015/07/11 22:54:58 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
   -mate-sensors-applet-1.6.1.ebuild:
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 968b229a72db..3936d2c88aa0 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-sensors-applet-1.8.0.tar.xz 352128 SHA256 9bc6f42eae4b866f83d0fa9566e0111fd379dc6cf9dcc020b1fcca1c8a49d410 SHA512 8074900157c0d62b060f273fa975efcfa3808afb9c81c44089c1f255ce95ed34744070f98893d7b6bbb16d076ae7b7ddec391ef46459e06646d2586797df85fc WHIRLPOOL d245ed9cce0a9bd9eed1e3996529227e3fa909ba9dba37975599409783bd7f34ead6ca0d477dbac6d41462c85ba599ecb14f18a80e6ab604a29bfce413289bfe
 EBUILD mate-sensors-applet-1.8.0.ebuild 1902 SHA256 1e6b994dc785d3f5288881d0c068ad50bf52b811f3909fe7c5429ab9e65a11a1 SHA512 a9a7dea2c809b91916b3648c2b2eb2a8b487a556e9e1fc8c5edf6f771e1d753f8e6c222ca29d5d2fbf39f23321c1f70b9bd995d479c025896b6a4ec15e4a5940 WHIRLPOOL cdcceb2c66ef7fba7dfca300e0fe66b550f1861674ff4311563421337a769ee84dc18e0787a026c2ad2b3ec3392f3e5a8cf5fbfbc3048dc1cf5f82cded3fed7b
-MISC ChangeLog 1660 SHA256 ed002045e519510bf80c473b3f6f0c60fdfdaf77f3fc93df908e53eb75d5d136 SHA512 647c37e859f8579d51440c019d6d30951e0f72a55a56cc2ffbaa33a1fc52cecdfc82b9792a5dba9ed6db5eb5305cfcd1d12083805889658030848e98e27da7b6 WHIRLPOOL 60245d607dd7aed93452a5a194eb298c85c543626740c899ad145ed7ae6bb652f66908b316b1f567d13cca3ff9896ebe9e2d0293079dfb94bb581e4b8991c678
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1766 SHA256 f10bc489fe3fe5f2ff92a56f4318f558ff837f29054a64adff5f71f9ac2a885c SHA512 dee036dfe4dff3ab0fb5c6aa05689adaf773dfddade5664be7631a42750941ae4d2700a525fadb1efbb2595e8693e5c99ceb978f0cb6521a02af0a8e4b7e66c7 WHIRLPOOL 520c0ac5da58f70e3c44cc8c381b6fd2202531f42af9b6ac35ab1f069d2268d126c2de395f6c0979b51ae1d7fe9de75e06630b1c3778a12b40bdb9681eaa0725
+MISC metadata.xml 270 SHA256 6746c6cc4826bba198db09f22ee574d2789284b9e609046d84697ad027523b53 SHA512 ffaac135cd0f50999a32d419fce1d7c6b3c1b46f2fbfec5772153ebc98a265df9dfc5843bdcd650f7efd4017aea332bc207ca6f93185111d1ae86bbac09c527f WHIRLPOOL 7064e75898f6cfbf1b4181535ad16623e69c2f74236612af16a1ae2725c8f999e42f9cc348714c1a6d2c74fc47163016e4a7546f4c46120bf0b3d4dac39c25af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbPvAAoJELhOzYlK7nn/ybgQAK7N9YpmrmzTC3QqRY+BoWd5
-Cfafa2QPqsd8ZJEaNsPAnZ9su81eg7dAC992KEDQWzaBZHtSWKZqce/lM95mITjD
-KOXqU498jv6I4zlFnfN+z6CEZvYXS179xTzBgWILYJp40yl8Erq3fLf5Ie567iMl
-ccGD+ZaLIXSgzngV1z3bQm9G2TGsAjdetfnk2sXP2N1/OCe14jk8HDpw7OHVCqGW
-5F1xK95rieUwDWC8wAFHXjw8+8plLhqV5bikZapxtx2mmocfmAQ3Adx+VvvtnHjK
-MfEITYRWkC8x2R6hDaUOaR5qm6UT+5rTzTPqqI/+TCtudWTBdRKnPonrdeef6GTY
-wwbQM577hx2dR0DS/7Rady9TK2AI0KOueoIvzr+kRqK3Vqofv+s6mAqBXkeCNtj9
-ARcrIxw6nwx5S9KxxeWwc96TQPR/mzxqY9kRtXzt+XsES4+95d4dde+HgkFNDSKG
-Vl1jqBozDS0KgtiK1UUywQGGREdKobmC019Rl9jl1+6aViOaafpuEn8r3nMm2yUb
-MDpcJmcEHRDmbYxm+nheq3X7HAxAhvVqL36F1S5W/JsZKsI+72OvIvW42GUsTMKb
-L64BQjVkKgIoBVU4T+xxMqcp0sv8jD8agKmHMQYUEnw+yW/53RXzIM4Egx0zz3eq
-v83LQElBaBQHWIpSv2/s
-=SJei
+iQIcBAEBCAAGBQJVoZ63AAoJEBzZQR2yrxj7jpsQAKibILZVknUurIJ6VbmXzIPe
+LItgULK37kfZorEwhjVBX0wk0pXj0js0nBm2josCeIzjT29F13BddA8DTDKJw00F
+XKhPPc7QJl4003BfO6Zw6WIzjXcq37NZf5h4EUmLNSVfLTBCymw24I+VM8pe/UlV
+c5nWPbOoBKed6mW5WwmXKqnBW7s0btg5PgxB13mXmugoircDkOAhjGqX54s5pTyB
+tZECiAOj2U5pfBtvIb7Cyxu5fhgv92uc9sHdS9KmduyBE5F0ZUPWXBbbNWCB+43C
+opG0NUYBJdlwjNt+/UALc5R0FF0J4qSUMfRqlPFVPVy/WemrE64bRsSyvETrBNjb
+dV8ZvuMXBYjDPyPHtu4b2TRp9TH0mNoa9MGAButhelq1XfKrADfHr5TEqIIFcvIV
+5hsr5+VSZFm80go/Eb4n7SPpnrTUSLtG6u0UOKmf1kvgugZyt4e+esAGBlOwTKJr
+xOKKKkNn1d1fXKHSMRcltuBdn9vFnBYOqAq+TWUhALKpeYXuzQ1HCcrestZym5iH
+5Pjcl95PCEizumuu7R1v8onGRwI1yLxTxYZSIizVkA4Z+xN6gP6p10eu8YMS9fpV
+iPliuXMzQEZanETx1WzRClVo1lkl827DaA9Qi8nJG4JlQ4Gy2V54SRmbAsQJ82WM
+KnsJnI3pFPZ8HsDQJvf2
+=9dOe
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
index dca1781cb290..5c977d7ea185 100644
--- a/mate-extra/mate-sensors-applet/metadata.xml
+++ b/mate-extra/mate-sensors-applet/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-sensors-applet</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-system-monitor/ChangeLog b/mate-extra/mate-system-monitor/ChangeLog
index dc1e5f4c222c..4e9d40b36517 100644
--- a/mate-extra/mate-system-monitor/ChangeLog
+++ b/mate-extra/mate-system-monitor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-system-monitor
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-system-monitor/ChangeLog,v 1.8 2014/12/20 17:38:51 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-system-monitor/ChangeLog,v 1.9 2015/07/11 22:55:37 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
   -mate-system-monitor-1.6.1.ebuild:
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index a1de6ddab6b1..14357cf33ecc 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-system-monitor-1.8.0.tar.xz 2099600 SHA256 00ef3c595d4837e44f70c40e683a292836c9c8a84d1f9ab66f5b97a206f47712 SHA512 175c46b05544de70fca37c444fd2ad4f578f62e50da1e0d30136fc2c6f79d49ff68c1d6fe6675d2aafd5d726c0b96d82971df3dc964b7430b2f4db179db91856 WHIRLPOOL 3a30f5c441ee1f60c7e735e7ea6c57d8e03cb22e7b3edb83bf2739548a939fc1ed64dd561bb3bd7e3f33de5643c25d14b940f8d9bb209403af1e30297728c266
 EBUILD mate-system-monitor-1.8.0.ebuild 1141 SHA256 1ce3e9c9df748626f91e171e16c280a3401400f8df3086e85c907e60613230dd SHA512 95dfb75b741a3eded07936ac089b1c0a54a70fbc6cabd72345405338ffe441ac719d883844d2bc91ac97143338956bdb50dc127159ba7b505ac4a3ab3098e222 WHIRLPOOL 7f57159b4d7008102b28e5742e05521bad474bc9dec6552d5d28e0435529c92f8908b3145f7442604361adc700e16508ccea337e9d12df6480572d5f2b0fab1f
-MISC ChangeLog 1335 SHA256 e02df63ffd031589e89b48352316b312f5dd60d9c21dec631ea73c55c923e057 SHA512 15f790b85095a7d00456d7c8ddf6871c7c81d465cbc311442a275631460f3e6b5db43c77f4f0c39ec38c374d2017bb18d1f572973e9d9966b954fedb26fae5a8 WHIRLPOOL 4a322c594109d5bab2b20ea24a18ffd23216c6674da25f430ec98322fa6ebea1f1b90a9dcc9560c1d47fb406bb703ea51e759524bf59b8819203aaf3bf434435
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1441 SHA256 b7c64279deb98f6da5a92ce21cc01a4bd11085ebc943fef22b3daa5db550bfba SHA512 b8e4e108fa1a2060371da56ce4ba3359439c14a41e9095c5ab989ed3c6e581172a65f573d3097bcb442eb13cfdfbae08a36fa9da8155059567130333d6c0d282 WHIRLPOOL af948b5e8b2c7de83df2e2f5a240a33e926621a7e0c305481f1dff30f82b57cb0c9ae1d473dcefe94134b3e7c2cb4fa00458aba057b3c2b545ee8e6ec417c6dc
+MISC metadata.xml 270 SHA256 a34248f9989e878645498a88b0281b0bb11c24ae6f1467f2dd9739f92e25d97c SHA512 a4255c719f5deba97b108ee1fe844bd460151ca042adef0c3321bda7bcbb0d67abb656b3c425a8574d2bc5f56ec858656f770a3b4e9dc29204ebfb7f69be9469 WHIRLPOOL d8a7bb0fa977d7cd314ebfc7ec259aff394259cb334a12121cd4f9599eb1ca2b38877d71a059bc96567f6de85aa9d2398904f5f5e28062804450a676312268b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbQsAAoJELhOzYlK7nn/6R8QAM1oodERFOXdhRx41NvivyUC
-jnKc8f3Lpv4XduvSz70gnK4l7mLHNtjpdFV48b9Kkm/gAm5I4R3t4NKLMU29ZKQW
-YLc5wYEaQ5xMA+iIdhkE4bQIXjg5wPHKWOpdEoAew10x9lQHgP9gWR1sJIk8buNW
-gZUzucCAaMn0csqhrJMtHbqYffofnjYgO4dGLNH5dw/v35kiJywVLWYUFdSTt+yx
-PGsqOIyeYTWTeHx6zQYVbo78miXb2dx2/1Oo9j4+etzQHmFu1OCN+R5DH4283aWE
-Y/ZnQa+Ekeuv67uUZkEVEgrlK3NLW2+cYXpr1nkg5absrHwhHaESgffuH58DRc9S
-TVxYPV5G6jZ/mfaXmadYzBkpWM9HUIxSRiY/xcS+OuB7Dr/gC0NFrS5i+UzDbCt/
-P9vz6drOj6JSSkJx9NWDLYvHf8o7wZne+TlL7ipTl1wRl4tbfuFElaflZ5yETwFc
-K5pIJsad14GeRHj+e58IgvTzzKiAwpS46ZkIASjT2UlZN3Vo/ObJ+OAJHo9OUoxC
-oZISCJIa3gFGlQTO71WopxXx7HuuTV1/etNT2U/EQNr3JQhc9yhWaG01W3HIIJq9
-xrls5JgknadgKmcIqIEc647YCQf/EBtnSj2UwYeiuQO0UK5sRgFU7N9DDX++Awb4
-6k17+Pv8Dy+EZkyJAhwG
-=xTdY
+iQIcBAEBCAAGBQJVoZ7eAAoJEBzZQR2yrxj7o6YP/2g/IPZKklPvvTEjoghSmDg/
+m7w+fLDzjJRrNeBs8xXMZZeOdr2b+daPKUqGW2aMCQZ3VG+KH2DBrU3HvXKfPNzz
+2hvLYEdDlNX1wE8cuWz0QWhQPVrSamXfPJaeN+uBstSCJNqZ6cX2yqnBBWDv9An5
+a2UMQ8FMbThDde2o6DS+JMHNbSSgOZbcP8yas0ZGMuXGqdkrqHF9N9ezepBLjacT
+lKtmMoY9ZnVHU+H0OMitffbBg72Q0JS7wFZRnEjErvFoxZCg5yYnwr7yppxt/4iy
+wn0pjP+K15b+50vVQJVlC1QaABosJfH8TsqyoOxN87gqshtfQgmaEigThtTgsXY/
+GTFFl9dx5g2JrFzpRo+KKfKqIylEx5tXgIF1ofp45tOLuKjREDpBffi2SNEoFmYp
+hpMm59Tljkh8wAlbZccV/+Ku0HAl098KQ3Q1qUIRd+2xCwlCeLfq5krKOCBknxb3
+7EZi1WuivQ8etp7xsWh360ubyrVAeVbwHIGyhzVRpjbNBWAcxIfIv+2Ycjrkcb3o
+dAUuna9JyFciziGYY7pG8AXega6y76gKQQc6q4j8vTZcEfz6HgtCQizuPtPQ3khO
+PCTQPtDbydqfe+XUiNauTZx30/094VLnOHDi405xAKHa1qs7pEoJfaTtlJUpn5IS
+nr1nkeh5C0lViZMsrD/N
+=a6yQ
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
index dca1781cb290..8a0098558dfa 100644
--- a/mate-extra/mate-system-monitor/metadata.xml
+++ b/mate-extra/mate-system-monitor/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-system-monitor</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-user-share/ChangeLog b/mate-extra/mate-user-share/ChangeLog
index 9b6c21677a7c..de7930b36470 100644
--- a/mate-extra/mate-user-share/ChangeLog
+++ b/mate-extra/mate-user-share/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-user-share
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/ChangeLog,v 1.8 2014/12/20 17:40:09 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/ChangeLog,v 1.9 2015/07/11 22:56:13 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-user-share-1.6.1.ebuild:
   drop old
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 993c9e3904b6..142f30bb39d7 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 DIST mate-user-share-1.8.0.tar.xz 928348 SHA256 8cfe07fcf728384b073557aa17bc10c9e221c6d714a1009ace582c3c74cc8b5a SHA512 0d0231abfc65fc8d0a16ec871bc534d788d9699f5a3a8b2f967c6532b06266591c11199eb9630121c595513fb7255175bdd8eeae0a265e68c7d0f5059daf4947 WHIRLPOOL ecb66912c6015f97f24156f8b83824873136177acc525bbed72606af35cd21d95e1cd2ea556ac9b7c403e6a756e9e9577189ee4cd19301e721113c51780f6d01
 EBUILD mate-user-share-1.8.0.ebuild 1638 SHA256 5e5724300a7746ef1271403429bfdf78daf429d562a69833e9b9516619be539f SHA512 3cc4a310340c32f337f6f4be46c831bb83565b3ce760d5ed7f2ed19e30488dcbfd5ff5692f39a4d285f2fc58557f0cf5884bd76f92365cf9c6eb69a299df69bc WHIRLPOOL 169ddb8d65290245bca2e937256b7b91330f31fa5024d907e94945d0f340c872f533494ab6d097557e4f97903ef91d9b6c7d877907a0cebada58787ca73826c0
-MISC ChangeLog 1296 SHA256 ffadbb70d9e8d773283313f2c77f2a95a11ace34485d3227dec06cef36a4ee5f SHA512 8fcc7286431e7bcdfe50fef17174e4225f10b0707ebc6c3ae9a2546194c9f1cbce81911b9f14e362bfc7b8bf9b9702010c7d00d858676d8f9ced9f3e1e4565f0 WHIRLPOOL bde4bb2efde468426a057f8a96a27823260bbabb373be9d219394f75f709d7c2d5e9ca38486551c87143e8a6f557b8fa037f92643729cf80b77829ae85984d32
-MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
+MISC ChangeLog 1402 SHA256 9437710cb864bf4780ba1c4120b0a5777e9b686958a4dd0b47a43543d2a4b5d5 SHA512 057477222d6bb5533d6362609b90048302ba79b4d8cfc32508ad765e07c269203b9cd548a68c52d7a7682644238f6586df990ca1e577c58d143ca14ec92ea600 WHIRLPOOL 5a1650cf01c5cfe1ca5b2c77359c6f4b48e7fd609c33700f85a49f44cead615818d689dd91fdd6373506f60ab1e335d5b2915e2367f4efb15f741ded00dc0cde
+MISC metadata.xml 266 SHA256 3cc457f543fccf8a1543757e74b11dfe76eea705ed9054d085ff8303f1d9cc98 SHA512 481dc9079f73abfb3b56e98c5f74b7b2953b673fd88d9abeb453da13207759304878e4bcf52ccf90f0d9e4b34e2da128620bcd979cd720388e905c68f4618c96 WHIRLPOOL ccadfd85f04b39a8791ed8c0208c038ad4960acfd15473ff2c3ff2a16963f3ac0a2cb5771a206a73ff4bcab421b74f2d57965f3502a0c7f7dfdab485ee51eb78
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbR6AAoJELhOzYlK7nn/MTQP/i5eyJC56cXGOAvfrezOgFMB
-l13x9TXPFexCkMwj67u4LgeP/hvRT8VmLTETxy+a9cYf8/7MmP3UYlqLiBgAFTFN
-VEQLYyrsVhtR6q9k5iLQ/08U8x46/LFORIWAFN6hypbLdYjuWvQcMtOZBtp3NE4G
-t25e6NvkbAyszKSJOGyLGhydP9Z3yiL8mv5aPjS6Xe+e6y5qTxS4r+Klw2IUE6yF
-1vEalXp1GpxoSrsjVKcasgI5Rc8U324Dk/0fmEb0gSe/wtKJtnStoUJr+W1e70Ff
-CqqCcc0ZLnWUW2x+jDDcLgA+3G9NcQ/7hM3mdpFo483vAU5Sq0EiZwQ5M8iD5s+7
-SWD0U5RzP2Dy0wSHFO1VTg5Hdd2GwKPgoWZcTmE4gCdc5QR1eVxSnv+UsUKAcEQN
-XhGna8Kw4BEWjDEkIv5W1ULyQ2SgZpktGH+4ujC19BI8P+Tfdam0dLfqZIDYBxwB
-CmTnDXd2fmP0nFbXJkHsC+1gOn2KY9UG4+y+yejaTUnDYQ6y1Fy8LtxMrmrHlrzQ
-EkIRIRgXwq3le0hUdIVDUWgbdmILvRd96IIWDOXjqJdaKLIXfc/pFHINhMDmE20e
-cSX6ZmRTB1meNi89agQv48DdVOkvpc+1ih7+X7FfBP394/mTgzrsPcrxlgExibF3
-fCmjjL0xSZUWVw/fAWsJ
-=JIsQ
+iQIcBAEBCAAGBQJVoZ8CAAoJEBzZQR2yrxj7SvYP/Akh+2OMS0yQBjKuzNxITjIl
+IRtFQXkOraJnNrI6JK4vPrfL2Gf2nkZ4Q+VmXVVown4Ah9wx4b55e/l/3Moz7aZM
+Tfduh/EGf6paNIUQ9GLbumAMlWBBWYA5IWdfvE/dqzwUibi9F8HmIe/w11nlrQnp
+bdKKwUBoiM6O3DavkC/FATxhEq6sCxxxSN2x20W+ObvMS7URcZAAd1j6jmszFRPU
+O6mgZc11M18EkdKargNq4nE3bnSo9RCTnUjnS7k34y2eisVrQpBBAUtqZwS3fpcL
+++MwSzlBHRYdgMH0zWuZucVw6lyvQ2b9MwUFhJfZpYw4gHAbWtz3Rwbii4LeiIEx
+xsGuCuFaucFaGD4LMfqTUtUVLw/H4p3UbaLDoG0iIXoZLj0X/pRABIWrtx1TYpL5
+SegXfwuq8Yv3ZpazCDmT3oztnO3EcV0XrKFpWF7cTuWE/eIK5M5p9eMEZZJpDHV3
+cL1ZxBmXlqxXzt0NFDcGY9DbL7vK9f29Y3wCTSARiH4VtFFy9KCy45/PNi7Igz+Z
+tX7kYV4GMYFkNFNX1Gsr4MFazVizrHhzgamRBbof/V/dtoLyFhCrd4m6Al3cQ+Jq
+5G/H64+hAj4D/SQqyhmtVlJRQCBTLr7LK447+WmwJAjb1ruTwTBI7n3wTdZ4tQ5r
+lrxCUbbbAP6DbIT+FPJx
+=ox/n
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
index dca1781cb290..3b08cd863903 100644
--- a/mate-extra/mate-user-share/metadata.xml
+++ b/mate-extra/mate-user-share/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-user-share</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/mate-extra/mate-utils/ChangeLog b/mate-extra/mate-utils/ChangeLog
index a6c2357d1b0a..c6a835b032bb 100644
--- a/mate-extra/mate-utils/ChangeLog
+++ b/mate-extra/mate-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mate-extra/mate-utils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-utils/ChangeLog,v 1.9 2014/12/20 17:41:13 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-utils/ChangeLog,v 1.10 2015/07/11 22:56:32 np-hardass Exp $
+
+  11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+  Update metadata.xml with mate herd
 
   20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-utils-1.6.1.ebuild:
   drop old
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 4974e0d461d1..2fde55ae7a03 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -5,22 +5,22 @@ DIST mate-utils-1.8.0.tar.xz 2681836 SHA256 490d187d67c4f542cf3b8e63337acc1a9b70
 DIST mate-utils-1.8.1.tar.xz 2648184 SHA256 0ad9c40c656214caaa6cbd2107ebb13e3cea0b64b4e31c7105568726313522a5 SHA512 71a6a57365a067012447222b2ef4b768234b2e58bf88b5b45c6e4b7f746c81136ea1dfee45257406b19f2c4f4c51adc3279b09f7c9c41bfe7be9c66321ad0eef WHIRLPOOL fc35c564fb378ebfc147b9344790aae5a3934e86f6cf642dedb2ab98ae093bb259e298f4fa6de98157f3c4775445862888a56464de8852d829e6040f9a42fc95
 EBUILD mate-utils-1.8.0.ebuild 2132 SHA256 2f9257bdce47f992c339721ff141316537ec331b999d71246515196d257522f4 SHA512 de589e8f8bd7157e28b13c60ea0520f7957c913c0be3875c24c11187c79f33c6f06d778006d9119b41664bfd360754319c335ab15c2b1359a856e83823cb263a WHIRLPOOL 48b5375264e6f5f9634719a02d6c97cea9cef70a07b6e59270be190c286889427d09db08b146984dc30ae9a0c51100a91875e507072215235b92062b25fca01c
 EBUILD mate-utils-1.8.1.ebuild 2135 SHA256 a399dd705f2c2f52f4f0f80d7cea68381cd168562f8494782d55cfc7602baa3d SHA512 e25fdb19006eba0e27212788216924b2756b85b9fab2caacfadfae6f7ac5c89bb0b2717760d183e99c2d23dc62fc5eae381f26fc256cea1400b49377a9ad5063 WHIRLPOOL 3b316a746d5286d286bb053d2c3a63804c973190d89a2e14d15b6b60d74c571637498edfff9a37a5b758340e7c13141acaa5d81815f3463ca815f9c55b92c823
-MISC ChangeLog 1342 SHA256 4602f576438ff3d53a8736f95cdf57c1ea4b2e3551277a3866cff8235e37002a SHA512 9931c69ae32c940c27d6d98b68b6015afb3383c76fdd2851f808384bdd5510076ac3011b95bf04e2d7c94f47e4d3272746cbf8850cd3911cd470904cbf127539 WHIRLPOOL 648bbcc4ed535057b993fb90c58b6ef382f9947f1131b83f9faa0148a3e6dcb04c1a0291740e83d867f69e1f04231bdaa841e83b2fa2cc503bb19de164d134fd
-MISC metadata.xml 308 SHA256 d9bac8f18fe6ca64bff70a82ef188d67eea6d87053a49e551a896bab52c06073 SHA512 f06072edea9c4a12a08cc255a90c3d1bd095c34f3c5963f8aeb36afbfd8fcc0f44e2b2f771c0f17b8f6fa701f51532e14bb8c4837a27132c9fd118219b959bc0 WHIRLPOOL 60c91c1f592e08e61b5381b63836beeb52888e037038a875209f8037f90f1c2ba61d8fc5f82e8391ca376b4363405f2e0ca0164ac3109d431c89df8d5fdd2af0
+MISC ChangeLog 1449 SHA256 9b1b5d0da1f5ee73b87fcfb0416907e9a044499d39b26813aaa353ad4c7bfd9f SHA512 4ab5d0ddbfa5cccf2d325c7464f09d1b7816e3ca1096c5f618778c52a0bc3a456f33da516ae246c15ca013138234bafcb21341f6355d2e452d43380d8b56a056 WHIRLPOOL e8d9ea4ce14e648396c020e26155f4319976621128fbfa6ca680cb7d84deff56b53949cb954f86148745a85c23102f630174b208e5c7747f4f6ea9264b2e2c16
+MISC metadata.xml 336 SHA256 0d2a2881231c126306ca4f87b5d50b6c24a43cf7660364045c7ece9da966d4b8 SHA512 83ec5ac8b9aa3dba5f4aacba706d0af08ce916548fd5df681ebbd261e234fadaa430a32535bcdcca83fa533dc3a7f042980b42405b8cfc5ebea2351f37173490 WHIRLPOOL f3fa5097a9f676552b9e26c0e9216d769cdd74954d86d950c2b7ed3897cf0ce418352aa5b9cb039a007bbb729ab8a2598040abc12d225729a092a50b037de2ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlbS6AAoJELhOzYlK7nn/X/0P/REurTVwd8lW4RCO+D+2LzoJ
-TuNKAEs+acTgqSTv/mtjPUNGvtl1ZyCusP6t22DnpD2jaZsT33aRsNN3RTUJF+xu
-fWL2bDEAN7I9T/FAmQejNDKFURg8BOXCHOHgXJkH0Kqxu6kV7IRzKBM3E8JLLIx4
-mPQz4NkRV4WZXOLvyEXyaohiDHPu9PmGT4qLXidGYOX55G/I6oWJWQAQUCMIwHSu
-D9xBDwC8HJey1L1nGxFXxS7o0yv55JZTjFhOIhyv64cipRrENDcQdErN++9zWswd
-JDLCaG0FDs7c2xnhIN38+QYD9zGxw60PlpijXSxK2BWVAUDWer4FtlUr9YW2M0UH
-ImdtzsemXgjlgwihIRmHW+zuWlq16dmfMCmOS83/xLR0IP0UYNFYcpkIqTOCys9s
-ae2bTbpQ9mgZWTr6OvgJpk3Ufaz1M7MrNci5w2PJtIktYu9TSC7zB9ef3YmiYj9h
-QSNEDpiedxhvyaswF32evVKerVYSRvZTZy42XUFyrgxz4MYwAvZDDoaFbcne8uaq
-e8sZIPRGip7hs349iJAF/kfS64zXvbkadnBdsm9Y+bQbWeZ10zb00rMVYUuHNzfO
-SG0yUGF6BZq2DNS69u4EcSW5A4uLJKdgPGo7rZzT2lApJdhxHe79ODbD+VvdGG9+
-JZI8OB57ynR0lBYsaABo
-=2ZuM
+iQIcBAEBCAAGBQJVoZ8VAAoJEBzZQR2yrxj7QgQQAJYhZC06rf/zRqdj4Z2Mp1A0
+bnjQbZ/5uA66pGtRaotWeLrXEe0+3378vpoaF8Yp+EBrZJfh9StRG+zyQ310HJA9
+7wQmyF0wH1eO2AI31qijo7qIfGVdqG12DUQbwg6T7UZmgOAC0RIcBWY0qbA2Zhd4
+7ovXZo5qLsoFnAQGZjGicuM7ljL8nAyckdlydLTfOffvL5Xh4H6gUQ1ncWz1BqrS
+1kPN2XmB4xLtYfd9Ic+LHoTQv5n2iB11lFV+3bw2yA8P1rI5nmodEEh1uzvZCS4P
+EFd1UtXQa5PgyVni6IadeCtnATvQAd3VZbCdOdx9fluYGIylJ9YkWK5PVSNSm7wN
+AfQy7y34liMjyMxiMr9av5SkbDMKCyIkWtyl74egiV8Em17z/bd6E6VKDjW0HHLV
+7mfTDaL9KwJEwh32wVctY0w4ky20qOnI7yPewoZBDQJ+ADKyrgoIhSQtgdg1K+FV
+N5rpI76EXiEDoncqbxXLOjtlvMg8FIVENl9ugbYb0VmGZjX6IiQmT0owKPjNZSr4
+ag3nlEuEAxDUs9l5icXMeBmRkhqOoaSR/Nkx5oF6QlgJ8j4oKrgjmKYHbMi+XtqL
+o3jedW/UINczB1MX+PxNRKi62I+lwUnIExuVQj89FhV/zFHBKfnt+73IcpnATh+b
+NyzxPsoYV4tKYbkzWdaq
+=4vK9
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
index 373ce6c7a25a..dca77826b865 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>TomWij@gentoo.org</email>
-		<name>Tom Wijsman</name>
-	</maintainer>
+	<herd>mate</herd>
 	<use>
 		<flag name="applet">Enable the mate dictionary applet</flag>
 	</use>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-utils</remote-id>
+    </upstream>
 </pkgmetadata>