Replace herd with xfce@g.o

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

183 files changed, 1611 insertions, 712 deletions

diff --git a/xfce-extra/eatmonkey/ChangeLog b/xfce-extra/eatmonkey/ChangeLog
index 672e7b819238..15ac0185b182 100644
--- a/xfce-extra/eatmonkey/ChangeLog
+++ b/xfce-extra/eatmonkey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/eatmonkey
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/ChangeLog,v 1.7 2012/11/28 12:17:15 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/ChangeLog,v 1.8 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> eatmonkey-0.1.4.ebuild:
   EAPI5
@@ -28,4 +31,3 @@
   25 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   +eatmonkey-0.1.4.ebuild:
   Initial commit wrt #311287.
-
diff --git a/xfce-extra/eatmonkey/Manifest b/xfce-extra/eatmonkey/Manifest
index 0fbdf002409c..352d59b8c1d6 100644
--- a/xfce-extra/eatmonkey/Manifest
+++ b/xfce-extra/eatmonkey/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX eatmonkey-0.1.4-syntax.patch 267 SHA256 38079ada1b5b65a609723fda687bf935c2f0e9b7d85cca890b2cd82545a6a320 SHA512 1f2ab3c62ac18e9e93caa62d99b8deb39303689b1de63845e9994cd81b223c924f6c8257affa66da9b539c0f74bd7364620306239a4d55a8539df92f19980ed6 WHIRLPOOL aa6a808fd15e661dc695cec57d1ca4e2e72a83a760aacebd999efc6704f9558a09652a1716567faded4a3a60af51d834a932c06daa871af56ad7d3d0826afad5
 DIST eatmonkey-0.1.4.tar.bz2 181996 SHA256 b8915a0204d750c939314711cc836f3ad9eb0faddaa2e140ca679d2764a7b3fb
 EBUILD eatmonkey-0.1.4.ebuild 1041 SHA256 2d9c6a3ef8ec6b29901adb7c42c22395f87da3113e2c15da1ed31883086e2a53 SHA512 2296e5b58c434f7e5d7c93b1ee98c633d438551026a11a7f69bdd6d927528b9c2273555a736fa91670fcf303562b08d582044bc855c33e92138842014f69fc7d WHIRLPOOL a109005459694ff4a81eb2f1d451c6e11db8e00b57f4fa427bc2f2896c3540d191494c9cc7be7ce2ecb7964200399e3aa14f25203c64958d23cc1f05e225ee18
-MISC ChangeLog 1088 SHA256 7b790630177d20b864cf37cd3f3be55ea9b79257860895cf081df9918370570d SHA512 18da740e42a4ec84748a50d30bbbd1fbf081dfa3fa0dc3278a8aa21089ea8ba5a856e4492cf2cc1ddc684f0618d2018d0c6615d9540a4bcf5c7ae7107b4b2d73 WHIRLPOOL a87fa890f1fab40d7846eea2e88df42c9698f6f96a11b96c439044667fcd5618c795395f6275b16559bbf18e27d9e0cea71e725af8515065d127d86217c71492
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1181 SHA256 dd398f322c8f5e6dd574754f872b275eef9d4cd433fae5edb74a23df9c8ed5b2 SHA512 433de8caf73a66b935135aaa1fc98e6c86db5c77e3a40d5fd2b914c5c646b819dafae88fe1bb0f08bdafe86c5788508799193010cdc4e458886a8c050cce3e9a WHIRLPOOL 19a4130e94fa24f970d1ceb799d9a7f8eefe5356c36e5bb20da836834081fefc2c65592700bae4cb0706ed4f27774cdf40e5ac1b117a74e8c24835eac4716331
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgCWAAoJEEdUh39IaPFNzn0H+waC/+uf5nguu4t709CBffbj
-ru4RzvuP6v3C98zXZpSSUzOoJt5qWmCgcxI1TWzRDlvaA65MC51UjRUN8WSOfAJM
-3QBnqiIjZxlPivRrjXE83OUNI7S53vJAoQN5F98qOGHnO1d+xJXoG8yPK26aHESM
-+40TBeO40GgSjw2+6Oc8/qfCK7pfFa6FmWUHl8F3kqwKr9a3kiKIeCmuYAurgxlS
-CshMMM6J/G0MGgx+C4TvBeTNikrDDTNPqJ2fzK6FZkCxVU+r63DSkTfiTaTjqMz2
-ljORExdNEqCYtRBED6LKDLqEOIJi/RgnCjZ+BZOB0sT3SOSj5EZRq2YHOozwV7k=
-=7zyl
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VvdYQAKEdjTkreoiV/L/iY1Pswc5+
+82e/WKOIHgPLhefeqiEScbLKWOG9pOQdAZIGnZyNKGjQcaXr6OihSttg4RZUVj3+
+k5dtgoRfmHeho2MJ5il7hIc49m9SLC2OHaaQBe27H7F/mNiOixfiKpEsuM2eZrNi
+w7yoK2MIwcFigOQ/EF1JDISww/bGuoqqh85P7tyYM3Y1uBwkNG41CYiBqr48QOam
+a73zaPmYkEuDFLudJOxOxGblUYSsVsI0vpg9V/+pKHsiebVMUqzTAW4wYYQIXk4u
+REU2bRTkmk5mGjU+Ikm1md9TpjfLWRvEfUy0Orhv7WiDu4Qs2sNFt8I9b1g7UvwI
+3gCxw/7CIvRDUSwuJ6aCEb4wkOk4hn+nA5Cl4+sxeZqugjswX55lgWjvJ5cto0dD
+ROVHylCPnbRBEX8XVTluOMD0lVTLYdD8Aod8YkOAXnKGFaNQ4Hmno1YHlcO/HCWQ
+HTlhbvAokDn1b5vEWRExYZTdeN4k+EQGkDxJ+kCMdMTeqDFlMpKdPWz/+uRkrQVh
+PuTEl0xoAkudcS6Y2iQU0ftm/OCdwkCr1zyUPmd5BKJCUQj55cI+ngRUzstQNIvm
+teqyTbRU/VUEuqlbrfSJzzPKisCOcuupK52cF93eDMMy9Q7mY1KfBQNo32pYecLM
+q6UhM+V39RFy08CiolNi
+=RZ3W
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/eatmonkey/metadata.xml b/xfce-extra/eatmonkey/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/eatmonkey/metadata.xml
+++ b/xfce-extra/eatmonkey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/multiload-nandhp/ChangeLog b/xfce-extra/multiload-nandhp/ChangeLog
index 2340d38cd40d..4e5cc3cd4f10 100644
--- a/xfce-extra/multiload-nandhp/ChangeLog
+++ b/xfce-extra/multiload-nandhp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/multiload-nandhp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/multiload-nandhp/ChangeLog,v 1.5 2015/07/13 05:05:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/multiload-nandhp/ChangeLog,v 1.6 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
 *multiload-nandhp-0.3 (13 Jul 2015)
 
diff --git a/xfce-extra/multiload-nandhp/Manifest b/xfce-extra/multiload-nandhp/Manifest
index c07dedacbf3e..b4a4ed07dbe2 100644
--- a/xfce-extra/multiload-nandhp/Manifest
+++ b/xfce-extra/multiload-nandhp/Manifest
@@ -5,24 +5,24 @@ DIST multiload-nandhp-0.2.tar.gz 32910 SHA256 3f8169522179f804470ed697fbb3c1213e
 DIST multiload-nandhp-0.3.tar.gz 34812 SHA256 6ede95477422c94cd12c7999d7f3c4c3a7cf1db70999dd0dc50f3a44762290c7 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c WHIRLPOOL 74254cc52a1f2ef4c73d1069ca408cf2e374062c254300e2fb9a3bcaafd44e6cc22d2c7d0a53fd70b15b930681df5b908a9e245ad9d6891c526b0267a5348e27
 EBUILD multiload-nandhp-0.2.ebuild 1231 SHA256 d01dc6d756209c6f6a04cd2f495b6be3ca009f31dfb3783af456f102675ec03d SHA512 c9bc484333f51e1743a27be8be0e499b7b9e56606471c360c8c09ae5107ca831e88b1303689e95337d9ccb8696a55a953ff2accfc064de8442ddd29efcf7e878 WHIRLPOOL a802633731c375d54b52b8bdd544a2cc384ebd2ce0989f9b8b4998e6d799c63c31bf1c52ce7c992e7c84f1131f7829b3313613c4b91d3cd16a63a4b2a9665e4b
 EBUILD multiload-nandhp-0.3.ebuild 998 SHA256 3077e2f6241681819df59222953565f7ce1903e5e24778031d84a93c98dbbf33 SHA512 a39abc88dd2be13d925fe95b2bd8922b0e0d3046cffd9ebbf85907a7a1552f6e6fe7055b6b99ba18a31fc85fe2f032f866192834810f5c3db545bfca68b7d4c4 WHIRLPOOL f205dcd4e104ee5e28ec21ae9447dd0e06ad6222167cf576b8c227fa61fb0108f98cbd19951da37395a72697eea4043cbb7e13777b469f68531a45b7b0953cd9
-MISC ChangeLog 1100 SHA256 fb87ecc1b2f926c52b072d16bb5572938c0b67b7e3d81d344b965425466d8ab0 SHA512 d7706799904611bbac5edb38a4879d3eb20afe134ff9d4578a07e8ddb862832e047d66242c734bb1519b338ac9d219567ffd529aa1220b21d92b8044a6dbbdbc WHIRLPOOL 3c4afd71321604ec41328a2285d05eae2f86b27477d163adf0a770b656d9182e3a24284ba3048a5d821ac9d92310cd3b312b925fb1bde5037cb073caa5b09cda
-MISC metadata.xml 420 SHA256 1d44dc9c0598e27f16c87d73b969cac427cc9c65574779fe14c3c3ad70921f8c SHA512 1fd9f8b002bbce06259b505387c2c9a6931c9fd231286fff2acfbf47002e0ee019c7514638f2e01b4cbc69159e44e1b600dc02b93b6c15b7dbc21d0efb4ff97a WHIRLPOOL bb3593a2ea503f6a97cf680a1cf3a90df60ebd3706a6e116fa0c2d16efbccab84f8027972b69e568599ff8c5d4eb3ba4adb9a0f3303a77ea6f3d5d9193f2d3ba
+MISC ChangeLog 1197 SHA256 ae97bc50a19035ed207aca1e59a92a1b998e58320753e85b4455c32d8c95ad35 SHA512 59968ed0c5dcc84c45c21fbb4855d4962f924a8479e5a117e71e8b9b531da8b72e8fac39537781d954b5efa2d7e2a5b1543fd4eb8fc6e94561185d1f44394563 WHIRLPOOL b3bcefc9cfcbd24b7747ed56cfe40b4a129062621d69227961fbbd84bf36d672a0eb216d62427665fc9a33c83028bb1f007b086130ef6f557e9ad74c04141aa4
+MISC metadata.xml 493 SHA256 22e28dfc230e8b6b5b893e70f159bdb7e6c5efe0bd0cd8500d54393e4a237632 SHA512 40321aaffae2ed3dbe8c1e3d234643ec8fc282343db71c8b600367a39dbd601a5d4de3cbb79cae7334191377214072f2c03980184aeb65ca651bae2ce9ade1de WHIRLPOOL 75dcce851967d5bfd72d8a30b18ce4fbcf70a44608f662aa60a05265a7e42665247a1490cededd19fa60043ed6c94fae12f3bb70d2d3c38b8b6e9e44c115d186
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVo0cDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfAIP/jBjbvSLSz50tSbkqh7pnkjX
-324CL4pgQSZ5Q3qvrIMEBInnce9e4cw2S4epYOICPnqoFeJZlcRe3KKz6XfMYN3I
-qmKitkaOND56zoqENkPyayExl/rKl/ZrW5wCABmlAnR4lwPgY3BqSZ6bcZNjemA4
-nQ/6zMFK0lMjuv6bh0e3qi3rdV69wEUwmY4b9SbW/WMjJhmVn+aF2trsoFBWSAZS
-uu8Ya2nmPuAC5xrbsRJjXrK9J72kjzMYY4s4J/UVoupUVxuO/D3ZB9hTvFoVVz2G
-ITmYoTK1kyOGQRFVDkywQ3yiXDn6tnz3Eu8epKa+NGj7leyk86HpE797nLr2GTKb
-TnuL3s+aqPway7Qp3U8PpJpqhnY0qVyEnyTgG8XUA9EUtWBYw9uSgiZDAQlMLqr/
-/Anuru837E6gdx8gVo1e5ncl6MsxzNTiX3B0xKsXOox1xLTGaAR2cZB6I6T2puEm
-6wSojskjESC60uUVxQYH/j15qIHDI5vH8TvCas7KZ/IvwpZMx7yEBGKg/zeNaXYy
-DVdCfg38z+cgIRLooy82X7tHmBR7+cOkzzO+wPoLE1Z8MDeO/DOamJisYDlurQDJ
-ieSOGtAQosIfu+0P8mhbxsMvJ37YJBN9yIMxPPs+s7gl9hhV/qr43ptsUsQrK07K
-0eh1XpARnU7ve1C8wJP1
-=Z1Q6
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vv/gQAKoHpBu7jKuSKhhFxiY3k7JQ
+YK++SJtaUeFmreS2IbJtsQouLykYnqL02eHIvA1xhHd5R1jueHcZWcui1mTtMP+g
+voy7FSJD5jSgk+5kH0RvUpetZS1WRuEtXstImdJ3yzLIYxSTE+0wAyHn/Ay9Cl8v
+mez/RWUAohwsxI/3UJ3czBv9oo2eVSVYL56LKk/ExJEwD+joXHyP3uTBQ+EjN3Lr
+Ks2VAvUt8M+J5M8cLDwtUzc9IbtJJGT4fGoB46VNZkxosKJsMk0kYoaaZ2YYiju7
+0zouLh090plflOAo6oyTodISNm89E9UgST2KaCO00RLv0J4QFYGlFAY14GT0YXxe
+lMoD1k12pUrFEN0ZyM/eICYvjimC0f6qo2eGonpENMmO5p4XF8rMvQM9PosXdcW/
+tgQC1AOKcd3gNAIBmzqlLZioVWoJS50emg2YgBKDJGAVYinsWd9FNHAm9Lh9UdEX
+xR2vmCdF+BDbcHahxs63kQpKxbJKBlL0H49C4HkKH1Kk3mqkCpHBW1fhQcu0VffQ
+KnfaH2xFz5OI7BzrzhLh7eaRAHmGHhyqYj9yJDCFHgzFfMmNILcBF90XfqfrSnHK
+zyP9qmqeprkfyKJSsFYF8t9MOSIJIOrUNUcVe9JhkvhPPbWVYqVvPHZJjCzG9Tu7
+KDCzxEIfHaAlZ2M6ZwmG
+=vZg9
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/multiload-nandhp/metadata.xml b/xfce-extra/multiload-nandhp/metadata.xml
index 0a1bda0b4dd5..fed5a18cb79c 100644
--- a/xfce-extra/multiload-nandhp/metadata.xml
+++ b/xfce-extra/multiload-nandhp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name="lxpanel">Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
   </use>
diff --git a/xfce-extra/thunar-archive-plugin/ChangeLog b/xfce-extra/thunar-archive-plugin/ChangeLog
index 4bb43514e674..5227c0528ee3 100644
--- a/xfce-extra/thunar-archive-plugin/ChangeLog
+++ b/xfce-extra/thunar-archive-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/thunar-archive-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.38 2015/07/25 12:19:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/ChangeLog,v 1.39 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org>
   thunar-archive-plugin-0.3.1-r1.ebuild:
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index 2477a4106b76..28c06bf5c36a 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -9,12 +9,24 @@ DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 SHA256 9ad559b0c11308f6897ad5660
 EBUILD thunar-archive-plugin-0.3.1-r1.ebuild 1023 SHA256 833a0833e11427f154fb62b5953e7d8cdf0a4d26e86e13066309ceb76ef84526 SHA512 7709b80b420dd6d7fe7b8b8b52b4310655624d4f63af5b3db3d512804484271f7836844bace3ebdf6ce7327e9c0808a047a4fd432e0be7089ddaf4b07f56373c WHIRLPOOL 876d78cd8a23372abe5099a8b70004f3dc297d271e6169b7903d109ff88794e882e73728d438b7a0f102e946b3acb81dd9b40d03a268ca601a9fd7d10b3ef71d
 EBUILD thunar-archive-plugin-0.3.1-r2.ebuild 1081 SHA256 5f923f5c331923f7090517e7e650a677d2a7a1d0544f45e94e3e9c91e60c1de3 SHA512 7e641f4c39b08c0aa9887fa73cda9eb4174f13436cefa1c585f57a2eb90776cb54f45fd03acd301ef80ef56f0d0901aca66bbcdd4fda6c6ba3ebf8dbef80bdfe WHIRLPOOL c52d18bd1c563563013edd144259253f04ea7a2aee9892e5df3fcbd00f9d807a9d3cb1da4f6d1d67e785794c78e367d5f9990d3df4c405b0f4ac11c7d41ad885
 EBUILD thunar-archive-plugin-0.3.1.ebuild 888 SHA256 ef5055673bcc8b311738e57b06bcc8e58a911352562af84e5fea4e39be78dc4e SHA512 a67b8b54f286817d9ac98dd8f00012909bea45219514e0661a16176b717d701116100d615513e34996dfc556ff44d6f7ffbcec90a1b0a9547caaeb6cd7760ee2 WHIRLPOOL 354a76e08e2f1d995fc398b56dabc47c10ecfe1e2cd476eb931131ab2939cd2c5f0ce43563ae3c5dfa48f2d268ce985ce951fbf89c29fb9f60824ab0d1e58dbc
-MISC ChangeLog 5539 SHA256 a9ef18d718d3064508a5039621e8ca29339f7417ecd562793549c4f03f8a2627 SHA512 f645996abf08493a82cdd70adf1ffa2e05138303ba45d07e7282b6a88d2276e9e6d8e5b3d1839e2dc5f1758a3e456b0c94d3e7be0258fd854e7c4fbb233c1cfe WHIRLPOOL af6bb9190048ae88339e23e4ea1923ae6d8e924ca43302e306a61a4fd10a9eab392033ba7652acc5d0c3b12cac646ed43748695afc7b41a4f721c9e348e77b19
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5637 SHA256 fd4b8300c4656dec2652b2d3a72fb8fcfc158a8796dad7903dfec14da51eb2cd SHA512 dab978b9df44c7cbca6bd43284fc1f436812cce03f87bd38dfaeef173a570eb409169ba6f25d4362df972f818644387e066281b4c3ac64f2091f2236700bde61 WHIRLPOOL 5d93ac66acef2a9a694956dd98dd2a870692b0022448f00acea7d903649f1d71d170f1ab1874709ebcadbff6b14c50b133a7d0c2c4844005011713bf05feaebb
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzftgACgkQCaWpQKGI+9QyIACcCcSM0apMx7K9HVxe1bzXfT+7
-xZ4An0NmpsHOSxEvvJsmVQ7wcpmfpa2P
-=5aE2
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VB4UQAKaHK6Ow3bMcgHN1U6RDMk/4
+gRAf2RVAMbZnxbZWoMpuXWe2NlkF6EbsQGl7/w2Fe6A0egML8hZoipzB2fxjMHxW
+vN/LSYnW3GzKMnaXzAaSrv4m0hDEZoYA8/nwwQqsDp5F5tC5yWlAVIKd/sgabF7x
+1fgXJpGE0yfl1YNi9qfvWk/fjnKOou682XnG7RNMao1spPV9MvA3j5g9pkKsbx42
+3/+d3DyAfVwLvqf/LGLL4QBwDm3Gnbsew0t8Xq3ij0nT1/OjS9QWufwtClZQFZu6
+Zniv9u/vD6354YQhlobsJztOIxrOoXIG0cQ7qhYTpojCdYHiyMZrZXS9wLqhslfh
+Vx83D8gSBqd0nJk1KDM3N6rkI2bWMyH81TjVSoDTQJN7xwX08qON1USuUv9suzmh
+O4Z19xgJdUn/U86NfE6TVY2juWJJ6kCWG5Wg3NSv1rfMv5jRHlXmZwWa6Nj2viIL
+pt+b91fQvA9ayFfjQ+kd91H0KFle0aW14MhcmSjtOLrdwTFUN7uGZfsNKAIdxrbx
+PCfD3YoepnKzRFQe6vWDQ8dewwHTeaSJsT8Yr4dpOjUO/x/MLxeLXq6VnrsQ9bR+
+QjbfE5JAaz8MMIosmX7EBb6yhM4z3wheOLB5Ghrgx+4dLXDarF9qnzeIFCluzrNj
+Iaxl1d8gZj0N8pb/z4s1
+=MCBU
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-archive-plugin/metadata.xml b/xfce-extra/thunar-archive-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/thunar-archive-plugin/metadata.xml
+++ b/xfce-extra/thunar-archive-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/thunar-media-tags-plugin/ChangeLog b/xfce-extra/thunar-media-tags-plugin/ChangeLog
index 0f3b2ba01331..75ff45aeaa3c 100644
--- a/xfce-extra/thunar-media-tags-plugin/ChangeLog
+++ b/xfce-extra/thunar-media-tags-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/thunar-media-tags-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/ChangeLog,v 1.17 2014/04/11 15:54:59 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/ChangeLog,v 1.18 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -thunar-media-tags-plugin-0.2.0.ebuild:
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index ec2b450cb2b7..63861d6dce98 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX thunar-media-tags-plugin-0.2.0-linkorder.patch 462 SHA256 2101bca5099dc0ff56bb39c244f0192d11f5d032a6f8ad80d2fc80a4fab22f01 SHA512 2417e6f53edf8b869481610079c5b34cc33b2422a6d580184811a785d50109dd692a94a138b5c7aac92b49fc259b2c76c92f5f02ed8240c4669b1adbad204eab WHIRLPOOL f65de1a9fc888961791ab2670ef9c9524deb82eeaad94a8ae168870b557a2516fbb9ccbf76ae015ad77ad74107e0c6dc1eee9f9d6f9dba22beaed8e8bd70334d
 DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 SHA256 056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d WHIRLPOOL d44687e580adb4b9269e7e344469344a1dc8d14f2ff928f4913e9b9c2ea6d39697953391ac342979ec70e1e24cdb943a3170c3453eed15b4704d8d5509b97b10
 EBUILD thunar-media-tags-plugin-0.2.1.ebuild 913 SHA256 5cc83bbb927be50cd9cf6d2d1cc2394c0f813a023a5bcdf99a8fa3bb1494a680 SHA512 c74733be34099bc74399229696bebec5ab83e52f31c1a3fb028fa4abf9cae4aec4800c6f74ddd8c980a66f36726bae009c58542ea5aac0e1623e4b941a02b735 WHIRLPOOL 650201308ef6f4f22d40c5a2647486f1786c80f42bcd5e096d293599502e1a82d6d89b34094cfb840d37036a6d7cae9c80f2dc91388a21c7329072e8e403cfe8
-MISC ChangeLog 1711 SHA256 da3727d11edf2cc19d11572b4893e87e177cba3ba42d51067be3da56239a6548 SHA512 e91023fd75754b147e114e49b8fe35c6044a198ebed1a8031a90a0d0e66985f6576dc51d90c01f779ca0335317f10f22b3cca6c48ab842fa081ea341f3b5b553 WHIRLPOOL d85231f0c54128a0eb373262403bf38dcd020ca8324512d032f22af880b1f183861275986cd2d7438bd798c3fead1d745b9d1bd4fdb65eda3e76c16e5b5ad2c6
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1805 SHA256 a9c2de0babcaae0593b5e6ac8c290610da6d909e28811d6a939598ff3b5c09cc SHA512 e091d32f2db09eee9362fd3d3d10038c23cc97ec91c0e626f4c2805407b85abc282973d081f7763e213d6abe44074e58c0ed808b1308dd7642d674966657daad WHIRLPOOL 165d8ec103133e7ca6fcdacb07538515927df79b7a083c2c9a40eab7957c2124e45136d7278d8e9b1375aa44bf10c3d19174adc679615f63d36b4d3c89118be0
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTSBBRAAoJEEdUh39IaPFNrZAH/iM2BfDDmQcMYVFEWEw1rwJ2
-sK38PwhUqWamJuNSxEloILhhFI4PqItQ9mG4EzaFSw5FC7YJLpBPx0lfCskAgkSi
-VAFQhu8WujeN2kz+l1OkNsXjCTVd9dF63EBIgQz/h5LjmoQFI9KdaGYS3hAG11Lj
-8kZZ0N0KhbaApagmYF6q8DCLg/dXVSq/8osZylqVQqnUAhFASsM8J3R/0pAEMKBR
-curZqtaXgA9iZ9IkeyedwdtKbSgdz1n0gklVz8OX3btxMEA6aVebXZXvkrEn0/Um
-mheS4eu2ztG6RKtOYMg+nOZknPmJoRQ3yNfqqhBYHLp14ez4L/3Kr4YCQpBqaUE=
-=f5Jy
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VfowP/R1c7mfXaemClYWDpbO4k+bU
+3DBjBi+2LdSgUUqpbJu6geF1rL+B9HZDq4yQJAnZnNbTVy2DZZ/qBDaxEwVP6ljx
+NNJodEx3F9Vnz3Gh9MY0qhkKphdozuPJPaON7U07QR++YG4mZl2CP2VP4afd0Kcw
+80MKRa63yLF/P1PfY2zKugGgXB0hvRlhGjiI2sWWLJSARgZ4/w9TBAEERiEZORLb
+LfAgkBbW0prkoPiiKv4ZQAB3bAaPvDQNzpArhNnAJlrvP8De00qP+sHqpVIE29pq
+6BgRz1upJGR3QGz5gICdmUI9cznSWsttIHHtNMLJU9Tj1kikoehWQkh9uwyjcuEm
+W7tPOWlRiTl0nSg0c13UFYBgJhqehoDA4BXlaUOqEOF23UMHrhpU0oDDSBCr4vLI
+EvQe/XNgeJQ+Qdozslqa7ZXM4m1eE2LFFtTBqLhtBieoJ0Vv0qMpcsH+XmyLokMR
+H9WtuOTKORTjmIFLPMdoGc5Nyc/OxWQLppm/lCiDAhr6XwupHDkiSG4R3nVL9W/p
+Vh6NHfeLUsxZ1XC/cMM8QDr3rw/b4vAaWBOlFWmnJKJcf05KE1mIUQeUNE0q/uLG
+WfL7+uLSN+YnCL53AQtchszGNCWhHEP5RgW52swKU8TeFMpvbjrUYvfO33BzZNA4
+fXHn/dV6yFhDBmcMXcwA
+=3H2x
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-media-tags-plugin/metadata.xml b/xfce-extra/thunar-media-tags-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/thunar-media-tags-plugin/metadata.xml
+++ b/xfce-extra/thunar-media-tags-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/thunar-vcs-plugin/ChangeLog b/xfce-extra/thunar-vcs-plugin/ChangeLog
index fbc35221e9d6..63c39ceecf8f 100644
--- a/xfce-extra/thunar-vcs-plugin/ChangeLog
+++ b/xfce-extra/thunar-vcs-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/thunar-vcs-plugin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vcs-plugin/ChangeLog,v 1.22 2013/08/09 06:57:32 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vcs-plugin/ChangeLog,v 1.23 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   09 Aug 2013; Michael Weber <xmw@gentoo.org> metadata.xml:
   global use flag "git"
diff --git a/xfce-extra/thunar-vcs-plugin/Manifest b/xfce-extra/thunar-vcs-plugin/Manifest
index 501b54c354df..6a58bf1ff57b 100644
--- a/xfce-extra/thunar-vcs-plugin/Manifest
+++ b/xfce-extra/thunar-vcs-plugin/Manifest
@@ -8,12 +8,24 @@ DIST thunar-vcs-plugin-0.1.4-ug.po.bz2 4628 SHA256 ea50f843b721f7f1e31ec9abcba75
 DIST thunar-vcs-plugin-0.1.4-uk.po.bz2 5469 SHA256 a43df313ce3a2968a83efa41a46193ef42b095913cbed27230d3ac092ca2b08a SHA512 e1b0b6ab444fb46d626c889b9b2509e21b00aa380c40da5b871a4e6c12fd34609bd0a74b2f7b5894601ad5fe4727fdb177ae7af0f0ef457f23021287d6dca8ff WHIRLPOOL afa9d171c22fdfa467958a1946ceb7d9b0726d7d3d80a8dacf1cd1241d45a5fa9e29f305d459a92656b9fb84c1c470ea36fdacf21e7922667b6790211a342c28
 DIST thunar-vcs-plugin-0.1.4.tar.bz2 435835 SHA256 7dbbdb22113cec40f6dc46cf4fd113b47928af15ba64e9fc66305a01c4291d4c SHA512 037ca986ab9030146fc409d78d235a157b956b202449ef8e68de77dfce29ba2dd9a2dabc793215dd9ce455f97d8c5400ba51c8254b3c07b3e0d87572df672151 WHIRLPOOL ca5eafc6a3e0061c3b87afc93f1ede109b17919e8915565b004b3302d4e21493c1880b7645f90b2dcc288fde84c7249754f0652e8ebbe20139bab6d193b4ab1f
 EBUILD thunar-vcs-plugin-0.1.4.ebuild 1549 SHA256 b355021992756be99dc716bbb283c203b05a08c31b184453631007324287390b SHA512 c75fb5d3e83ffc00730d25b1b49ab853e30cfd865b3a6db22adc0adbd58ce5ee12d1ca0ee4fb81e4dc82b88aa9c0d63dd5fd0bf9bb41c7b5aa56135aaaefeafd WHIRLPOOL 566767793d8b2a3130cf25ddc3de93d0facd1510091239a69bb67eb1404e48015d6e20bea0e662b4a5485e3cc2befcb10205b5d421f987382c968c117cb53f33
-MISC ChangeLog 1401 SHA256 dcb0d2de8244a469d47f3c0f347c6db3952299287a8d4267b50cfc3b6a99b707 SHA512 2e1925df573f1b155115fd2ad1291b4f5f203820fd667508d0bfd75630135036e60f234871e368530713375c1fa53d3546285b124236fcf1888e643ecb246884 WHIRLPOOL 4ba6f4565683cda38b775e04eefb308457448dfdc8a6b5fe84cbfc2418c856740503ae7e163d6f6c1053e1755d12ec19f6e3fad665aded8d10f551aad459ca81
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1501 SHA256 44143e8140277340c51bfda116ef60cc8c54092196fc22c17cdd366e485fcce2 SHA512 867cd02918e9096eb82060e3bbe5d7cc0b64804cca5511a20a78f40de6eca242a88f2c2c23686e5f66dcbf0c15774860dfd5e39847b0a4b40a775c8118ebdc48 WHIRLPOOL ad6f36af09fa536e6c8d8668ab8f96f1f544628d490b65d603825bfdfd4de49caca56da8cfa785fd53c2c61b66f822f37e71086180c650dbb7bfbe3563b258df
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlIEkt0ACgkQknrdDGLu8JDN+wD/fnlLYc7K2KV+MI043ohxYIxH
-nZOb1H5vwlc9c/fBOasA/ien8AWoEgIIPmAM1S0M1QFWfbKR/TeBpUqG3PJ6lpcd
-=CkVF
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VXSsQALQHPEkOsEbYK5I7QcajC9Dz
+hRb2jijlFpJW4zZ1KUpRw3dY6FcuF1AAF42e/E1KNB/8sWLQJgc9E3JYJPdkHSEK
+LXLUBRADBu45VU9I+eSwW2jor1gJ1lFDUk4LuaqeRnBlF1dB0VMLPq1rJsN1nTrk
+yp636upDNoIvmrYusF4mRVoDFFVY62yyCwFZNb5R+yy9MmArfB6jkX1Sffmi/aPs
+q7RyiOQpCouDUC0KS53dtUVKBo/f8/OZ23Qg60KBFjG/AFhF3pcC3Sxa75bjrEMG
+4R+kPrBTp6DaGCc+hpj3OW6MHzEzTXQoZbDBDk88J7PaHI6bqVPv4wj4Ti6bHEqQ
+nsGAjGiGgT0MkESxUAm5Ye0USxm1x/okOvDPhMQbTu2VPxbWxfJOZaOxr0EFVkry
+6jY9MagQp/WPQ2YIIVLKYzpCHYj2sU0Zb5+KvSGfqWHB8+GVOpEGRi/cG290F0gE
+fuzei0AMXd/eI58jfijWlbpbF+0Btph/2zonrPbzgBxEc5+gFwve3HfrmF/rvyui
+zbe8NfsU1tqfGucP6TNOWjEjLs9ekRk+ykWuTfbMOu+tGRdiVNAolutZ/qkyL1rV
+Aa6FxSMNZls/SO6Ir6EqyZrgm5Cfp+EqAiBSE4VMsUsiJUttuloZ05CrDQ3V5df6
+YsahcPjjWvdDFITSfzV/
+=Im9S
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-vcs-plugin/metadata.xml b/xfce-extra/thunar-vcs-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/thunar-vcs-plugin/metadata.xml
+++ b/xfce-extra/thunar-vcs-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/thunar-volman/ChangeLog b/xfce-extra/thunar-volman/ChangeLog
index 6c4f731cd89f..82efc48e486c 100644
--- a/xfce-extra/thunar-volman/ChangeLog
+++ b/xfce-extra/thunar-volman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/thunar-volman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/ChangeLog,v 1.90 2015/07/25 12:19:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/ChangeLog,v 1.91 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> thunar-volman-0.8.1.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index f7189f8b0c6d..97d3338ce081 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -5,12 +5,24 @@ DIST thunar-volman-0.8.0.tar.bz2 411013 SHA256 ff0887c862b578580d05f4cd7db660813
 DIST thunar-volman-0.8.1.tar.bz2 474769 SHA256 5a08bb5ce32c296a64dfbdb2406d4e45a208b2c91e4efa831dc28f1d6c2ac2bd SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6 WHIRLPOOL 23bafe819c90ad16a0d3a8df1d267f56ae6600a53b121da363975f327982ef60b5d8218b81ea91ce19b5cb31a432762e63f2910b67759557253f7fd34efb4e86
 EBUILD thunar-volman-0.8.0.ebuild 1081 SHA256 e2785b64ed6b4c89487b558ceeb194debace02f3634ce123919f157401a1dcd6 SHA512 9e4a21d7a8c7409826c7bcf481e020fd7b24b21f4000ed4ac45f81b6c4a9e4f9ee04b7372827422bf3c3cb0d74416f91e37eff22a14079feb22c9c740eca32bf WHIRLPOOL 20038195b18cc925f60bb849cca5264e954088282347385c1d032a4812151f59825c5ada5928ef605eac0647d1ba600e0634e9e2651f748bcf3227df62ff10ba
 EBUILD thunar-volman-0.8.1.ebuild 1079 SHA256 caae3ea4a2a84a39f747eab0375d200eedc8d46421cc7cb2710cac0d2677d70f SHA512 d8d9672b3b4b8578e5dbe749e6b8540f72ea3a58b76ccc8d41d72786d4fca830ddfd58054b069c78a4ee75756a72b34f26a15c44634dd73094778458dfb59868 WHIRLPOOL d73c3b833090d427b0f2e67a3a4fe209e26102e4d130c5e27a5cc18b0032d96fbf6d67d667ab9418c8fbecaa47da90e801a25d43332bff3b7e849e8aab832be3
-MISC ChangeLog 11703 SHA256 31fce0ffc20868ac3dc4406237ce82871365b93b84998f72b16552f07fa2e64c SHA512 eb62dd924c3cef1af24fd4d0cb9043f74b26082164a455eb286c5c756ffa93676944f555193f0bd04f6fdcbdf07dbebd41d2eeac64f1a812692a32b819d5e083 WHIRLPOOL b3d08fd9252cc35a5d208aa09f60e706fa92c500ca2b7c0726d250744f29711771375154caf169b3cf457623e577cf069fa6ced805d2e716b96966884866b3f3
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 11801 SHA256 738f488fc32ac05c6fea264441bdb62476aadc8afa1a66986da59ecc0d3f0bf3 SHA512 51596d4aaa72865d746ff7072607eb20c408a2ebd6d4b0bc6b97abeca0c962cb1d5406df11814ef18a5c4ccaf8896f750adebc18dbe13c08dbcb73fdb3780dec WHIRLPOOL 6ddaedbbfb93a00732519386dcd454cac50b347fc4f70bd1db86a09207532345f513080cb7fdc97284ccd46c7c290818e5e3fba274213fe9c2588da44f37b721
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfuEACgkQCaWpQKGI+9QPugCfV7lhrqvCD2o11p9e0b6cTMyG
-0YgAnRzlrH8Ti16JnZ4LhLEKVn3ifddR
-=T40E
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vq0IP/RjqoJhscV/stY1MFbtZUye0
+IWcen19gQeyUVEunHw8RRxKTHlER5e+MvzfdfPxKfW29MtV0Cec2YdKIruSKuwUF
+V756hYztdGbPkYf0l5yHlng+ajziOyi0dM9nSRryb3YduS6fNemlzH3SRER+rO+s
+BAiGd+2JB+JvJn+sVhFl4C9hmPPABR6PFphRz32ZHNklqYatf1SqGdKilJsbyqd4
+fpvqvisgmn/AVnO6/ukPwKlelVggNGYkfZGIqFsNo4Ld2Fk8cFsff7hCrZiftRP4
+fL+QEmVVc5XHbtzpHg/AgZkAISxjQbf4JZBXl2n95OE7lN6r4zousSB6CWQ9RmsD
+wgLIChiRSUz+gUW5krDxdIBGpWq2zqWC/GVX8rU8LfdzWkg1+yMVIqz6LXnAYXe9
+C8ZjafOmuhUL4ZdEf9UfxZBxqM8tYPmkfDvVhh42EGRBmrpFfGSDeAud22G8wP1O
+/aLZfHaGmLGGXPwcUvKJ5TqUN/FdrF7UTbEseL9JBupcscqCFjdfF/T3wzMgo384
+lNkaWzw9oOJXxPeZC082YP5kYvl9AXb0NW09Gytcms16Qq6vcgbtEcWotY4eIOEJ
+liAmY8a/4K+fQ2/WDX964PvxCs/IA1kUD0KyEnbHjzYQo4r/usy2DNdnd0SU8Ft8
+gvEACUOAmQjc1ZOGP/yk
+=tdUA
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/thunar-volman/metadata.xml b/xfce-extra/thunar-volman/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/thunar-volman/metadata.xml
+++ b/xfce-extra/thunar-volman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/transd/ChangeLog b/xfce-extra/transd/ChangeLog
index 4e491ecdc15b..879af2d28417 100644
--- a/xfce-extra/transd/ChangeLog
+++ b/xfce-extra/transd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/transd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/transd/ChangeLog,v 1.18 2012/11/28 12:18:52 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/transd/ChangeLog,v 1.19 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   transd-0_p20120503.ebuild:
@@ -66,4 +69,3 @@
   06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   +transd-0_p20101006.ebuild:
   Initial commit
-
diff --git a/xfce-extra/transd/Manifest b/xfce-extra/transd/Manifest
index ea66d87f5d28..d876fc20b84c 100644
--- a/xfce-extra/transd/Manifest
+++ b/xfce-extra/transd/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST transd-0_p20120503.tar.xz 227316 SHA256 6c4e028e22a9e3c2072b805016c3e733b46b52c02858a514c3223059179480ad
 EBUILD transd-0_p20120503.ebuild 761 SHA256 8221cc9a44c8fcec2b6702bfc3d9cbf71a51eba1a1c8bdbdf94f385c1025a2a1 SHA512 a76b7161d7440a5a51a72d57307765da49ab96e849d4552aacccf1f5e43e8f4b937038c190054f5fc5afa9b051a9ab2e1fef57b81e0c554fd299b4823f50f779 WHIRLPOOL 80bdf0a1ced8aa909fb217aa209472b23e4d457d6e914cc2e25565322fdfa5bc58d55b4faae4708b781df71e6b6c447ef234b7a7998f3cfe3f444552daf06556
-MISC ChangeLog 2070 SHA256 e30dab0f5fe4faa3f2eb413d14f35c2e874d4d8bcdd9b468a6de38535ebb9804 SHA512 dd3e792507c1ae8d65bca59513ab654b01ff486898d3133053101f4488bd1ee5e0acbb563ddc472ea41f0f8db82c6a36faeac92def89244db691c6c3033c49ad WHIRLPOOL c44400d3da0083e41c2c606abe45f5a4257716991be739812db80edbdc6c8c422d9b87ed6a0fa9fd60231e7bc8fd4f43678fb53453a244999b3d6c904cbc7e48
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2163 SHA256 234b616ec28a5b49cb53f25f2ce10b02b1816109ab628184d9c14d75f2228e7e SHA512 805f4cb2d9d64c4ec2bc2fac1e1ad9c9e61026aa11d9397511720901692c53a19f84060aa6f01621af2bbac1026d6a87fcb4880c9c28681bc9a206733c002ee5 WHIRLPOOL 5ce01b614d91aa4d764a3ac6e160af938d044fc7b7c0d39991cfa9c7399dcab8345ae996aef1cba684d417e03c75ac90754129151cc42d520899b5b5da1a56d2
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgD3AAoJEEdUh39IaPFNJC8H/ilFDnPGCFp1TwFzpPPw9EMp
-e7o0EwdkWqwZv/oKGrwpL6/tZNrvXVA9FCCE0PBFwiRR3KFYdbam4xTmO+VSNpeS
-1CGnzOLIYl8G1nH/TJkabKQW2natT7+ze7ZaJBAVecyurJz1PHE/W6OMnJf+ZL/0
-SWDhFgvJ8vWhTzC1Ftu6gSTNgKLkjZOaB+yezHqpZNoqlTkzE9AW8HPPSghJVHmd
-TkdJ/RqbOtEPinqjRZ+f1me6qOOp6nYrRf8BqHojvSOL1tTscqX2qZsffLffUwNU
-l3CWDzEVOTsEFQiucNTUsc1WNnr6lo7QdC83taA4mUThOp2KNPVQ16kHicDIIg4=
-=3Aom
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V3FMP/2Q2GALsYcuw4dUaHSg2OVOl
+gR6daJqPVj4qiZKeELZKsaJdZSTVpXbHhZ+0UY7JXYWU7bhoggwXfZMX49JUB5uM
+nwApzovWxWuYjzjSB4mv8IB1eJASEqrMr298LOH5Zr0bbROhzI7IYvjBi1vTWPfY
+hl5ZSr3S+MfB0eW+rk4kfiGo2AKI+T8dsZ85iiN6nRX2Dkl3zFMJdpq98yyOR7iz
+y9bFHZpMpluSrDkjGyGMvQ5yaA2076fIBfaNBHpvEJVXTQP/xkFrG4EJgZbNqGQS
+uctkOmT1I7AvKRqVHEBG/D8g7R41wd6rN3cMK8/MXmJage8pKx4wDvPCteroA0fF
+sMKSs6kdPaMVucmwjhK7FGOnpSiB3wi3ZBsvNgIDN6TJbZBjS/d0lIAx2MYoxEvf
+U9o4/KdrVmAsKO+iIPnQcdR+l39GOCS31gWNTc5UhTRt2yCKjgivV9K2qTugGFxd
+tpvd5deg7UQjfaPtE0qTB225zKdlX37E6Sg1D9EkA2DQHEHRqBA7/gUpDidDjRHb
+HPdfrMHRbUTxvae+CJyBarXB4vPBEgaaI5KPZJguGseS/879v8PMc66fcAoQsbkI
+TH4ZXuY1S/YhXjsEeecRNjPTzywn8bw/MyqS9piwuBuK9IRywmx4p8yq6AWgexeN
+1PDuqOyaQFfjLntkWA6H
+=oGhC
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/transd/metadata.xml b/xfce-extra/transd/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/transd/metadata.xml
+++ b/xfce-extra/transd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/tumbler/ChangeLog b/xfce-extra/tumbler/ChangeLog
index 3db71ab1ce72..7ea1db0dd74a 100644
--- a/xfce-extra/tumbler/ChangeLog
+++ b/xfce-extra/tumbler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/tumbler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/ChangeLog,v 1.72 2015/07/25 12:19:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/ChangeLog,v 1.73 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> tumbler-0.1.31.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 767c29b503d9..824b48267f27 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -6,12 +6,24 @@ DIST tumbler-0.1.31.tar.bz2 550650 SHA256 d0fd329273ff6ac98885eade4c3d8c87a4dd08
 EBUILD tumbler-0.1.30.ebuild 1715 SHA256 15f0139780194c0b9fbcfd4985882aa2a6ab1e09208892084e3249ee80371979 SHA512 9733d73732e5206b9cb598c64c23a063beefe45d5e808c3e8e77e14f99fcdc102eec114cfe605819e1e5f73a3f49bcffee70b742bf5282916ded0774bc1b2dad WHIRLPOOL 89c1db0f31cfaa2845e5e7e33b54c24a4c724f66e96600c2d3481f9b612b678ead41d2903b664533f8ea2bc8487610d91504c35cccd06fa76e08b58e2a0f3ff6
 EBUILD tumbler-0.1.31-r1.ebuild 1694 SHA256 a3721995f8ad029006f2c3744708bb0da1b9f8de2d5f9bbd6a57a50127146a6a SHA512 4102c87041c5094075354d3c2869e523ef30ab1690904d3598d900e6903cb298e54ba27b01c60b839f9b8df6aea45bf6dd8fec5ea1706443a22af8b8ee76d1c1 WHIRLPOOL 8f70f9f76b95945bed53bd80515fbaa682ee5ec456c37bc780cdbad27601509982f40d9980a8ccf44eefad62153e369f99572de5b083ce865ed7109f25a20579
 EBUILD tumbler-0.1.31.ebuild 1717 SHA256 c898894d718c179c22a67f0bf3c5ace6db306c12e1955d00f5f6a7a9c79fabca SHA512 131f8deccad434fd93e406d120e51f03da8f1ecabbd8c114bf65053fc58bce6111c48716c9519e19dfc85eb960b86a420fc5c08c07a0a5929c81aae47fd9a114 WHIRLPOOL 22173b5a67a7a7593a149a6d63485b3225631d17c5710355455b6ce9746e6cace2ddeac03e75ff4931722d45e290829ed40715cc664700a5d77e62f23de9a385
-MISC ChangeLog 9511 SHA256 f11b5c65e0d55156469c49b641edda457547b492138baf6dae49bdf1194eac4c SHA512 68494512ebba47372105f2e25c5e48c18ad0a888acc178f0c35575d7e69c6b07986a29ea50cced5aa2273585230df0d6e011bbbc716c0725e00b7a6b7a79b99f WHIRLPOOL 3fe57708a6ad1ab6023e54762925190105ef2533e438edf9b74d78a7646952d3308797b241b47c8eb10a0c91ede03c9fe55d24e590526aeb5367a6fff1e1ddf8
-MISC metadata.xml 280 SHA256 c35803e7b9d72098c030f255331de14ec272d9c80de13ffc358f22d7e65fe4fd SHA512 d77fb2f67528aeaf81c330adf3da2540b3d84c4f7bc995f773661b39ebbe17eddb7156b78d274403b5083d82db8a46bcf8572cef2dc03ae28280c6b6e0f004b7 WHIRLPOOL f60cf3d815fafc90b130fee3f75d81c2e53d8808a285fe9f9f0bc53eb054abf570842e622039b77ca730e634c519e8725fb731e052a74df1ba375b057cda63d1
+MISC ChangeLog 9609 SHA256 c5d252a3bf7cd1d0ece27db5823c4dd4d2b65a6aadf6f7ec2886c02a1d30ae1e SHA512 a4a0996c11197bf032eb8557d0516fab3f713615aa58fc836f0fe1e5165c321d386822bd69662dbc65d47f256e2de560db1789fdead319ca1039caa61b648b40 WHIRLPOOL 94aa0b2374271eed4426587bf28ea130694435e69f8fe9edc117cc22acce579e942c1a63259a4e58ce95015d9be5ef6ef15e5a9d4335c8ec69f6ed45b72c30d7
+MISC metadata.xml 353 SHA256 c9c4f54860b0ce770ed29b52d7d630f2426c5a94832da97cfc2ab83e3550b61c SHA512 af37e6977852cf4cf758221e09cb3b3f7b6247130e62a5f389175b3071c851861085c1dbf7cf6870b09530f11d78bac21de9f213bb3f9f688403d58a438d7b7a WHIRLPOOL 941e2472ad2ffb9067a0eb99bda4ef0935da6651728f64273fd225fa4d66b9467609adda9a72932b39c6c7a149c7df2867fc4c0f5d9e95aa4a5cf4d3befc0efd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfuoACgkQCaWpQKGI+9TRbwCfabeBMyBdUN29qHDQ0KxVhGSC
-cFgAn2z/hjvnqd8fidlNkvtf4EbbByFY
-=HXw7
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V3JgQAKDrmlwJzjmiyYJz/uW1a1VS
+4KJo+IJFR6/+7seghz4/E/0t8TWx4rSdoAazCg879/U67NcZFGUM8lgvlTf5mq61
+Tbw3xetdMxtwDNrJNUSlk27hSB1EGAkZY0BPAhchZ0+gxWhhUczJMIzx7a+N/c8+
+8VBe+9iPYf2iZN7PVQKcc4DgonMKJQoDZCCn6QOEHbtOF6cpV94njLbwALZ3pdlM
+lLYDJw2+Os/rC9cpCcyxV+5qoFeGRXJQmtmH+in+ldiGpxnb+QTUPiLfDczR4Ne4
+kW29HCOLgjGOBKqvJiTNWMrMR/MbYEefZBrVXlZv72RvyDBckiiPbI2nxnRTF96o
+OYg4S7chnAjBDpcVYkxm9mcFSnPUu7KErXohG5Rh5gAuuzOR1cOG0JJS96XK9kh5
+9H/PKiXKDZymn/iWJPEkzaIFIE/El0OQFCWYdr2uMKBfH04KFtfAjaQ8YeXRa+cM
+pJxZR6hUAMgThmBoqODXWnkq33ydUM5DZqEEm4BDudAY3fX8JLrBvFy6qaYiVsVo
+MiZsUQijivAOrrK2arzIGy9CfJhETKakZDw75RQiFXbxr1tQOuhMuOZpLJl4OqWb
+jaw6BuAC2d/K0pU76xbeSFGYPpZMRFovdJWPVjpFtaL9h2dfbSymjq/Akias754k
+XP9J9AdS7jWYcQIO4omQ
+=eVMc
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-extra/tumbler/metadata.xml
index 00494bc4ec7b..4836a6508786 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-extra/tumbler/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='odf'>Enable support for .odf thumbnailers by using <pkg>gnome-extra/libgsf</pkg></flag>
   </use>
diff --git a/xfce-extra/xfce-theme-manager/ChangeLog b/xfce-extra/xfce-theme-manager/ChangeLog
index c8a63ab11a8a..edb943123910 100644
--- a/xfce-extra/xfce-theme-manager/ChangeLog
+++ b/xfce-extra/xfce-theme-manager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce-theme-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce-theme-manager/ChangeLog,v 1.4 2015/07/01 08:11:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce-theme-manager/ChangeLog,v 1.5 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce-theme-manager-0.3.5.ebuild:
diff --git a/xfce-extra/xfce-theme-manager/Manifest b/xfce-extra/xfce-theme-manager/Manifest
index 857c3ceb84b3..a77218145f7e 100644
--- a/xfce-extra/xfce-theme-manager/Manifest
+++ b/xfce-extra/xfce-theme-manager/Manifest
@@ -3,14 +3,24 @@ Hash: SHA256
 
 DIST Xfce-Theme-Manager-0.3.5.tar.gz 209269 SHA256 948ce9f26d3cece7eb839499a83e696efbd2376ba6c03628a5d548e9e4415b8b SHA512 41029dc93c464c8b0d47dc36fdf8417811e59aae5cd41dd55fcf4a47199ba114bc17d74f6d4a2c7a6f999cf2afc6c6f1c0d53a0c6f4166537e8c9090acfc1a80 WHIRLPOOL 85bdd10f4a4e6753c1c81821f6c81a0bc0e371cd567f8f5d74c79ada9cd56d2b0998641b0a49d4304fb8342e088c7764fe8c6cdb14829e24a1a844c4e9248cd6
 EBUILD xfce-theme-manager-0.3.5.ebuild 1434 SHA256 6de254e7e531603a89acdc4c855cae6c06e9678c4e01453bc9b6d57389ee6b7e SHA512 07ddc36142e44cf8bd46e956ef3b12f1ac7182dd5ce5460a96c9204e9d7b128ad726d6c079234d6b0753f9aa6634143275d85f2c2b2e73a36bff115ba8eb933a WHIRLPOOL 09f0a32b94cd80089efe9d1d2dc03e843bf776c914a13ba0133f281376f321736fe39dfc746d64bc3d61cd8da755e7b9a70825d1b48fb8aa8c316167fe75a6e1
-MISC ChangeLog 840 SHA256 3c5036d05a336d00262a3dd2734c096b2b0ca513c022ade39d3b1e4e9c561203 SHA512 bc90efd96e8fa99712b2ba1517da02de21d7aba2514d2de96a1430400c301afeff516a2e7c15ac3430b6e5fc5d301272ba0c1af3580ee5e3eb08a55bcd81037d WHIRLPOOL ef9d929d3f7c11f6457b81e5f92c1c004b93e56b50c0e0c94c0a3220966aa6ca6dcd5e942b77f0032ce84d856b449fac418e28fd2a62632656fcd64219b0e25a
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 936 SHA256 0d37d29ece41351d5e3c2d22078b32b116f6920b35a497281c43faeef24110fd SHA512 f77f02ab97b6ebbad32c6703b066c54b3c4fda60446a900aaf82cb69216f1b3c698766c25d4654614cab7ba0bb9158ad8788ba4bb9d04a8a2fb682bda7440f30 WHIRLPOOL da1c24d4cbd5f0ed0e2e1b3b6c766ff93d5724b21a57db6f9f63661ea150fa00561962129c4b2f15a7c9121394475a30b75d64bdf1a58c7958f0789b17b8ae37
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWToD8ACgkQG9wOWsQutda5dQQAxvEk1A3+b2HBvvqq+YxIkib/
-yPrzjOyvstchy4EQY+UzC8085b5dZ/3DeipnG79rj7hSj5ZoaUWzqROo6kDzfOyR
-pWsGTwC38eS8Ohv16ISl/eOi0S9RwEW2qqSkzUTw6+16MYjhi4tJgcTqXGPP6bXk
-n5+G+fImotgZX0ypQCM=
-=ZhqL
+iQJ8BAEBCABmBQJVwenXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vr2sQAJy+IEelJaxi2o7ljojuvWfI
+Fc3NLiU8o+Qar4m/yljBkqBMxPIIs1/C5bLDqCgEVeckJL0grjF+66MfPJ7Kev2j
+CEyosdcKZAzyJRoG+XDdpxxqfXpfAcnc2eT7DsxqrDi3R63xyvt3aKMdMag/qlyO
+0jMRAhc1bPRH+6FeFwkZOnXWik2G3HSbc252zTYGJh119Hi4kz6Eymre/xilXsFD
+P4+d1Inrxh6wpy3UHUIIszyZBjfAE2XmeGWFHGbDQYyt2KbsUBOw+GtvlGIUf6HW
+lgu7oWXVFSx3pL9ZcLhTTz3z2qJpOmzqts5kYdn9FuIJYD//Vgql3PA2RjTSV+sW
+YiHn1MznNwmuEAP4kzgnQXItEyvg+ggI4MpGfKf3QRPQFMsIyloiNUAV6TIrwCHV
+jul/YG/2K/kXMABt4vhEj0I13KIBkxMOrRZVr9qmNP1vjgXvGaiUPc3AwJbSk2am
+R9nefsFLN98TKOrfBp4X+EFcDMYbHU2gzBLoLJ0aZkIWGHd6YAIL9ztBRj9X/18c
+5bU64xLnOZRUmHcTLbMMtckndtW9P8F0yGYcwepEM71DHIAO/rYdDpf6/6op7SG+
+y6cASlG/IBSyG19nPRGFbK087zC8A2r9t9UfInQPRcuP7HIlGrZbR9Rj82cbmZy6
+WY7DDhabNlXuXTGfTPQJ
+=naoT
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce-theme-manager/metadata.xml b/xfce-extra/xfce-theme-manager/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce-theme-manager/metadata.xml
+++ b/xfce-extra/xfce-theme-manager/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-battery-plugin/ChangeLog b/xfce-extra/xfce4-battery-plugin/ChangeLog
index 1f1f01b5a458..7f7a605b3cf2 100644
--- a/xfce-extra/xfce4-battery-plugin/ChangeLog
+++ b/xfce-extra/xfce4-battery-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-battery-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.27 2012/11/28 12:21:18 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery-plugin/ChangeLog,v 1.28 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-battery-plugin-1.0.5.ebuild:
@@ -123,4 +126,3 @@
   +files/0.5.1-freebsd.patch, +files/0.5.1-libacpi.patch,
   +files/0.5.1-sysfs.patch:
   Rename xfce4-battery to xfce4-battery-plugin.
-
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index c4c533ec53e6..036e0e18af07 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-battery-plugin-1.0.5.tar.bz2 403505 SHA256 f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11 SHA512 f49f33178a771b952442f498cee2c722146c9982cb27453e6547a7c7838eaa0a22588a7d2a56f189f7e9e7b90ed7e5ac7a4e6cfee55dc5e43d32c5ef95b20062 WHIRLPOOL c23fff115afc9b5660ccf64332d71123d2e9161d9d79c5d66cc7aca12e5d904836b51e314053e0b571a044d70dbc64f0bb9592e79596fc9ee87f56376e120735
 EBUILD xfce4-battery-plugin-1.0.5.ebuild 989 SHA256 4d149cc3a81db60a58d1be3d06b4613778bf8b17931f9bfbf24094c98cafb6e9 SHA512 d846d06df02d89ca74246f34ffae19f617af36e925af03f37782854139472873e47761fbbe5513367278e8a64622303ed4eda72731d694cac62b40393bf332a4 WHIRLPOOL 5f437757533c1588a42d10c880c4ba4ea0192565458178d9fd30f1b4cab14bd790e08e6c98b085059cc015573b5e7cf3406aced08fc49c704a178a997b3f7459
-MISC ChangeLog 3963 SHA256 9add4a7edbd0fb0e9371577a67628ddae88ce1dfc7d0df8be38099aeb2d3bd1e SHA512 3f4beda30a2e9a934d61c0cbbc5ea817dfedb7803a18463918250f5f0f6332ae1f9277481e1b9846b9ca6cc5650851fd4412c8e5c9e9c8fb676b19967d4e47c4 WHIRLPOOL f99c7d2220cf103efa4bc6a0996fe5d4a7eda28283b08b80495b178f8555c868f744f4f84052553457e4fccf66d5b2531dec8e3a4579d9b44b2f946819783046
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 4056 SHA256 a7805cd0d5db9a8ca5ff5f18bb70524969dd4bb9d24bacd5dbf06bd0879a2490 SHA512 185290d73726cd41461649eb25cf8d096e46e26c37ebd2300e5ea9c715a8965d80bfbc8a25656ad0e4e1ff09cb58bea61dccd45aa1908d53d2e42652b894b5c6 WHIRLPOOL 0927dd7bffe5d51d2efc1864cf644359a1aa7f3b1ec42b670fc708404ee290340e09cd4a99ada18063d970bc4f42b55be2dd7f3f54818c646247ae57242d1ad5
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgGJAAoJEEdUh39IaPFNAgkH/1nkcWwt4vBawDarPRXR9SOk
-3jy2lHsB+DSMT82KSu2cjKnfiRvzUbD814G7jM9nP3bkhhgZjKW0VDZEkRy3obit
-HoC0S9cVJu7S9Jh0zbtTtMW7FQ1ibPxzsxuF0F6flEuG3qycEoY9zd4OAyZGnhax
-y14q2M0Fu2mAoakAecftRlUFhG7iaZuxHl2oDHNpwko5h2AA6hntR7eLO7Oknb0R
-WbSJwiANNsHZQVvT0TSV8hmHJU+wwdme9S3goPGUgoNyJi4UEH3Aw8/r53ep+jzR
-pEWISrTy1/iFJttkst2yo4kTdc5eiURQxUO01xKN6Gp491SAX5i6XTSl2eg6Quc=
-=4tY1
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VYwoP/j9CpZgzOWTacG/Bzj4p99Ix
+pBG7OHZoNuGnWw5kXSdP9DFVSr3aO7hQqSZ4T371RfRRbnI90aDsh1qculpsts2D
+3n2rZGgbQOj0ASezUghwyDMP+DZya3TEijwXD4Xic7+hZ4RjVyGw4u17QXy6oPJw
+m7ym/YtSyC64u73aA+EqDWIZQvftoWUQPzxz2dXHDZ13uZr7QJLJbwxY8yTXJVQ3
+AAv69zARUg1Z5INettFSv63Vx1IZk7Zz6QkqS5eZNhEvhYq/7+Du7yVrp8fmOkcf
+8nrOSbpWmRMSpMZ2oGZP/ncRxJiD7rdMX90mcV14iFlVWDQtGFB0C5yQcaicE5l6
+h7rmQhjLrSwyI3o0kVcxjwr/NuWpvScyM+4Nh61o/esW8uoMzNVio1NZgHefKFYE
+FAilFY73vIKJqt6nuqfLb3cNsTUbWWkExr0IkcpekUA05I76hBI2eWdMpD42yAPv
+L8Pza3s/0jwnnB2bBoXp5j8xc7oDYmc7PV5P03wKLCWHl8LYJ0cBKiz14hh9NKIT
+i8g7DLzJwO1RMtsOmczOLDIv1xpjY0Q5uymODRZZGSPhHVVmYHetg7GAWTQ9J+8+
+FmQ1OQW87HWfYCakGa7AFzlv5sJkqN7Labv/OLcBCV5UlTcLhVC8AKZUt98ZdVkd
+v6UuzdhT6Ao2BbIcJ0FG
+=crO8
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-battery-plugin/metadata.xml b/xfce-extra/xfce4-battery-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-battery-plugin/metadata.xml
+++ b/xfce-extra/xfce4-battery-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
index fc9920e34bae..166a9f623249 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-cellmodem-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.7 2012/11/28 12:21:58 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.8 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-cellmodem-plugin-0.0.5.ebuild:
@@ -36,4 +39,3 @@
   +xfce4-cellmodem-plugin-0.0.5.ebuild,
   +files/xfce4-cellmodem-plugin-0.0.5-asneeded.patch:
   Rename xfce4-cellmodem to xfce4-cellmodem-plugin.
-
diff --git a/xfce-extra/xfce4-cellmodem-plugin/Manifest b/xfce-extra/xfce4-cellmodem-plugin/Manifest
index 77603193bf6f..3a74e63cfbc0 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/Manifest
+++ b/xfce-extra/xfce4-cellmodem-plugin/Manifest
@@ -6,16 +6,24 @@ AUX xfce4-cellmodem-plugin-0.0.5-build.patch 1601 SHA256 83ed1e2d76246fe1c81c589
 AUX xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch 864 SHA256 f0b30a8d776574d4d010d8fe9e58b9a359359650681712f8492a0756f0fafaa7 SHA512 29522daf5e822f272d5014019656076d5e400055fcc0ea274181eb599eae739a5598f55fd224aafd10602a2ffb706b0a28335a988682c8b1aca674831424e6ee WHIRLPOOL 5ff2cf358f1b25ab2765060014ee629bf3f28ac6ae6ed765541e0c71cec176aff71233d16500fd15f2a24e6dcf8525785f7b574b694f094d74bfbac0cf7c6c44
 DIST xfce4-cellmodem-plugin-0.0.5.tar.gz 155935 SHA256 0debba5007f20382bb7135bd0c37fe6e3075ca8fbc810166d5b5fca26965bdce SHA512 a59e2b8fa71b490abc99dc9f28e5b147e77538036988ae4c2faa93bc3f7a0187607d486b7eb92580fe2519a31917cbdba5c7312070149340adc417871e8702bd WHIRLPOOL d7e9b47f0265b3e1dc932aa96c81ca929b6add59ec6196c23db57f3525958737d9af6fbd4271b08e0ec5c6ced2f83e5071f337155368c945aabf0c7a1c675763
 EBUILD xfce4-cellmodem-plugin-0.0.5.ebuild 1134 SHA256 e99421859adb897243bff8a95f63e6814283b7da9027cc994aa192d9565c5b88 SHA512 14767facb0c278f41d9aae38c1b0bfd1a87970411f10e22a00be0920bf34cc5392d8bbfca3a821964d61cb5165b69a27a11681e3a70b1ff854cad78d11a780d3 WHIRLPOOL 0e1f08d51ef9600925a231ff922ba2553b028314ed8ea8631f4a1af1caedf0bd44700ee2a5ad0198f14841ccd374c98981b3aac2869d1852b82a538c248f2285
-MISC ChangeLog 1541 SHA256 3a6ef00168239fd4d93c5f729a922848b0b1bc7560632d875f8032fc6313a10b SHA512 3f29d9aa8f808720a391ece498cb47dd743cd89a09a9340d9b8528062c86ab4e32b1c6515e40dc783d5958cad29a49412564d5d0444ac444939a0b0ce84551ce WHIRLPOOL 56fe032708a52aeb20784ac03b1ae7e029d94f703dc389923dd1b3e49901905a6b7974eb13b646193dc311c12d8e6d53cd306d2f5d98a7a3db0ff9b143def220
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1634 SHA256 d69d03fcb5ed42faafb0332b7e9680b0309a1034fffeed1dae72ea96f8ef821b SHA512 727dc0a9a851596240584647db1ba1cf63c7d8038d47ea4756db2416aa6ecf902053d43798f992fa5acb9d65c3aac64221456cf8d2e2b9c519d4affda70d04d3 WHIRLPOOL bd503064fc3c3dd096a28c4e63f9a7049113a09cd5618567a271e9f7aeaa3cce9ba2e32f1a94423d4ba0d36a689b556d7dd2442a6f6a59660cd8e88ddee314df
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgGxAAoJEEdUh39IaPFNp4EH/Rmp3X+sHKknHRoX3KpYGC3e
-ObP/ub209GzkzVLscfAcOnF8EeelkYisZijPzLLBWxRt8khC9TDGgAZU1GCN9dwQ
-88MwA5fTbp6HuVKj6TRetfmyEM0w8R1VrukKK+W1JYxG3mKz1yWpQ2NS3oiiRyod
-wbfYmwj8S792CQOiQ6iU1MnUacA6LIgAgeXi1Xjq8WMWoGnyqFU8cQpwebSWuEt6
-8Y6L+7niwtsFrhkJEEcDgrWXI2kx48FR/gGi0PwPEx26yBjYEARjvR4wRpZcwYYs
-Vw9fOtN2eVro80fh2jaoqB5Qem6h1jD2D7fEJH9mjwuxsFd/TdkhF/r0cePjaX4=
-=2nLG
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vcv4P/jlv7sdkorxeJ6kz5rc8ADAN
+fCi0aIfXrSSiyBEzMOjtaTq8N5PvPU2VhPE5p0FGbz4+BtwoYDVLVEGoq99kdiSJ
+GssxiEzijkFRSmjVoCFJbUeDDokItHoFecE2tfUeGra1J3YkMAi3lQSmpILhS3fc
+B9kxWdwUZhwUQxWxK0eoc0pz6EZlxzEiOc+smDLDhgTUVM310CBuBXsI7tBsz6q8
+vxCJvGsxB3hq03IG2P3KOBEDJKNW2rEvyXuEGFJNqoSuMuGpuVvPuV9gqM/H8Uti
+xw85ea5L96gaY9UO5Dg2BQch8ttaASNjoCZ3Up8tqJTotco4ouQmTMjeJsuKVkM5
+v+DUy6QWruSOtCdEAjk53wHDbCPbQ56FVxKce2O2gLrU/1E9uA4sdpxJGy54hWc4
+ThR2kn3EdYyPe1FuiJ5lkqYp8ninRLQW0IZu9s2OurICzzJYG6NQA79k2UCC/5yU
+K9AgPsS7wKRrotbd0hmesRLLlFsmgPdMTNoKxYSn1QZLsKMzZLZZguc2jliwGxuu
+fZss9/og5HXiIeMXgmjTRcFTocDGfJq90aaL4V3PwJUygC5YVa3tLKvwawzuqZg4
+UjvzvkLnpfOggBL7we3xRd02eWczF5qdFScau+itcRWpjNgWlA/dM02h59O7St6c
+kYpNfObYyLik2N2iglCr
+=rydP
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-cellmodem-plugin/metadata.xml b/xfce-extra/xfce4-cellmodem-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/metadata.xml
+++ b/xfce-extra/xfce4-cellmodem-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-clipman-plugin/ChangeLog b/xfce-extra/xfce4-clipman-plugin/ChangeLog
index 0c2f052f1515..b87d5cc16201 100644
--- a/xfce-extra/xfce4-clipman-plugin/ChangeLog
+++ b/xfce-extra/xfce4-clipman-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-clipman-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/ChangeLog,v 1.65 2014/07/18 20:01:19 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/ChangeLog,v 1.66 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   18 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-clipman-plugin-1.2.5.ebuild:
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index 3b9fc106042a..d83888e27fe5 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-clipman-plugin-1.2.6.tar.bz2 438346 SHA256 23043f99c3e5257d1f3d68b5ee5125e3469c15620d098e22c6250386197f48a5 SHA512 fc6b4cee1990ff13f4c0050ebf3e4b69fc0f7124fa2dd9b41933ce11449d322fad666b1af82bd610ce2add28d012a7dddc345be4afa1432bb330ecd6344a168e WHIRLPOOL 6fa94e6e364c1a10e9de6cd80a1fad889a411ea3ca533647bf10f73967c60f1ad10caeefb0e838977b2b01f550a88561b196eba1f42949f00edb76103ec8ed2c
 EBUILD xfce4-clipman-plugin-1.2.6.ebuild 1184 SHA256 6c69286cc19df02824e18cae347906c257a79fa7f9d114e4147245eea1968e14 SHA512 29880f2375c5e5a3e06120d7a4ceb60d8354da623a64530ffa62a6f714ecc73ae1c1dbc3e98425ca3b4a6be6dc8f7d2e9c51caa0ea2938d931ec4a82cb462255 WHIRLPOOL 1626a7e682ad18c2c1214fe212d96961199c774ac83db40cc5b6595c3e1b36826254398308f6a796e5d4217ee42cad8145e50a44c7c8812019ae35343bc34219
-MISC ChangeLog 8795 SHA256 cf95d9980fc33912f965078281843024ca564d79ea90e55c0f0068582722b8f7 SHA512 f034d43e0191e8d974eed1e382711a6c8c666f1df496f1ec47cc5646fd5bab969259f320359b8153e84ba231a37bd469b969319e44ce73969fbf2a2856670fdc WHIRLPOOL 4276e6afe59cb027a992e4972bd39093220cabb834e997af38b4aedfefabecf36135ba3f5f354981588fdad49c59233f67b57c9ac638fdff6113a979d29970f4
-MISC metadata.xml 256 SHA256 44311b970246d41359db097ebe5826aba6eddb89c51493200d251956c74a8810 SHA512 06af4f0f2b05369f433c6c1efcf54f6127d5e725e553080897190ae23df734c3466a97c9b34c5806139844a76737ba860921d16b5b90c96bd337c9214501dc82 WHIRLPOOL 44665f970f0c32c481ac6594765c94145e16b4ed466b895c47c2e2d5def794e1d1fe28f499ceb9f098760863690012f2acb0b197e2749cdce46893d44dac29db
+MISC ChangeLog 8889 SHA256 f26f6a471243cd5a102554feb6d9c82810e6f574faa3db804a0ecc548e34533a SHA512 59dbf50a9ca1c1b5f67449a720f6f3728d941681f14d3b43fb428bad5f223bfc02761eed8a434122d25fb41cd1728eca8415ebdb8bf1ae1b288f7a4d5b111235 WHIRLPOOL f513927d190c6c752d5c084129ddde46e0c270acba90498a733e56650a39d922aca0a6b5d209985543ce2c88ce990cb12ad8c472626f8155a212a43e40df872c
+MISC metadata.xml 329 SHA256 21f21de295e7c45525a6f02aa6640e957138670797ac170d184f76c2592815ab SHA512 50a3eb00a11785567813eb10b6dc560d753df4aa557bb46d3ea2bcd55c58bc86551741f9f432c7cdf20d21f3bcd09c967433f0e18c1187666e863e4fccb4d046 WHIRLPOOL a07466af66ae052b33147846c6045fcb63f42ca56e1995132a087bbfe8f5124a2095a598403e772efd8e2b8da6eda826505c0db02a65e7f8bf45871e002169af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTyX0FAAoJEEdUh39IaPFN31gH/0Nh8rVMZgcQCdVsrvEyni3I
-k5PPiuqbYtIVN6IFptPO+ZX0AxZfhq8hRUXS/on4erivsHmnhO2nCQPCJK4ymmeA
-77Wu0XYg4+84sYWGxyXtuzfQpJJU3pvnKVeTquB9DAXqhvJlyL3LQiS2DL98Ors8
-EsPCTEEdCSxF9ZXvWUSEI5L/+iz24LOgPEd99DEfW/WzkriJGZ9UkTG5NDdQlRMi
-LEcsbHNCEcvQJ0uWf+r7IYLJlwF9UrvznaTDgSNhXjs1SWM7t3OVGDJCe6Hjq2tQ
-+s4d69spiRMMBiKxIW7hJJqfho0ccgYQZEHmOZuLmrgEy3RLpLtOJJhhUxK8TxM=
-=zGZE
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VnpMQALt5qoI1VJdygF1vjyAFjMfJ
+8c6bDa73yaYe5r2qyh1JRCQkpggw7g01Q1GNbo477KgxPdm5mNq7CKWq7RcCfzQv
+1QV2y9kthwkoDLfpoTpplaLp8jyTx/M63tkM1byAG5fZ1AwWp9fJlbHU8h1FepjI
+I2fM7fp73PlTQlkIyEZjxCjU52gIEybw/X/tOg28RyjKAGCqkAEygRRYYrTEiRS0
+xXoeqOyFDLNXV8fLqFiakHHDowvYv7k4AebVvvMhDTM+D7S/Fvfes4bGlnu2GI72
+KJAkxxyiR4cAa+mSfjek7w7vwR7FhtaZCWPFRLDmbar43woIfqS46O81Xyt6S9vL
+XMrdopFeWxT7KeY47D0xl6eXKA7hYqRh4u/9pcFqd1V8PNx8e0cV8Rg5RZjO8Wbx
+eMomTrHGV8cAZ6TKIMal1d/lZ3UfBCSF81jYpRPsg52RvKx5pxUgU6xYhYn7lKdp
+3SDA6RNNLQhNXexOMm1WjbZPbttuj1Gzxa0pcM1HmLWcJbRQwozIl5yPqKGomLYs
+5j/3jFrWuFR0FqiAfuVn/4jDAuS0NBHTMcv+BAWJfncIpyu1qNh/hBcvFyD0S2sU
+XxDFa+fykn5zl3hoIeVosRF91G4YorBS2p9febXMmmXur1UXZTD6vHOxBvvoB4bD
+TOds1DKbIhxxLbF4uzhv
+=kmbt
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-clipman-plugin/metadata.xml b/xfce-extra/xfce4-clipman-plugin/metadata.xml
index af782a9ca930..7eada0009129 100644
--- a/xfce-extra/xfce4-clipman-plugin/metadata.xml
+++ b/xfce-extra/xfce4-clipman-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='qrcode'>Enable support for <pkg>media-gfx/qrencode</pkg></flag>
   </use>
diff --git a/xfce-extra/xfce4-composite-editor/ChangeLog b/xfce-extra/xfce4-composite-editor/ChangeLog
index 3e4890ec4e45..8610c2d9b050 100644
--- a/xfce-extra/xfce4-composite-editor/ChangeLog
+++ b/xfce-extra/xfce4-composite-editor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-composite-editor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-composite-editor/ChangeLog,v 1.2 2015/07/01 08:12:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-composite-editor/ChangeLog,v 1.3 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-composite-editor-0.ebuild:
diff --git a/xfce-extra/xfce4-composite-editor/Manifest b/xfce-extra/xfce4-composite-editor/Manifest
index c51fe584c501..a7ea5f8b35cb 100644
--- a/xfce-extra/xfce4-composite-editor/Manifest
+++ b/xfce-extra/xfce4-composite-editor/Manifest
@@ -4,14 +4,24 @@ Hash: SHA256
 AUX xfce4-composite-editor-0-validate.patch 439 SHA256 a70e10b7304ff0027fd71a478abbe92d1e218c7750e8401afd8944c1fa0fdbfa SHA512 d0f8908fdff5e1b6e0e3844ab2c97aafc1f273916e11a4d4b0222d2aca4a1fcacb0dc1a43ab900c026f1691f15c10221342f10cb5843341cf4ade507063dd5b0 WHIRLPOOL c89fb7ffbcda26bcdbf07d6b4b2fcd097040698ba15873f97fb33e91c080139ea8963af12143cc5485d0f9ad492b58b3d20a8decd200be1004f79e254d12b0ee
 DIST Xfce4-Composite-Editor-0.tar.gz 3027 SHA256 dc43c954c327a48e6cfd52e5ee8a7e36e7f4a3e24b3b10f3ef1643831d0791d9 SHA512 27f1b754d6eff167a117ac45bd2b459c3b7a789c929e8417564d7f5805a211f4fa2d2ee049bf28f0dc0c14ee84f4608c9669b269e9df78a17308ceaff9207516 WHIRLPOOL 0bdfd3be2f06b9986cd51c57067f780e5419f3df9e1f453193d8b3832bad32eb4b8d68be8b136d1c53ca17f6bf0648ca612b5ddcbefdfefb2ebf9497141de275
 EBUILD xfce4-composite-editor-0.ebuild 886 SHA256 542d1820cf5931827c2f539387cf5dfe8f602acf47719a77ab61106e15285a1b SHA512 035f0d820836e23a617b57b0323ed04c2211a3a5ce6af18d43d817a245d83414c0a945bb2e7ecb00f1d41bb6e1dc29528cbfd5079702700066d4798820fbf9e8 WHIRLPOOL 00e307d3f5fb54ab0e7777356292713db69bba6f1b45b3b19e10b58fc41161099d82c4c18438beccc851f31c634b5ea05cdb22b5d220d5c53a15af062cd3dc4e
-MISC ChangeLog 554 SHA256 12d646699ce20056d2fe3d6a8f9d505655652e8b01826f47baed2e982c99b03a SHA512 9892aaacef560e231d3c38cf59506eba1d2f473719a8636984b981fc7b1fbf247b5449ef79533301557e89ec90bb1e1d1d1a9fa23225e41981628cefc097f582 WHIRLPOOL 770d2feb98226e6a89897435b94824943b61c37932fc38b1b097c0948fe6f494aaf5e560014ac9d8808c80cf6868e6b6f2561f8b96577fea085c97f38e839d44
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 650 SHA256 f7b0df1a916edd9005be478de8d6e7efb8ca39e254cb55f2403d23281a6a54c4 SHA512 148df8b1249ec36493d018f37e4dde48a4418f92da6be05f2d7ac0eea4cdb90cc29d9ae0243655cea4f1746c509a82ad890f7eb8797079f1088ce8acb4f9bb20 WHIRLPOOL f2dba75b7b2ae800819ae5ed488b10ce6afa056cf0a0eecc902d48ade3820948749dedc02546f7864777113e5e64b692ad5ed20c395636d684b3f009503a899a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWToGoACgkQG9wOWsQutdb3HAQA1FM7pV7SV3K/Sk6X3WQx7EaU
-lKJs7tSmTccc5nliWxxusEu+fnKJYEk0y9LgEUZ84QTPwGQAxzPrQLsNAQzBp8w+
-4bXfjfWkxiXfNwDRN3VNE2FjXuBxdffBAIe3/uSVRMiZg6vpjLae3PbMZXUHzjId
-5LarwZL6SvPMyS02svQ=
-=evcA
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VG7gP/0RD+cUNKcF9ONg0c0VudjEK
+iByFcyWEZ+1PWkmlzJSK4sfffYI0OnaGZ6P0J4ZtK94scJ89Nu04y+07k5o9RSSt
+8WeY4iCdr+TMTM3vGUZOV/MEdngLrmiva5VlDJxwFrOh2OMiwtUBPmfG4CbtMgev
+myazYaDeCvS17dFe4iK8Qbsr25Ck1XviEZz9NosBk+dsT2kPV/V/ppzrXsG9EOYv
+QoqncMb3+R8xXuwqTr2c9kl/TQ0v4TJnxrLb7SniIqiDMm8cSIpBaasqusKgeKo2
+petdgQy4RtCQ+JbNABNtQwvvlDPnExjX2ecUtg6zzyaYN3GZsZyMB3e9JkI8TmW8
+Hh1BgZm6dQDrYTCy1n0wItw8XXhEGPJNcfi2Eg/tJ789R8O2yZP01Uj67NnCyAPa
+ayBU0Kj4xdk+WA6QUGYuJOWd7tWfG9p/Trsy98yz6IYHwLQNshtfV+TsHJvm8rbz
+094nvcPrLt3aYv8JquS2SDPTPthAbaDlZDa0O3pxuifclE2CdpC8gfukLJ8NY09X
+cFbEHNYhhV6LXDviA/Set86X6Dsr25+UhqnqocCnd/x6fH8J6TG1F0arRLuiAZH6
+19YvOvV4/7eIIVPZgBlQezKjhJrNVx/4vVZ3CP5WJj5ef2Dz4PD/9x+LV/xp4RKh
+P1jjzIbG/YZJuaTbj/lh
+=ZJmv
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-composite-editor/metadata.xml b/xfce-extra/xfce4-composite-editor/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-composite-editor/metadata.xml
+++ b/xfce-extra/xfce4-composite-editor/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-cpufreq-plugin/ChangeLog b/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
index bc4fa43abcb3..b2be117dbf75 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cpufreq-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-cpufreq-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/ChangeLog,v 1.21 2015/07/25 12:20:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/ChangeLog,v 1.22 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org>
   xfce4-cpufreq-plugin-1.1.2.ebuild:
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 15a5ee34e544..bfb2b57dd4a0 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -7,12 +7,24 @@ DIST xfce4-cpufreq-plugin-1.1.2.tar.bz2 376966 SHA256 fd9ca91b99e830c6b0962a07eb
 EBUILD xfce4-cpufreq-plugin-1.1.0.ebuild 885 SHA256 5ddccf5d75812e62e80d32a2c17929aeff128d763ef64bb62e15c995345090e7 SHA512 3a39b85b603adf9cd097569cf2f3d937318d2c666262c1771df5b5afe57ad889bcf38b5cb7d029022ba27ce1e5d712a52625da170df1b06898b1f146389f5d3f WHIRLPOOL 766253b4678051dbc3f3b06d17c04eee00d40999c6e5f46d5c89f3a692d0b560776a0f1e9433c761a9cf3564a640f614dc0291a5120f50179083fd5d37e81cea
 EBUILD xfce4-cpufreq-plugin-1.1.1.ebuild 901 SHA256 fad81cf2e5eef38dbd018d38756e75931a7fddc8704b3e37efda2ff89739d871 SHA512 30508590ba3109516243dfb59e23a7a1d155c7ee5f5437982bbf9502b1d728dcbfac1e8cc584a85cdb36176c09693954f62fdad572b259ef0dc75753dbc8ecc3 WHIRLPOOL 46fda8d78b415db393c5256acfa8d409b928a334ff572952cfbf4db39b11d4f7b22bcda28926b07bd9d2c8c39d548573f70b0c047b168699f11b32cda75ff251
 EBUILD xfce4-cpufreq-plugin-1.1.2.ebuild 896 SHA256 81be6aa1b23e2ef2f9817b4fb7015686657f3f2511bb427287f119024e19d0cd SHA512 c412783f64842c9701ecd50068e1271404c1993b4c2c91df2798b216fb3cb61432c802431081a7e60dbc03c6f70c2bfa78436a41f82ff1cd79e3dca2c85f519b WHIRLPOOL 8eb0c18593928597d2848dd9d86987112a46ac1f908998b2ddbd79431a81891ccc1d5cdc67ab604d8b52e6a851a9a33797cdc8e0d701564a97aa91fbde129c83
-MISC ChangeLog 2959 SHA256 eedfdb1f861acac46b779a7312a50107c353391e79f5bac4bf7349066f3dd59c SHA512 c0958b58f9e7f35756d8904b73cde7f554d1826bda9a20ddce61d81dc085e3a7eef6cd19a7ef127e1992c9ca980fca02e21730238498771be918460297b8426a WHIRLPOOL b032cd56e8b247d178b99f93b74f2d637d302e24f7c7adf1ff9ca6a3621d314ab3d9a23291393a055901213061c3637de2a23599865f6cb5f12ed6604d5973dc
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3057 SHA256 bcd5a019767dd45ebd6a7c7b2694e695d26e3ba96611cce99f36c404af22cef7 SHA512 8c61b4bf031044be8db66bf33fb08f908926c3114312e2eb55401f4b93b68f7008887cecfd939bcc580e4a9cb06de8214c2b3cb0f3a0a12f76c950b77b145202 WHIRLPOOL fb07b25cec7c3dcb95aa2565f34276e9928037c9ce5d355b26d90c3e10b64ad6b2ced1845340041a29b17e790d566d0bf6fb962ca48893e626e5625d15252015
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfvMACgkQCaWpQKGI+9R4UACfdf/iEvMNvDAsZ5XxVsoGxm2j
-vVwAn3G13/ji0Mie/n2TmRrpcADWh4JO
-=bFZL
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VsrQP/0x+6NkAPwUbD12QRnneSfI1
+bzGxBgqTgLe0MbMbpUtonzKUd4jG6CUO+ezBEokho933TcIqQViyPHp4aZSyl8iC
+z5WxKEQaBAjEwqzZftHOsOm25WevZWO6/pJXyUw53sNkfFWL4H5wGmabdcz3UhJY
+dneolKqbHYAdG+VPpfmtz9PRGNcYDEvfuBsBqyW4LrRA+UuWjgWaY5C4KXeaSC8f
+sH0GgU0qzIbLH1601cSu8QuQurTilKmZhe/NRLH5vszCRp+9gElqVVjnRZaCQjPT
+4YSILae4LQfymvr6AIaDd2PizcwxWttCraCC8+O6nsLKf1STnIPdzoai76o7T+qY
+MGGL07s2XK+dsRbhE8fDXn9+/id3VNkME6Xqtgq9JVcNxHydHvuq0m2kTWOwwzJh
+MbWN3XK8DqEekHvLuadQjU90N5dFkZ3XnHTHS8G6GzBXCmMfCCeC8DvewQHVk1+M
+6XORLdulrk48TugRuPwyqsmykifaavWLvZFMEwcgXtOvaZvmRiP0nW/J/mM4Gzxa
+X2Ho0tXVpIs77DnrzH3eUFWEb+mltyVtvS4B+p8XUIVpzL1PdNa/Q8HUQWUT4NIb
+YuyXFg7cu97fWOuENbvr11T4q8rvln/l8LuamYGlHBEhT+jf02c9CmjSuqTSj8IL
+L/04Dkw28eXmF6Ga5E0s
+=ulF/
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-cpufreq-plugin/metadata.xml b/xfce-extra/xfce4-cpufreq-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/metadata.xml
+++ b/xfce-extra/xfce4-cpufreq-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
index 3553f228d981..b8d5e9fe465a 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cpugraph-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-cpugraph-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.35 2012/11/28 12:44:03 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpugraph-plugin/ChangeLog,v 1.36 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-cpugraph-plugin-1.0.5.ebuild:
@@ -156,4 +159,3 @@
   +xfce4-cpugraph-plugin-0.4.0.ebuild,
   +files/xfce4-cpugraph-plugin-0.4.0-free_and_realloc.patch:
   Rename xfce4-cpugraph to xfce4-cpugraph-plugin.
-
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 563d39195b12..1a14a2558386 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 SHA256 85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7 SHA512 3d1246958dd30638104f14a8b0078e25c05b67b42da953a97cb51d2b04e70d3f1da9d42ca4f4575b7114bce5abc4cb94d598737631536c0575b55d9a391e210a WHIRLPOOL bcc2594a7ebebeb0ed9033adddaa4dbebefff786c81987a94f1ea8c69be13e2939d4816ccdf00902e06385bfe76cc87d6e813dd434f133ffce757404062368ff
 EBUILD xfce4-cpugraph-plugin-1.0.5.ebuild 910 SHA256 595a0461e51de001429fefb96d4af74199b58ce04569946ad29d0bbb8b3f992e SHA512 98856e60d86a12cd4a4fe7cd2c9f21f0824a83e4d07f05d70f21e43225ce3bbfe2577035aace6e233eb2fc7a285bcbd694d304b5d8953dd507d509a3005d1bbd WHIRLPOOL 5f2bcaff6a9086823142c9d4c61e83db2de15d9f3fb3f34da65b293957cca63d0e3ce81983fbcd8def7cc05ed3f754584aa3add8afffb474d3ccac42cdf28655
-MISC ChangeLog 4899 SHA256 dcad7fdd713d30f5f189d1eed30f96562f2b2a8d0d2b4c449e458c9030667eb5 SHA512 d462de212efc0006662e58370393a51136ca161f194d19be058c9835b465a41ed27af5590da81f650adb9ebca3229cfbb31ad125285eaee6a17f1e0f3c8af6be WHIRLPOOL 858a29205d5cf79e727107c12b10fe7f6b6b0a71e4f6597bcb02126d9b6476be713b0d8cfba441d1f63d03932727bd18c837cd11e40dcea0226c2d76659e7f31
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 4992 SHA256 6144b4d89488d4d7ec2835d879ce9942dd5e23a8dca479e591162511e7feb469 SHA512 c2bd157cdf4862131c2d6c9204d2c02a9b0c6df3c4dc18596032c3c93770b05433aca5cc4e5892355ed842d3de0be01155d9a2ead21a93527689af9403fc0c1e WHIRLPOOL cf4a6aac6e2ab5a31dd4050b7a0d7a08985b6b61551b612d0d2574f98a7b3df7dc05b5a7ca6427966d2608be50e595857f7ec179437a36f407f8fcb21b526891
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgbeAAoJEEdUh39IaPFNAhQH/ig7YYhyF1dQiw831S2whD2w
-NiixnHsWkH2kjAF44YSmJLlWb6hdmGTEj7UI5MF61LkGvM33HOjqsYS1wwgtUUH+
-ttKYbJf2dLgRlv9VL5U5RBjHOKSCgs6tllbTzRde0Kb1+IdBI3vjHY0r6Bm4qt3P
-8nxaiGckWb2Dxw8lFx+ssjCuhWxLxJK2ANeV+at4sc3efpany3sguNTUmKh+PAI8
-fOBnqCEUqjnPzViKCuaRG6AKQbKY+51ozgvMT2IPRtHKJlxFPIRr9Ya1UMW4XyWs
-bUsBYNKJRukgcM+4dF9qRUpE7E0Rm3WJ1mTJ20u2GDWA1QmoaJ8XyiHkfvEhaz0=
-=vBuY
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VSjMP/0fPMPZ64yqf6OD2yTMKQBA0
+f9M+VaHT2+/sootelmI25WPEkDl8HnCrR6Q/fXktwXd5DlGupoWRabBmiZciGnf9
+U0RkXs1cdiverJzF08QPjpbnrAzI0xaIC/h9Ya8eckzafpmvsLNDV2c+whDCRiTW
+ifzHU9kccfIrtoUOA2StMUV+GVG5maAUu846q91EUpM2ou7stM975yHIKcJOpioc
+PeiwgKGR6qXSP6Nzai5lXfDGEC8lqf43GvSCGLQq2u3/LS1EMK5gfqzWZnTS6AGF
+1zrEUfbAj1n/ZqhQV14SttekwzVtyHFlv18vjYxoPprqhHyFizm3mlk+h+wD8+2F
+tGNAWCJZSmP6e2xBuE1COx24sXYiQBUNfhGjD9VLNM9xBCk1X3MeQuN7xMj7xqAP
+v3tSb3YPZ+MMKB/R1vhztmZ5A8LCH31alIKW8oJ33aHTwD1qcyYwvSodglcnrcOp
+9M6FKBvpHEQIwftr69qB1QIeaAFab5o3VDU8OiD68x69WZEtW+EtAFc0wQpXt39i
+jgEaUVM44tQzpknGI20cdKvAvix08FdebjExFl+2Ud/uMXSL4XuuC7nAgdwAXVKh
+71Ic77A2HBdRZqEp/AV0BiANAi9+aLiubAnWMLQRcFCG59jRRh5FG0T488f2S5Nz
+TbYFi5UYYhmcm+dM9vn7
+=/Ev6
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-cpugraph-plugin/metadata.xml b/xfce-extra/xfce4-cpugraph-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/metadata.xml
+++ b/xfce-extra/xfce4-cpugraph-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-datetime-plugin/ChangeLog b/xfce-extra/xfce4-datetime-plugin/ChangeLog
index de2358fe155c..d779fb8a3c64 100644
--- a/xfce-extra/xfce4-datetime-plugin/ChangeLog
+++ b/xfce-extra/xfce4-datetime-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-datetime-plugin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.20 2013/05/05 17:08:45 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime-plugin/ChangeLog,v 1.21 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   05 May 2013; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-datetime-plugin-0.6.1.ebuild:
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index d0ddebfec682..d640b1a124ad 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-datetime-plugin-0.6.2.tar.bz2 287129 SHA256 9734da671e8d1d7de5fae92093a05d653c9245b838542fb9aff3e10368cc9e2c SHA512 53d7b28c125bf74479d4788b2cb9462d3d5252bca9ab4c615fcd98e63b2dd4b30d2492214b447169e0f895449051f1f001323cb0435e41365fd5b992283c4e6d WHIRLPOOL a86415cc4f5c38581822985d4ea5a7e76bd6c007249c9dc2df45fd42c51006227fe65be032d03f0daddfedb1fec8c238059632cd873420fd93502516034aa6f6
 EBUILD xfce4-datetime-plugin-0.6.2.ebuild 934 SHA256 498161ecab4fdcdc27f8e3f6dd7b971d64cdbbb868dee154aa23fa18b0dc32c4 SHA512 74dedf6170451f7427bacce093e8bda5a426d8cd3d896fe882e6eae5a7c69b5be80518ee81b865a688f5509462b8968b17305979f11df93fc7f309131808b7a5 WHIRLPOOL 75c4549f7aa57b2c95a19f838ed7a82735ecf3fbda96e884931e399804139998a10d27a9ac936fcb2d0392efd6d1eb2a42c56744381e2273e983cdde8f5dafbc
-MISC ChangeLog 3050 SHA256 d703fec04371877c1a16dc965d3066a4156295709782f204a04f9d049d7a8654 SHA512 3ad5ea596c9c65a1922bcbfbe3ae431d09e08cf07d19471168d0a6b3924627f71720e0c2f57e9af95e38f4e21fc5b45e665325000975b7c1e73903d24b3382e3 WHIRLPOOL 6e916091ba166f57eadc2aa4618638bdef25abe6b6cd6ca1eede08d82c9b09e00d26a71008c822adcab8053626abe55bb43d30cc06e5b024d1ecb99b8248662f
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3144 SHA256 6fe2aabc60ae32a0b4d030e76537fd48abd1607bff50fc266a44e59bf90a30b8 SHA512 103875ea8d6d472c4067e8ae60921c2304c8fa39d6c95d0b89f1ee7b566643d419c58af34ce2016d450ed93012a6d6fba02085c950bbb88e4d0dff01b9b75687 WHIRLPOOL 1b233a96ab02c7b6aaad092f77baa96fc82b427c23e22f634c085f7716fe786dcc81fbf1b25b30b97eae311894d4a9fdca3f0957a4a327270ccf2a065a0c4b05
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRhpIOAAoJEEdUh39IaPFNVmcH/RiUCixwtzB6USP3ytkU8R9K
-zQ/AcqFammdYWx/THqSLIJCl0Bymzm1PKnknqOI+pK0TPCYRfYBKwXURv8DKJA18
-eUtBXNrtzwAK35V/dgRgrkGxDorAxCIzSba1zXezRBV52C04HIf1chwysoGJz7q1
-iWoSst9mr4dsdxg8KhPGfMuEmvb5OIqkjWmPeh6Gvqj64NUx0+u3O82GWUIsK/OS
-8VN+dyi4k1I7Cd56Mhz9yco3Fwvg+0hKimmIgweOOQFIgaXgMIo7XZacu+WGAqhN
-1TlPusMAiRTXS9qMbWoICuCRhbF94/HNvVvyHWV3ytqMbt3rij+ZLhID2mEf28Q=
-=kbpx
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VG/IP/0ezMAdcSRdRFtlUkTHRlmcL
+OpinU6x1VbNRTrfbcNQ/aoMAhzTf9uGF6RAw8/ZXG+Y+IEIcehQcITNqjLNWGd3h
+Ja9q8CyekZF7xfkZZ+pp8y5TAPkDdDuGFTDRnrObynQYUjXfW82fuDJy1DCJGlZw
+t4/fz+ZnPFXhk4q87BWZc5DOwW9K0eZor34ZRdBIzHYqV67nFBrLcIEOYaixzm+H
+hWBVFz8oBXlCw5IUGyET0sU693pB0iI/s0yL6LDIr1hL8cZmJd6e7AVpgDw1sPSr
+mUwx6OIFvMIm4NanxzgwTw/nAxf9fdmcKW/y+S07BYTwf5UeN7/DirXMpj+uyKNe
+laSOMcAXLs9ZhYaTXZjbXukPYfZd5tGZ/odGtkPTHWvaMz7VvXBWF7psNr7XxW/F
+rV/pRRoY1gs2mLcOWp3bXs35EeHS0YQnZrsDGQntYqMAZrvQ7kc57u4ejdYjZUBQ
+shXNpep7sXm4naMBrKFapSWygaPRfYwRqJBjZVO/LaHqYyekG+FyeNS3BdiemAWD
+mOqEhqk4d43hAHiaUzVPaoFoMXrizkqe2XPtd0b6CQnsqxCnW9czHfFHrGn9wzlg
+4A+1KCCQ8GUWnm4zTWks7vjAssf+kVa50wiFCzGfgmN4y8Rft/cJAZk69lgygxEQ
+XXxs905mm/g+JHhJfUAj
+=GHlW
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-datetime-plugin/metadata.xml b/xfce-extra/xfce4-datetime-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-datetime-plugin/metadata.xml
+++ b/xfce-extra/xfce4-datetime-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-dict/ChangeLog b/xfce-extra/xfce4-dict/ChangeLog
index cd03235cbb0f..6529b46e2264 100644
--- a/xfce-extra/xfce4-dict/ChangeLog
+++ b/xfce-extra/xfce4-dict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-dict
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.63 2015/07/25 12:20:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-dict/ChangeLog,v 1.64 2015/08/05 10:47:50 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-dict-0.7.1.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 46fd23574809..275dc6bc6a7b 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -6,12 +6,24 @@ DIST xfce4-dict-0.6.0.tar.bz2 373420 SHA256 a8188ca4c980ca2003be6bf2391589f51228
 DIST xfce4-dict-0.7.1.tar.bz2 493952 SHA256 d15611e75a5e9c51167f2101cb760505ff72c446ef15542183b5e0fbf9c540fc SHA512 820d77e84583ace3b809b45ecbbf16da7fbdd5d4d69762e18e940f20ea9f54a5f88332e24fe85865fe50a5ab0c31f7b9b20ce28c1179b5538d4612c2d9fe1d50 WHIRLPOOL b17ca270ac568667467bfd79ec40e40257efdeaabee06fcc3a3044832e1f3e6c03876f11583382a95939bcd7a16c0e91b40e8a35557b1b37b45c47946db52158
 EBUILD xfce4-dict-0.6.0.ebuild 1339 SHA256 0796f84c3120a93c80ed8928adc2c59374b849ce6cc5dfd2b5beab4174b255d3 SHA512 228b32adeaf6ef061c21d758d99b19ec5e1c557246e9f373ac892ed5f478f6371031616f0729aed7c36252d0bf5a5777922a6146954e2c0b99fbe18bf9732271 WHIRLPOOL c8c5517baa84beae759cac194b7585c363dc3e20ce10f21d16844aaba4f42c2a8e70b524a4afb1d4ff01766b7ea9d1df526f26ac21bda803d0a3882eca916cc5
 EBUILD xfce4-dict-0.7.1.ebuild 955 SHA256 4bc972690207809dbefba24f19448b528ee6a3ad122aea78f76e081aaa92a8da SHA512 dcdc6032a861485f2988de9e6d2da5a995aaa527a8481cd36132ac8102723006e7890506bc5abc1997d4e34f9506e91ca6ea289cac0f9019d467aee16d82e095 WHIRLPOOL 0d571f61580d894275f00cad3dda954e1cd1cbfd22c3634681467cbfcecbbc63e2fe0a7a4d323839fadcb6d60162ba873e611ee3445cbde0ed601d5028ff5679
-MISC ChangeLog 7797 SHA256 d925280df08b96692881bd60bb165e9f8f0181c7472b59353ead0f17f1f42351 SHA512 f099792075aee25411efeebbea6181a382ab5423f14b90ae1a18e9cea751d848e03157acd59fc8780320601fb6d910818da7180a46d78f09306ef3e21b604ff0 WHIRLPOOL 565970830a0a04787aeaf333f56df6829c9157e10b24919ff81b3653109e23d21ddb0fbec34cb452032ae6ac65aa1c51009367aeabe5bd6fd3f98136c834f073
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 7895 SHA256 9800b1238087b5a543ccdb5918678243ea74e466d3ac5829aff361c714cbae03 SHA512 d2ca3f3c0462d43d4a4fc6b7ee2173b8190d35b1bce9c2e0bf7c612a7183da2e92643328e70f054984f80f6728499673a468b5e9e9ee15bac893ff1218955504 WHIRLPOOL 80b9697e9f0e4fa75b32bf812b45a9048a9214f560a1701ca5dccd13e5bc0c10fe32b4a041a55833eb030f7ab553373382e260067d305831d2bd8325027f575e
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfvwACgkQCaWpQKGI+9QH4wCeOnxd4Cv4h1TCMplTC7T8Qjte
-AS8An0zgVY5S0gxOF9CD1eEHJGg+LAeg
-=dCyR
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VlskP/j1ckP7BuYEriSre0tXvFapR
+YPCKSyDPa+Dj7RU0jxdc46bbUVwGQ+Ul+TGJbsPViLe71WZ2ncVrDJ8yjqD0vxNT
+Kjh0Pjof1vG9T89z2AlpLyhXpSndUceJ/nEvAtlv5Jd7ygXz8F4Z1H9ZUlIA8etQ
+XpH0xq1l8Y9qckiJokIgayxMje6cX8mMsMa5L+TCdyq54Mrzhv7spOfm+wEakoAd
+aek881QE5LfDUjPbXPDNr1rQmkE6kwHCiIsgYv/k/FnLARdRnWrtxcCgrWpe9jqY
+FGicVnzGhyP5fpFDXySCCG1erl0rSDz9WFa/jonhI7xQYqrxQaYJlgPFa5P8u7f5
+qfBvewNyQooG+zc6FPzyfpqoAFkpI6FKYxAlCUA4rTSZ6ENZ++UqOSHHdx0QMUu2
+gCLyDesMJwbtZVKkK5rn8/86NN7mx2CzNk6ys5r8aV7t+W6cCfdbDECY6nDGECa0
+QtnOd6IVm7jihQsY3Y0HKPfB+iP5T33SybOErxeoopqu1HAKb8UT3u8PwMJ0Y5po
+b9SlCgNyorQQL0aPQ8jjE0XI2YyQxF0QYG6SIcQ+fpFr6FpnKOJDtN/QjNsFmHUI
+enMXWp7RWMxwKqMNMKUfpM+E99whDc5bKutpSoL6fXc7/gmXZFqa+Zhj9qdMBQG2
+TWbQYRIMsdQOeWUDQIsA
+=dd3m
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-dict/metadata.xml b/xfce-extra/xfce4-dict/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-dict/metadata.xml
+++ b/xfce-extra/xfce4-dict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-diskperf-plugin/ChangeLog b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
index 7af56d2a0696..77a3852d93fe 100644
--- a/xfce-extra/xfce4-diskperf-plugin/ChangeLog
+++ b/xfce-extra/xfce4-diskperf-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-diskperf-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.34 2015/07/11 07:06:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/ChangeLog,v 1.35 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org>
   xfce4-diskperf-plugin-2.5.5.ebuild:
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index a10729856a8a..eb4d226517be 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-diskperf-plugin-2.5.4.tar.bz2 321974 SHA256 aab6b9c4e2f78620920efac68
 DIST xfce4-diskperf-plugin-2.5.5.tar.bz2 321446 SHA256 cbeb0c00f97362eef3f135afb77947aef73e938bae0386250a122ac6644b521b SHA512 ab0299246f228de6ae8597ccd14980111c28a774e6a41fcaa23cd50f978623fb3f4a20b61c19d0644e2c8062ca9037bf365cdec40f3174aa6d1a88a63a356fec WHIRLPOOL 7078e23e8536cfaebd36c00a942758db8941df226cc1becf194f6245b5532647cdad99fde19efffcd057654143d4021455c4736a988a722ec2302185030a3735
 EBUILD xfce4-diskperf-plugin-2.5.4.ebuild 874 SHA256 806ca3e178968eea72398ad6f620ee50778e264b13e7597633a2d2fe11fdeea3 SHA512 9b4f201a81a8447128992fb9e33549a45a286270417dc784f9e8cc5dff65bbb73fa4d37f3fa0c554c228103e16274dd6170ed629f4ced2cf79debf022a2fcbba WHIRLPOOL 66f102a4929eb0f8a76ea88cf27c76ecd884fd8429fdab02747f3af6ffa8ac90d1c8dac0ed8fc254275e6cbb8c15b676064aec39c871fe561283408eefab414f
 EBUILD xfce4-diskperf-plugin-2.5.5.ebuild 875 SHA256 d03b764f9a902b3e4dfdadf9a8924d7295c019774ba3f9f390df2052a8cecf1e SHA512 a1b409134c01e16e983cc2e5f0bf36d1c6055df58c275567e555abcda5c36f443302fa78aba34ce1c0cb9719fc66a3c8bb9a9de5615d526e0323a2ea5fa0e52a WHIRLPOOL 4c95262b7bfe7db3c9427ed9c37ff4085e2797965ecd7e3170ad174ce64cb55300a05a08805dc9b36dcf519f4245709e6a8e5283868783c8dda7bb7f3bdbda5b
-MISC ChangeLog 5088 SHA256 2532a7501d6c8735bea066257c8a742e5f628c4d9ef633100067868d247d78c5 SHA512 c958c6667da57355a5a4da75be4a07726322e0d5d066abf6a7771ea6caf3f536f969d01c3bcb6b05e87a0831f425b4903d780e441762f92f1d8a7d96cd4a7edd WHIRLPOOL bb0383e2f858f31e0f42d6643e80b058879c950e4f251d117ca53e4799c3fa63911ca363a806f76eef162cb682e14f69e3a2e4cd3ee44157573ccf6c75983180
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5185 SHA256 0e4f349e1eca1e0d541a03da4d093b3a54ea9cac0a3ff424ffb96dd6fbb567cc SHA512 b91809da42e6b059e3b0ffc025db14aca27948f7db87c9edbfcbde74e604cc586dbc0a6b88b8c6f1b8613a99d114ddabea71e6172ea85701a34b1d31efc7e7fa WHIRLPOOL 746eae7fe23721ec25fd4a63f289f019e3f8906f62f8a26be7b1feb7bcc344fb551a4e4a374c065e2aa7f3a8c11170f98636a6ee3baf0c3c19af1733808d25f9
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwIMACgkQkKaRLQcq0GJzdACfSMt9NDp1zDgzsrr8KevPmxS4
-THsAnjXu8JMjJX4iHcznvccTXKexZopR
-=tQUh
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V5lUQAMpY012krSMViKi5TGJlWCxQ
+TcYXX60vm4mv4CB7R1oBgXnqy+YmOgZUAm859QYKAPl1E6QcTMB1efl0oUSa6lv2
+qntLh9t+QjyVuUXorrkQdJQB5Oqu8ucSBfr1yPtFjmfCMIs+bVnBNxucb//iK08x
+CKI1cu0rM6SvfutetroL9c3UpSArXO93pqd4hUi23xoBPRaZFtNR5WTz8hAM/1Lq
+qCIrEHt/wcErgV/I3IR9ZYiK+pAJ8kTLhXPpx/TNvLshTbL2Dhj3EpI0be0ZS+Ey
+BchIO+U8qGA0+reOsmpnh3IOwYEKVS5pr4/TRsfTQBXyBZddozkrcjcmzARScXfo
+VJzvVJWafuQ3C5w3BLUeyZIU4o/PsuV5PxXz7/R9mYfIEfal1+h7pEZbd4LfdrFZ
+fC6RG+mS34lyNJj/DZ835+i0RIY5xcVrL/JehPJgQ1URiDb+rx/LfYMt89tfJJLv
+T07oyPVRxFDosey1gi3gC8DKxS3oKEXmhgl4dFlHqoY76c6hCytJ2H2Mlul+lwZU
+uGXc1HBxrVeonrpRiXZki5RF+mdtqduC50PwNjQqqHHffZABSymeu1ENVg9GVkH9
+ZxnXHYGBuR2LqSLjnxyVcsHSnHsHu+0R8ICmkRL0RAdaf6gEJisFTMizhMr+tCPF
+xMxAvzv/ewa1uTKWrbtw
+=L4De
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-diskperf-plugin/metadata.xml b/xfce-extra/xfce4-diskperf-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-diskperf-plugin/metadata.xml
+++ b/xfce-extra/xfce4-diskperf-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-embed-plugin/ChangeLog b/xfce-extra/xfce4-embed-plugin/ChangeLog
index 89c6fd280ef8..801455fa749d 100644
--- a/xfce-extra/xfce4-embed-plugin/ChangeLog
+++ b/xfce-extra/xfce4-embed-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-embed-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-embed-plugin/ChangeLog,v 1.22 2015/07/24 20:57:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-embed-plugin/ChangeLog,v 1.23 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
 *xfce4-embed-plugin-1.6.0 (24 Jul 2015)
 
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 35aaaf927498..46c592704f17 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -7,24 +7,24 @@ DIST xfce4-embed-plugin-1.6.0.tar.bz2 348026 SHA256 c767df6360e8194b32bc24823dd0
 EBUILD xfce4-embed-plugin-1.4.0.ebuild 885 SHA256 4d26373b35a75db3d3db5f58098f5b2b128b3db6fe63341eba44090e2bdea308 SHA512 4809bac49eb778887d72bbe913bc25c1f8d9682eb79183075d70f930c16c9d709c81023f67dc375d6cad2486c8729576b9f90dde1138db5d65577c243ba31510 WHIRLPOOL 938bc482afdda0d985376a53c8dd05f2dd542a5da180a68bdab4085e10d9053e10e72f2f91fb92fc1e0902cd47636099e23cd15d4ca4cefcb7449399f67b6856
 EBUILD xfce4-embed-plugin-1.4.1.ebuild 898 SHA256 aeb23e83826460fba02c1d7501e2d98857981f4cde31bb02ac84b1d2133d8ae9 SHA512 4d0379691b942b598853982125d4a18654bbb9b3bf43919f6ade63dc3f00547c01bf7a270e78b88909c15479cca2f8ee4bb9167db8d23c5db121608a951364b9 WHIRLPOOL 574f81669449c2ef595ca4dedaa8ff3315b7efd48fbbe808011f2c97eb2d7923581b4fca6dbb21f44bb34fb31ad0ab9637840effc6959d2ed6c0085deb43094a
 EBUILD xfce4-embed-plugin-1.6.0.ebuild 899 SHA256 4e8ebbfd27710a7a9fc73a3c1a0012186906c1d15f3aaabcb93c7c20f6ee2275 SHA512 abf2fae163a4d22c26fce579e6dd676948527d07473d83cacb3ac8a6b5e3d384dc573a750e0580f8ab028e3510d0c3a5a1a49c0b81b9460e97723ae3f83b42e6 WHIRLPOOL 087a24334071b9081168f71562aa050f53f4a27aa14f1bb71097843e3065ea5f3d7e4740bc10351f1fe03c5777a1f23b2b863d2077bb7e761b5d375d51338ce0
-MISC ChangeLog 3090 SHA256 ef3fd61d61934479753e79b9db46eb2c9d191d1a82849fe787ac2cf7cfc47658 SHA512 2a859768ef48bc96d3e28996df458417f20b5fb8312783da8f05411b08589aabec03d2d313811b8b258215cb59920c2c280346de01bae16fa3ca4a63b5c7edc9 WHIRLPOOL db797d5b6136082ec0a8c8333049af7092114e23ed933fd408165f2e5b124fcd97b9f8db7ada1fb24b6650c0a8efdc0ff5b1977d2d81eaf151ead9e9cb3d1da3
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3187 SHA256 90cc24fe94b878a9bffc07115e7209b6dc2dcedd8221d0f51b6a9736a07c163d SHA512 d8561c59803eab9836b3671882308b6a3eea9beddb426ae3f9c7c171215aef19f5cd77dacda86bd73071d1e49bac33f87b76bfb640406772e498b044bf9bd5ba WHIRLPOOL a434757b82eab7068f459ecce1f725460f639432390dbe98d0e222c86304238dc91c8aa36e64efee37258616f1c9376179ea5d84063e737462f4efea1a8808e8
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVsqbMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHD8P/iKa4+FFDORaIBXGnYuoYS7Y
-M7Uc63ZdY1X0P1d7cWLdVuevWuGfUPsWE7lt59OpLPAATH6B3fIYjDzcM9o2jqfL
-hp0FBuEaHalqJDSjVzuq2DCkoCmdvIzwm/BWxubO2qyLtV03I7oeJ61CgYkzBEAK
-VgXNVtANW6zZw7599VsIKG5jTnphJ3ARsBjX78kQFwYCAMK1ykCFlzUeKqijPrfK
-h80FExyVXWdrxaInGD2Hs+GT6TRu1aRgdL9qSr20BPtZNfb1jW1bJ7kVay03U6eg
-8pV8koYsUqOLT65T9/gJ1zcm3toECmllATzbQohU+HHjqKHdPiKbn/91iHmtlx2T
-e/iWa90yLnVN/NBd04PbzDCc2RD5gYWvXY4ZUhbLO/iF5CFsa97bd/e3I4lOGWiH
-80JBcDGL0DlKXcjKc2KdziPS+6heFsy6r2Kb/juOK0yjA4413tsj73QGqLKKpnNM
-i79DffQrC36vRWZlYeo9YCZ8NEG2X4ouUQdziYslVl4XllBvBAFuwSRowExjpAui
-KtfCGAZAVeLQtfmf2TahY1Dnm8BcPd2gxHcbT+aqGSyVBEh/CIps3jfkC2NTVIGx
-uezaICcpojtISEIYVbUfsdfMSb96rV+VFbu+TntVZ0wT0Ucd+EUVuS0D0quZKQdh
-XtqWkkvK4Q5wjhz07tSR
-=UKJU
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VSmUP+wZlckBSJDG36iWJyXMacKHA
+B41rVKP8D4Yi8NPr5n9L5XRjQE5D7hxcBPscBt5VzjGMtaWDJQUKfBk8a3MqULyW
+JQ7PrsL38l53o1oU7ISuW0TtCKV167HKLzqbe9Txj4RU6yDC0ZM+8LmfbiszjmQ9
+H/+kI1CRjGKuxdleMP+vhFgerhB7Uj9HmgcAAFTOiDGnqCqjOozyvKAr0YXf8ohI
+dymoVc/AsarcOH/srfXMlX+muohqSTxl1YmOcYTw2rFWKUlFkHnSWyd73i4iyBqK
++EfrOZvWZjVwcvOL4+bTi56QmVACuFrtgTOQu7ZwZT8rJBHgGqR4zF7O67/OmYZO
+abKNSQ1FoqOdU/b2dFNPOQIB6PziO/mkplAlTPmMMzP3sWeZcUY4d682k9IY1RRg
+t7j2wAgUtkBDq1Wk/BNWwW+dJ8O2g2KBXSBkYD2mPOWXz3j57wi88g8GnjmK4EQU
+ckCiIjdtqS2x+YcmLH9qk+c1+3TShrz22Qlcx3kbT95WAYm6YKbD3mjsYDwznIDT
+qM3VSQcB7MsQ/Zh7onK2ZucUw6jl6QfhS16IQWcM9p09FliO55EM9QXVKcMDA8B6
+DCzp01NPkDz+HzNoj0RAJDQwczcByFsg8+CSY7JqfnmcwRgnXPHc87CGhMv7/FTR
+2g/uEZ2LzQQoIDXQPxsY
+=ptDr
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-embed-plugin/metadata.xml b/xfce-extra/xfce4-embed-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-embed-plugin/metadata.xml
+++ b/xfce-extra/xfce4-embed-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-equake-plugin/ChangeLog b/xfce-extra/xfce4-equake-plugin/ChangeLog
index 863a0ec27254..4b4432bbb95e 100644
--- a/xfce-extra/xfce4-equake-plugin/ChangeLog
+++ b/xfce-extra/xfce4-equake-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-equake-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-equake-plugin/ChangeLog,v 1.14 2015/07/01 16:52:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-equake-plugin/ChangeLog,v 1.15 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-equake-plugin-1.3.7.ebuild:
diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest
index 16d370f77a1f..dbfc233f00ad 100644
--- a/xfce-extra/xfce4-equake-plugin/Manifest
+++ b/xfce-extra/xfce4-equake-plugin/Manifest
@@ -9,14 +9,24 @@ EBUILD xfce4-equake-plugin-1.3.4.ebuild 848 SHA256 7ff61a144e19556b409515f0178ce
 EBUILD xfce4-equake-plugin-1.3.5.ebuild 856 SHA256 d7cf7f22addfa17eb39059dd6067a8dfb86b52ff1ed2d9fe71b82931bcabd1b0 SHA512 e38281c540cc5cc8ab786c9278f90867dc36fde25d8f82540d14f97112e33e51af72b2d8a4a939c02aeaa158096065a7de272b1cc31229c92c461bd99aa231c4 WHIRLPOOL 1ecb42bd5d59713370a944977d7fa164cc25b4c13c359cfbf18403189dad02490e4cedd05575dc8cd36aab1f44e451d2ba4934828908b0b2413206e4dea745f5
 EBUILD xfce4-equake-plugin-1.3.6.ebuild 864 SHA256 5b599c6d3b91bcdb0fc16754aa99db295d2ee9dd525dbe836c818b1ef953e544 SHA512 24878009f8a1245f156ec8c2b844b4a09833dd9c118b95625880f22209853c9105f2a32b6b2e5767c2e5fab102e772ad618b580815708ee7da9bc374e39fd482 WHIRLPOOL 262e0800cc78f919075fe4606ac679306b2753f5431cac7f65a9a8f8640d0ab643724a96d0e8525b7c89b97e39f3e442d79c89e101cc52794f14066cf196c07f
 EBUILD xfce4-equake-plugin-1.3.7.ebuild 863 SHA256 109b7d7bdd2521849feeb320a7a3a29f5c346d654809f18094ab54a4041d3d8a SHA512 396f200d1111eccb6033b5f70303fcb70fbd0b55ef65c790bc30e2c3328c54ba2cd2e644bffa5e9bdfc9c2fd4e66c0188bc360c9786b8e4a810ce16b7f66f6af WHIRLPOOL e06f65e82bf01d1ff082e98f60c58109be5abc47911c1aa917439c5d2afca3a14c09ee8ba1fd9cddff6bab174f1d11edd878b23d9276f9eaa87f395edbf53a30
-MISC ChangeLog 2100 SHA256 74e12bb46cc9893d71a16aadfeafd1cfc86f95fd761f87914bed4055dbb36888 SHA512 d7033d2ac6bb1ea289d9afd1037a82e5e5ec81b8a293125dbfa2c1383cd1c2a8e91963e267a533b05a94de43134d47af22f675cb24584b9839e458561fd9b390 WHIRLPOOL 5264f795b7a57b1a1d784e9832582fe6ddb308b15448de9a54615e629792c481e84fe7004f6efcdce0df65f7e326da8bded9a09edbbb72010c51204a450383c0
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2196 SHA256 e981733d5aff29f327069fec6d715732423bec12ed596eba4ad49e42224de04e SHA512 e3a0b74ad9752acb91cb62d48ede9c356eb6ab58999a90628172d31d79c1864db4ef83c47bb524a320005c6123a3871ac6a27c966b15d2306e6e448426ed0a87 WHIRLPOOL 492e4e585b3881c419c09f947f0951e56baf92c27c2ee5f77c543c138b443ea518534a53b14a5d62c981fb4aba83925b9d7620269de08714268090afb8c795fc
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUGjAACgkQG9wOWsQutdbknAP/Tv2NWQ3HNNCCeJ4cZqzDcUod
-+uopTijy3XDzLxjnwzOgpJYkS21aOUs/QSdd5jJ7R2txzPYmI5Jbo8bQ4FY0PfWr
-mQpYHGDdzQ9JnqWJFLYh1df+UM8YX5UeEl8dqJnvB+kYGhBMz3sjmBBDveddWfAz
-+T/8nkHHcorutVV6Nqo=
-=dykn
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vl+oP/1g4XWHPSECxeplK0ZWEiY8l
+niasxEYPXqgSfBcOas8olcS7AhqQTIyMOg/eivDUZ8Eroj8UWt6atd52Xq6YxoiZ
+YWsQsgLZU+3g9xa+evBHxcz7F0YO5b6ULE7NAM1i7sMtlVJ3JiaarBbn8BOPCN1y
+rwehvk+UAnUSIz8A/rh7V/W6Roe4MG/LdjPj5xL3tg3ArT7VARS5fMOihF+KQIgR
+KibJXwGhWnyWNzG6fuqOwv3L7eRO4A/7YdiMlCTm4VYQ/2dBpsQM79HhbDbSKO8A
+KnpGNSEdBikngERe7fU7c2WocDTmMWJ0dyn9v1/lw66qqiBUIttM2kfCfpTy2Foj
+GP3AH3WMqsdvWyYk8rJVggnOtFstZHXxjlySb3AmTcE9586j83phrJ9oa/yNZeuw
+ehmHtjcTyAW2aXYN9rAR2DPpfF4XXDkqu4WFizPElo/b05P2OEIEjFzMZoSfjGnv
+U7M4TXubinev9zmxyb2t4PYlNLjqRZDVZgdc088lAJQ3PBPeb2G2KXCAQ1VuTED+
+eSYriqF4l0chNeOkJNKPPWmO1A1ELZjhGRGp0kJXBryehMhFXBRPQOEiLXmeuzAn
+zqwzULE+NzbO/WnEGVNUn/4WDxht+oi2VJJ9URCtK/31OMpJIz/jHeONm5LQ0VKm
+TxLHnbICiXp5y8hJojlF
+=p9M3
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-equake-plugin/metadata.xml b/xfce-extra/xfce4-equake-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-equake-plugin/metadata.xml
+++ b/xfce-extra/xfce4-equake-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-eyes-plugin/ChangeLog b/xfce-extra/xfce4-eyes-plugin/ChangeLog
index 771fa1d55288..a3d6762ded47 100644
--- a/xfce-extra/xfce4-eyes-plugin/ChangeLog
+++ b/xfce-extra/xfce4-eyes-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-eyes-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-eyes-plugin/ChangeLog,v 1.29 2015/07/11 07:07:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-eyes-plugin/ChangeLog,v 1.30 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org> xfce4-eyes-plugin-4.4.4.ebuild:
   arm stable, bug #553500
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index 137672198d9c..89c8f65f4cdd 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-eyes-plugin-4.4.2.tar.bz2 308935 SHA256 dad102fedd0d9e6df45338a018387
 DIST xfce4-eyes-plugin-4.4.4.tar.bz2 352535 SHA256 240ce85b68d3d161f276ebbea97072dd6ee3df77062fd073bf6eeb4d3d1400ca SHA512 3daaae5af2030e007af969832aeb11eba4aad0f4d6a166c2965e16a4e91619acf35ad3c0dd82e32d817122330c4b009cf3d469473824af133134e05a161df924 WHIRLPOOL b706b9a89d6fb0f2e722fcea4b981f0adf9e9cb5ee4866ba79c09fceed2b80c05f19cdf2903907440d1adb564764214c942cea6ef570893c1dc014ca904b143e
 EBUILD xfce4-eyes-plugin-4.4.2.ebuild 939 SHA256 06d6158e5d7307922138586cdb6cb6e982ca636707aeb3ffc9e641deffaf55bb SHA512 ccd39276f330866855205192173fc0fb610394d4ad6d5825e20adaec36d222545d6807e5f3452446adf37a26fa5f6f6d52e8c1857a4df3d9d212825c93f21ae2 WHIRLPOOL 86646857016d6bebe13c56b3304123ad840f3bb64aae5009b1cff63d8c3325fe544e500d29ac2639b3eb4d787bfdddf0e589ef8418a134a30f4b64bf7622991f
 EBUILD xfce4-eyes-plugin-4.4.4.ebuild 951 SHA256 d07fc0fb7be5d5727f30732bc6e958b3faa3e1fcc754e87e1c4058117088eeba SHA512 b6d665cd7f506671eeaba63ad4935f71273f5c6afd24978ac46f0e2ac1cdac9154fdd2b49e0fadeae58abea8d37da14ffc3c24cdcbc9b3a6356a831679fc40b6 WHIRLPOOL eea6dcd1647eabf51a535096f71d739be4f06dea145e1aaf3069dcb46f17a539f3abe612d70e70f48d5dbe23ca23b2a53dfec71f6b94f57607855ddfd984fd47
-MISC ChangeLog 4088 SHA256 d194acff9a651a1fc436123b6e3dc7d53e68ad712eb1a53ea7405c5b9a043fff SHA512 5233214bd9fed801b80de8f74df4e4f1e51318e15e0d50448547372a138b1926afc3d6923688931d17ca064d0bbac8ae61bf2ce4cdeb4262ca50ebba9fa00644 WHIRLPOOL d985a46a23fd3b78d5269d95400d5ecae18ade2fba379d0ed2fcfdcd1d369d914093897119112ea0c9514a31fe61d2dffdd1cfc8823521f507453de68d0943a8
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 4185 SHA256 a05cdf9e6e562c9e7926da1d1309d7adbfaabc6a79d116ea0e272a1efbc530ae SHA512 c3209ec64dd2c1bcd9a6c3bee1244589719d52ce76c3dccc05d9fe9e3992ba5a2f1cc516e7a989d63cd206fc13482487a0a0ad0a30e91df5d0277a71c0b702c7 WHIRLPOOL 4416d7042e51f758f90e756072adf30710b988d48d11591502166b10293210080da300d66c72bbfb1626dc5f973e050547786b21adc0777c9a6641adecd528e5
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwJ4ACgkQkKaRLQcq0GJxcACfcck1+s/XIjjG5Ccue4jHi3MC
-Z/cAoIFtgp9jXwgKU1FJJV/7QLBH0NUM
-=3Qo0
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VrXYP/iQCMPU1vLQaEI+IzuhB0MOW
+7DVEJZONQrsXsswdgU1dlQbgvRwUE9n3ZhfxMXFqLvtM0isYU4+z71cdp9c14smW
+9CkSv9SxmX8xrErrf0eRJKe9Os9Teu3os+kehxmycegf4YxHFoIgJ76B135jWK8K
+tK5BiI+F+eqczX3rcW45TEks8Wnxg1zExrro/QViCDXLFxuO6qI96T+YW7iMcUvQ
+qMC3mLLtsZs+MvGgpOnsjvg9xLPpkVhrDL6YVDT6q/mvobIEIToEmV3fuaEiJmNC
+eohH0eqN44+aUDDp2VT+KfrLCNHYm/+Y+atL6rsJ4d2P/9fXnV1yBVSIPXGDCzbm
+ZOJTWDIRmQrwQZCfgbIeEzF/NQvH6r6nSiuFsX22xKNTPpZyCMbrNk4EkCR5EKqm
+hj6EETqihPhS99tjGdWOjArh8FKaAbBV1gozPPOQtsYhC4tj5l5ZO//g0Ictz+bG
+WaGfYi3531BD7WgjnYpssSMgRHO1+g28B3kNk9wVZAaFaR3OpfNgkfDbBVSw2Agf
+BW0AqvHE58d38+qB2S/sQinA6+etGWU0aa6QT2ilR13o7Kb0+Glhi4tJzV7sqaKS
+MpNJTXRqmjkSv49SFJhpaWFdml54pHZh+Bdl2iTOHj13exKWRWaYegyDXv3H2F66
+zu4pgQw9NNOI1Ma80Rmc
+=K4Ju
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-eyes-plugin/metadata.xml b/xfce-extra/xfce4-eyes-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-eyes-plugin/metadata.xml
+++ b/xfce-extra/xfce4-eyes-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-fsguard-plugin/ChangeLog b/xfce-extra/xfce4-fsguard-plugin/ChangeLog
index d75226a78f68..ef1842c1206a 100644
--- a/xfce-extra/xfce4-fsguard-plugin/ChangeLog
+++ b/xfce-extra/xfce4-fsguard-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-fsguard-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard-plugin/ChangeLog,v 1.22 2015/07/11 07:07:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard-plugin/ChangeLog,v 1.23 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org>
   xfce4-fsguard-plugin-1.0.2.ebuild:
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index 0eb83840d094..8130e2df53ca 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-fsguard-plugin-1.0.1.tar.bz2 356783 SHA256 fffb7ee09769ec0b991b8752b8
 DIST xfce4-fsguard-plugin-1.0.2.tar.bz2 356715 SHA256 a2c8d59386ae3d23cf6bdd06a1cdd7a1b9473cf6f38ae106600b194c601040ae SHA512 1539c3757c8ee232bcc686d641dbdc73d76a8ab699b3bd6f32d662954ca3225b93a823e510ccdd7d59aea090e97b06bd7c9e70997cdd33dd32f032e2414a3d14 WHIRLPOOL 71c573875014ae969f95fc0f01f517c64ef84b99be75053c0492a355b9dfa274319647ee7e5b9376612e598afffa0ce59048c899067fef93b0b83d72d975bc09
 EBUILD xfce4-fsguard-plugin-1.0.1.ebuild 929 SHA256 a1edb9c647ae977f24c0af2b13d64484b25dd3420c16a735ee126791a118a0d7 SHA512 ab52b53c50ec5e7b3037ead1f9d8454803eb1d4fa97bd304bf7a27e158b9ca343e6613a04b6ef23c90e8b707e8796e19ed7f311af73436048f1367dd3cf4c6d3 WHIRLPOOL 36b58d263acad2f33fc5cef232fdd86412c9fcc7bf084a309d2b8a2d326f82504665a71da24996eef249fb8120c4b31a872d943f9914f1d5ffd504f09d9c26ed
 EBUILD xfce4-fsguard-plugin-1.0.2.ebuild 933 SHA256 019a4694a6b03cf33fb9b198b3e4475fac439a9e39430a50e08b50652af126a8 SHA512 cd401369f5f9912fb5a66920e7d39a0d634330c970d4b511917d390473cc6f7818371a755ba3749c86246be4d69f48b57e8fd9ba49450d8965374a45cbc5abe9 WHIRLPOOL 1a0e805b1f8a4d1121092af5c41962b35d19a222d2b0034a8651f4f091b15be400ad483a87bef0a27ab1a027a8a0889e9c9f48f008df493a1bc3cc4e52314ed8
-MISC ChangeLog 3105 SHA256 81f7711d60c9021bf03336ddd9363c60326f62d362650e414b683300ce6d0c34 SHA512 f9b4b1b7f949c9840cdba08b26e115ff7b97742ca31492fd04b56b0a8cd9df27eef92c39bda9d4a56c7d3cc54bd6ad5b9a57d703ac713c8cfaa4c31df5bb4bb0 WHIRLPOOL 227f518c730ce8f21a01345275bceb4eb09498b80652f8df95525926a9ffd118cf99c2ceaaf43f9ac54c8b29a11ad94749320f68c13c675dd08928ba9fc8468a
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3202 SHA256 3ba0c0d0f52546f530595d25a56d70319949506576630d70cd9229bfef6d10c8 SHA512 4a14dd71156d486c02db1fa7cb1759301d72e5a93cc52dd2a6adc19f5730adcfecc58041493302d0dfcef7720fb187afdb997962fc4a44c2b015d62069a29a57 WHIRLPOOL 849e4bd0b46493f841a89ca3694e781ea5467f2ec9c7f6d2bbf73903d320f85b83242995b118103985e6ddebc78337c4476ddb7bf9a7b1fc8eaef0742734444d
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwLkACgkQkKaRLQcq0GJt/gCfWLnzDJdCFDu/jMkAYWD+Kviq
-3/wAoKAM3NYAfAr0+pnRF3k0qVSU3s67
-=Lleb
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V29IP/0rdyz9SdkJ+HgLa9Z7HIOoi
+SpwatkmzRY/3eqs7dFn/g7CHxBTpQP9viPVWraBvfiTzIw3NiMG+uAxJSvnUUgZG
+ENq8uFMnhbYA8zVFU22+ncCbuAYekeiN+6wMqsLPe73tSrlnQ5hmysEe3nRKrNr2
+qt+9Az9JkI2BGpWrN0CqpqMCCD0mVo5ONPdwsELHazRDIBO9BZ5WGBcmYWtohie7
++75OFh8X/lJ/z6lkvNaKXIjMONE/82G2xpd2sL3olRV5KxKEkv7QMS822Qo+xJit
+TyKXbivoMi2/6aohTgixNpwy3/JhF1llYXlUFS8DtNR4lPqfpgbWJICTIjg21Qr1
+OMqg4Nw+CPaqbVLRovwvtHqtHKIEmI8hLrpvacL/czkpAOP3ZKSckgZs8SCYTsu6
+UjimQIeWgVO/bo1qAl9VYS5nuWU6FoyKd9f79vXK/cxDTZiptY6mHe1cnA/ScH8a
+0/6FDqeAiFeZpo7owZhDQZ7gCMwfyIiz4gCGK/ZTI9fYXDN3jiUnxGpCOlg0FKLq
+8XwGFYkOum+AsDPadALYw+QGeHI9GtdDhIIGFoYvgEh5+jF86dW6dmdPEsRTE8y6
+keFJ0Pa60x2IQBhmGkAXDmDc1cV49oNHmr87490YF7sGEpyB3SR0ZKJjWvQGCPVS
+ypeuLS7pof4kujI8ObNR
+=GGTd
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-fsguard-plugin/metadata.xml b/xfce-extra/xfce4-fsguard-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-fsguard-plugin/metadata.xml
+++ b/xfce-extra/xfce4-fsguard-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-genmon-plugin/ChangeLog b/xfce-extra/xfce4-genmon-plugin/ChangeLog
index 98f03c9166b1..c967b42a020a 100644
--- a/xfce-extra/xfce4-genmon-plugin/ChangeLog
+++ b/xfce-extra/xfce4-genmon-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-genmon-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon-plugin/ChangeLog,v 1.28 2012/11/28 12:43:56 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon-plugin/ChangeLog,v 1.29 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-genmon-plugin-3.4.0.ebuild:
@@ -119,4 +122,3 @@
   25 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-genmon-plugin-3.2.ebuild:
   Rename xfce4-genmon to xfce4-genmon-plugin.
-
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index d68c195dc9c8..a3b110c8fa9f 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-genmon-plugin-3.4.0.tar.bz2 307493 SHA256 b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387 SHA512 9cbe76933414fc539d4a8f803fb31ae31169283e02ded8a4ed13c9c6b2e4af9827313ca099b9d85e2b090a9520824a68e63d5bfe3537293a750f3c3b5f57de98 WHIRLPOOL 6bb8e586fa2ddc6ef13ed0fc1005d9d537fc1850ce0124a75a93d29e368109c26bacf47c56743fc050c5fb14877dbcfad3b56c1778dbba989e9e9bf06dd313d8
 EBUILD xfce4-genmon-plugin-3.4.0.ebuild 955 SHA256 29beb85b9b23867272cf6d4c9aaf149bdb9c61d075be85319dd9f17a6c207831 SHA512 9162b1fed7986e70a38e18b69c4046e0634235530ea84ab547b3ad5b584bef8acc4915da0934a798546e7197950e429569dd507d293c561376a2f7146066e5a8 WHIRLPOOL 66fa78f69ae0fc97a17af8c4eb4a8740f0f25a0961e8e60cf5cca0d05a82776e51d597b386fd05c125716311a041f2ed7f67038540fd254a91ec615b546abe68
-MISC ChangeLog 3690 SHA256 514a72524dc3e46f31442b0c462e683f562985a02be65ed5639da9dce9964097 SHA512 8ab1780033eece87b3df61d6a53ec2aa0a46a68b5191bbf6725d557c52d0715e2659fbbe8f6762596fb4bfb673cd85d9c58550f91709cb8336cf498f0bb9fa55 WHIRLPOOL f80985e7a61005a1cfb3a3af3e3b24ba3a8b7f5490f492721c299d6bf04d5f2c1d827705e70dc4a58026f43628d3ad4baedf64de2348fe3ada1b5f7a56682dcd
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3783 SHA256 dec7730f13a8fad8a641ae1b771c7aa7e0e87c1b9c7b74738b57742da9e218f9 SHA512 6423d31ba59e21bb5cae3bc232b183c18a82acdcee9a487fc168588f979274f6ec4351410558b7736ec4753b021c2898b7141ab20fb88a113b6d560f58de708e WHIRLPOOL 049bdaa85c8ff236a29b8008c5bafd0a5df2f0e8cbff611e55207cd073cec365c65b9725e46822f3cfda052300d46c4bf57af7e75c5334c820c2da6bdf190365
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgbXAAoJEEdUh39IaPFN/14H/0jWDkVqKfjBFx8KSQ1kOmzg
-IAuNrkGTAepW+Ew/I7tKWMIZVxDIia7pqjYOLoWL1dKFKQqyrKUZT9rJv+/1cZHP
-WQOEY8m0QqX2GYZUSQ8PtN6C16qMDUgA+aCYEPui2WC/nzUVYnJUJQWMhKC4ptQT
-5+AHeE6dKP4EDbfw3ATIWfLA3LppPSinBAE5+TwDvIbCqkVwkZDvJTn/nNOxF3ju
-3wrNvMAWOmlytobi7hpdoEoqrDExggw0atVpykjBG+WJjOqX3q8C/xkFdBtMut/1
-UqrG46/9CxSWeBYui7D4S+JKWhZ2K4iAMoaDT2w0rJUfN/IZG1OihOxdFocVa8M=
-=YzoY
+iQJ8BAEBCABmBQJVwenYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vy4gQAI42+Z32iFbQfLb7GBexR04z
+kDKyzDqc5GfJhN+27z0rYny0aeLglmh0bvESlG6XgMgdKUhvEVxwb1IWN3P6Nimo
+RP08llxcOBhCkzfZXshiwTn4VrOQdzBVgRERawy++XytuURPI+taO5MWr563/4LL
+bEDO0hYYeEdHtTfDSBCvhbTi6MTN46YxeigyQ92ytgFsYUKILEBlf/sns0RkAGjf
+KOqVs5XVW9sKHmsEtRcjlXNPErX8Nh1TOMYWya/5p0gRjxetbO06fgahGe3EyYUi
+vDAsdONer4xiz/CYINB/jm2e0p8UdkCPClxlasRpuIiwitX1UxseKvLHmfw1cFq2
+gEmhQlxX1tqtUpUUSWcR5uoEGMIJnP5OYhgQ0PIdOF3zwTNwQp3/2pf+TXdB6jxQ
+0rlSS9klpXwiZ4BICMxbj/A1+2hsa4VgZBEccYz1sQarq9g/9ek4tKuSeQJ0yE1k
+dLNymEychLZa6ErEiSHtIH+Il8c3Nj5/vocudO62wch++DBrJP5hyUAjJXDrZpeq
+Qa3jGlaNb68+ivGs3vk/IpguPScscOXjr5eO8HryCWzLMfzE9zW9x8LVM5IdR+O2
+O1w1plUCwCIfG9eLKOgNNXYmxgw7HC4motXsGuEeupW6RvXiBxlM5u2Z4pRRQdoZ
+gHXKcyGyIStEJgLN7IZc
+=r51h
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-genmon-plugin/metadata.xml b/xfce-extra/xfce4-genmon-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-genmon-plugin/metadata.xml
+++ b/xfce-extra/xfce4-genmon-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-gvfs-mount/ChangeLog b/xfce-extra/xfce4-gvfs-mount/ChangeLog
index 3f7e5300970c..09204eba7790 100644
--- a/xfce-extra/xfce4-gvfs-mount/ChangeLog
+++ b/xfce-extra/xfce4-gvfs-mount/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-gvfs-mount
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-gvfs-mount/ChangeLog,v 1.5 2015/07/01 08:21:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-gvfs-mount/ChangeLog,v 1.6 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfce4-gvfs-mount-0.0.4.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-extra/xfce4-gvfs-mount/Manifest b/xfce-extra/xfce4-gvfs-mount/Manifest
index b9e534ae2b6a..5bde10fb51ed 100644
--- a/xfce-extra/xfce4-gvfs-mount/Manifest
+++ b/xfce-extra/xfce4-gvfs-mount/Manifest
@@ -3,14 +3,24 @@ Hash: SHA256
 
 DIST xfce4-gvfs-mount-0.0.4-6d2684b.tar.bz2 280614 SHA256 48983cbc25519e6d4739c9f848a49159641b19aa7a21c55fd748205102926fe9
 EBUILD xfce4-gvfs-mount-0.0.4.ebuild 984 SHA256 ad7862e7f814889727b8aa921e1a7f67a58114198180f95fdc3be15d37296d10 SHA512 ef17cadc738aac01d8bc55b393484b180af7a1a38de9a0c8ba17bff5662c733636f00420033e65266598a8ea7c53d030023db482518a47bb43b754404080863b WHIRLPOOL 84df99b531536adbfbedce68eabe44913c0c824188440db631bd9d6dfff072f76225f8c61e13ca548b6221e219c3533e9a1309eab274793a53272451d3f32631
-MISC ChangeLog 946 SHA256 f1945528dfd13f4dd437c6209b9ae3dd42a2af1a0466af4a8dfe97731938c495 SHA512 62eb0643870db17b8443edd5eae00e9ada918b4b0be10da290ebca74b0ef669cd9e5b932f92d72f6608631c7022d44fafd0a6c67cf2632e948a2f47407bd046c WHIRLPOOL 60848d5b46fe30a20b03cdf0e9d4db7588f6181a6bb628bd9a36570502688b0838a711c64ac127f0e676672624aeaacbc0569151d840fbd30c2c847678f308a1
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1042 SHA256 9dcdf6d4ad4ce69dd683415c694418b8c40c1bdef3da0732656d75d52e9ba3b3 SHA512 fb3d050a19c7ae0f1ba5a5924668482ee48796e738216e9e8fe93c7b13a4c791cc79f225f3173cbfc034a75a1767690a575ff50fffff53d0b75698786538d8f7 WHIRLPOOL ed63d1ec74b529c8b3e3e268bb13ccf36c1e313de6ae6ad55dd42013b7649e0f95246d81236ceb024924947add858ad1bb6ca818284f5349cd9e789fc8b77a2a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTooYACgkQG9wOWsQutdZeJQP/b1hkZhqimif1WOdDUXcRgazF
-t4gApxMr5E8MSJrJspjLLh6BoCjHGcYmQc0HWDTv72hl+ZZR505MoipvOiWXxfgU
-ncpJpO5En+/yvlWlazSNaN564/gSREQBAYvvAmf5NlFQiZfR5d0/J8N4Q1+Xm+db
-C9fypz758GcaNNesIfo=
-=CE+1
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V+MEP+gJS6Xg3jtXzndyxPJocWZBp
+gZIcf+s17APXizr6G8EZkZZNQj+/skza4ViyjMvwnZagjZo/a4msoXUDSsIJNYTf
+FzpbvJXUVKbJli4GHgS3zEHjcLfHz40MiFv9hykq32sMX+YB45aPutbCydHy7rsu
+BIGrp5yLY9KPl5yULHhJD/JorhgZsSHw3/Pp8Knrc63e1a7guXitBIZaFWUJCKE/
+nrgq2KPkXr2TYCx7ri/67pkeAgGr9hcfvZ5AD8l19Y+e4EWtqiBoj8jhh++wkyDo
+Ye1o6cjTBDeBk654mtXSuwn7laC/NtM3KimKgeCvgQoszTaCalo0TeP9DjLV/0Zg
+b4OoQ7CuxBDyr7J0uOlb/LMzc+D8biIOVLV6klEct2G7ZtcqwpHdRfIDppzsox9Y
+8sNO3gZrN0lIk+eBbK4SqbtQYpNQToeyI8XXiZNXuUBRe5cKoQOPx4j05LC/sLpR
+IBQHKe9HgX4lBWvvgwVIg/tREVVGLyP2X5pjI+dNm5DG903SKwpZ2dRi200pWW+t
+wvoHzW5fVKHHeUIHHW64YXqm14ydCAvJUR70+F2XzpTqOMRitOlrgffgHYSLg0cC
+UJM6RKubR9xIM741vJuqtoF+ZG4Aa0aAS2PmLCS0MeauHYIEExrtLRpuPWe13KqC
+/A6UJCDhN4PYKEDEs743
+=l/H9
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-gvfs-mount/metadata.xml b/xfce-extra/xfce4-gvfs-mount/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-gvfs-mount/metadata.xml
+++ b/xfce-extra/xfce4-gvfs-mount/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-hdaps/ChangeLog b/xfce-extra/xfce4-hdaps/ChangeLog
index 0b03a55d2425..d1208950ce6a 100644
--- a/xfce-extra/xfce4-hdaps/ChangeLog
+++ b/xfce-extra/xfce4-hdaps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-hdaps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-hdaps/ChangeLog,v 1.17 2012/11/28 12:25:31 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-hdaps/ChangeLog,v 1.18 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> xfce4-hdaps-0.0.9.ebuild:
   EAPI5
@@ -65,4 +68,3 @@
   24 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-hdaps-0.0.5.ebuild:
   Initial commit wrt #311145 by Michael Orlitzky.
-
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 8b31dd1031cf..b578498804e8 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-hdaps-0.0.9.tar.bz2 304851 SHA256 b3e6bc203127c0def80ef0b98530f97c4496ea9c50798ad43dbd4d3d5bb603cc SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740 WHIRLPOOL 1a76066ce7a014f221ec8dad2fdd98ee16463f5294ccde5d917d8e09825d9a7d794634533c8102944fa28f6fd9890e001aba492c247a0af9994aa6807e4fedb3
 EBUILD xfce4-hdaps-0.0.9.ebuild 1090 SHA256 f6ac8b24d7641196b6bfe358f3ab71d0a1564140a96831c4463e8c9a44e410ad SHA512 d630c257a0fb4710ad2a797176e068cd2a3437692ca8ee4c09b8013128d749b19d1f9852a0971bc2660bae67b2f014d9b8b666466f1c846016de84da63d74997 WHIRLPOOL ef424e0e566fc6a43653a211d6df0a1e0a675f19831421e5158e5670161d2a8a5bb77b91135645f278d1ea772658753d60494cf7899f5da26c1799f087da32e3
-MISC ChangeLog 2049 SHA256 ad3cb57c5862e151b8c1ea6cca6622b04899133cc481d7698844b040b160f2a0 SHA512 820444bb0e7e29ecd9d7a996d635f9f604ba38074deca89a38bc8a991c3fbd6b442eb22c1db2aabd3789a00706fd331e62fd1be3dd5a290cce6a8aaf8c58ad01 WHIRLPOOL d1bf7b8f3998eb5a2a60f00ddb605cd590f865208259f1cfd7b21a1aa4fc2264a0f51039cb95e316e8f8ad5bef5aa77f7cbb9a7ab9984869228f669325e26fef
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2142 SHA256 c371d61d682b34403c44c43162667a53d69e764a0e7a589d4570adf49a8d22e9 SHA512 a158df72f9c9c3ab7354b53ddd85465e8fe0e1fbbbcd7d669a4605829f59de4d7cd45c5746beac8b241d18eaff76b6d9fed204b91fbaa96df0c8f0450349f2fd WHIRLPOOL e70af41c2ce1182df636f1e54a6eba105e4c7667bd3fe6ff717cefacc846403dcd6a37a0799fcc076e08e05945581fb4f03a8be407c1cd78c472c9e8398fbf57
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgKGAAoJEEdUh39IaPFNc4YH/33YDfR7Gssg6ky3eNmkAnZm
-BMcGIBPvu830QuWykmmHWCeeoY8vVKtBpUE2lmQfNZhIRJmjQLJDU6SEh9w5AaX0
-P4ulFT1Cq2x8jXEpfo75TCLlmJ6Bpi3T97u92IaCI5GiybG+7VrGmNuxuhQoG7OC
-BoJuwSJT0LZDOSUXtM4LxZ1ZT1jeDAkXDVJ2eKtROaSaQvInxFbkOZmlGAogt9MU
-jPiTkVemuuSkHaq44+qxJ+Y1f3fYRndFwqzxtAN+O5bImeRB1exFD/9Dgx1KlZC7
-2jT5lWAwkiUPXsrmv9ucFdAuuPKKy+/YV/XT5Anvi57wi7jmunRnhF5kPdyhP40=
-=Dm6P
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vz1gP/2GiJffzP3pmx7pqFZ40zBVO
+wl+qRJHGvkk/TlO2fWY0VCITiYIdSTx6t+1IrLYrP8RDkiq88LdDZ+MLrTMUUTLq
+2UnXe4mPBvrTnIN/ZfGbIMM7fYisFuPcMgrsBkJLX94gxdKxKQhamQpT5yktHX50
+JbIF/K0PTrJwdA80vaSDLTUsyKefVnZXpy2vv++heZcOTSdXWoTdoZpdFYDFNTgf
+QozTjEZCJ74CcN5LhhJrhr6LvwvJrnhX3hb0UjFZYl6XWdELzLY91kBfkueJ24fS
+Ho6ofdsiVciIAe1KGTXYvT1APFmXFmCTnZR7kE/Whzj2C5qtUzRuSUuODVhavnzL
+S7rLMumJVAjBC6AoR8G8jv3fyha1kmUa41l3LrwrJhgwk3JjlcJsQ3hvFVrdySvu
+QQ7UIPhNoTn5cSw57MFsWiHDB/MdUgtKVea+VwzowsJ2x25JypUlm2fB5DzRSF9r
+T/f9PL6KzIpC+Qd3e0J+B9EDqGCOOz65Mv8breKb67xeRrF1rOVHKjdYYEjYlUr2
+6sxE+gkKt8LMDPviqnaHLEAvlYQWiYzEJmZyug2BieV9UwjWHANVr14Mgh2yaU6L
+hxjSYqGXWS3YYAD26O7rExeTYa5YakHSrViTRDfAe3orT8Hk5clu3p6QsBGpMnNT
+YHn2ZCYgbRDTKtpnqEq3
+=NwoN
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-hdaps/metadata.xml b/xfce-extra/xfce4-hdaps/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-hdaps/metadata.xml
+++ b/xfce-extra/xfce4-hdaps/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-indicator-plugin/ChangeLog b/xfce-extra/xfce4-indicator-plugin/ChangeLog
index 5a3868cd028c..2e38edbef03c 100644
--- a/xfce-extra/xfce4-indicator-plugin/ChangeLog
+++ b/xfce-extra/xfce4-indicator-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-indicator-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-indicator-plugin/ChangeLog,v 1.23 2015/05/11 17:51:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-indicator-plugin/ChangeLog,v 1.24 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
 *xfce4-indicator-plugin-2.3.3-r1 (11 May 2015)
 
diff --git a/xfce-extra/xfce4-indicator-plugin/Manifest b/xfce-extra/xfce4-indicator-plugin/Manifest
index 59e8c3219fed..c39003f9f3f6 100644
--- a/xfce-extra/xfce4-indicator-plugin/Manifest
+++ b/xfce-extra/xfce4-indicator-plugin/Manifest
@@ -7,24 +7,24 @@ DIST xfce4-indicator-plugin-2.3.3.tar.bz2 380735 SHA256 c46b529b0f31c8ba9401fdc3
 EBUILD xfce4-indicator-plugin-1.0.0.ebuild 939 SHA256 fd17c09b1a352a414dd10e1664eb7dfdf76fe6f484064bff68facee3938c5a15 SHA512 5389f6dae2ff5dc6846910ee84c3cbfa38becd0b241589db97efc8e728c961ec3e19efa1ce69c6424026e86391afc291ffd63765dfe176bdadd406f589d39aa7 WHIRLPOOL 7d8813b068bcd64ef5b2f5e6bfa716ad6d3f0fd1e4a42d759471f5f171fed75e3e3cbb9b3832aa4bf01510aed77f50a100f4470b501eafec23c2541cf4e74a54
 EBUILD xfce4-indicator-plugin-2.3.2.ebuild 1046 SHA256 120d6671091aa88bacb86aaf9c5908701763b80a224a813252de7e7905ccab6c SHA512 0b95ab24215c866a95b6dacccfa8e9dbd0d6f61c2fe0e12dd504eae9608f0a0ece2f1fd6257c0e1baf9fb293b6b2a84d60520dee1b7984e1adda7a00b7f659ff WHIRLPOOL 6d03c648502483159e0b55447a84bfe913e2542db832e7d4b7c9de9e51eb01edee56f8ffe166957bf4e6a7017061e41fdf13824ba35b19cd6abc70d68d6124ec
 EBUILD xfce4-indicator-plugin-2.3.3-r1.ebuild 1061 SHA256 95d93bf3cb358bb6059cd08ef359885dae655ab406bd22b4d8987a32af367f2f SHA512 7f93f0481cba2c7a035aa2b4deb3944bcde2bf755c57a7de7e09397f167364587773470a643bc390f56e0f605124f1e23014ace7329ffab956586a1b112feca7 WHIRLPOOL c46b69eb576564c3aca502313389585b086b719a9fe7d8310c826e14e214f1188338940cc4b984f36a4e73bc679a24e47d24dd9a39dc2c81d47cc7e11438a662
-MISC ChangeLog 3137 SHA256 ee499069fe13260c69a8784873910369573c3ff3f84d7279c0d3a9379e1cce01 SHA512 dc4a46fcd7bb3eb4968ddff6e9fe17d27156e976029418089b5829f69d64fd2f777f469c610c6c98f7a6ec86837a017764218e5cb4779388ba1b05c0c3176160 WHIRLPOOL 8d6be42eb1f7846b723cff7fd64e8afa5a84cb2b265d067d84db21282ae529602f4aee544d16aecc816b2fe48828481e94eca604b1c84e189949cb00dfedeaf2
-MISC metadata.xml 256 SHA256 80d0e125c35afe3684277f52c06524c93d8c59bf464aa7e344c025c734ad9423 SHA512 16efbbd4ebd137b8eb9f9621698a775859dba4da25f0b276e42271fef052cb8d60b7804ca09becd56f7324e8605c52d2508e0507544aee040716b4e945d97926 WHIRLPOOL 599258219792b2efee814e586ab9e43eddd4327973c8529c0a8628dcd3b580b7d171dac9d11243a25a4ef7e9df71e457a061866c86779243c09e4a07ab5c9f80
+MISC ChangeLog 3234 SHA256 72503da6f81ea6ab2a15ae5c5d1e7c2b8b5ec3adad229ffbcf44ef95b7bff899 SHA512 a2bf61b6ca60f7c9e5d77b9d855ebc8c8b1ce157a26532b18d05896eec423923de9fc6f884dc0cc3a4f87076cfdfc82aab2b7c5083de701b0a748cb156c63d24 WHIRLPOOL 888fe142f78967ba93539615312693484d41c2772b53bb80d5c3f7dae3168c1e69c533d19b39e9115b8353631b67e85c5d8ccb9199c3051accca01f2c62db5e8
+MISC metadata.xml 329 SHA256 6b99833f9fe7b0e69cd95ff7eec156905b818363528c52abc196421533ccbf17 SHA512 095fe90bf0eed34f44ecd768b957bd9fb83fc8cd74746eb39efdff1b4b2add78b3425cb6bcd718be884bf68f8742698214fc7f2673a415433b076fceb937901e WHIRLPOOL 27bceb5544c657945adbec302ca441a320703777bbaf891dabbc6580156e7752138b8f4573bc1cec24af4e014610e45abb87da26a6d414cefc73973b1709a3e4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVUOwtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcf4QALGUIDEGEHG5/o8QH6gmBMHb
-FBTArnYmZlBFZGTIhpAp72o6VbQ0dw+tUldcVXVGjyJbVplr0ErdoTnwin6Pjlrf
-k329539WKBBQo57A5dGRcttk0purMyyfpT+X1k4J5UfJ5OI6xaDvwdgB4uOAYdfB
-iC0k4H4vTh9/gmFC6XlvKeMeqVnwJ6d9h71ZKbcsLIy6jEAy/Wm9e0ZOncQTqSRA
-IVG7vt82fKTa+UbuQWD2rIheUj4MaDUx+CRxR/T/sxELLXDw+OS1FhOF2xikr16D
-lLL6/ywwjvbrs/km5ZqrWQyzvpxca5f8ih4txPuHvgDCUiOTB8iYty/VCxySPL9y
-vroBKQ/cax6+5vNz5ICI0BgDiBVA4BHvRuCK2FZHTs+uoxXOSc8JHlmd0o4ceqZb
-JnHFu3/cEPxl4WWz/EEyfOPWVJKJFy0zrljiBUS1wvwHbDdR92djL5UbPflNS+3T
-6/4gTBBBS8cegmXMFl7I5k8Q3zpbgWkZ8ibZHGq7RMC5ppHNJxgaYq8BjCOuGWAu
-hnB+LjrCxHyORIfrzJDUrtMkgoGLWfFcNIJsxb1DzKj4V4GJt33vq26Z/+WgrDW+
-IgYCy+B71ELbHxdpKgqMMgA+qbnIKOkZMX/GLfIszHfq79SKoHlKFDNLc73SYN7Z
-Tp+BFoAPWewnPZNMThY1
-=wLVp
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V9RUP/2FVmudHrSysrucmY7HxzKz1
+opk4x7kyl1+C3U9t9sfyRcSsh4a0XItR2H0I8Y/vg8zGvimUy/mvs95jESc7Anou
+ETWVumAilBBP5k4QkfszwmjHNmDWfYEmWQJ22KYRIqM+Atuwl4o29q1S2506K2SW
+GPFKYWcCT6SgcV+nbcfKwBKFv0D5MpAGSBA4F/wwNE2eyRWc0cAC0hs5qENVAffZ
+TEX7IlFLcSEMkljyTRVqz4Z+Bxvzr57of1hVRXT2gAUqEbtTt8SNC2EXdyEU+vSz
+Ks8WMDTjnnPq65OlU6vqazLYfrlXzTgeqFPWrdLat0K0xdNHZeOPWW8cPYqC2HE3
+ztqTwrlTP58wFyMcdXhU1y2dVi+O/5vtrP6u/YcedhQkB1YfvEpsjUdZNR4bp0CJ
+KQif5vbBy+DGkACG4vA6cAgHDBeELjgZc/3pg2TpFNMIHgxzygYXqaLVeMfidne6
+9GjBkQCU+SjvjjMScle3m8weptJyTrlE4L4UpAOEEkj49kGhWII8454pweF8nkLm
+SifSqB1RW0t5kw30CO1s8MXm868atzGeN5wrjQCjvZxmmrdZ0VTbVm6bhdTVvoKw
+7Ro6aGJ5g3NMeO/pzivJK+ZCo6uoxY8qVSz6b692pQ0cplQYBVYJG0yejeJHIfdM
+wpvaoYlcp3adZrThi8jg
+=TyfS
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-indicator-plugin/metadata.xml b/xfce-extra/xfce4-indicator-plugin/metadata.xml
index 883ea2e53a9d..d6e3e8667920 100644
--- a/xfce-extra/xfce4-indicator-plugin/metadata.xml
+++ b/xfce-extra/xfce4-indicator-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <herd>ayatana</herd>
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
diff --git a/xfce-extra/xfce4-kbdleds-plugin/ChangeLog b/xfce-extra/xfce4-kbdleds-plugin/ChangeLog
index 47cb8a06da89..b253b818207a 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/ChangeLog
+++ b/xfce-extra/xfce4-kbdleds-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-kbdleds-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-kbdleds-plugin/ChangeLog,v 1.5 2012/11/28 12:22:14 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-kbdleds-plugin/ChangeLog,v 1.6 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-kbdleds-plugin-0.0.6.ebuild:
@@ -22,4 +25,3 @@
   22 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-kbdleds-plugin-0.0.6.ebuild:
   Initial commit.
-
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index 40587ceb5279..086876f69f93 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 SHA256 6d280ad7207bcb9cc87c279dc3ab9084fd93325e87f67858e8917729b50201cd SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f WHIRLPOOL ac2fb041336a491e4e16cb7af08e1ecdd985cb0d0c3b54b4c5a28dc3a63e80f980c19fc64c83d53a0dfde4b3527efb4af234447d12a09775a046b62332e43461
 EBUILD xfce4-kbdleds-plugin-0.0.6.ebuild 852 SHA256 ae482249fed29bd0aff1fb0992fb571b569b23f48441067c62df939240f3b82e SHA512 e9cb1817fa10434f7e17d31ed05fc493c7d0138f5e1c0d8da5fd3aca2ab0282938789b04a12404349bc7198fe5b3bf039624441c2672c75762700dfcd4b81a61 WHIRLPOOL cbbd9a44c88dd030e3aa7d18d8dfdf02b0539bbc0297231500a9bd7c8f83025d7bc8284debe808646e6d5fae8c321315c9cdeb123431bd9588e89be02105570c
-MISC ChangeLog 848 SHA256 2366104162a373d1eb2bb182b17d5ecf5ddca1edeecca7beff25faeecf1b4c38 SHA512 d1692fd3664eafe6c745190273103cf1b93b06726c4b39fec86788f21cb777cc48cbe3bd02804c4c5263118e81823a9daab7bec76dfdb804be77a105367ffe05 WHIRLPOOL be723110d34edc51f08015abb1cee9738f0ead3a5aeac5f5552d3ac6384ba1490a070df7a7e17587b4e1c99da02a1248f9dde04cce0acf9696abfce149aac62b
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 941 SHA256 ccd321df6259f1662af7591730784e5fd9cee1dce3180efbd3ab1ba3ab5f0550 SHA512 37531bfda92ae2f6837e2b1021c8325c5546b8613c8b49f6d08dfb08c369f2d3e4fc4fd5c8474593ea252a05de84faea2618d395f135fed836cff90499342490 WHIRLPOOL 3d8bb9eaf05ec7a3c4ded14a98a0aca46879deb5010b31fde719bee3f97861ace3019eae55dd4e17bd8b26284af5a2aa6c0b6f8425973845de994977569004d7
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgHBAAoJEEdUh39IaPFNpiAH/Ro1YHIlhdHSRWrINDwt5BIe
-dzgh2XzWsdbZxNA/wuEUiqVQzueXeD16kZGuPPLtA1KiGGYBk432gWReDF+ZWPs4
-vN4eSzC/mVCIdpmaon+bNYIsz35wA4dKiC8G6HfrJo0uVTCZGe+Ouau4Sk4TO4ay
-220LD60ewLvRwFUJPP9Odwq9z9Xq7SYTv3Dp4eLsSkayJR0q8RWIsl+jeXuUW360
-pyuDdHwFbTjc8bP56ydcZHZq2pnEmvcOPQ0Dff3ovpd3gX7qGw9bT2gkWWMvZJKO
-HMW85ThtmqQlWR6GTKXLW8GdJTZwCPWTMAJtT/5IbJX1H0N6unHrvhL9yhUGzYQ=
-=IDnZ
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V2MUQAJRMRrKEykpSShViU0WyUXJH
+GPmtx2hSW8PVLRJQeJA3qrSgvnMaOB5blutoc79KxSJfT2meyuqSxMi5WA2Fivzl
+lcWpiDLcw3tC4k0Dw2+1o0OkkGl5lMZGAZ7DQCe3gGMzt8lggUdR1JVRPMuPco/y
+Vfyvnxh2cYNKQ53eRL6MsLCl3rqSL6n2GY5LthShEOujVQl8ad3BkC7NJdJyAoAx
+gKOPUCKDDVBWdjquYvfyweCmbH2/8fyIqHr5vAqC5biakrvlVg1Gt50nN9cncNHI
+wnx3PxrKx3H0U+k1BtPSiOnraCa1TvgRH69Xce++KSyRaSyXC6C0ScIt/cqMcHFm
+6s+/SEKE7ru+l2sjBnOhwi4Jw5u9M+FMALhOzhJMWtmAiqwSqehhRKw35zVTjep1
+S4GpHjKskXhVQNEqTO2PUU8tvEVmMMLqcyGR2FGdHWYfsxVUFaHiZp3FgiFuJbgr
+pJSYz7vEOthr7StdeVV/DPvOr+MUaaHZsUXTcjiNF142ajAbi8E5L2cfIhb+9u3I
+Q0dRha/M2wkcgk6CoIhANe/OMOqBAwuRXh7Jk58btiJHZkhZjvFsrOomKZ5SH8Ty
+Y01MLutJJ9YHDVWAvAm+1iRPnDDcOaSACJzmXk1FyZL/lOud5XvJSLC2yGuaDxgU
+NRtZst4l1WMDhHPUIhq6
+=q52S
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
+++ b/xfce-extra/xfce4-kbdleds-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-linelight-plugin/ChangeLog b/xfce-extra/xfce4-linelight-plugin/ChangeLog
index ed56c85ebcec..b9c5e3601cba 100644
--- a/xfce-extra/xfce4-linelight-plugin/ChangeLog
+++ b/xfce-extra/xfce4-linelight-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-linelight-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.17 2012/11/28 12:24:41 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.18 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-linelight-plugin-0.1.7.ebuild:
@@ -73,4 +76,3 @@
   26 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-linelight-plugin-0.1.6.ebuild:
   Initial commit.
-
diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest
index 58b70686d556..daab32431eb6 100644
--- a/xfce-extra/xfce4-linelight-plugin/Manifest
+++ b/xfce-extra/xfce4-linelight-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX xfce4-linelight-plugin-0.1.7-port-to-xfcerc.patch 2439 SHA256 f554e67969269f84690538ce022f258fdf91449574290a35e794f2836fcc6590 SHA512 12944d8dbcf882b1fd3c60746daca702dc58b02728dff253cc6a98f6a361604f3152681f17ba8ba23a108d5fe93c8aef6ca402496230ff77e5d34985e4339c26 WHIRLPOOL dd8100dac43e5edb1be4b44a4b61d5bedb63646c44eff72d67c610c182a4eda332c90498e6883c8df40731710381f5a34ed4858cf7ef6814ad1290e4eb8b7cee
 DIST xfce4-linelight-plugin_0.1.7.orig.tar.bz2 239068 SHA256 0226ac62fd3b3875353cccaf8b2b971b923e1e6a560483c7e163141f7fe6b8ea
 EBUILD xfce4-linelight-plugin-0.1.7.ebuild 1073 SHA256 b5e1ef6568a657447844a0befcfb410b8f08d07dae6a001dcc01aa1c672df093 SHA512 bceee4574b97df30f58c066a42f46efea8daceb5e0622c6b331a8456cf659d6c7d0987baa588357ea83108b8dae3470e02f363baa43a4b5ec932df9702d3199d WHIRLPOOL 133bed2e8aeb8f354fbd4a495c4d31d54b9f7c8c5a57743f9299503a7d92bfae77b03f369fd517f4242164031fa42f6805df3b7fcd873c9209e4d040f4e328c8
-MISC ChangeLog 2681 SHA256 d5c8dafe6cc10dbfc1c6b9973bb11798f637874754c905b544b6e80dd931f5c8 SHA512 5bbe0d7a8574b824d15850dea5a541a3e1700e6ff5c9dd501f26d27d07e81f56966b15af8340f30d66d6f1c665e6c24b8eb0b598a2fd880a210d506fb2d4168e WHIRLPOOL b7fb669c5dc393a5ae6d5526c3c9700991d94b939a3bb57bd28aaadbb90174848aba2eb9406869259d4ce8085873a55d3871881449edc608d6c5b1568856849b
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2774 SHA256 65266c58c2e55c91c682ecc23b0047c549ae61030efca8111d6fdae0cd75c8ee SHA512 b558bb3bc8652a32cd412f22205d94be75517d8f9e9165201a55b34b2ba163674b554549d9fac283e88b208cfa5a3deae612cd7b7009fbeff309f66df34484f6 WHIRLPOOL d863a07f0659cc535eeec6d314f642a361109ebd60b0f52ac6c54e95364a42b71e143e3492e9a3920ef0e24e514ed38301dddc3f11777f03195e9a8cc8912f43
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgJUAAoJEEdUh39IaPFNkV8H/i9WVK/dD5kNa2WUrwnbOK0+
-iyUpZypPXk6pR5AlVfOyV1lGfAvGi6wwml8zuPdX+c2mI80Scru/0CW2p5af7DN7
-Wlu0+UPFzVFLSoUQKJC3s6vo8doYEN5+BbCTDUReivBpprZtNWBFQQyX4YO+7cIC
-A/cNf0f9an0+yfAZ3mcm/wgPLIQ3IRLESsVBjTQyRPvo4/HTMmfNr/iFxb889zri
-6pCnKtXH+aU+pXp8AHRXWavV71PDBLmM53jFrXs7r+0J2tiGgInyyBBrWI2Uu9ZS
-CDdK2u6tpZeNZYEbocjcM55XEV0l50UBouOysztTCvFjql9HR5JJaM+xfM4bM18=
-=eSg4
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VzMwQALdQR0e/1Ah8gDkkwbCV91a/
+KAzKriAE2aRs+GKqGgp6MOadc6c/33yuTbpJpqb1yciLOp4A6Iwe3boxxvEDFjAP
+XUkZqar0ihsXVJ7U97RjGIMeaKVIDAVjsXMmWbua8pDWdHY50t5EWk/wlGVSwS/x
+qsSeP0SaeKJ7Nvn4C/bkZDjKI8E8hqtblmf97tOuHcU/QDGFBzw1ll2p4qLy9Cwe
+9nyv92cK5KFx2u0ppLluad+/avx+TisMsKF0PIbOT4rAwa5WTb+E/Qj6+XiZeJMK
+ayCZg4cjAVdKOgQInG67LSWsZu0zY3tM8qs67Mx2zOQjwty2JkOnLWQkDC2vFYPr
+N2Exe2rzMPazOolgFeE0BHp9UXMGaVkzRtR78ysdFaNn4uw/O26vWP5awwN7I41O
+4hTy9fyyZO+YHrZNJCks0cnu/ruLAJKNPKyj6qfcxQFBAciRGKqLe45o0Wu/vnhi
+geZp/aw0jWGpQSiTqoKK0Zm9X72WCC7ldnG5cwqxdoEYkpgXAMa80CljLnTKKeL5
+N33lRR+9gIg+9TS2FNOm9FBNhbKqeodfDJWAzGfypOKQb94ofr4odft9LO21e4tW
+cGJEmSbLKUnDVy9s/12jLs7T/edq7a51YxwOUI1W1hnN+AIsBv4qRIYg0n5j1GmC
+4fXHA2QTnh8Gw5E5TZTq
+=bosS
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-linelight-plugin/metadata.xml b/xfce-extra/xfce4-linelight-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-linelight-plugin/metadata.xml
+++ b/xfce-extra/xfce4-linelight-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
index 7cc53729c29b..252df2eb4ead 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-mailwatch-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.21 2014/04/11 15:56:06 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.22 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -files/xfce4-mailwatch-plugin-1.1.0-gnutls-3.patch,
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index 6ff4c3babffd..235350d23eb8 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 SHA256 624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83 WHIRLPOOL 187d636667480db2050c5f75c74f57af7a2ce1476c55d0317cca0d2a54b1d27b2c41ae0af5a2c015f92066859d186d71f53ce88ef9f5038e1befcf89614780cd
 EBUILD xfce4-mailwatch-plugin-1.2.0.ebuild 1127 SHA256 2fe95b9064e7ea9a949527030d9679fae7a9cdc9634be14772afcd0130c693e6 SHA512 53cbc8e6eeb2eddc3d8b26908a75dbdfa5db9f2d45ac17a52d14d9e110dfa5781f60acb1a23c7f4942878e78f74cba748e6dbfce6e934ded19bef10226a0dcf9 WHIRLPOOL e5104ac4de57a7bdbaa331b8ae2af2bfdfc3fd97a8efdfa2d5d197047113043a534f246e3e4e2d2d2d9eb30d5524d74a009e443d6ecbc70ee2ef212ade3eac75
-MISC ChangeLog 3639 SHA256 5ce25d4912a17c23a650247fbc6fd9f27bbdd720419f24ba74ee21d4ceba0711 SHA512 381a1361061a672326911cfab0c2de111ff6d2d23aa738835ca3b19c8b74112d725e788f1dc306db268d1e5539b6992c044660389ee3cc3b13c5ce28919bb293 WHIRLPOOL 1f8d9704d9af5e59ebf0d094a00f3ab3917af97e835f98be4ca737ad9b156adff5205ed23a4b49171d2a019d096a1cc659e393583e70314f7b6fe5ca342db2c9
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3733 SHA256 9ce9686d02d288860c3ec8e725fb3c958daa84ca54edda018a6c7e8634a7cb28 SHA512 6020767db5d0d0035a9333b40e1821bff7aadde266c3fe837aa7a272cad8c7b72071f76c97ad866e66a29bc4ecc8c3b1e52208e91ccd920f55b08216c46517c9 WHIRLPOOL 684845e7128885b2d09e3437cb207fb70493bd872eaa58f4962c9a8da708a93f8511f44d4b9c0fbcb6d64c98a476d6fbd4e7b2dd56268f93a4d524d8c528717b
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTSBCVAAoJEEdUh39IaPFNIy8H/2Rnfh80AIdicj7E13HD0Vzk
-Wj05cAiojU5ditOG+Q18rFllM1jVnUc3/tB0n+HC2VkjiqYW/q661ZIBRoWfVFrK
-s1Wqrah+q1SSpTqWzNVT6aa7PixLwG0U30W2WVA471qp6oQt089qKYXg9Y0Vmzw+
-uY5n08pFuDgsqb8JKJVNpHavgTQdH6RyucZMzNEYDOuMCW2tybweQT1xVFmIvcnz
-QkQOzS8p2XXH5+T37bQ03kLKdQkFi4XUvs8GWdFFWj0AOqFeLICt3xH9EhGSvT+y
-BTlVb0NDeklVATp3uHDzHGoVgIVx2RCZmmTJDLCQnuyoUspi58zzv6pDCc0D+e4=
-=w5Le
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VyA4QALqKzacvAnWMnmo3knAqf1lJ
+sPqFV8nKBrJvfEECkxF/aWvIYL/Hl0tbIfyI4WH1qAokOWQhAD8ET4KaT96DwVA0
+4CjRZvt2jSYe7NUR+p/QWTqbmLj8M/PTbNtbRsegk+IeEFXdXda+2ThMinkFEFN5
+SsahfuYB4T7ETw+lJfvFi472pLiy4Lej6BLlBTvvKdt+2atrOtqNQKZmbrVeNICh
+rYANGvsWKBpbrBU+HZkgb5mp4KIeORTH5KgsOIy5jMDo8jEZy2JCaHIsIS+EM32L
+LINx/XZ91TEZ4/9KC+Kt1l1EuQvfJa369Vtqk0CgD+yo8slrkwiG1S+HBkGGZI2u
+l4U44XWmgNo/QOCWJh9hiJg2WMKjBdMZmWSwwtkFV9T27Y6fLcZN5q7bKYzest8B
+7HKfvubT1uSimPoOvBGoPX4Q7RG7jrrvEAHRHHZhiyQdStw/vcKGRQzsEOvTzie6
+kzVfk5uHOuLfRg5/5tGV9Tbj2kfd2pNveHirKleUS33P2uYPJ9xgv9Drd55AGszK
+8vAzm6jcbQ8N6w1RD+UOwFEBitCxvSi5RHHQgSc7a7eTrTFF79fLUtbzX1feAtvL
+RKsk5kNgQOe1Tm3r54+2UxfklS9gzGyJmZhzLp7szCYxXxmIssx5p7TX236Pced9
+Me8QEeRlT5eQwjLL8Hrd
+=WfJk
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mailwatch-plugin/metadata.xml b/xfce-extra/xfce4-mailwatch-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/metadata.xml
+++ b/xfce-extra/xfce4-mailwatch-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-messenger-plugin/ChangeLog b/xfce-extra/xfce4-messenger-plugin/ChangeLog
index 5c58c87c1553..d5ab8496a2bf 100644
--- a/xfce-extra/xfce4-messenger-plugin/ChangeLog
+++ b/xfce-extra/xfce4-messenger-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-messenger-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-messenger-plugin/ChangeLog,v 1.8 2012/11/28 12:25:38 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-messenger-plugin/ChangeLog,v 1.9 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-messenger-plugin-0.1.0.ebuild:
@@ -34,4 +37,3 @@
   02 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-messenger-plugin-0.1.0.ebuild:
   Initial commit.
-
diff --git a/xfce-extra/xfce4-messenger-plugin/Manifest b/xfce-extra/xfce4-messenger-plugin/Manifest
index ea754e380a85..8b925779f783 100644
--- a/xfce-extra/xfce4-messenger-plugin/Manifest
+++ b/xfce-extra/xfce4-messenger-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 DIST xfce4-messenger-plugin_0.1.0-5.debian.tar.gz 2849 SHA256 40b41e466e4a5114bb7f1b3c8689e48e08d86194de83d84f07115fcc8fed61e3 SHA512 744398a1fbf50d00f45c3ec173dac67f8945d64b482481eeb7bfc29d79141ecaa0f116cc59574af9c6865f49fad58b3537fea9bc31fc4813dd5821c9cc6c65ee WHIRLPOOL 58c751cd54447d35b0f9603be166cffb63cf691ad0462244757f39f4ed352595ccc192596a7fd63172e6bdddba99646349110c7bc5ef73d492f1a15d02b4d791
 DIST xfce4-messenger-plugin_0.1.0.orig.tar.gz 403341 SHA256 23ee61dcf23ad7a3801ac32a090b8a65897ac10bbc9968cbf9f8d1dd4ada5ff7 SHA512 d9cf1c0caeef1c858ec2a917635081cfab644846b767b05d8dea9b450f0a9027ac48c4f3080eaa190d9db7d98c7871bc9cb4ef101fb1bb52f088190ff594ccfb WHIRLPOOL 8b374822577eb89c737d04a83b1a8aa8a3431ef1675ee9c09fac9f5a3b9a90fe404bba43a47c012a06764662353d3b1e38e0e8e77e9ad71a3f92ae5b26cb5ea3
 EBUILD xfce4-messenger-plugin-0.1.0.ebuild 1225 SHA256 01cab1a28ba02117ab31f80af8431c695cf364fbabcb0b30972b9f1c5d2bd130 SHA512 6948779ec9a8e241bc24f38fbdd9e3b5a7860cd535e3418a029b6157bfbccac20a8b6cd82132ba5727c0f660a0e3fadd92a3c7be8bb29a2a27234c6984118a1d WHIRLPOOL 8ae00da2d91a6d6459386fa210e15bdecc8207aec39fb6b539e1b323bb0e542278d0f4a31c91125ede435f2873a2dd3a690f8911f003128687bd1fee99e5d159
-MISC ChangeLog 1273 SHA256 588058bd6564999f333fff6c4f3d178b4217ee4f1df6b8435d7905623ea543c0 SHA512 92722092a0c14dd6d68c95c374bfea7a4da43b6bb842dbe4846b73eb3712955823cc0589c5c95f1701edaa5a8a361ddaa29d12502df934ad7f2d88514cb79382 WHIRLPOOL b905b3f57ee94fc9142608d3d0312bfee7a5ae2a5abc5e8d0f77a07425157dafffe81f80bc437df10547bb8113a8a70f18b0f9e862cdbeedaa07838e4842067e
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1366 SHA256 132f73f78d09c819289db91ff631809fd24d205c917d66c14b190805f33029b5 SHA512 7784295ab38af77e574bf92e5019559ccb9461345387d79a16698183284c65389d0fe4c3c0d255a3dea1e016ff3a6172d66eb7bb7666029a8aba69712ea14c39 WHIRLPOOL 82a74b12c2ac86330c22c98a4ce4418475249f06fa39cecb28c7981cf440b688003dc4fd1006c3f78b8685c38ea7aad5bf496eaf0f312245562b74e0aa2f0a00
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgKNAAoJEEdUh39IaPFNGSgH/ihHrgQ0SioMKKLYpP2V8Nfl
-66sHLspHnoF2HLFPYA5C8TFHGLE+BSMrRicHdYDZ/uaUbBk0bq/rsL0SlNsYitav
-Eh3bJ4dvEg5/iTDrisj/YR24dwhZ91ZNcSbnQKmZxj1Vo2c20zLeUccC2QwAqtex
-r0GJ2nAisTDbwNf/Fk6ngbNjZr9YsGjtIRig5SVno26C9FEYNEod7bzx+/FEQSiI
-oEfoz+H6Nem5kVtPhZCweMpcN6kPGMpZrw5rm926ia7OHC6kab7ceyM05yqdfgWQ
-snOorwtF/GN/bfakmQpM3j1OLO51wunEo0Bz0RFkNDAvlNXY7F6WQ96j09zCaho=
-=J4Yt
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V9Y0QAIZ1yT96WoZ7M6KG1SO+BN2c
+eVGXk4xZMYTaLMtBZh16lVX/XCeG4DU97EBt2a7b6lQGHN1PZweHHQl9C7UdpaRr
+pd9/AbInYzfcs7uTUaPtmIwywwg54810jdCa25tqqyNvoul+2XaLmvI+0m2UsUDB
+O7G1u/uiODZcysgVOwlnN5mxZ86si7VP1P+lIx7b/EgE3ldM8ItIwT1+tPO4Xcch
+8oUoku0UUU4etMePX40zDKJ9h3qaxakPD5d4FXqd1jWGhTFfu6C+5fU0oweYGMw/
+hxH0Bus7upwq1JHtdIYZoPWsjQKf+8Z9Xbil4qnvSwqlNb5FkdrhIv0xzAS0rts+
+SVtZJ1pfm5pY3DLKxlGu8mHTsJZwLnp0pI9iBgDw2zB1JP2KnkGHnIVK3nq5fN2x
+rxOeSQ0lW/EN1I/LR/rdDeaedcG/TtAZpx46doQOkPyIc0qpKCxEarhyFEbXpJVO
+SSQwObzy7gXvqoP8l1reDj8JDh2K0z9zXagHYTR4AKJL/5DkJm+LDkmsyhsnfOgg
+CW0lJVA5ioQXAp8L17ncqw6Mky/f8v5+7KHSWRrwCOsc4wAGIgxBxkICtvIKcSYk
+A1SLf4C6buCiiE/bHBb3e+eUPVTRN+4bw5WKjhdsaSgVI1lfgS9GFfBi2Kg3/ywP
+OEDfw4KkiHz//qlZOhzu
+=KHnI
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-messenger-plugin/metadata.xml b/xfce-extra/xfce4-messenger-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-messenger-plugin/metadata.xml
+++ b/xfce-extra/xfce4-messenger-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog
index a63e7ec59cf2..abdbd45b6171 100644
--- a/xfce-extra/xfce4-mixer/ChangeLog
+++ b/xfce-extra/xfce4-mixer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-mixer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.157 2015/07/25 12:20:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.158 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-mixer-4.11.0.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 8d06678307b1..78f92171d3d2 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-mixer-4.10.0.tar.bz2 461526 SHA256 a8c589001b438171ea5a6b46ce9895c3ff
 DIST xfce4-mixer-4.11.0.tar.bz2 472235 SHA256 fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2 SHA512 0ef27ece0d5f46bd83db86d8e607d2dc34f4b0221679dbdeae4e4eb9993b30398a2e882b3a870af9928906330898935f2fe29e83442ba6f01b9e19d02ea6f66f WHIRLPOOL 58ebbe509e89d7bf3dded809a9466094287e53d7c0ed905c6c5e3bf70ac8810d9ad174a1dc082940c77b55117e6931d067f24dd46b8c09ce1fd1f6c39fa96492
 EBUILD xfce4-mixer-4.10.0.ebuild 1199 SHA256 26d08125fbbd2f3bfd00e574596ab35844de3fc76a01df8256e3a5391255721c SHA512 942927dae2ac8e0d0da26db95b5d51dcaaca942abb892a5ab6843ba7becc4a0b8e15473293a6a8235684fd9326a96de8f52976e907624557fe026c2c30dbede1 WHIRLPOOL e01e5cf2295f4cd321bc165f716c00f1960dbca19476b876310979fac6f1da7ee87ed30d6af6e66f9ac25d6c26acf5f3146fec27d64ab4aaf87b07f16cc6e89a
 EBUILD xfce4-mixer-4.11.0.ebuild 1247 SHA256 f2fe466656160b7393ada84cc35afba8b8a6884719767751b1bdf72f6e3c38a1 SHA512 ae5dacdee92e564793e714cfc0d42b5d5c55041a8f85e840d159ad3db2170e55a3c5d8a45b33db793c5e8ecdfa5a1f3d7b35760e0e6da1163d2e928a43d32431 WHIRLPOOL e94efaf4289de71d814b3ab364a26f89d00210c9d1c46697f4e44c256dadfb2296459360d6d05606a563464a0cb65651505abf62bb01c2972fb04ea7a67dff51
-MISC ChangeLog 18734 SHA256 20da8e7919bea85ae02286840bb75895338538711616330cb9c4dc90c4cb7770 SHA512 7b71e28d39a4404fa0ee93de373d6ae175397f1c1cfca7225ae2a1c408a86fe083a503ce781ea537e4561a4ebe3915e6936d91c723e8c88cf9ebc48d78e07edf WHIRLPOOL 5dcdff868dc921acc3cb365098b69264002724ed76b1de7fe41f6e8b1c1255de2790e7426c76310f7566965ae1a297f62eee39900329e12ea3699acea0ed939e
-MISC metadata.xml 270 SHA256 9568371d0548b06b90bcea695664980e1f8ec49be43b59f18d7ffa401e48b0c5 SHA512 409f3e7cc027dd96f5d10a2d8c259724ebce79d71d1408d965213409ca407b0d35f024d4a49d53fc154cd6d75adc0d8a225c2d2276473e6843a6c5aba68ba72c WHIRLPOOL 584d0d3633c087015429905257eee4d1960c7c6141d09b12bdd1bbd378c3745a2a3b0e00211997aa709e742bf9e280b27d7bd1cb3d86de1935fff5894c0177ef
+MISC ChangeLog 18832 SHA256 ca72f0792332c467e30fc1a2b381f03e58aef50cc44e863a5f74b135bda0f6bd SHA512 1cf5adb95d0050f3f73ecd4906001363d1f46cb256e91d92ae10516ccc97046b34658f4a2aa959d1026b497fb7737d77593a9f8dce71339320dc9a2b80752afb WHIRLPOOL d0c50ec25c01bece86bd2b6710d0ce67300f2e66a395e0ea5683c2db96fa131ee73b83060d29dc10c6f19fca168887dc3bdcc2f83ade81b79be8decc48dcb483
+MISC metadata.xml 343 SHA256 005fd2075545587aa2aeec870b241e283c3463c8114b7d9b733aca183a373250 SHA512 bb30c13f0d529f3c3f65592793dc5a8017ad17c5b6e39694d45ed83fdf7b279e6b656ca56300b2a45f3b241dc293270203406b2a9ecc21c79b5eab886ab55d2a WHIRLPOOL 51e2b325d14d678c2e0e61cf19781109aadfeab95c9db07064f275e92230af9fee8fcd2ad0fc674e5bc471aa676e6f914672224eab4dabcef0ec77a9c3d152c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfwcACgkQCaWpQKGI+9RXtQCbBxQ+XPKcBv3CnwhX/7oyoGdJ
-AI4AnjyBFR/YlZcmQfQmj3rkeA6Csqim
-=YNqx
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VIN0QAMUWDt5D7vwdE5DL4+lAaOqV
+UtSaMpgRlXNHIaa/K2UFL1wA7GL6yF4krl+r5ZDzPVU1GrxNrZBjqemhLqYqvJwI
+l7KzZ9kNS11uDf1HWzINXYaZjKIztKq6A+Ajlo5H69DH0MXn0r9/6dtw31M33LTM
+ohirDyjU8nA2OVEGnKNU/8mEhwdWoMOoLe4DKhpbWz17b+tRDLcIyR+sx9fb3PP0
+jXGMZQZx1cHYVmxnQGSUOYMMQJVdVXGJb0pbwG4Tu3nGVM3y2bUWq2XTb6IeM8/+
+5nGU1wOPeUhKOujpGzIpZJ9Ba8ZAIpoXiFAzkROf1c+R/5zqZ5OTgeiMcELhKkOp
+kxOiMuXFsWjpVnBpVO7lCDbR5Fjh55W1lDkVX6zvfT93uoJRQKOGecqgKeYVim1F
+arQy8rYhqIQ1vTKc83Nu0Zw53xLOyG0Cnp8oIDIOn0ZYglR/lBOa7rJ2w+9nvIu5
+yQI+cB1YGTwMyNogGWDr5gqXioBnPGKX5WX4EFwNR79YMEAPXcVFsEVcGsGw0y9c
+/bTJbiZNe5vliP0t2nvjUPv93zIfLDMmi3ywljM/K7ylzy2PY2kDSLQ5m1gJVz/7
+Ute/SCRN9clBk+a1qiicRzpmE6icHEe1QIj5vtT1uhwf0Aw9SRRcL/JmIMDz6tow
+gl5RQrHAb4T3q242LbER
+=PN2s
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mixer/metadata.xml b/xfce-extra/xfce4-mixer/metadata.xml
index f9212a8dcde5..ec535fcae23a 100644
--- a/xfce-extra/xfce4-mixer/metadata.xml
+++ b/xfce-extra/xfce4-mixer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='keybinder'>Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
   </use>
diff --git a/xfce-extra/xfce4-modemlights-plugin/ChangeLog b/xfce-extra/xfce4-modemlights-plugin/ChangeLog
index ba7245dc5ee9..57c4c4d62875 100644
--- a/xfce-extra/xfce4-modemlights-plugin/ChangeLog
+++ b/xfce-extra/xfce4-modemlights-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-modemlights-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights-plugin/ChangeLog,v 1.6 2012/11/28 12:25:10 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-modemlights-plugin/ChangeLog,v 1.7 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-modemlights-plugin-0.1.3.99.ebuild:
@@ -27,4 +30,3 @@
   25 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-modemlights-plugin-0.1.3.99.ebuild:
   Rename xfce4-modemlights to xfce4-modemlights-plugin.
-
diff --git a/xfce-extra/xfce4-modemlights-plugin/Manifest b/xfce-extra/xfce4-modemlights-plugin/Manifest
index df65dacf55a1..7e0a8e49754c 100644
--- a/xfce-extra/xfce4-modemlights-plugin/Manifest
+++ b/xfce-extra/xfce4-modemlights-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-modemlights-plugin-0.1.3.99.tar.bz2 157029 SHA256 c45b9e67b5aaa8d47c6292eb90ab29f8f5c00ea4d69182aaee54386304b50128
 EBUILD xfce4-modemlights-plugin-0.1.3.99.ebuild 922 SHA256 9a72574d375617b9fae7673d0915a3d716eff4c512df0dd4e057718a3c8d0b0e SHA512 29e27a6bf165032b200ce15a7c17e914ac34fe37aeebed225a4ab5c3b76037d9272b8cbd96af470fc109998229b6f8df7428ef47b0cdb89f83bde356441d1007 WHIRLPOOL 933420febc752e917741868c63265a1144db1eb6a4eb8b033396768e0e4b0f55d96a16bb2d5031d655c078b54f6ff874355260718e9e44dd2354d98848f10061
-MISC ChangeLog 1064 SHA256 d28852906ad849bfc9a0631cc599be9a00e426a041af8bab9a720b0bf5bfca93 SHA512 50e9afeb6310f80c928d41ec84afc8f854250d20462aba24ba9b41cd78f64e941d4fa7a5270ab5b67afabd3c51a670a6665ceff6c1ebebce23f658678be85b40 WHIRLPOOL 9de3ae88798294807021b0e10bdaf09c564d3b6bd31cf64008a0ab38f07615fe18f9a062b5b26fba736bcfba10594c8f99ba54deffca97ecee4cc648cb548543
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1157 SHA256 3787554bfc5bac008df24042e1a2a4b030263f791753211147c42eefd42abddf SHA512 5c65928aa4e61fe92bac5c30c465923ab500373a9c993ac2f07a12150c33d24bae8d45e08dbfbb0d6c7713956820088f91b0a881e960deeba190e82922f9aaef WHIRLPOOL 0d92ad7fc653c7f19b6f78b0fd8737c6860d12acbef03b87eb935f554703b6488c9dedd3c55da522846f083243e8ca1a402ccd5e15a552322652c53278e4f6a7
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgJxAAoJEEdUh39IaPFNDfQIAKFFDTKdYB/5f9e/eMIpLxSy
-CCAXQ15bckC2/xtW3U1IuhNv7iEiYFEg6qBZ4m/Sb6pFi1++8SvoguMQrxMqV6+w
-yad57eJ4Ijn9fBbwlBcET7i6i75UNumkDtdNXbyhq+aitpf0zh+fIRBUsS7vfVWG
-2rFclVB3YlAn/WtBojqrXMDXTa9WcKUz6gQUu4zOUIdGhCpoP78KLOSskCaO6TCT
-R2MpjswOZM6s25wwQh678t1iaUo5KKYJG3zLIEm9vODGg9KHWS77laFlImk5CSX7
-o4Sg9PPcJIOhaeIBzQh7w/xhNLZpP3LR9j+kqKAxBx86EJ+JvT0WqXu0ZbhvegE=
-=FGqN
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VR9wP/A5wx+eKY/MzxTi9XbFchrs1
+SXL1GAnOyoe4A8QLi0AIlo5wdkdsJkghAhp0ZfDkqhBC2rLSDWOLH+7ROYFEzkwR
+g6LYtjRgvTd8OGI5ldBYDXKMXn7PgZ9JMxLYKlZcXIBhQCHTNLW8YcalXE/79Diu
+w49lBi/5NIncJsOftG7YvpKR/Ow/PqyGyN8FyGpkTCaCEiayofC/EXdYxOryCMST
+RIeKhrTZ8cVG7HzrtL7k0KxlF/6d6dq+tcB7V2BmPve1yXi3VlSjGkmQpmxvQQsv
+lvz4AKFAVI/P+Nulqzct1AewRdPqfix6mZylwPX3pv/3g1lFLep5b9V4nVGy1NDM
+6l/2LunwvZCIXyGTYKBPmwKoNOBSf29+3gn5RFDswXhYSlfbJ2qgHPXXw+KiHZ9K
+7AZE/Se6Jt0lWm7tCiiwALv1bK46NViZw1u4WrQ3DMw4ejjGyGXMXi9GUdZBLwrb
+XG3uXVPuj7KqPMDnwHN+XC7Jq5PGPzy95A7r6MfvEwrBmQPdpxrx3O+ohKuLzVHX
+g14/cdJc1cn9lQ0oGOoafvXa7maaXggVMIEAV496yU/7l3qHW/+m2EwZ7MBanl1/
+zlASyVIQrWZL2tDVwGYleDaomHNR7va7JJU3TxZlougvOZY6FACmjXGqg65xdaVX
+DVrVSk0tO0/nt2TT09tG
+=4VEL
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-modemlights-plugin/metadata.xml b/xfce-extra/xfce4-modemlights-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-modemlights-plugin/metadata.xml
+++ b/xfce-extra/xfce4-modemlights-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-mount-plugin/ChangeLog b/xfce-extra/xfce4-mount-plugin/ChangeLog
index 1fcf399a7370..e99b874d0816 100644
--- a/xfce-extra/xfce4-mount-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mount-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-mount-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/ChangeLog,v 1.27 2014/07/27 18:02:35 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mount-plugin/ChangeLog,v 1.28 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   files/xfce4-mount-plugin-0.6.7-LINGUAS.patch:
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index bb37a193aab4..a6a6c948c17e 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX xfce4-mount-plugin-0.6.7-LINGUAS.patch 489 SHA256 81929b7b21dfa39595dcc7e210ae16103d8bc6e8d4448ef5cc06d30bc84ba852 SHA512 51fc1cbd31d7ad46a195786c14f35902e293a1804b9938702e40e468ef41f6e6596c201e9b379b739ba68265ff48221e5f80d34ebe997568d1b306c968292496 WHIRLPOOL 1ee8f9f69851c92ecf59485921496d49a95e1710003771506a3578b787f006a7fea32dfec2d97497c938649e319c875f8574897f5161084b2aa3d07097db1335
 DIST xfce4-mount-plugin-0.6.7.tar.bz2 390163 SHA256 541b94a892aa15d57707db9703bef85a5ce342769326f138cbf6cd7af1e2ac8d SHA512 18f4f4fc88c521f1fd6dcbcd3146fc8379e3aa0fb00e4787a34b6c52f68f765f18354e6b66e50c8b1a42e4f2366a5779cf057ba8b71fee45d0d3d023afe6fa7b WHIRLPOOL 87f60ccd0469e9ccc97d0a57ba3d968520edf5551cd017a8b90192eb4dec4b353e5fc08f8fc6fdef6cf22feab45122fa4ba66878babe08d9d302da094dcdd1e4
 EBUILD xfce4-mount-plugin-0.6.7.ebuild 888 SHA256 ac726ea25fc56c8072e00fbba4c1af4c0732f30b07d793af11f9ea06bd1946a3 SHA512 7c431fa89be07e942d1bbc5de94db4cef76baf97d4400658a17e5ffe1d53760cce16228f220d83b6e67535f39cbaf6c2f44b9104ed1c6282bb8d7e758a4d35b5 WHIRLPOOL 7b1df1a687835511e7d4ea27171eb4bcde4cf5af9117097d9d5b8b67bb4bb41223c41535a8e07e57e69136ba297ee3c992cf08720de2ebe047c960facd2dd11b
-MISC ChangeLog 3816 SHA256 461c37d4ed4bb9fe0b42f3ad8e9414645a1fd11a81d890b849f0abb2c2de48a0 SHA512 9f67bb5b46a7572feeec539d1b74128770ce934ee99248d178d9d23302c98e475783c1d634bb11ca5f5e7d15d40d944ce37dc3ad0729744ed2180baa974410c4 WHIRLPOOL 9b4392e6ee8b25f50541c046bb3716c11597362c507c6596621146192a5d543da5f0f483c620b3a986adb4c24f08745b517982e4b6a5498ab8acf1c10c7590a8
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3910 SHA256 35c5400de44688dd8a7e71d45f09f41e2809d9700f5abe408ef6fbfba6d2032a SHA512 2b01567748ccf64f3f5a45d52432c3b36473de24cf26a9c0ef49f16d735c35abd185f09016545a28d42d806d75e5783231ab353f8011534e7d6530c6b0fb60d7 WHIRLPOOL 29e10d8fb434cc4f549c3cbf1024692b7b4654b5f856528b9d3f80d74f364980ca09061fc1fa760284378b39d431f4d9fa761ddd4c934758388e271402d1d5d7
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT1T6wAAoJEEdUh39IaPFNkbgIAJ0H9CEBPLJ54u9v6ZUnmQLx
-F0uYMav8woHFzymO2zjVVtittj/c51agdPWH0h9o5jrLFBvx7Qe7H8kSSN7xbl/v
-19ODnfHcPhd4kZONzeW5EPZKWFmYFWvxDfC9p4gpQNeGH3FYJKuShw5lvXoS5o/4
-84kxCbqEUFVTJBAJOk/bgfm9TIn+UkpelZWdugaixZiLbo8b74EY3KoNjP6WWhhb
-tbBL8zlRWUsjmWnZ+UQy9V4Vf8+L3AX4YAmNnvebmwLUtJmG26tHVI421q8Qe0eF
-/vd1sPWBtFdcYOBAmuT7fOGIN/GgCf7vfE8nmdC//WRBwxxzgyMHDW10p02qZPA=
-=LRNc
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VEfgP+wbAZFfRAMHdBfZkUUI3Rwtu
+0TAp4VBciyUtmADBIp1B83V0uYMcDTPu5RLYdIsi4BZWJpwdLYfx3af6GARHB0M7
+8t4dugp/IN7hZziM6hlB/y1qDOqtOi1IIfhbaOMhvKeToPXBKzfFmBgz8MfC7ZCh
+yL9gnkkmxCFAdQIbHvnjIQKUuYclGxrO8OtC5TES03bHhZZGnvdDZ9sDsajPn3X/
+c4S3BvpqaMUUtVP8pETyf79WP3Znxdtgz4c/BDA9GRU6rh2JTLYzd4Wr9VPlpVxE
+ww89ZHh6arDhR053WHIBSrCLVRwCS+CD2aGqBI0l90JizAHws7vv58COTnwLhHgb
+Ob2PyX7SMqAh8HCVgWyVIz7R8aPhJV8o4Y/iWvPAKW6+FR9PCl5Zf4AxLMXhBzbW
+28l+V/o58O/2dDEjQby79gpkWMirVBm3NLz98vGdmaPobaClorlx4hRMyBuuq5YH
+iw5uaEhAhe1CLyEg+X37eXdHsyzUKvTj+sWYeJYkWP6EgfzCSxyQA1OCW7cdGXm8
+H3Mwt9eq7JpEzJMCmtqZw/jCmcwztc+H2AffMliUbG72M6bNJLvEh3o1xCjLLqx9
+yGlZYmClsWJanuS+0f1QMpZCTdQiDJ2T49qxhZVger1TO8Loy8CPeuuaMRRrFaeQ
+Gq9wnQLNFvU6q6Z0Zlfe
+=5qcw
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mount-plugin/metadata.xml b/xfce-extra/xfce4-mount-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-mount-plugin/metadata.xml
+++ b/xfce-extra/xfce4-mount-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-mpc-plugin/ChangeLog b/xfce-extra/xfce4-mpc-plugin/ChangeLog
index 689630a49832..b3bc8d6fb11a 100644
--- a/xfce-extra/xfce4-mpc-plugin/ChangeLog
+++ b/xfce-extra/xfce4-mpc-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-mpc-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/ChangeLog,v 1.30 2015/07/01 16:54:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/ChangeLog,v 1.31 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfce4-mpc-plugin-0.4.5.ebuild:
   amd64 stable wrt bug #553500
diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index 6d2d675f35ab..5e070d28cb14 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -5,14 +5,24 @@ DIST xfce4-mpc-plugin-0.4.4.tar.bz2 287320 SHA256 4f0ce6146aa2680a4c1ca7bad1be30
 DIST xfce4-mpc-plugin-0.4.5.tar.bz2 284335 SHA256 e71f57a28915c57459d6ce0eeeee1d0934f523c0ed083158c3d3b3836fc06fcf SHA512 272331170396c0635800c692fe06ac5bf53d0a2b007c6a8939f1678b109942728f9f97787e5b33abf94a56de6b72f6ea4cb3348f4ac3593b0bf4ab4c1ef79a57 WHIRLPOOL 724d47c3db533cce4ad8fa4317a7ca8e0789024cb0996b4fb2ea00744e5e4d31b49511eed2a35824b51024f9c153af2bbcda72f3169a016a09a4f215fee881ee
 EBUILD xfce4-mpc-plugin-0.4.4.ebuild 835 SHA256 a2870dbc2ff2b50b915e970b3a509e981ee9a80aa59709ab95377fa689c4f07d SHA512 fea5bbc437cca5cccba751427002683533227b544405a5b86ab19cfb7411bcf0dfaceed5b1043e4e65fb321274caf082f216deabc10c1d79f8dc253c6432d268 WHIRLPOOL af9b4f785c6d3003c9bc1597df49b1ef117f2af6d47631273a5af5ef994ae81584287af12a89a7ab46107bb2d2dd15cc521b96b0ed051402ab12499457cc3d90
 EBUILD xfce4-mpc-plugin-0.4.5.ebuild 842 SHA256 c1a5dcaa6d600458f66e195da3b1f8eb2f7eaf57e3c4c210e7264960e3ccaae0 SHA512 6494be45b07f7dea9dd6c738eaddb666ff98012b4828af6c999053ebcfc6689d9f0159c1d0df887ef6030ca93e2a9b6fd471fc69d6da3102d3812adc80170504 WHIRLPOOL 3104afc394bd6f30a2789168a9001bd41bd35626c9ae40f030509e27271a897f5754827cedb32991db710ffe36b4a29b5be3ec7ad7a12692cbb88968bf9ad36f
-MISC ChangeLog 4159 SHA256 b8326233db04df8e956fa663553063197035b19d3ddc536026dca2c068c67bfc SHA512 d684b196b723ab5a4cdf1b875cdc47c935a939f72120674dfb9659b506daaaca71b610147f82e25f6a2828696fbfa39a3d82b27d9f2e05a1226fec6193e2f39e WHIRLPOOL 0d71e533a5fdff4b4cfde46ac54c870c1ea91de6bc8b725edccaadcd61f952784b62fba8594cd69bac852b868acaa26fe1c6663d07034731b04bd9f69129c5a5
-MISC metadata.xml 303 SHA256 0125ccd39ba1cf3fa1a712da026895ea2888e2fe512e98ef84bb219aa8414032 SHA512 71692bdf8aa71b2bbfa14a68d4011dd2f8e65afeaf3aa5ec0cebf253d94aa5a88eb9ead1c645af18045bac553e39cfd4e876ab37f2d26376452a66080c1dc7a7 WHIRLPOOL b364051c347fec09d52122f5472e5cb6344ebb2da8e4b1f52549cac77a372c9a9611dc13036096b91d69cbf14a455430682dc2e82a325340121a4e8f56ffae19
+MISC ChangeLog 4255 SHA256 ba8f6bea0ab4c6bce0c66f876f8c9d3b1e02452a0ca96ca05c35cbd8fc63ceaa SHA512 9e4557d1a58d2844f043b5724f788e20478c2954b7e3bd2b5e0263b1d3c0ac0f4d91d496fa5762bad1458ba649406032991e7695ce0f4d0c858892e1857ce8b8 WHIRLPOOL 4781f88b28656e2bda78b749f6bea90208f37a509b81b04ff08e4f23f03335442a11c53f505d3037200cd0ff99beb7c8b856df531aecb0563e93f0ff1c162234
+MISC metadata.xml 376 SHA256 2972ff2209b507fe988655085f943dacd229fd1edfd959142c687433ecd8ff2a SHA512 dc94191615182a4ab069989501474d92fa8606e39de50fb8ac7055e8dc29389bebdf308babf3478d0c21befc262b1d3fd55ceff888262a9e1cf0bd4a3fef3172 WHIRLPOOL c46a8578f7eca91be595d9b95c826703c9605007d7c3a00b786af91c121919d2883383ade8b2bb534f4bc762d48cfcc17c32a890315c45ea509add95268bdd19
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUGqsACgkQG9wOWsQutdYyoQP8D8lmB1wm3yK/2cY2VsrZme2h
-QaVhEBHN8Z+jrQda3OR6WPXVKnBWVFblfg06s8s90uXkHY9ttYhChmQ3KvwxwgOP
-COU0+efEeuknd0/ddd5lumsISKrg88TOfY6amQ9aW6zjIQa5D8RuSrpDAW57JHel
-MDnE18Rh6kMiVnDFhkM=
-=i8EL
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VDlIP/0RdUOPFOMrZJkeVqsLqc1o/
+W9G5Eohefa7F8CUOAKymYxzZklHbOoLrDhE2ZaQHWIdv8wL/RzH1zN2EG7J5RVI8
+z8gIusR3rs2F/e73AVxoKyiHUQZ/6iNHDX3VfFtAZwirxyzL2aPQVi5nTEV/69ZL
+l5xa8/HxgGBxc7Ar7daHiY19uzya8BT/BDlz8OCAN5a6mQJAG5LyU9tQJr5HDN7x
+A3q0Ok6qs8yShyi5SdRMURy5YhmEd6c2ykNZrvZPQ8O7vbNkApwcCWDKeDT3UWNz
+YfDXzpxw0G7g/tzCfEcCfTG0ftmO/6+MrhXZX8HQGGteYv6gzEmFs533m7lUlIg9
+YW6xZgahAnDilu8GnQVhhhB+A/rK0MWejeuZHVZ4B2kQrQwAAYQ+5WrFgCwLQLPV
+LcY1RSrFoG3Ii37uMRw7ZqokxcMxz9mZR8Eo8uYjOGSvJdM97Jy9cmLNlrH6rF+9
+LkmNAN5k+jUS+4hu+dhtIJDNxWecnR1CzMVaaIZeLvO0PUYMRgerHVL9iusVIZr7
+L5qfvTT00O7k9xKdYigsF3zfygGQH4HMwWvXdSx90uFrorgqOCdYB/+4S0+XmQK9
+0/Fvdbp3HgBWEjunZBeL8B29WL4mvxrrUsBi1X9iDH7ts4t6D24dpk4nuEu62DWw
+0yCGl13q1jpAi9rBV0vC
+=hemV
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-mpc-plugin/metadata.xml b/xfce-extra/xfce4-mpc-plugin/metadata.xml
index 89a73c926e26..f66c5c9bb296 100644
--- a/xfce-extra/xfce4-mpc-plugin/metadata.xml
+++ b/xfce-extra/xfce4-mpc-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='libmpd'>Build using <pkg>media-libs/libmpd</pkg> backend, instead of native fallback which is preferred</flag>
   </use>
diff --git a/xfce-extra/xfce4-netload-plugin/ChangeLog b/xfce-extra/xfce4-netload-plugin/ChangeLog
index 5d6723070b9c..4fb540333625 100644
--- a/xfce-extra/xfce4-netload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-netload-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-netload-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.42 2015/07/11 07:08:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.43 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org>
   xfce4-netload-plugin-1.2.4.ebuild:
diff --git a/xfce-extra/xfce4-netload-plugin/Manifest b/xfce-extra/xfce4-netload-plugin/Manifest
index 9e43c1c264d8..7db75ec1245b 100644
--- a/xfce-extra/xfce4-netload-plugin/Manifest
+++ b/xfce-extra/xfce4-netload-plugin/Manifest
@@ -8,12 +8,24 @@ DIST xfce4-netload-plugin-1.2.4.tar.bz2 361889 SHA256 fface918822c012d8067171165
 EBUILD xfce4-netload-plugin-1.2.0-r1.ebuild 974 SHA256 46668e846bf6fcb4faf3f7a2890807b20a0335a517992b3e73dfb7352161ad07 SHA512 88b6796160cc82aa95db6ea853e8bc863be09aee90ca34dd3fb7e4ab21a05c8aeac1fb5cf969bf97bf06e19a38f34bf6d0c2f2100909015e7854e7f82614b9bd WHIRLPOOL f32f45b7c3040a6de5104490c4ba33efdbb744d84a9da889cd9dd44126ded90a70cfa1c26d416575d24885c0b72390d3cf6b604f65d25ccfda68a6bca628d58d
 EBUILD xfce4-netload-plugin-1.2.2.ebuild 864 SHA256 e6495d3aa7aede6176baebc3a3149c7c3c3ea2d01fb82b7960afa14eca1dd47e SHA512 744a24f668bb00f8a03f6e8fe86fdb0e397c917b78f0ad3430ea9240b283dbbde0ca79a129770b6c6cedf7dd2c64e8ad3ef5f1280280409d6f7419fdfe8e92e4 WHIRLPOOL d0b9d9b75ff455ac9bd2af246454b759af259deacc13c765bac263984fc6ebcc87fddbb79a551253ed0b988bbbe5b8bb97881b6999cdd2e468403429b5b62082
 EBUILD xfce4-netload-plugin-1.2.4.ebuild 862 SHA256 a5b9e79d5ae461c53d37af2a4f9ee4712b26ff06b6412f5552ae2cc51f76f80f SHA512 03cf6f0ae1904fa902e269580eb824f693507e34249b582d3d21a728c73c28bfc908a5911c2662c17456a983b528c649b1fcca9519341ad6e9a8658ba0a408b7 WHIRLPOOL 58785bbbd7b5fd30b1c5aea861b313216bd360c47909bf1c7c92cf0286a587f366352c1cadda23869db01c619351e231cc33d1ce0c0f63689ff05cf8f984d41f
-MISC ChangeLog 5919 SHA256 1dbffea84d57aa0cad9e530a0749c4835dba0395f58723a6a3d75e557f57b7ef SHA512 f4af160a7530434a4054875f3859a5462135aef6d8e34e8d6d3405bff5eb2e07a6ea4236f81dbb09b3a2413712ceb5b5ce8938bf8508ca837a0dc6fa6ef27893 WHIRLPOOL 0306ff79c5de839a8e902b486d6459199639743779401543fb3069dd7113e18fcdfcb434e175e85d7fa2c9c9c274bece1f4d77c635cfde7ab1924946023234ce
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 6016 SHA256 176e6952e94da011d119cb0facd86899f097c50039345394efece7383928c63d SHA512 b8d27f9f007ce38907e1d8cea04a25144cb858abced2e71db4670f173adce690031e47d7ba1176d591168b5e813c98fc305c5526fbc5f16869b53cc224fb4c60 WHIRLPOOL 783783fee2144b1b950956b7d8fa454f594ada540a278c891cfb9909a2c0efb63d2fa4a4c0c8b0670739fdfad72cd8d54c5a63c9f9b1b36e0e2de35811033048
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwPIACgkQkKaRLQcq0GJvIACdF0QC96ylylh5niSIhbRI2HFA
-IQMAnRrT9TSDhDGlACDMVXWQ0hCzdItj
-=13H0
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VUb0QAJQLAt83GVgDzpFbLro11t65
+Phf61ImkW/eOwcQcZmACGB12sF9S4keecZUGALDvbRlEknxnZjvbazxmE+eGPtIH
+/j0GRhULxyXv1cK7LwCcCm3UL+pq3wgljgLw00JgVTYN98xzSNuBYuz7d2tk8oXz
+vlKOdGAEPdrtD+rd4FakucjMKBy3X+JEGDV2B3/Yaybs7l+5NCUD7vIVwiRO0tBH
+6zwaMtpv2bLZ6BO1Ey1Vaxl/wYHvpggvECweFokuxOpRPate3wrzTVRo7qw3mpBb
+ihXul8GYDz3ddElZaQyryd1TcAazazKn/CGmHhmJoLCnWc1HXGU2OnrwSxxxvzdH
+cnK+iK985B8xsnUXJ1I1o3SU8gEKI9h0P46X+Wy9RGKukd4mgFO+7O3f6VHzO9Ko
+xElB7K5pgCjiLPwlmNhdxKEwy+Lw8FNN4NfbOLvraKMx883ieO54D/aRKUv/kLmA
+FMadkElXIiWeC7v5skZTyZL0n//DpAQFpdwEwkT3LzA0+7mkJSbVlnRQZ9UapbSq
+d0FXlDNluvFK97PlbVHmCeNZrFsuv79mglvt7uIBuT6KGnmNzVoSngZkjjZ10KZQ
+u+jAM8BvDxDPoB+5CRv7PicpHRGlhzuj8AQZ56KSCldaOT2l+Ze8NDAY/rZPlPPu
+7Vp6RZcaswUO29FqMoh4
+=oV9y
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-netload-plugin/metadata.xml b/xfce-extra/xfce4-netload-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-netload-plugin/metadata.xml
+++ b/xfce-extra/xfce4-netload-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-notes-plugin/ChangeLog b/xfce-extra/xfce4-notes-plugin/ChangeLog
index e81d90e80a53..00611fba3dac 100644
--- a/xfce-extra/xfce4-notes-plugin/ChangeLog
+++ b/xfce-extra/xfce4-notes-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-notes-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes-plugin/ChangeLog,v 1.47 2015/07/25 12:20:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes-plugin/ChangeLog,v 1.48 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-notes-plugin-1.8.1.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 2b330295cf94..1c957d56e6ff 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -7,12 +7,24 @@ DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 SHA256 07a4c3e71431c24f97d2e270452d
 EBUILD xfce4-notes-plugin-1.7.7.ebuild 945 SHA256 8465385930a8bbe24afcaef235d823b3184cfc3f37301a8b88057b28eb0d7749 SHA512 b564c0433189596401123fe5090a9a71e5307fe8fbc327157553a2b4d7b192242dde3034f47b8d2ecc1a931db2bf83a5c79ea1fa5c1238e484e7c086526456a6 WHIRLPOOL 0297d37d1eabf0d4356e1a16b5e1143854e257016861b63e83aead8fc0825073f6bc270a4eef40f835628a2488781ee89e70446502c0fc669c2eb7fba3abfbee
 EBUILD xfce4-notes-plugin-1.8.0.ebuild 978 SHA256 1203de11191df892fe6939e85b96ca8bd49bb66602a9b149df342e7220577435 SHA512 989fa15cc43cd71019b73be74fd0a3720d164ea51d69727432638eb0def6f02f92eda039adaa3846d850ee200b81c9cf579c0538ee56615e01529072e92f8f0b WHIRLPOOL d08f771cbcb7d5b4381461bddc86d1eb20886e04b374f05b1111046f5661b1f7d74ea2373972f1c66e10c5c121e8ed0409a4b3141326f3dd668e199e8939b72e
 EBUILD xfce4-notes-plugin-1.8.1.ebuild 970 SHA256 67bd8079a9af4a3f972b48ac3d3550535a2dcd59272a8d3cdb931759ab61478a SHA512 7a52048b2154635243ffcdd99d6ed062018a41bb9f328154a3d3116a474ccee49656a49e0a82b9c5b49588e71e433951cec83e1fa89a58c57b2d157bfd6948a1 WHIRLPOOL 1ba91879502d278a4fa5486b1e3d13833288237e8b165d98bf59d86f84ec7be17a4b3360491e11ec21994743e0584ecf63bf96e5ad05885a925dc6d96aced5e5
-MISC ChangeLog 6505 SHA256 fbcb7c396df6e1abedc6bf3dd86d0b5be9ae3b2f60291a2a4e5793e126545fa6 SHA512 7d3716b36367e25aef9b8a2ad5d5067617b58f1e814a071a657f46917c3669f7045b54ca6de9f82041b9b50b32382afca815ea015f71e807eb0099d5a6d17fef WHIRLPOOL c045af9a311fefed26e3908e3774b5af827659ba319b4fecaec3360b2b334e9453ae8de89bdc2f845e2778b70334b5f23dcf5ac0ecb73606efc0f029dc366faf
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 6603 SHA256 f26d0567813378933ecf71a2d0922c6dd4758b673c09e4c923904b659e381e05 SHA512 3c60cad9d67b1c4fdc752901c1282287cebf07bd4793c0685fbe446d02fb7ca69b54877c21647863e5f35467af9712dc629493709ef6b6ab315f055619862f26 WHIRLPOOL e2f5085080ecd19abaf0425cab89d7ebee87398e9f25651d96787f9664e34748b3e89945ee8526f19d32634b488ef94427960ee970d0b7572a8fb2c1277e599a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfxEACgkQCaWpQKGI+9QXZwCfZBRtN5gsttJakdWPGPLDDR2j
-6b8AniBlcORNtJZ3oPFfn6hwVrgVLtR8
-=QlX9
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VYbMP/2v0TGSLoRq4EXFwl7sOztyX
+SRYodr5XuD+TfHb+8BAIPlapVKmU8z5syR79WYn316z3V+b0r3uhlSIp4ifMwK2L
++XHopr4mbl7zfmiPW6/AMwjDoKdIgiGONXjejO054DkXub52xv3LYX0B4LFlDcqw
+psc//kEhymubp0GDawf3xRH3DGaYrKaWzCJ8qmecQde1X0VX+FQcSH4s8ZJA4biB
+onEQ7O0IkUpsddcKP/D7UUHLWdw1+Eb2Iz+pbGgQUAvZ7EhpqbBq7MmKF0PhR4+w
+m5lBwNmblyBqsiHl1m43pWy+7yLnJwTRdDX37oxEtEQ1qsRmgF3g3da4b1rK790/
+NmpFpVbU+AgUIBYVDaIUAzmCRzYRb7gEZ0UhvUPKo1cc/5gUZN523jY0WBkb3d3h
+cX1G93qEGbaIUz8m+WxMjFAHsOjmKT8/SXzJR8wI+K5wpTLwhk86lAab8M7Q7Y6k
+zp2hELAQEVWaJTgGkAJXslQYsf4giSwqU8GbGZLviD6oam612z4EV8Bz2GxRa20n
+EYWhf88cB1u4QZAqGFb9u/3oqvY1WL/l1Rw8flmdPJEo2cm2rrhkLG5Nc/YtnUTn
+tNd/IjFE62AnO+E1bmItcchjYadazugidWrNLHXY9q5fu/XFKcYzWpoQO07sAD6L
+Z8NrxtfnDddCJ+n2vrD8
+=YKsk
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-notes-plugin/metadata.xml b/xfce-extra/xfce4-notes-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-notes-plugin/metadata.xml
+++ b/xfce-extra/xfce4-notes-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-notifyd/ChangeLog b/xfce-extra/xfce4-notifyd/ChangeLog
index 91f622332129..cc2e7285592d 100644
--- a/xfce-extra/xfce4-notifyd/ChangeLog
+++ b/xfce-extra/xfce4-notifyd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-notifyd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/ChangeLog,v 1.24 2014/04/22 14:04:56 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notifyd/ChangeLog,v 1.25 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
   -files/xfce4-notifyd-0.2.2-categories.patch, -xfce4-notifyd-0.2.2.ebuild,
diff --git a/xfce-extra/xfce4-notifyd/Manifest b/xfce-extra/xfce4-notifyd/Manifest
index 4e04d061bf41..f15945d655a3 100644
--- a/xfce-extra/xfce4-notifyd/Manifest
+++ b/xfce-extra/xfce4-notifyd/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfce4-notifyd-0.2.4.tar.bz2 361619 SHA256 8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0 SHA512 4cee6395ee925e41ec22baa0fca21b38261a547ddff32f6c140db91996e2aa39b86113ffbe42da3c98728513a10eadd99504a05f31100762eb5b19bf8a74ae7c WHIRLPOOL d3e33bae0292852f8645a83d469e0fc093edbc038210aec7f02a879aa28cce81b95ab937a63d890f3f5177008c070721d488076272705a76b66cafedf9f65919
 EBUILD xfce4-notifyd-0.2.4.ebuild 870 SHA256 b07f1015c25846380ca195b8e37aed01fcb8cc741a9ee6f59b0a93ed75cb16ed SHA512 0f52d9522babf155ae98fd22a444f01909f80fb0dd4ffbb6ceadbc88e17df133f6067aa3d5327437df9a8ed7abc74c44eecbfa78ef8a0e3dc4009329c0120ce9 WHIRLPOOL a29372b17ff563473e526058e7cb33fa483025cd32885f2eb209f2680da3465be38436e08df9a2e072fa70cb3c4ce61262df87f6d25e7c3db6bd80b225424fd8
-MISC ChangeLog 4937 SHA256 904102a547c7dc47a6a927e6b15da326d63612e8674b738e44e61ca98ce34e1d SHA512 5b2de826c8aa78241a7193f932430a8cbc311d146de93e5f35a0f6306b44d1c02ba0e3c77915171c0765ba80f9150b5ffd3c2d423981d7e52dbaf06f80fcd964 WHIRLPOOL aaffb16161140a470808307886d6db75e9f6a91b60e56ac444603cb56e416c46a8bba805f60d76f0ebbff1f7c61793d61aa6bf299f87be8ebd5e70455cf13bce
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5031 SHA256 68f1d8901c4bb088251cca057a4e689e04ff5d5c6d3b8031d126a22633b1c176 SHA512 9a027ca153cab6228e07649d911840b251fa92cdc64ef06217c01f005736bbb1f809420e774b64e574857338302aec84e0d12a23ac62b8bec47fd7ada81e7b21 WHIRLPOOL e755cfffe7d3644089e94e579b9784239b1a9b355d154613b5d736103229e7b01647c40d8b556e8c2ae58e56195c430a786ef0a78d19c5ffe63a5731ff78d217
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTVncIAAoJEEdUh39IaPFNUWcH/2Jue2j1VkWUsStk1MyGhszb
-WNpthS08Pseansc2wbvlhaBgHoKgHCzRLISw33uIvFyF9UwClop0odEmyApAiJJ8
-wa7vSYwAYFhEGlhszy3D2hK9SKYPtHHHoRzVo/s1DUBe1K2gW+rmfug2sT+OnPWO
-u3b+av8O1qixzR9MJhQThAXDnIhlujHFPQ34xp0jTR0HUaswmuVIiokhpgPTOzbG
-MlxHUwdNwTEk4OhzXqPJ1+8piXPZIc5vEI6xCF4YFiVZ5CbgyyGwm1ElyAardXpU
-DjLbGqcLeBOtISgeQOL97EgRmtYl6NJ65N1RPKp6PbcmifMumF8gwqY0jYM37JQ=
-=9nar
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VwmIQAIZIhAj7J0gaG5qTxd5qlmcA
+9scN6kBdM+hSyArYtsgplsZTKD8L0Yy1TWk/e0pmEDHpDXIw1pmmDucdRVo1Ndfy
+lyeWCWLqGRT0tXM3vMWUCYiDlb6N6CvxpkMKNNfVcrzDv+beSOFBU4QIa4blB6w8
+ANahFuWhIxG4MLAKGlvhu7PfipeTvt+wMjksiNIf7NgyxqEABQXz5UvHRb+m55NB
+JlI5zF4xnNCP1YtkFrZoxHr9WCMWtAYFnZasdtCfak/MelMXYN3CSApfWzl8/ukR
+YzrkspVFHhxOn5j3saWtMswRZq5tSrCFtR0HWqB5+joUjQDPzyOWJnTuf95Xg/BI
+1ESS7lmuHD5MCgr0LlsU9TkWBluaAjyxcGMZKOnWwHZ1PqkZPQ01Sj5XrN68yV8a
+9kzVBzyGGpbNyQ5lchlYeVBG7jOSB6TQa3yDFJouN/bk3I+r9ZPJni86kCZ+mVja
+rf/3EHNrEXovVD3rz+91T6crze6/FZOH0+wkgd4IQ1lDUjUQOak5AKdz/0ZkMJs4
+zEWWu1ZTBxDrs0U2mPC2T709sBP9QCO3OtMN+pSKZnkgNv21vK+tt9tD3a2By82A
+ScNuhike0jPNTNDefPVYYUCofuEo728QuRGm7k9Pd3NBxyeeNWNDqNX74k+3UCH1
+0fO2ssmaXEsqLqRTy/IP
+=iL19
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-notifyd/metadata.xml b/xfce-extra/xfce4-notifyd/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-notifyd/metadata.xml
+++ b/xfce-extra/xfce4-notifyd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-places-plugin/ChangeLog b/xfce-extra/xfce4-places-plugin/ChangeLog
index 7d1fa69888df..b61a869085f4 100644
--- a/xfce-extra/xfce4-places-plugin/ChangeLog
+++ b/xfce-extra/xfce4-places-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-places-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.47 2015/07/11 07:09:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/ChangeLog,v 1.48 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org>
   xfce4-places-plugin-1.7.0.ebuild:
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index bb3271e10091..2fd284b8d83b 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-places-plugin-1.6.0.tar.bz2 348333 SHA256 07b044025a75f02b84e8848d6f8
 DIST xfce4-places-plugin-1.7.0.tar.bz2 371395 SHA256 4175c614749abbb5bcf6f49c88125fb0dd36db69f4c374df23563907b16e2c3f SHA512 ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3 WHIRLPOOL 8b3a16ad17cbda883c3f798288706e3f9a3caf03d8c74c74fc52fb3453c484a3679740b01d38b70c3b8bdbdfdc2c1274cd2e36913cba1e4091fb1c9e5f1231be
 EBUILD xfce4-places-plugin-1.6.0.ebuild 1139 SHA256 d52e0c352f9cac50688f9dc3d60a3a182ae805c212554bec77ae211400a5d34f SHA512 7ab8a05a705e212a390b97496a6e1fdaee55cab05b45b5c12715dcde4e51355991c8262be92bc3f5bcb9cac0ed7610415472f4134e5b7fa381955dd6a586bc2f WHIRLPOOL 248cb123f1a5060886d6a635041064cc8bc053753898da452be3c197ebd7e56f18abccebf16429c7ba93c3fd455869b05308eff62266673c2c50caed6e435de6
 EBUILD xfce4-places-plugin-1.7.0.ebuild 1159 SHA256 61a678ab9bdcd99aaa42647cdd96ae34e747036104cd3917d3b622cd9b209436 SHA512 ea5e2c3125c2c1338f4f4f4ba75a1da6f9dd2a54293880aaffb7ecf9465de18299ed4bc49d6973608eec02c0ef74a5a305f6296a261d1ae26c6d443a2f0a8ebb WHIRLPOOL 72ff5847b9b8bf4ff02e1600b874b82746820e75672f06121d148d6018f0f74177da04bb90226c71ea83c2021a656a4fd02349195cfdab09c70d51e45c4ef6b5
-MISC ChangeLog 6287 SHA256 de4742b41d3a11f12a72adf9decc05b0a9227c6f1432d6f969e31b877854491a SHA512 e68b7ce7550bd5ee3a34357efeff11541d1b3f2f89a7ea672ff9f1a2ac1e0b6563ce8f488363bf4ce273fa9919f49134ab1b9779ae1721c71842de5ef99713d0 WHIRLPOOL 45e5a391db7722c2e7df59efb36b67a16b2ba62b275cd6ec025e7c020697e1eed2418433f8e76c8c91d828a4c73d84333a5b9cd0b35e93d2f45502f3c6dbb1c7
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 6384 SHA256 c4909a21fd204cc186aee185d6be0bdc8d48e8af745d2a96bcd2d29de1f5a2d3 SHA512 d303288f9dd1495c858f6c95d5ad4c7dd24c392756f10592e7e394bc1ec53e6340cb0bb92431ce9f180d8b7470e8df89928488c12a7edfb3f0c44a3fedf2d87d WHIRLPOOL 1980452898d61b147cdf16c9c8e1fcdddcd6ee8819c2b71293617a77bd4fc006ff816bfc4255f148bb57882f84c0f44e6239be4ed02c7e69771edd9f2728806c
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwSgACgkQkKaRLQcq0GJTOQCeM2UVPn9ft0aGPX9BrEVlNMH3
-FmwAoKUh8p3MZ8gqkr5cH5GZ8f5VgvuO
-=0Fi+
+iQJ8BAEBCABmBQJVwenZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VOHoQAIPTJfKTtU7KiHZJE/42a0bz
+Z0mtWURuLQjE00jfZmm0QEmWiK7LELSy5tQrvYTmAbSW+Kb9e2yRBUZirt2xGg6u
+V/2c0uKaHHso4OmCRszbU+QzqxaU0gYsJbxNMYbwHbl84k7iW/cg6PaC7QTUC+2C
+vXVq9cdeSLFwfFBqx1yhmPD8Ab9XLCrLeAdR1JoQnn+k/R1KjBbeUNXzLJcJe9Jc
+uzp1ImDJN1u8ahOL8IEgcjn3osWMNJM+HVfVl9y2EJDB1U+3R2y0ZZjf5jLj36jU
+KPle8+sXfB67dvCrOBGDGpT6iX2kaMj3gs/Y/6AYBbrwZbYLmzKfGNj41wTOQ09f
+PoKBF2tILSs5EBrpXg1QibdD+Pr4HGfk9/As4BLJZLGrzbOiFBR8MCK3oE9MOo+N
+JtdxXqkT6w+IJJWEu/as2rpLZi6i7Jfz0sMQ5FA+UcJB7Itg3dkTkKqXum6xjh4w
+84vNUQlzNTe0yDq/iUO+KtW2cg7xoa3305MIO/oDsinSpVHyLt7qOZS4U0VEZ50t
+3C3bO8oHGDzw0sdOOdF7kufs0JWMXGdGwYhpu3oxbVHarB6XYUyRUevxh24C0BO2
+C8bXRcD0bpDQS+MjOLfHTiAF6/QGnKr/NQgS0v/In4/IaIgRYsUGCN6oWjJFvlr+
+GD0qa0FqX2mYrdpRwr85
+=kLsf
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-places-plugin/metadata.xml b/xfce-extra/xfce4-places-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-places-plugin/metadata.xml
+++ b/xfce-extra/xfce4-places-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-playercontrol-plugin/ChangeLog b/xfce-extra/xfce4-playercontrol-plugin/ChangeLog
index 66ae7617eb57..c0851f61c902 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/ChangeLog
+++ b/xfce-extra/xfce4-playercontrol-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-playercontrol-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-playercontrol-plugin/ChangeLog,v 1.9 2012/11/28 12:23:28 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-playercontrol-plugin/ChangeLog,v 1.10 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-playercontrol-plugin-0.3.0.ebuild:
@@ -39,4 +42,3 @@
   31 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   +xfce4-playercontrol-plugin-0.3.0.ebuild:
   Initial commit.
-
diff --git a/xfce-extra/xfce4-playercontrol-plugin/Manifest b/xfce-extra/xfce4-playercontrol-plugin/Manifest
index b8ca4f20fb96..728a72b27c32 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/Manifest
+++ b/xfce-extra/xfce4-playercontrol-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX xfce4-playercontrol-plugin-0.3.0-undeclared_XfceRc.patch 296 SHA256 3a08f5b125c57496a4edb615ccea1c10466dc7478c50766af49ba2db95574d12 SHA512 88630db08853a76a473823f7f84ddd3751f74c0e8a9a7e65105c68cbf5d9286447b9eac5895310f28b0a4c23217ea1a4f8716dd44a458b284284603e3cce6cdb WHIRLPOOL 0340b3798a161b78bd7f2a2d6a3bc183ae80e7ffacd60a2ffd9c5544e1325ddccb93020a20e195457dda792f6bfca5f27d7fc6475f8722bd5413427166be4d5f
 DIST xfce4-playercontrol-plugin-0.3.0.tar.bz2 297945 SHA256 bb38d039d3d485481e1f02b83975dfc9fef3f36c5b648e5486bc49d6b37ce69b SHA512 31de7b67b5de512042f667970c5bea08fbacfa577c8aebba2e35ef57cd0275e682212c46afb2ae5cf3e6ccd85ea6a8b18b932b758f2409109b1d07380da2398a WHIRLPOOL 7315c715a7a2c8b0b237ed091359b5c6b35075670229cd5dced144f7749d6d9119b7b721c3af4741e377eccddc3486ba280d13b36022a174358c6f624a613018
 EBUILD xfce4-playercontrol-plugin-0.3.0.ebuild 1236 SHA256 b8553aa735b4ad25abb56e319de7ea4a2987c06996a0d383be9c35b7f3a84b33 SHA512 7cc4ba8befa4a9ae9ec1a41abd9e92daa785c8b541dfe9e32c49514df711c805ddaaee178512392c88214390d46b2c02f389324e5633d6a2e9004a559b227259 WHIRLPOOL a3356ea26bcfa2a6716dc3cf83237ee1af93bd26a0f8cc3169a8e550d3f6aba9acb4c27e9fda1d2023b3a2838a95a3d8124327f3bb384a8e45a1db4a0e6b1e59
-MISC ChangeLog 1531 SHA256 b1513fe636e318cb535758cbc3a89c579d4caa724f0eee644c5835ecb41303f0 SHA512 9f77abe327fcc116828f865a03a14a0929e5d37b293677bfe2861fde2bd6ae3a6da7873d5c1999172439c54cb00313088decd3beceb4bbf22e6192b8c75e18a0 WHIRLPOOL 207383278da24639356d411b0fd0b73c6c0aeb60214ac372b604828c7ecdbff1e115dcc680913337170300257c5aa927b2761a7a7f4dbe724e0ecd62396d5bca
-MISC metadata.xml 297 SHA256 bb0d56df6b8fd4e8471fc51953dc553a6917d68336eb94c51874d3b23bc73543 SHA512 d4969c0cf4f429f2e5979e5635cdbcad3f9e842bf25865d6c018b28d8c633712fb0e7c7d558658f7f035a6086edd76a9f7b34298c3906485b5741769ab6fec0b WHIRLPOOL 03ed85f79dc31837a8c2e3f4dbf767f5ff65704480adda8e2d52a063a19cd9b5935109007e8b6b06a3541785c3815184cbe6b3d18053103077b37dd0f93660e0
+MISC ChangeLog 1625 SHA256 838402090393d4177de4dac14c33bf808a408ca665c3c28789178304e09d8a58 SHA512 b98b30637ce62ec35c25401ce7b760b449d663dbd21d65da5acf21f6c60b975d84552361f8a8812934bd0b22048813c96cad82e7790d5ecde94a567b847b8b18 WHIRLPOOL ee2bf11a5cbbca93b8c5120f10875d397132f5b8c4fd8c71dc7fd3eb4546c22400b2c3cd49b042799056fd47d49e381ccaccc35356d2512e284060d9033d77a0
+MISC metadata.xml 370 SHA256 05a47a337a1d17475c44af00efdf57313ea54036a3f2891cba0322f4eeb3ae85 SHA512 6639612c0e71c9aeda75ef84753c4365a36b097f08aa50ab596c0a0b167bb09fb5d178e4b9a970417150cb33ea591e7f04479798336fa1353cd047fd18c66dad WHIRLPOOL 29c8daaaf41a6b02e3a8a10b0ba1164d38d5f1c13fe16e00c86d3911e334f176d3e4f0726e4a733f48febc67b9481c02af54ab7b3da6215441adf6809b6ad3c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgILAAoJEEdUh39IaPFN3gsIAKI3GNkg+hYZCyoJBxPcworK
-0iz3NogmsnUQdiKn58dFQysRzKNceyILkjWbPgwZRsd8QvPMKpc+T4G6MfAutMWi
-K6oMgioI9jxGPkrqnukJTmcayZXpngxaj2UySYwEWaDy5Ng4azqIq8lStcYvR8T7
-QQXSMcSdVRfrpF4v3/qnkm+T1zZeX0zlxbgYjt+J6vkCAU4dEAaI4W0/qxXRgk0S
-jySX7A9RQ2cdg5n+ReS5WZj28BI7y56Ru/TFzGn+SLm6mlconkcElqQyCnEeX8TS
-1f0HTYa62A61uZRVpAO0S95+FYuHcLZp/PWDjhaDVNHNz+EcAzSPGA4XxHKlgOM=
-=ZKn5
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vnm0P/1ukbJodELt2EqXqH1mXfozL
+GrLIznVmch6iiZeqLorg8Jo38x+bQc0mMBrpzq7z03oEQg7A+7rpqKmb8uPa3b9G
+CtCEnEF76G3/Qj7qgHiFw2SxERXHXvcZ8pUzPMrrxUcMDYtb+o35w9VtJTuGOr5H
+aGJtoGQMYzXp664147NFS7huHo9IraCTNqWMsIIlj3Bcr1dqhBb+lvu6aZh82EWo
+6tNH+gd7/hhE00p6qc+PIdzpeNM2U/Ts1V2Aw3FBVMfCMEK+/wk48talgf5vXbZI
+TS6wJAZWPQBw8mP/IGxbq8uPrkxr8nF9hJ64n2GJjcA1iCWmbEBvyCxe7vTVkE4q
+BxwUzJX2qKVoOfilmYw11Va4gnThwId65Jdc9W1pUujGXB2kfb4hpP2bHIEu4FvE
+XUXGR9evk3jXMNzq1hZ30yW8EMgEtKizFEQ1z/GQ2hih7vv5EroZBxOJ37IPQCO0
+Cy7/+2CxP5emHvub/vGmzh7u2wOHSn73EaR8ul04tjZPFYLtXJhW8s7yCuPZsq9O
+YAjZBZZw5Yi+kx2+taka42LfRcPQJULrR0n5et1+ejm0O2PoRSMQVHR74i5nmsoZ
+b0vNWCn9aCujll4XwrNVp69SAqYx5DVdT89pzaz09hH607EtCrlEX23EF36ao9TX
+vX1WziYmX7CXYY65Cc7C
+=YhSA
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml b/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
index c0fcad81772f..71cebe066642 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
+++ b/xfce-extra/xfce4-playercontrol-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
   	<flag name="audacious">Enable Audacious support</flag>
     <flag name="mpd">Enable Music Player Daemon support</flag>
diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 1cfd03d67aeb..5de309e2b83e 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.100 2015/07/25 12:20:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.101 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-power-manager-1.5.2.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 0f90e2b263a3..a7e3230ac45f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -12,12 +12,24 @@ EBUILD xfce4-power-manager-1.4.1.ebuild 1802 SHA256 0c5220a5dbfbb646928e6ff12170
 EBUILD xfce4-power-manager-1.4.4.ebuild 1816 SHA256 67dec150fdf43e398fb67350495228c86d40765de7102cc2ca0f57ee41178454 SHA512 1b993a2a063fa891d770b68430dc9f5998cd3ac3751e37ee9bfca358b0165ebe3a67201a17c8683572728aba8767fbfaebba042cec26d4c46013c8795d9ef274 WHIRLPOOL 72c0f2c96091ff431649577a2732c1858067e0a9d00d5fe23f942ab622d773186c78484c36f63dec0f0820bc15fb44a1c456d9d839a097c2f5a42de430cc3e2c
 EBUILD xfce4-power-manager-1.5.0.ebuild 1470 SHA256 80f7846307ba50623324edd57e0da43acd3b7c12d93f67c84770b3a0f4ee85d2 SHA512 7a7d9c6c7104bba5f62bc67d324f2639dcdfce0d157626fab24db0e49eb3768ddad9bc1c21f887aae5ce6bad567e722a946a5f59526baae478984c092a373e7b WHIRLPOOL 41d79e93c6a82be82d949c9c43925dd45e13cd14e12fe1cb285afae4f6a726a2c3fac604e666a025624a6e88d3d8c6cae124b2283a35eb1e921ed4b720f80a40
 EBUILD xfce4-power-manager-1.5.2.ebuild 1579 SHA256 6fbdbf4e063a1cdea2165ef6e93995a93ca320256396767ea056825f58442a4f SHA512 67d285402b0d42247007af86bd36e9fb85fa9115f2e5a0f85bb0f9e66e2cc55a6414e328becb11f581ec0c9a4360abf88dc6fbac5fbf0496172a9c8688dccf71 WHIRLPOOL 817f26f68e658a96551ee33c6e277ddca318b2501b3bac5fca22233695da532dce8422d40a1d267d3c38b43f0dd76524c1c15e08f9cf45ca9e0caf7acbca61d5
-MISC ChangeLog 17038 SHA256 c475412a5d22d1581e15916d344a2a09a63e65212c55de8519f5f6c7d054ead3 SHA512 861723ce61882bdcf9b3768942a78b9c4497973a26f325ae4067ee0c269adccb14d8249ef8701efee53ce882e1dc8b3e01679219615fe6da02f97f29521828db WHIRLPOOL be8526d125316377fd1a4fd7eeced576dd7e837dab542fde6aac16d2f4ab1cde9fa81588b2ed8896f7d12430be7871009c965bab058badfb5bcca3b95b4f379d
-MISC metadata.xml 328 SHA256 f2c527a7d705dba4f89e8d4ee9e8753a1b02d76e807c543e0828cd552e36fa4a SHA512 3d2fb44a95a8f5efef609fd9055d79c1dabb6f83647671e7b41039ecaa96622878bf1d01fd23f563934668e3af22c7ae9e692789efcb7f81637b4e3fa1ea798d WHIRLPOOL 0080330bfccb679e920c1dd333433e33a27b2b52bb8a22cb341251e68e8e7ce108a040470eac9f57d3c9b28cae375cc533be1539ed025e6df9850709450a5bb5
+MISC ChangeLog 17136 SHA256 072b7bd7d3bd95b36abf67defcedf1f5c96f48d00899b3f8d9184792172d248b SHA512 7a5a917893fc48120ec85745e9a0f96c7073892c6c9d6104c1ec2f31942df287f58d6f488778922faae5a10cf16e99c457deeeb9cae5e49f1ba6a5f4f574ad9b WHIRLPOOL 749d872c3b41212115de42c325d1e832d1982379f750468604fa169296ee94a176a6d0422adb8596cdcbb18661afe14be0513cf32f82b34a5f8097e4f2533e6c
+MISC metadata.xml 401 SHA256 d7a98555f43588fe5413c78ca2f07a22fda32f656343a18b1ccc65177d7fa645 SHA512 140db4b5194b1c60e47e7311df2cd79a888a16634b27de7bfe597dac28f6e5b77769589435749548bad8e2b64c42f8e0a4e89f59733338a57ecfa38d8138a62e WHIRLPOOL 75f049f6292551ee2ad7f690925964ade2a588800ce25fa5dd0c0d97805a642c33338d5a496cf268a6cec273631521edad0d9caabc0e9566d5a82ea43de9f454
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfx0ACgkQCaWpQKGI+9REyQCeMpZTAUNaHzYB1kFzL7dmHTWP
-EOkAniiJMw5hNrIAL5RnGjOu6oK33xwD
-=Mc8u
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VbxAQALb/bKUZPYvsaYbUfvZvCmBk
+fafISYUUrTVIq2PWzzaWYvS3LWRdeXa/7iQRwdUPUwtOTMCd+472shI2WdaX1vEF
+XtYbGRY2HsPZ66wjuCKkXSrQ8NBLlYi8qbUhDOkSNOpAj5eY1rFIR+la+d5eynt4
+U+Zb+QRAW67jHc4csLwPoBNVwF3OOL6Mg2ZK3FBnM8WkApQEpcpP7t91qBL+wRYs
++GD/OHq1AnPEqfjW6Q5thtXIi+1/NWZtU7mkA0+I0OF8+G1q8JiZpNkAeq1MjXx/
+JICy2Lt9opIb6xFbL/SNAboKZSZ2pjp7/rvArZpKuW8M+JEnxMYXbH8VPaoAKUCP
+oCzrDJIoqRA2zpWtKzsz+n6NmuhRjnmkThTtP5MxsDA6OHnnb6sDMcUo8G1iZLUz
+Rv8jYV+8huPoLDIl9MLsfnhRLQ8evvDGJqO8hZMYXiGmay3CgO+gP3ihOanh7fZm
+W+NNp/JYZvR68bXNfcWK3bjGPZDg3NDiyXTqB/RpYqe8i38QUCoBlmLRxiA7sdQh
+cBHblah/xSYTIkKQjwSYfb5d0mR46NL+DvDY1vNKxJHfnswab81zthkQWul08yZr
+rXuEt5dWxJDW/A9BlA0c8m6Rk8iQIaCGXgqTpGUcctSRKa7FzSkYj++kl0hvTkKy
+9FL7046Sa96NPhsS353v
+=mMyt
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index db7b902fbcd0..a09362f4c8a1 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='lxpanel'>Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
   </use>
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog b/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
index bbe12cfbd735..8527fec5e16a 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
+++ b/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-quicklauncher-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog,v 1.15 2014/06/20 13:25:46 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog,v 1.16 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   20 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-quicklauncher-plugin-1.9.4-r1.ebuild:
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/Manifest b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
index a99afacc4360..9982d8271ae6 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/Manifest
+++ b/xfce-extra/xfce4-quicklauncher-plugin/Manifest
@@ -4,16 +4,24 @@ Hash: SHA256
 AUX xfce4-quicklauncher-plugin-1.9.4-X-XFCE-Module-Path.patch 330 SHA256 a3790c192f3ed1770d68e367d92695dfac01a75c179cd30c2be28c4ae1bdb7bf SHA512 e32d2730f9a78c45d387b22a1a39d96c376600abde1f91548da9f423901da0dc4569183c828282c5c62b94fe515ec5af18fcbe71508c4664197a4f20cbdf3d01 WHIRLPOOL 66099ee5f60545cb86ba7f305d01832b24f8342e2386dc26fc290dde5457c4a21f754a824088a053d9fd2e74971458f5bef089eec24974bd65765b5dfca9f0f9
 DIST xfce4-quicklauncher-plugin-1.9.4.tar.bz2 282545 SHA256 0b253d96e3b3fb02508e1100cbf39bfb8b40e9c75da75053e6432d83dedfffdf SHA512 11db64adbef5a04f25891132e798e77a713d5f68fcda9ec5349f975f56c4f352a2da8493d721f307d23e973c02802840c2feef444921da29f2b6e21a5c79a228 WHIRLPOOL 9508447a2c0b9c5bc4db12d0745ca16e54d8c44d988eb9d3873960183d2c3b5784abac6443a8a8735681fcea2d149ede8e8d3d5ee180bd814713802edb21aee8
 EBUILD xfce4-quicklauncher-plugin-1.9.4-r1.ebuild 1421 SHA256 5e46308901365fd118443cdf1e42d6756d571f618f487efa71a209ba28b44025 SHA512 ff93af4701804bd98862e303a7b9c6506b35e0ea087cf908c6eb98ae5a33fc471ba11a14abca701ba66a297c07d837a1d9651db40917abd3022c6ae2d59916cc WHIRLPOOL 94f27629824e3dbae822b4dbc9d6a6720eaa67d2382201e6513ee7486c21364b14f4aa4b5a1952eb18dfc456167905d44f2a19f00da9e5c71144adb34270e05c
-MISC ChangeLog 2697 SHA256 6f324ad6f0a769369224f224ee4aadf40a6813fb1bc28a575c50a01d641bbdaf SHA512 e503a70cecb95b25a0e59105d196685e0abeae30f4869461c79405b2bd8b6be45a6044b483d7065bd06e3583b404e998bb1c89dd14182e9090c8c92c4a6081a2 WHIRLPOOL 92a947c63e94b8670b32494507cd77030fe46688a283f4b13d033e3064ba4850752516019af1210dc107b6ddaab1ee4d5f321344fb95b308d6bbfdc1e75ceb82
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2791 SHA256 445916802cd0fde0df2b0f70797b344c8bbd86e3fcb61cfc9985670ed33c3cc3 SHA512 2913d84c2b6752d44c42ba74d0997351eb881025f820fa7c4647676d675ace6f7684a7c5e09fd5327ccb4b28dc4434b3913c0cf73ae428bd316b9c61d65959fb WHIRLPOOL 1998d432bf6cfd392e063e93eeb4905b731157b35e0026d46f30095be679aab03e7ee105a19ea95940429f87dc6a199a1f5e2ce52608df6db6235ca6f2f0dd5b
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTpDWKAAoJEEdUh39IaPFNsgEH/A9VXMckWL8J3glgEb67BI+y
-TkZj9YNfh2gwcYLoTKFqTquujyIaAI8NoEgflvYAA2lScDL0AA+cj+DfqRJs8k5T
-1TveQNWRaQQXTdM4+y75J25y+BHTpxZ2aS0Te+IQ0dYb16rDZW363yqRmydXYwv0
-EnSmi1aYx6Wf2342A0tfuNQZElgKjVtS5v+18vPgl52WIzfdt5mIzuhtMRa2ElJ1
-Nfmz5fGv7K/xv3ywysDhAZ88qli3ZGkyYy/SVGKS0FxOT3p75z2DlGjTzpNAYcEr
-pAboKx0jLIuRrJdt7z7vKgXWWpUKk1QIyGDhxc8LuQXNdDXTNdlC2BgMSGP8cik=
-=WbxC
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VWEEP/iq1zSzoGndunPyVCmGn8Y12
+nKOtxWecEHSc8z209KqgEHiTvDhFVB9ewVWq+m3bvM1kujUOpLnNKWrQ8nj139aq
+yYYtZnzm6qGZDMoBbdbtx3kn13WnYmPuBVb/5XWj8OMUsUAYnyYx84f5sqNGeW+w
+ZFaqWeuy6zvo6jOFtpt6VBYcskdKFNkRPHIVlZ2FTqKXOjUD/35X6JbPbZY8iZX1
+xPTw9AzfAibaNIMNW/hA9H674lKq0j1YDFi1LHPGkSaRDysXBudsDoEuA/RPjzdj
+49jE8Qb+HCFVxch6DY5Hcw9pwCrO5tJAjhecn8AJDZ6iqXgnuBeQWU1GP6ctWn7v
+m4AG86kbzlbl4HB7v8SkpD1gW0a6I8U8KCXjToyESf1NFqORpwcxgCFezmOzgqS3
+i+B4PrUrzP0gv9k1o+XJvMDp0fiQnKvar88yohIQ9d8qyqFzru84yZ9+Q5PslWIo
+tY71BsMo2f4/jk/mg7ewTVV9ZHmjvws3NSLw1g5oe7M98F0RZg8fLBNfgy4HgZkR
+gvlOrjIR+m1dNh0nkp93PIMUKHkMV2St3dxVzdDUw1MkCu4RAPKRCBP28e1o3dA+
+V3J24GjUdAB7n8MUkIBCdcbzezBJOHvHxp63yI0ZwLs9GTLHxndvzA6KRVTDvrr6
+JR/2+Ixy7lwl/qqZ2Zk7
+=vDzm
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml b/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml
+++ b/xfce-extra/xfce4-quicklauncher-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-radio-plugin/ChangeLog b/xfce-extra/xfce4-radio-plugin/ChangeLog
index 99bc2977b6a3..0871a523591e 100644
--- a/xfce-extra/xfce4-radio-plugin/ChangeLog
+++ b/xfce-extra/xfce4-radio-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-radio-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.22 2015/07/19 18:20:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.23 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
 *xfce4-radio-plugin-0.5.1-r1 (19 Jul 2015)
 
diff --git a/xfce-extra/xfce4-radio-plugin/Manifest b/xfce-extra/xfce4-radio-plugin/Manifest
index 3b11f8a0feba..c21001f17d8e 100644
--- a/xfce-extra/xfce4-radio-plugin/Manifest
+++ b/xfce-extra/xfce4-radio-plugin/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 DIST xfce4-radio-plugin-0.5.1.tar.bz2 137447 SHA256 82921775cd8b1633cfc15581b35d7dabafbe6e1431d385919369dfb1591e13cb SHA512 54cc25c965dd6d220019382d0cc0970bffc3b9eaf315f2b055ee2ed56f818066e1fa51d2613c04b74562ec4f4786e9b87197a791c3e7867038b9b2737c540e09 WHIRLPOOL 0597a23fe2f51505786b8d9fe7cddc91764a8d95ecc39a015d2b6e70d32c4b763246e13dc677032e15e4dbb7c5c8c902e8662fef6b8424ad71fc0b21c87f88e9
 EBUILD xfce4-radio-plugin-0.5.1-r1.ebuild 891 SHA256 31fd78c8ea344dc5241254071b7349729dcf45c05c9a50c0a96baaa69c94a4da SHA512 ab0209412fc83c69d5773f568e79d8718874f84fea42d7377b1953cba9a143067c13552208bce0093126079d226c2df2a196ff120ae1a73fd97b92d2c5f50f42 WHIRLPOOL 8f073d04683cb7b6046ec1398064d1f785f9a36d8c65d4aa5f761f5868b5248435c2d6bd4062d6d04b249aecf9b4b048b60148b4e8866caf06a387d3131c080e
 EBUILD xfce4-radio-plugin-0.5.1.ebuild 822 SHA256 7939dbdb4830ae0e77ab109056bb11c5083d6737303ee3ceb7f02a3d0c5a34ed SHA512 eff9175bc8660b87de4e0e64b52acfd00f41b925e97cbdf68aa8fb4c0331e954be224498a10910dd3fb33bae25a04ae0984f8fbc59a25c6215c3b0dfd2b98542 WHIRLPOOL d4d47925c279d2b30194056850fd521126b7cfbc347c0c752c5a799a5a7747d7746590103efa0e508b21394108aadb2de5c4f4b1915a45944c290d6f8eec839c
-MISC ChangeLog 3376 SHA256 71220262f2efee44a125694f0afff584de7a8aea936db4a08e56f79f13319750 SHA512 0ec2207521c6ebec9a89439bd6ed09574345b9f45ac96d8e999ab85973cc2a6382266371609cfa8a3437791c335b007c131b7c548e0cff1a02ed990ddd8aa0f9 WHIRLPOOL 3906be1cb2a54dffa46b9b2c248212db15c55a3d81ee555be1c4fc6adecda8bb18d1d7082963e87ecb4cc32d1c03f5edcb8b129784debee3ce6606817dd6a12f
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3473 SHA256 4474d4edf3b8c66986e734689b4edf2d80d86645b76d8b23ce97d2e54f66987b SHA512 3e0d49064fd2259511efa80cad5106a3aab9f5a4a02d1435eff3dd7c653d1f74d0600c28b7d13dcf29c62f38eb08652c59809c7a9b46114b6c60b150917a30eb WHIRLPOOL 2c8a01d166974009df3e010ff0fe1f7581f5775c66050178091bacad482ccb561cd649faab96eabbc8bf9c595d093bd7f8f0c4b0e86c9914916915ebaed06f1b
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVq+qJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAS4QAIKHkcOh0eaOKGFcuqhwg/5C
-kBLOD4yR060Zd1FIs4QYyoJVZfURY/WEjSD1gZ3YyNO1W2ulu3JmG17mfLWSyB2n
-pSYdpSaE5O+tOU+EGYqpRaySDy8RteMkQa5KbbBgtzwSz3zj1IuNtw0xRNDT7Puj
-KCIqQHvVFVDyzw+iMAbHnrVGGYY2hBRyLjiqw7GU+jTrqbp0wYafehtR+WyEZyr8
-KHxNBmMasJJx5QobEn9EImRIicvHIj810X5BNOmou4MVkhY7xFLh1J8n4ihDXwsE
-q9f08ifVB6StdVHx3tkfVG9xOIYkpiszVb3R9NsCLqoQomLEROyg06y5MZblnsHT
-JVejcvFekodi4AMK98j+vFZ05vFhHa+9EYsxqqysQTA0Z/r1dFt7x/vv/E4p1fR/
-MH6rSz/pIGOVOpGeYqfNMossJOlzLh187+YO/pjsHpV6EGJiXlzuO4PksCC+NUs9
-WGYwGRGopS+lRanHwgcxIFD6ndfXZKFR3YhwU4cyYPnCMZ2yehZBvG8wesLf7622
-GSKuSParmsaJ7NSqgilzNpfsoe72qIN1gUzpdIvaSUGItm+FM1bv3hOlN7jbJKsv
-f1XMLI9Cymi/FuruNEYzWIe8HtuvXijRKfW+FUBipmvgVx0E4bK2sLfqIVuvEqj5
-s0DHZelJOWMG56OTyxNJ
-=BfPT
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VV90QAJ7pCjbauGy1frWXEqA0CJ8A
+DCr0W+Jawls6y/GaDmGOsxgbCFifuKrE9bLaFt6dsl+Iu+OF5TqcOgwFjQ1noJHr
+Jg6LMteHUkkMICOGQYGITctnUYupRms121DeH6Ebe7sGr2n0aBRXi2HnBH1Xn2R/
+oDjqIkVKOMlXcaIpmmSuZ8IOatHXlA0prvgX3dG/QU3t0bBAOvTPT6QL00Z5tGtJ
+5wZ2z0lECmer7aGUGpIVgYZV9P2q18S1PCO1OcEHve/OY0eSEm2jfm6KGVERDtLp
+OZ8lcjkN+wG8RkDBrLT5TrayUIax3tqEWf1YiPlu0dAEn1IwaYiIlpM0g+d2GhF8
+ZPsBrgJXfiQwIMu6H94jkKy9nByeS8MckKaV33ZuK1CfXeVqfQfhwSoG0tWJzoDF
+zzHJ0qkZU2BxSbVh07eDZitQGLpt4zjD/kFxI5VDBFxZnmYcADGZxsgQ6Kp+iA5l
+HKXhz/K6RR/uLbsCigmPXv3nhOyCqsTnpjEE8GkkOnHkXehY22RI8VxN376tBAlk
+XG+IeVMijvXGGOIwqUrMvFO1/QJeNp20kxNI/WRAint5uMmorTG/JgcCagpKVAh5
+TLmI0Ip26U1BAfMU/vUey9nEoRjtWBSvwZtZNOsU/isYL6+VuJWFUwupbBawxPo+
+vnD1Ir6HLk539dGzttvb
+=l0u1
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-radio-plugin/metadata.xml b/xfce-extra/xfce4-radio-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-radio-plugin/metadata.xml
+++ b/xfce-extra/xfce4-radio-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-screenshooter/ChangeLog b/xfce-extra/xfce4-screenshooter/ChangeLog
index 4903c06ddcae..efa2c1c2b82e 100644
--- a/xfce-extra/xfce4-screenshooter/ChangeLog
+++ b/xfce-extra/xfce4-screenshooter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-screenshooter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.109 2015/07/25 12:20:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.110 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-screenshooter-1.8.2.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index c5b631409145..5c9af30a81c7 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-screenshooter-1.8.1.tar.bz2 1407790 SHA256 40419892bd28989315eed053c1
 DIST xfce4-screenshooter-1.8.2.tar.bz2 492524 SHA256 9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69 SHA512 e43dce108c7bacfeebdc39b0c9948b348c77faf358fb0ab5f26d59c96980f1c5473ef87895fe53387340202813935ddad6e200010e61aa27c2c56b662ee56b1e WHIRLPOOL 9a4b5553c0b55d5bd8458f6ff4ac85d5eb07541a940fe038d25b29f021ed4f74a89da7fc006ff06a53652fa630740b42ebc3542bc589f4766bf2401825cb6a8e
 EBUILD xfce4-screenshooter-1.8.1.ebuild 1410 SHA256 1e8d77eb374ebcec0fc5cb9b3f7a01d59ac6d89d1938408214875dacf3a0348d SHA512 d8fd57646f5732e07afe59c298d9f4bfb3b8816831eb8d453029bf9f114739d9296b65e383f8c0c9d2b4609a639136115cb282c6226b7fd70d2b96ff4ae5839e WHIRLPOOL 013d6c6aadd782811b573662923e16e89b732f6cedc7934bfbf0802865bbec57a525c8eb8439ba7274e297e09fd3c30a0b6135027944c7fc9ffc3c63a7ce88b3
 EBUILD xfce4-screenshooter-1.8.2.ebuild 1151 SHA256 f6094265f325de7d9a3813cbd91f29f3187d9659e6ec0b922ac6da1c5b7e406d SHA512 8f8a2e41d9c46eebc57a1e2768d4bda7a1251cbf01d967ba9018ad61c96f13d6472b143b7db2a1c8b255165dcb4bbb04dd86f0df3b3a2bfd7cc875592bb5181c WHIRLPOOL f7de0edf7d834ec4a5669ae7cbc55299e30dbde532f397d367a78b143dcf112d236bee0483206861cbda646086b734ba26b1398d3656a601281d06ba6d767989
-MISC ChangeLog 15089 SHA256 437f38ca5269ac5efb470170c4c71eac026a8f49cfeb347776d63ebad57cf190 SHA512 96ab5591da1e9eebd0907ed0cee3a07910b1c746172ae88da9a02b0f619660a1ce439c0bc03a291c147c15ad01fc0538ac1b083eef932082bf4a19b63f8b6632 WHIRLPOOL aca56590e7a3cd3fb5e33648f0776fe0ffef759fb19c6c4f702f0eb4bd5f165801ac7689bbfb968313a61a37a15948395e3e164499d1d338964da75e71b31e0b
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 15187 SHA256 215c96db42d31c8cee9180b1e4d2bec3c6bef83d8acfa32110b4b3edbe6738c8 SHA512 520f7e76aa92a2ba03a27f854511be85c793967b446e6866fbebcca420f5812a286cb3a255e7c64489bfb2a2f2b34f4c752158a292a3d41fdaab07edbd29d297 WHIRLPOOL df008cc4e050f86aa46b468821de380b611cddf7e028d847c13bb7bda952091efc09559c2b8e6ad7a2153e5f2e5cb99cbe32af9dd66ee41c5297518e494b960a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfycACgkQCaWpQKGI+9Q9JQCfdfaJgN1rmnyp862sQXvvmslK
-v9YAn02bQwasoRCvX4xq6uO8Tq04hgMj
-=mqEw
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V7qgP/idXPDnYgoFdhNaetp5d/Bzb
+qgX9hKkZQFC/Rh+HMUAkMzge1/oO6vN91WJb1q03dLz1aVKUcdNpZgwANYAb2Mx7
+Gxx0C+2dXBCDZ5hX6/xfeEdeAV9m//MREkBIa+Qy+Pm742+zafl1bcfsKWLBzRkp
+etxhE5vIuvb9IaKRFEz51GwM8jBm4uTWFXEbqueWrP4HsBNHGEchliwGeYO3G6zO
+0ECiHnVr9Dt6xvsiVBTesSyZmqLsnkp5IWwNnmqNl6wipw+Zxmi2Dh7TuWe5/xLX
+PvqZbSw6hEbwxK3Lg0W0UEJ8DpNz7hCLrCStUhZrCYTRrzYB1lGmaJzOjT6X/F/U
+LgOgaqyFOO+YwJ80GHjO3ArLRcENvHIX5ZsEwHp/t6Lhr5oab1bqbuLA9g+ACB6o
+2IfTmxDDW158H0TA58uf9ry7jMiYIkm5n8rFe4pVsAe3073kOtgU5SdzqLO8GJen
+XurDDuswQxOc6LckxWOgECYGKrWXIXO+PBr9EZVtSy7PFyPLOP3u74ddNZJs4A/f
+CUCtvciKyfNbjSfByzEwBv8xKR0A+KI7TNgp404+lUye2LRdNV3HgsqcSfBcba3i
+LlxGti2RFanqgoA56/mwYrjsnw7coTF27re6Ka1Muc+2O2pzWpPpot61Y0qyOZKc
+u8dpQUjYqjwEvWSf7fBw
+=WoaW
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-screenshooter/metadata.xml b/xfce-extra/xfce4-screenshooter/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-screenshooter/metadata.xml
+++ b/xfce-extra/xfce4-screenshooter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-sensors-plugin/ChangeLog b/xfce-extra/xfce4-sensors-plugin/ChangeLog
index 1128709075ca..9e6884c51d64 100644
--- a/xfce-extra/xfce4-sensors-plugin/ChangeLog
+++ b/xfce-extra/xfce4-sensors-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-sensors-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.46 2015/07/01 16:58:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.47 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-sensors-plugin-1.2.6.ebuild:
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 99bc9fbf9be9..7a8e04562bc3 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -5,14 +5,24 @@ DIST xfce4-sensors-plugin-1.2.5.tar.bz2 399758 SHA256 6b3c12917116c0610c0ca08243
 DIST xfce4-sensors-plugin-1.2.6.tar.bz2 454524 SHA256 235ef842bd45e701bceebb21a384ab09f21afceea8ed95f91bb4c6cf3abe1bc0 SHA512 5c520f1c253df1bb9e29855c5ccfc1536034945ca68b43cd8b6d97083e528b2430230d9c51d43953a71c3f0171ae718bf1557714729b1343ebd51f91f3f36d60 WHIRLPOOL 60b1069b621026f37637ca93a5c8a956eb77ee234df472fef9c2f3bec56efc5f09d923e23fd7ab8ed76526a14ad414b3d82f2c2c2d7ab68118b4bafbe4add9f0
 EBUILD xfce4-sensors-plugin-1.2.5.ebuild 2004 SHA256 5534c35d122118a4750e2dd9989f2bed5617012919b322e2ff1b544c4e2ce644 SHA512 06a65dc5bd6a957f2f0d79a2b7752264063aa9474758411a45a212daaad998ce3f48728a11e53007622927e325f7765835d9c86372a019a7c9a1dcda140e98e7 WHIRLPOOL d2f21938de56e8b464dcc6ec0ff648abd601d143e6c289722cae3f0c9a9fc4dd7b24cba0f88eaac96e5cffadf46a73710e4af96d130f1d4337bf10b1edb410d4
 EBUILD xfce4-sensors-plugin-1.2.6.ebuild 1936 SHA256 307fa52ef1e3984a7b80d39abedd00ac3ebf2e2505cfaa9c2199abda6344576e SHA512 03b1e2b66f85f2bc77bb8ac0ea930ce910abc7a0a7fa18ceb4d6abd644a7d21257f2c779c5479884e22355a34d98232a8017827873eaa83f8669b845dce26173 WHIRLPOOL 30d280139faf47709b411eb0d72274ba19b21ce9bd1528fea19e789b8a8674f88f1c00410327dc7fdc88a1e56ed33c5d68e9c063766a00ba3b44579bc4a8b43b
-MISC ChangeLog 7307 SHA256 b7d649d11286ec9f66e656fc831fe0cda124c22050ed7c4ffe5ae0d59a62a92e SHA512 05c0dd5aeb16c06ec0e55cadcb07474d3450a2f400d3dd43427c640d376f6c8786c039913515c505e91cd48d87bfdf41c36e2e322b71ef48cf4d91b1cff6f44d WHIRLPOOL 68125e877944832645e4bccad904867bd485b11b087911aa20bdbb0a8213964f665a4ccf1f4807da20840ba31e2608b13db5dbe65b2fe205638e6f12e7ec645e
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 7403 SHA256 2657e869db7f6dae1b5c8f2e951053b49ce290f9c4b44e05db17864e7ddb3447 SHA512 df38f434bda060657683ac420afb63a8de43371acf0b1bfd8bb12f5e43aca1b94548ab56e9e9b81c1df863f19a9e3ab151f195d7d7b3e3c45a3ac48e1f994f4b WHIRLPOOL e0de626e15223eb6191a47c7350381b2604c6bde56e29668239b2f2fb987cf14dbbfc59b71c6ab531b080567ef56996884a2bc72c35cd5847b2e7ff47dacd168
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUG5YACgkQG9wOWsQutdbxtAQAhz1g2LkMsqQPj8JBvwmvc+B2
-u5oLa3vT3if/1dNvqeZ3VuiV93VMZlG5tQqX6VstgrUiLj1vccI6+sSTuavxiSch
-Svyr1acsCIaf/ePnUtN3YlORjRoRdpZONV922uACRhRJ6HZKocqehpgAjeBmDH31
-1Ib08iwqIFNNDH3suks=
-=8Q9d
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VJxoQAMStsWElYJO+YgOaCfXYmjws
+MiAXDdSrFcg9alFc9gIwOyfOiSV5jXps4QXbSkMXcpSyWtLoMSBHTEloJ6MhvzxI
+i6R99Are3Szaqm7alx6ev5P/jWbR9ILMCCP2Pu4L8iaff8LpIXe8gWYkEbhMsxhQ
+vpVNcXqMrTc2Su7PbvXQos4ChGDtlPo0MC9GpY6ryB2osoKLiSpIygvzQ1HsIFTc
+m+z1l/QkqyHBjA+dqhavK4qr1Bb3CZypJe8gLmuAV/DqdwaJa5SeGtMwNq/xQniL
+YkOEevY7mqz0eRXeNVXW//vqAIzMgEAzTshUmYKGBgy62tT34b7b9G1KkTIHigDN
+qYP2Rup088UzZN0wlTnIgrqG+WM5R6mjoaMIaOinsJeDY0rGJVeVcY3iNoRLSQis
+v5sdIgwBTuKB1MfTjzwaPPUNKxj58t/Z18jdjPbKSAmKZWraGdPDUoFiNaOSf82q
+/BT5TuqMhDnEw4BCZUFt2mBOU0vnkIRS+tSFlGskAJrP8JMtDXjMSqZovgidZWVY
+7IV6+a/0+PFsuv1FzH8CTDydX1sb2NRuRHgWkApqC3eamK622AjLKBYisJmYMZWX
+r5YrNsSX8P9Skq9QMOXlUzIYrT2qwzjDaLJxOCmN6z+LYTOF2SLgGdOYCa10BdvF
+TCCPgSUDHoo0QowsXerA
+=BmtE
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-sensors-plugin/metadata.xml b/xfce-extra/xfce4-sensors-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-sensors-plugin/metadata.xml
+++ b/xfce-extra/xfce4-sensors-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog b/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
index 995023d94815..8679a609eccf 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
+++ b/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-smartbookmark-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.34 2015/07/25 12:21:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/ChangeLog,v 1.35 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org>
   xfce4-smartbookmark-plugin-0.4.6.ebuild:
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index 17d68931e894..1d914dc6b902 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-smartbookmark-plugin-0.4.5.tar.bz2 271402 SHA256 6aa4269a5f4b7a3332d3
 DIST xfce4-smartbookmark-plugin-0.4.6.tar.bz2 280664 SHA256 3bed2b322cd39ce5845d6da07938c702260f3f1a9700b690ef377fba752ba24f SHA512 1d08b26761189d5e3b9d6a3e7f8a6bad8b73cc48ecf6d41c675bb13cc1074f48aca94e953b8d6cc97259c64c4f9f0aca9f0b0680fc4c6a9f01b13898175a5645 WHIRLPOOL 35adc639db061cb3158ad274cdfecfa0a8ad47399c8ee308086b12f4f6c4e6818522154e06217e75f56ee1e52abfb132c837aeba40b91f19aa4d49c5392eb69b
 EBUILD xfce4-smartbookmark-plugin-0.4.5.ebuild 1098 SHA256 fc811b502416939d8cd79e18daaf609d5a275ae8f9ce21a9e8dd7443b0b7b08e SHA512 a8be17b71b7b2056c75dd805179870424337f7a4eb3ef3f36b401031619abc6e3b7d58352695a8e3ecd455a4c421f5dba98dc7f4e63b5c18da1c4889ef72ca38 WHIRLPOOL 3a99cba853addf3a036e8ea82e6ba219d1af7985db52eb22a92645cd0b49c5420f7c03da26f93aeba549c98daedf49abbb9e6e17e996f76f18d68e2b4d6f1988
 EBUILD xfce4-smartbookmark-plugin-0.4.6.ebuild 1107 SHA256 7f147e0926353a8b7f3dfa9316f68ebb562dcaa6dbad0017789de072b6df5c97 SHA512 003bfda166c42fbb5570695b42b5f12ca33773ed297cb4d809983c49117814d8e0e0756d27fbd00f1060cf23648c148bc4b13b00bd8e3bada9e77589871b075d WHIRLPOOL 56c58a1769316c3c74abb358517534fb09651849c84dee916c6262aa830a4763ec780ee0164352198d8fe9cd682a007c1165b778814daaa50af47a9221b10a1d
-MISC ChangeLog 5298 SHA256 1472472364868b09b5f1f38b8dabeea71e264e13af0d03f8beec427e462a44fb SHA512 10ebfe3c293da362f8ecadeddbdf9158c49db29d73df54a526647f9d5de39869d66451059aa1d1514587a75d6d71584849e5fc89d88fa5cd48d12cbb0a7f3176 WHIRLPOOL 5f796db39b9d39901b963bce1dbad92e21c0253f17b3e2beadb3734373e0643ff93395bb541e7a2e4cff3983cecaba5a37bc9810f9bc1dcb964208f2100be336
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5396 SHA256 1b04aec4a1b7beb626a9847627c589d6640cdd5eeba23db1632b57d198278d76 SHA512 6dd95f3f9388ba8a6179a5ccb7725c7d0dd2ad945b44d31468ce0a157f7766ca3e9ac4df980b67698f8dc59d0e6be29f8d8b8bf601bed866ef98a72418650625 WHIRLPOOL 4ce92fcaa8a91ad8cc04481fd2bd1afc67f87394e52bf1927c681f57fd34c90411557f94d55b07bef644976bce2d8c7a1c46df06393308d8c80979cd296b023f
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfzAACgkQCaWpQKGI+9TKiwCbBgdixCs4xQfxnxgNAlpg4+s4
-/a8AnRuQogdT8kee0uzA08S5+ngaPOkQ
-=bPFm
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VIeAQAMyRggbwvaS49oGwbviQ6+yj
+7sinGlPGhvIjiJXpa9HBXiXGBBffb0yhlsalInsJBioElgJ6ngJdLx/FZnKVz4qd
+xB1oBjCa03pvww91Lx/v+NQIGVAFE7Yr+UAsnbqi96zQNJSQ96z8yMUlA59czMcP
+BKN2Nxf1nIDleBZHiV4qkK399gFtSfQVzBWwEXoa2ugsGnk8B3+m3SO7M59thQpn
+H7vRGhulyIRk1NxGmRrEwPJwVsUduf/zS73tK8uz6dlLuMyWT23SqrTGN8LXGg2H
+QgoA0YQ1Dx7a7SD0UX3j1Tm+xu3gW97VQM93vnoLJ7Z8r6yXjbNey2g74BP+9Gb+
+J6QmEbBZiW624RA/NAQtzAANYPZfP5rmwotoII/lUs/X+0aZhT+r9CrMvGQAv527
+uVB96xSXbAP/hMe3HC+W+bzdumr+gQ+V0zodQPAbkzB7+k/DqDWRCIFw+/N2GINt
+8o4GgitAo0R3GScgHZQeTZQGSpL+m37qb9rZDQTeZ77K41yIY5I0jQUTpojdEGS2
+70x8ZXBqICuDPsj5OOolR0WRbcDK/TnDbHh/JXHdjzwtBuQXCV3jyxEEr0hm/aCu
+B9h6njvnxj62SpKE62D4KIFTr/+muA7pIKtHbYdCtXNOotHblMbrEdbA6PJOG81P
+VabnImlS6w5HiZXA33cm
+=CkjJ
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/metadata.xml b/xfce-extra/xfce4-smartbookmark-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/metadata.xml
+++ b/xfce-extra/xfce4-smartbookmark-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-soundmenu-plugin/ChangeLog b/xfce-extra/xfce4-soundmenu-plugin/ChangeLog
index 4a74277690c8..65c319635d91 100644
--- a/xfce-extra/xfce4-soundmenu-plugin/ChangeLog
+++ b/xfce-extra/xfce4-soundmenu-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-soundmenu-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-soundmenu-plugin/ChangeLog,v 1.27 2015/07/01 17:00:19 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-soundmenu-plugin/ChangeLog,v 1.28 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-soundmenu-plugin-0.7.0.ebuild:
diff --git a/xfce-extra/xfce4-soundmenu-plugin/Manifest b/xfce-extra/xfce4-soundmenu-plugin/Manifest
index 0a2adf4a4889..d6b494a63150 100644
--- a/xfce-extra/xfce4-soundmenu-plugin/Manifest
+++ b/xfce-extra/xfce4-soundmenu-plugin/Manifest
@@ -5,14 +5,24 @@ DIST xfce4-soundmenu-plugin-0.6.0.tar.bz2 325349 SHA256 ff37c687ef29fd27ad14c06d
 DIST xfce4-soundmenu-plugin-0.7.0.tar.bz2 386162 SHA256 d8a8d86ffc09363984e4014ae188c1c01c51df665666a081188483c36ed871ff SHA512 d0f5815f70a64d8b68b7257d90697dddb465e77b0acfa4d0b75c4dd23864e4b3d2e58526932d9a5a9fdabbbdf2e8e3b24f8e5f26ad93e864dfe614139f7d3748 WHIRLPOOL 782752b2d69ab4301712025d5dace1fcebe4a41d594e24e3ec2bb15ca9a8de65213c82ece2cb208bbd638c0ba8cbe73064342d970d166c6336d6ca882ac9863a
 EBUILD xfce4-soundmenu-plugin-0.6.0.ebuild 1158 SHA256 2f5b9fbb582f536e6df2057641ad3868c9a5a3e7281fec3b499757f0988ad295 SHA512 1e04a64531d42ebc93568c37f70a371f1f08b6c78ae91a26b07f22faafebbd1cbd0e298a150a3135bc52df78325f17d4f6d6f8ee1c40651e215a81f2ce557202 WHIRLPOOL 8b04e81c34b7f2bd1efc527ec538fdda4002ffb386c706e7d379c85a8ff0e8cae8d6540365ede5d9be5fd4ec2e4ef171946614b5e4a5783b47340feefaf7670c
 EBUILD xfce4-soundmenu-plugin-0.7.0.ebuild 1248 SHA256 2fb73963fbc75796af60b891059582d0b3e40424ca195b7a1f204e09a61254b7 SHA512 43d2d81ad3157505f1a42f715201dfcd8b9300285a6142c99b9139a5f92128429a7bd085c10511b38ba4d52fc47b9bc235e2b18b0c0ecd8c9a7f2c9563460ac7 WHIRLPOOL 63de42cb47b80aef86a4846f383d1f5decb3d906a821f557aaf18f708b982c0c1625703e87478c5dd1f4f329509b1ad93915a88fdfb82cd9240dee76c563dcec
-MISC ChangeLog 3846 SHA256 64485e1636a23b38ca48da3302de90bd8947c1b1e124699304feacc5faad1ab8 SHA512 35e7edea737b34b4df7d3bce97e5359e59dfbae3618c8a6bbd2f15d86f87d9bf2c94badc9ce8b5054aaf9026fc5e78ccdedb22549dd0aa24dfabf5ab6d945aaa WHIRLPOOL 1ad075d780635d666075e50667a82b804892ddfc1285f19d95147ddd4b25e6178c7189f765b627a62852dcba6c20e2db4e1a97e31c4ebca3419e9f571dadb574
-MISC metadata.xml 574 SHA256 3d2bdea20ee45196ea7e5ecd97caaf01474453cb44abb97c87dd45a6b2b68cea SHA512 de7f318f0bc9c428e1f4ea8496b7b99b8fffd76081ae1c0c8bab8806e6b6a80e0cc66859394bf3856e47fb31740ccabefb46931030bd6603e76ff870d0b81373 WHIRLPOOL 1ba4c5a5954423fe9c0be1abd0385bf7d44d9799875b0b59517edecd1903c6b046d2827653ce1678c9dd19e9154bce18439ad07fe7636a8296f9a09edfe871d4
+MISC ChangeLog 3942 SHA256 990829145bf64112e3f1ae7ffbcb31e1a4dab455c8c8125a4746a626c2909560 SHA512 e78e3158b8629028e00c7a121a663bdfaf4b69da8a11334229876ee5e9bc92cb1014af37eeccc59e609b3f0c09f41a69b60c511d50f9280c6ec157e2856d0b51 WHIRLPOOL 53ecc1de4ec6f77030ea61880392624442e81b7b20fd0108f0f2d04f96d2fb5da7d0dcd88de6dd07acc9e932bad337b63e698ef3c8f68e077619d8fe81dd9e07
+MISC metadata.xml 647 SHA256 b37718b876274c4259e408b5bf2a512d47d091334f5adbb1ea0a2b1f9dab2ead SHA512 c6304f9a305df9b8dfa9b5390baa690f7fcee4f5fc90e2b2da2dfc055361410181b9b4727c487461090aa15416dccef9867bcc12a12a6acf5a8d4af94bf4dffd WHIRLPOOL ee60ef33800ef5e5d4ac0c2a3069e0b87dd8a1d36119d2af83df137d5141de20a13561463c44f51b20ba7717e2a45feff258cd1ebf04041980b0bd96721ab0b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUHB8ACgkQG9wOWsQutdbNhgP/VozuqtjpaIT+4XysipgM4rTC
-/w3fq1FPxDQHpHTAMK9Ir+3Ho24kornxA5qxXL3jTTPvct1DTcVEBNhuzHvGur3u
-9vnj4Nr7azaBUN4jdc1ChkpA93zoFr9Xg9gTCqwRGIW5BOOcm9BrVC9zYF33Pooo
-oo4z/gPw51jPFaOx+Dk=
-=/caZ
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V8PIQAKMDrq+YGlnFyuxOT/kNzjv2
+gPef54TtLSoS2QMWKw7GX1cR8wIRc0VHir7qt2XYZNVpKIZayVoKZrf4bokcyJCu
+iLYBdZ0vR9xUNQvLANeWsVYCoCeFgDl7uTlpciCWkMJ7PtbCgErrkbwLDV/4ptH2
+iTzfF62miIEhCr3VlXd56+JtxoLIHDYdZe0B7d3EZeDXxSFSpN/JfqAEDI2iNa51
+fpfI5sLcCPrHhmxbEYttr7zB/BZlrTggHQXnOt8dYOwBb8rn8aHp/hsOCCZX8qPU
+Q96byYY8/ntS9nq0UM4Er0v7wQRjlpZOXgUr4CPa+k3VIe5tyTTwGDuuuuzZqOdM
+y/b7n8oSlcFcybeBarXnIXHdqfV2pCpjOi+5ZScMyV4Ga8k81rewVZZk3hFoTVHl
+hsFptzlE8zN/3W23Pz+jgoeDdvpHATu7FPu3xuUwDCy1imhW+55NNyd3ORGoPriy
+WmW2Jmf9Bzrx8Fe3BNGCW6Tejj0Xsth0FZNpdyKMYVjfccCmXNkQc/rJxHfD8YCl
+C5pqLB0nGLGKyosNb7IutLsrfAYr3qUjzWaDsh1F7d2Z5r4LZy5nQ4Vkb9DnWA9e
+JzNmxS/NzOQOTp4PnDnTHUtipIjeovFVrT6uhFM8KtebsHIjQDszoNzKsqZrNLBu
+u9FMq1pHS5FQoEeVXpIu
+=OGhO
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-soundmenu-plugin/metadata.xml b/xfce-extra/xfce4-soundmenu-plugin/metadata.xml
index e0ecdc4e6275..c24e733f76ef 100644
--- a/xfce-extra/xfce4-soundmenu-plugin/metadata.xml
+++ b/xfce-extra/xfce4-soundmenu-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name="glyr">Enable music metadata searchengine support using <pkg>media-libs/glyr</pkg></flag>
     <flag name="lastfm">Enable last.fm support using <pkg>media-libs/libclastfm</pkg></flag>
diff --git a/xfce-extra/xfce4-systemload-plugin/ChangeLog b/xfce-extra/xfce4-systemload-plugin/ChangeLog
index 7610a7ff6a46..02ca8b624c88 100644
--- a/xfce-extra/xfce4-systemload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-systemload-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-systemload-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.40 2015/07/11 07:10:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.41 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   11 Jul 2015; Markus Meier <maekke@gentoo.org>
   xfce4-systemload-plugin-1.1.2.ebuild:
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 11eff53c0263..60ca0668d133 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -6,12 +6,24 @@ DIST xfce4-systemload-plugin-1.1.1.tar.bz2 299695 SHA256 1ac13efbe9e576c9effd5e0
 DIST xfce4-systemload-plugin-1.1.2.tar.bz2 305948 SHA256 b469b6b3a08ec29b9061151950d876d36bf25a3106ec77256923fdd6b5d18a7c SHA512 4d2216a707991ca17e7a935a6836a5b4236c1ab38e1738a57f754d63aca3d183802e5e530563a6e31c754ba6e4cd225742b4f23170acb07277f18eaee682fd31 WHIRLPOOL 8191c03200a5db22d4e5c9ee34915cbcb5363a4ec6e5c20bf06e8f569bea137c9f7d590fd0fcca9f8cb99c5f1f51484fed736aad6ba90da536d4691e512a2e4a
 EBUILD xfce4-systemload-plugin-1.1.1-r1.ebuild 1073 SHA256 6f095074713fca147b630b19665c91656083f709438ab8f0a34302fb6466d6a9 SHA512 822dc831c0ba868fe44f1aac0bc8f6e726f54debeef8f2c3cb008901ef92da2cb40b21df6094c0267f2eef648786e004708721b3783b99b86ddc248b30154d2c WHIRLPOOL ea35225b03dd42826ed799588a01ce777b1bd34aff462bfb0aaa5c05cad1d6c3f1a50a681e34b63ee7d36420fb832d4004616a4998234cbd588e29cbf7dac34d
 EBUILD xfce4-systemload-plugin-1.1.2.ebuild 1024 SHA256 36387051de7baa9fa2adec47eee87914965460ce9fdd72bc7d4aeb858473f74e SHA512 8590eb1756f233c0b3b13c684557cd8aa3e77a4b17c772808f114275ff45e15d43c4d25023b7e04cd326661c30e6f5b3a3d9bb018516d615674a6807d668c0f1 WHIRLPOOL f3e8e26ef9a836f8de6cbcdd63d87fad964a4de289aae3d63c156774dc902c6043d77b04d5192efe499c7c13071203a8d2c4fb23037d2330c0eda31959d38b63
-MISC ChangeLog 5802 SHA256 49dda2f54d2f8dade2c33af4e3913248467411204c402689d053d8474b44f514 SHA512 18e42283ff294271bd28305be7aba763e0f83bb24ddaebc94331d6dad8fe96d30ac154d0fba90a05dc4bdc91340c41517705bd178cc44123f4da7fd2902eacd8 WHIRLPOOL b827c4011ee1484ae912a4314fa69bb73cc57545e99e3afde7fa10fd98d08d5a2e58b7a4ccc47a57773723a8f788c24d0b57a98dd3243cc2c56367abbd028943
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5899 SHA256 0caae20054f3d55f7762314623336dd0ccb259cbacff62e0c9337da24ac978a0 SHA512 8146247f7c655483ff482994fd26ce2b8ce888f99d76a689ffa042f25dc8bd207e1bf84c8f9b96b0a43888e5c6cbb2fe9c2612f859cffc539eff30f3ede14e17 WHIRLPOOL 3624363580eb78cc2eab92c8119b11d9f1474ffbe566c821b3beea5d665e3b93cbe6416a7c7f6d44d65bb42cbd470089602f1be9456364509c8a470ae4c28dcf
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWgwXkACgkQkKaRLQcq0GKOEQCfQXb+o+kCRPPd1HyiMs1hv+k7
-pokAn0rsBh+hTvBlkQgaZ2ZRu3Sifppg
-=orSz
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V8kUP/1zDTIDga3qoAalhv2ibEqxD
+Fyhcw9MXZcDoIWXKo/D6xQ6akrFAVFjLYDrvcgGtO+aJeYDZTB3ilxU7tBEd2ki4
+QIGauxzPkel+omw+1/J0PYmlRbUTZw7utg2v8mLkmG/0Z0ttb742d06LYBjioT8B
+lvl9Kt10Zri6wzlW6IV4TsWDn4e/08SQoArJg9i0o4WVGbiXw4Sz5vdUvuEJ/V2w
+RDaqfUqieAQ1SX7c3Ro54TZ5X34QDKF2RUjtSJ/MjNUYVBXCN7tljJMsh8nPP3kn
+/vI5QWpil6aFT7Bys79+3QcVIGddpZxWdmLSheyydRJzYT79/wf4XV0Pl3QOPGC2
+ifw17LPgFrguRPKk62niA+o66efF2jcOs7W9RAyw9/8TQTxKxvCz8blKUtb1dQiP
+ZlGDgamUMnuAHkC5gF996cltZMHS2yFFAezvpR0dmvt4GUa7R4SOjj/St/Bnw9c1
+95r16jOzvG5fOt72tb1jUmjoAVPRX6jHmY7jmmV/zexxARVsQQGChvhtkzYcqBnv
+29gygh7ItU+G+TCSdUBxo+LlkY1SwHEnhvYV5jx9y1q6BQ3S4qu/mRZvXeam5hDr
+JCE4n6XbXPjSAvn6Kd2xtRlX5pVVnY68s+n+ADFPb2JEwCmO090UMSLphL87Bz/H
+mHIsYjjFfFbwRkuU9VUa
+=Uf18
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-systemload-plugin/metadata.xml b/xfce-extra/xfce4-systemload-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-systemload-plugin/metadata.xml
+++ b/xfce-extra/xfce4-systemload-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-taskmanager/ChangeLog b/xfce-extra/xfce4-taskmanager/ChangeLog
index a4517bddc5e6..61d830c967b5 100644
--- a/xfce-extra/xfce4-taskmanager/ChangeLog
+++ b/xfce-extra/xfce4-taskmanager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-taskmanager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.84 2015/07/25 12:21:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/ChangeLog,v 1.85 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-taskmanager-1.1.0.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index bce62b6937a2..7cf5f4f217b0 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -6,12 +6,24 @@ DIST xfce4-taskmanager-1.0.1.tar.bz2 368495 SHA256 f5aa2796dd9971f8ae400238bfcdd
 DIST xfce4-taskmanager-1.1.0.tar.bz2 365866 SHA256 2e1eb161f966cbfbd68bd029fb59115bc5ab0c0704cb500d20e7d73967e59ecb SHA512 a7b1d1a6836f89747c873c87e495830438cf3093fd044c43c951abca6a82ab2c0ae9a41eba89d570a83f41fb6ad447c9c4fc578930684c981fbe45de19e1d7f8 WHIRLPOOL 0d3525a572326538ebf4d0d1b58ab703bb95b91a3208a8328d3cc9cb5590e500b6d903f1d4ad36a4e97ef164f7110992bc2a8300610111ce5942891e888ad995
 EBUILD xfce4-taskmanager-1.0.1.ebuild 945 SHA256 3098d0475b58fba74806e8f93c7b36b9736905871d39c7079b10342abb541edd SHA512 f2a72dafc2600acac451f9f680883ab8419346fd9f57977983e4b170ef82830442a026099e6dcba9eca60ccb8fe56732579024a5a53fd2ab96a576bd3e1d97f8 WHIRLPOOL 9b65f13672a40fd7350b2288de1884b3c24440b3d264ae91a1aacf724e0cc7485ced9f19236ab94d23fa49649980b01269e906e693cd537e79e5b04f0cddc676
 EBUILD xfce4-taskmanager-1.1.0.ebuild 1129 SHA256 bfcd6cd22893e0ca6a4f2a6135f8ea73da503135ca7630c4df72eaf2c398cc69 SHA512 42d611f1f8a63c80b5642671a0839dbdd4dca29f147ba70bf34fd35b828458df38c1b25b406d6e9999a762b8cbfbbcc31ffd0fc94898d25a10e07fad94e07236 WHIRLPOOL c75aea3b48e1b525ac661bb32a588454d01add90e9c2243528b2e2509b483355b4239466d52c643118d420b97fc99126c10b9527c8591e5504159df510f49d4c
-MISC ChangeLog 11239 SHA256 e69d01f7e6c2f4c56702c7e0ac5235abc285edb9a48e1de53ac4ee73f3205b4d SHA512 0aace44d273a335f8ceda2a9a0015ae603f26cb105c861d28e9063099d8fc0b2f7c6080e87b029b1e76df0f2074f7549351595269266e85ad59f011e7d519537 WHIRLPOOL c335601b0110063a6bf1b1d7bfa296a027dae90f64172fa34a57ae008ccd9a82660df76795479413cbdb7599d0fae643a2b71208266a9b90a1f16ee4d465c8b7
-MISC metadata.xml 359 SHA256 adf95071dab918dc245d63384f3dc6c6664f20a651f1bc12f5451b89c992654d SHA512 326819086cc3d7a4b685e859a48d2b79194d36c41ec3188280205b5bfb1a7d0274b37f406df793378a965c649ddb73a38ff5320d41f9a6167c1ddd93f62795d3 WHIRLPOOL de1094d8bb50761c6e531c2aec7f45a3046067cd9ad421ad8c4c90d62130948dd87c8d8d1cd9f22f019a3ec9330d3d0a052f536d2a119df289b0669f17691f45
+MISC ChangeLog 11337 SHA256 766ba4e9cc95205d1372d0be042e4d71a5d5591246a50096459d8247af9a186c SHA512 bc8541d2e4a7ae687cc04b29f5d25a9586584ccb214135c810f5b3175c1ae61ff91f6f6b3a4f6084a607dbadf66372bf4baf5890b2607b83f5b690523671a545 WHIRLPOOL d6d2d0b1aa6db5a8e3b63718910f2aed5d57cd4aa9d92a14d18958e12cc4dc67d31056bd102783c70f17e4c335db6b81ff6ef56b10192c34456252c392e47814
+MISC metadata.xml 432 SHA256 6e5ce5720310c5039ae3fe8ed8686b3506db1c9c0a66ae85bbc6e55c5870ee92 SHA512 228c51dbc92baae789c9bdb033e585b44d046e83d345cdd017b6c3e7f84e6122f4c0fcd5960616a02062fa89babb9086166b1c464484488053786885b1d9ca9c WHIRLPOOL 25ac2fcf0586370c4597c83b94329d6c056e606ff504a9f5629f836b7e05af552fe7e1b2027401292c992098467613eb709d24c750c407c18d784b6a190ae5ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzfzsACgkQCaWpQKGI+9RjLwCfVUzU1G0zrzo/mlCwATOiEkzc
-1o4An3YEP4Tqog+s00mrOLBpau8bDsq/
-=cFOT
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V0JMP/japXXiiLVgkf/7dOpcSoNXN
+bPhXTX+ia6WHH7oM13Qebr69L9qIglbkta0m/tvJMMfYxXR6dwyK3+lU1XTM4bdj
+xoQ4g0+paITVpBuQvM9tml2wH9TJM/wkgemgDn6wQBJFFahoMEqK3ywLbEID5OHx
+wuHoTfUcJAHBbhUfCJGxI6fr9FKJNOWKxtVy5y+SuJoiIq60X825oLfRKwbOUg5F
+gHx2Y2tnhUUVm91n/w4uS8wXB2t/vrZfZSx81MvkB2Pn6ElpGsOU/wMflbVD8x27
+PQwJoLnoIFHpxPJWKO1Xxng+9qsoA2USITuY690pCrTSsmBGwOfLkYnhD1F4wa1K
+aWI3AT8kj6W17VuYNg6mTsr83NQywX/iERBTeF0GAZDOqdG4qpwIrB7j/MaDqrL2
+krwu3WkqRDp8AjlWd/WjxMMUrzSpaySrz+9Tpuep9rB+W6QZq/2G0hKAOnD70r47
+WyiFQhfjcsXTmeQUB1XdMpkn2w+/E1Aa3jTHOraRByB2gohn8hxqHJXNQCsFNynV
+Y6Sxfoa/x4YWdReijMRAcseJvzBB2jpv2uFxbaqFH4W+xgEfGSC1VGTXnqGwJY7q
+mGA/ogNv5JbcUMkeFK3VRr4kUWctSGKOBuhmValxpI4JHfGkl/UytgDoIA8wKxV8
+sAz0kSxJnf7PQ6f4vXUj
+=GMtu
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-taskmanager/metadata.xml b/xfce-extra/xfce4-taskmanager/metadata.xml
index 047bd5cff30c..878ef7ebadf7 100644
--- a/xfce-extra/xfce4-taskmanager/metadata.xml
+++ b/xfce-extra/xfce4-taskmanager/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
 	  <flag name='gksu'>Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
 	  <flag name='gtk3'>Use GTK+3 instead of GTK+2</flag>
diff --git a/xfce-extra/xfce4-time-out-plugin/ChangeLog b/xfce-extra/xfce4-time-out-plugin/ChangeLog
index 5b8d721165c8..a43ed1aad17e 100644
--- a/xfce-extra/xfce4-time-out-plugin/ChangeLog
+++ b/xfce-extra/xfce4-time-out-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-time-out-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-time-out-plugin/ChangeLog,v 1.28 2015/07/25 12:21:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-time-out-plugin/ChangeLog,v 1.29 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org>
   xfce4-time-out-plugin-1.0.2.ebuild:
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index 4fe8b6bb3f31..ade297bea160 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-time-out-plugin-1.0.1.tar.bz2 333227 SHA256 e342f73315fa8176ac4fc3216
 DIST xfce4-time-out-plugin-1.0.2.tar.bz2 337382 SHA256 c69fb7218c685e516454810291c5245c49a80d774a6bded59c645a1af427c4e5 SHA512 3f49664fc8fd947627e40de0338e3a115806045c97fa08fd678fdbb831947bcfe14c02e9961d671ce7546d4913fd9319322476df590a70458bdf86fa3bd43464 WHIRLPOOL 7577b75771182686d548b36759a84d6a9744e1e012689e4ebe585a09340a8db9656a9b15cdf938b2aa28231f2cd3dfed8b9c7b10b106fef4edc0f51fe5dbf3df
 EBUILD xfce4-time-out-plugin-1.0.1.ebuild 948 SHA256 51f5e740ed78aa021a7c6e5cafb41a1fc4c7e2557416ff96740aa1427ba16934 SHA512 edbc5a0fa65e8f1cbed0c6cbce048e0212911e1654167caa82cda43d90e2f58480613f3477f7fa494692abe4ead96d8ff627988788f336c6edb7af1ae15f8c17 WHIRLPOOL b47b3b10d51c37b5fb6b96d795e5d6855b4192c4a3eaf94742ac8db71624d1f74a00522f7175e7067ff7254e15783c6d0cf0cf66f5154ba3974bedb862875ed6
 EBUILD xfce4-time-out-plugin-1.0.2.ebuild 953 SHA256 7a1309765fc97156ab8d6de0365bebc41fda4157a0d255b831fb99cbcceeabd7 SHA512 63045ccf09bb4cc31e2df00558a02a023b489fab21560561f4fed4c76d87891eb1631a433e7d232daec1103d130f04285cab79695f7b744b9e6985f5827fa96e WHIRLPOOL a48c85ba8344956a0d1b0fd08539aa5ef987318dc5ae8cfbd7204d0f31d437ddc4cb6ae434db8b343d26ed7e1219313e6c515ed0210ae1c3bd9b95dcca369bba
-MISC ChangeLog 4221 SHA256 7e8a3a7192cc036e9503c61d8f3ff009f17f592e2937aa33ea113a30ddfc100c SHA512 239d286bce9a923335a389d601428bdd825185ee458109e05b21eebf707419e80bd85580a2192cb7e7eb56113f10a99b69739207e293086d8bd6360f5de13883 WHIRLPOOL 4fd09136b303296a957d7820273a717dbc32e43f1b06e88d5762f8fdc3664a519623299060a7389ffe6a62c0197655bc691d76c1d886f4ef231917498426056e
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 4319 SHA256 b5941d68f6397102d0f7261284366208dc13280fe22e0c8bd3bdc357dac348ac SHA512 9a12ff6582edcd228498de29990dcd59656eb8f3bea83661566959a19045b1de48f01f44ce559b54a3613596df3c923546a088e7e5ea6cd162ede40512309514 WHIRLPOOL ca61a50a95e053a75c18b0e1c316b6cb18ada0e8ab824c818ea7398c1a6f8c62a882a0983cc2b6b4a1c9250f434d09d9f366a4382cf0200144b985d29fb53eeb
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzf0MACgkQCaWpQKGI+9R4yQCcCPYbbE2+cODnEjLpgbBsYJa0
-ZY8AoIICNFccI+X6AF0yVv0qGmUejBX+
-=yk4+
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VA8wQAJzEWMpWm8TzotolKBckDXMo
+QEYqzumIutSH/MwbQYTMW7U2AhBEeNeTqsu5Wo/HgE3vLsCYU2FNgjmRXV5RztUz
+kZ1wZAbgvTctzaAAJksyFenptQOrRsLNTMdHt/8A48LaGgxQRrF50kC37yqtNv3M
+KncvkrEIXQD6X2iCryrOO80BPFwbN0n3wO04jxI/awO8h2iug8MUpE/V36wCME18
+W+hhtpxsdOGcswpieqVQa/dGKYaZcNzJvwiMAuKimGty39YL6WSQJH5bylS/t60x
++E+0ZEsghXSULCGW6tvfwJ2o3KrS4oimB1npcTcOEc5RY/KEaItFmwGN+yghUhyG
+1oZNAhQpQYEdWC3tmmUnRxXFb60+CLZSx82Mh2aM7f2U2OQvA141I0/OCqBuFWfC
+W6JCrPXndRa1mh+fT1wvoioSWY77ilUq3FNLl+v7opV8amW73KfHQSeD0Zbep2zd
+QriqaJL0SO+pDRMw60Ne0lx3bM10FRWTpzGCcM3kVSAeVVvgL4/3j2JJTcwL7kRo
+YD4rbT929LI2MtbyRG1DysQ8ZVoSrLSiHT53xMKaN0roDeUTh42Dv/yl40ukCJeK
+cUFXofx2uGnd5u2qVDemfznbmSC0UIUZ0i1vIU7sUCRISNXsg7aquH9UqhtuDSj1
+wtjZdb6Tx6+tywGecZ5k
+=WUxo
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-time-out-plugin/metadata.xml b/xfce-extra/xfce4-time-out-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-time-out-plugin/metadata.xml
+++ b/xfce-extra/xfce4-time-out-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-timer-plugin/ChangeLog b/xfce-extra/xfce4-timer-plugin/ChangeLog
index ab89e9196e51..61926a1c1e88 100644
--- a/xfce-extra/xfce4-timer-plugin/ChangeLog
+++ b/xfce-extra/xfce4-timer-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-timer-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.55 2015/07/25 12:21:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/ChangeLog,v 1.56 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-timer-plugin-1.6.0.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index b1dc2deae597..a2d7518318a4 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -5,12 +5,24 @@ DIST xfce4-timer-plugin-1.5.0.tar.bz2 301575 SHA256 ca2ce0bb4297638e9891e44ef968
 DIST xfce4-timer-plugin-1.6.0.tar.bz2 325662 SHA256 39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c SHA512 aa2c6760945fe28fb1e8189b167dae176137164c017acb7057c93eb579147ef31134a840b23c78e3d1914c89865a0cc7b428e3561449f7ae01eb2d8a0fbd5815 WHIRLPOOL 894abd2c1dce539b9815c5593c391fccbed519300dfc87527af5370185dda5b605a6c342084e3bf2449f4e4504858f1e8439a4dcbe1055c2b6d8d673c329ed17
 EBUILD xfce4-timer-plugin-1.5.0.ebuild 955 SHA256 36342905102325fca28638d5d3ac3f6f275a94a5f5e11f2e944eaffd95a93c2a SHA512 09083b860f49127647f47b9ff084f79a714dd5e975d03391bf8a495cd3479288c07e7cf0a82421ef3f39163d2fe4b1b8c0e4b69665aca567c7a698cddff01474 WHIRLPOOL 007037102fbd84a42daf6e0cd0402c3f86b86fe443b22cbd625d923d39e39e7cb60af3b9fc0fde3ab6bd550e4da20cd5c858a605c017a529dcfdef3228146b75
 EBUILD xfce4-timer-plugin-1.6.0.ebuild 964 SHA256 bd013cd275df0bcc5c85c7a88a8adbf61d16ffa72a26fdb17bf7cc9f8d3d2391 SHA512 8cf54ec0f231f88dc887a1bcf2651f0663531112b4a3258e3f9561acf315b0b246ae7758b9d778ed421990dffe856fde0714e4da637dbe80e54532b7c2018f9c WHIRLPOOL d520f75a70eb83518027af650942325a63764305a4daf01e9f22200540ad3a1874c869f37713edaecae4a5225150b8b7ea4624be60fefced071374527d650387
-MISC ChangeLog 7173 SHA256 f257771b1f3a680beb5122b3e9ae5a3e8f0755378679875fa7b095dee9ac275b SHA512 9bb06ae4e8d76f569182ca6c397916ed02b396b59f063e94ed5c4071c7397c9e1d57f9054074b61d4dba738aeb8be38879fe8a426368d89c7ba4d2f1ca06317e WHIRLPOOL 588b32efda48ff8a0afe1c229b36c5be74aa1528f117837b6eed957837b84e163e85cabffc27c8a4cef4c76b78f3234acd32b42c4b204aa0072b79c12d4f55bd
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 7271 SHA256 c2c7950b8f77317da3d3a3e084dfaf42f8b3a0e949993b1d21c262cb48943b7d SHA512 987e7cec68483e3fc8403dc6b0cd84f11e335362b10b8ccd08a327218a9d20a0c087bae70756bcbc4f3671b91c7569eb2fdb26355550de0a6ea39ebaaba4f668 WHIRLPOOL db45c28b60f02f4245f9df4125945eb0003e9cae9ca0f5a1ddd220511f3ed9e92eb5c299190b559221534e3a404dcb1213dd397d29c5cecb2dd413e4c7946105
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzf0wACgkQCaWpQKGI+9QccgCff4tTZuisBBOCQITZwmnghe6f
-9LgAn1cAT8K/ftxcJg9kWYBQIeAfc3Kb
-=7YXg
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VWpIP/18SVmQzWiQ5m5WMRf+T2XPn
+ksqY4pYKUoYjCQwbuOHAl5jUi1eF+A4vw+VTz3qAReGn0DqHR7vaqXUXzVhoKvRM
+7AlipgykskxpEgwgW5Ktps5vHBrUIaumJ6/lHXoFdjR+xt7K1ylHPiWAlhe4kKzr
+vVtTUX8JLx/mxecsXhZjNT4yZKo8pNzlFzof9sGpnUq/tJdHkWtoEq6cR3gA772e
+Nx3VAOGHsvI0pYPB81ejTWtOSwf10S4B5aGXvvgEkpWQTKRktIxF6zPOIpz6RQVW
+h9VKTE1+IHLlWAv7ouCtwboIMIhsyonxG2ak9pjvkXa8cSs/HUmPv/soi4uBNNv8
+D5Kgz054XTTS+6PM7hB4vnb0ccI9hQQUVdRIvx5MEgMHG+mYclgZnZ0ftdblfPuO
+Dhm3jJqI8WhpSaD1J5qR0/0s+pD4W7pqemCA8pnMzgTifDrzNEn+mMBlB1on13LF
+LDpFPngXz6t05gp1roPYQ54Uu7nFZgY9vkU8MEZE/7V+TFb+VPda/JvxvEJ4GgkS
+InVQCvqezkP1D8XXQRSx7J4q16fnNZu2ZaNFjBBWVznAkpb9kLR7jn7OHxN1t8Ji
+wSMRjqMGSmqjIzhP9khT+qWR/+uPnKBYfQVo/Y4ArT6U2O9+NaSMznA3vZBYm5fR
+99Br3Dj1iYl5oMk/UdaK
+=mM9y
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-timer-plugin/metadata.xml b/xfce-extra/xfce4-timer-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-timer-plugin/metadata.xml
+++ b/xfce-extra/xfce4-timer-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-vala/ChangeLog b/xfce-extra/xfce4-vala/ChangeLog
index b9e88530eeef..ea2849d64f9a 100644
--- a/xfce-extra/xfce4-vala/ChangeLog
+++ b/xfce-extra/xfce4-vala/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-vala
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-vala/ChangeLog,v 1.16 2015/07/01 08:39:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-vala/ChangeLog,v 1.17 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfce4-vala-4.10.3-r1.ebuild:
   x86 stable wrt bug #553500
diff --git a/xfce-extra/xfce4-vala/Manifest b/xfce-extra/xfce4-vala/Manifest
index 593451a06732..ae108f54b7e4 100644
--- a/xfce-extra/xfce4-vala/Manifest
+++ b/xfce-extra/xfce4-vala/Manifest
@@ -4,14 +4,24 @@ Hash: SHA256
 DIST xfce4-vala-4.10.3.tar.bz2 88023 SHA256 07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b SHA512 ef5d6c67d53edc428ed10e59c21a1264a0d6d06efbea531a15f2eb1309e632e3cd275657aeb01c5723f437b9c319b922055598f97b0ee7db45853beef4f4d987 WHIRLPOOL 8fbb909f3177e2bba8108d7a509c6c49171125596d72fc5484360dd3cb66ec2be0706ab3c084c92a12a1fdbe3355986e12763bf2be4a6fcf908b4e52ff65ee1f
 EBUILD xfce4-vala-4.10.3-r1.ebuild 1013 SHA256 a0f8baae12119c9ba3c68d207ccf78ce067d68aa7f8254cf26ad8deba692c5fd SHA512 2959a2a0160667202f61250e7cbbcc54fec818f1cab6eecbbfa8bb75858b27c857b0bd392362d8880e2636caf5127cb3ecabada7a289502b307fc032e15ac211 WHIRLPOOL 6b9868d51a46e15465209d17338163bc1158b59cb385edda7fe4ea716d6f1fe3bfe8a591ee0ef29d4fe6a1358625f75c9f824d7016143a47032c91ede81b63ca
 EBUILD xfce4-vala-4.10.3.ebuild 1013 SHA256 bf1fe70b46c29d80da231e65a769ffc4d5892502d23e52ea67840217049cb373 SHA512 cca4276a4d74202b5d89b7424e41f32b035667d89d317df39cab5945cc3732207ba2c9d0225f69f5d10b9d8938f1991d65d03a58b8072343a06d36e180a25230 WHIRLPOOL 56a21f9addc3a6b22464a6324a020e02651919086b467a8cdb52ef37b1ac3da7f5b40239301b45b956a955560989ed2302260c2e7d0b63470e71a82907f79753
-MISC ChangeLog 1842 SHA256 0cc2a15d8471fc29a0748349b546752c4dc68b8163563ef64f63ac21d4253933 SHA512 129321e71ba6af5f461b4db6c90a744b454a8fe3bf93205cba03c75d49338ee854916b5ca25f9d3516af329be2e3b381b6a8c726ad82e08edf5953e68b4d8c3d WHIRLPOOL 8bcaee4677ca9c14b845c7a7f40b1f280ec1562bdae874b95c2603449230caeb6559c98552e5ff3f4a311bb798e3f5b380f676d1bd9fa6e1d39668e304bb6b35
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1938 SHA256 b37a8a745bd2b9c1d8c85eff5c25cb2f0f710d89c9ce9f6c2291f89c163dfe0e SHA512 62dc579a92b4cb67511908c5e8659bdf1efbee403ffaf671ccfba4290f33ec3282b4393694ca8cc7d1c5eb9e488c7e904c876174e6f76c6ad8f2e777d666df0f WHIRLPOOL 15cf11f3db98fac88294531f8a5291420e5d5850aabcf1f7fdcd6ecf09210952aeeb5fa46d348eb58fbbec4c8b4ab2d0e19e87f172ab91fb65194bf4ea35f568
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWTps8ACgkQG9wOWsQutdZImgQAkZpz4J/s3sk+kF77iHF5oM47
-rWjPUNdRpZcEK6dN4u9Aa6Ec61zLZuoY1G+jGqyYGdX15gj1t9dgXS1SYdGZVbNf
-XRpZAVURyWnFqf99NDiDjzgqL2w5mQLooYtpAsCNjM6D08/q3G5DGlAPMGRUFD7i
-8HD7Ze2Yv5YuAZUKmEE=
-=ldu3
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VG9MQAKxatdkdYUNNbHoM9BzoDwDB
+3p9HqilwENRSiRIlx4xpikJ0TrWJMhvIGsAwNfN/BeuNh8TLU6rA6Q7VQzjM16s4
+7SQPv19/gX/TFAHGpEjNQFfda7yJGcySRmov48+VtMNnwpWrK6+V/jTil6vjKbqF
+HQ50tyRwjccWZpnR3rLCejh8jqjxUL5dkHroFtVj3QyL2ooS1CTJCZLaqL3issIN
+4BQcQdbhzmoK9VbxV044p3K4nMSfqHcyJMpUXY7fsanRHMpX3BfOHCcYdwdNbN1R
+ZuxwlRiAB6wjl5b0IJtkXV5btyzzxGl5l35fDXLc+iyAQLhrrlhDNVzTV7L5Tcoz
+IvGG/x/mMTG2WgprwdZuqezuFcLCqsSP8V/UfifhR7DZLg4qbNy99VB71EMScAlV
+5I35f579YRnMEyVpQLVjhPsZ7hVc/riF/pV7LyYcEjI7s0O9k0tnL8EPCTjUbekW
+yNWQOVFqijvpOxHhABcp8S2GHOxKygRh8TYTBhnnmdsBVt9unJZ/SCvMwZ2ZGudS
+0btFS3cHRX2KZK7x6xPp6gP3/TrpcJAquvo/IgZ8X58O0Ie2AfX0sMO0zI/c4o+n
+0GXjNMz8yzt2/PzNQmtOjzufb6s6ZXCHEgcarIrN1qSPgqEroQrCJjbltTSNLrvG
+PPI14knrsYVNIpDJzL1d
+=pKjl
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-vala/metadata.xml b/xfce-extra/xfce4-vala/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-vala/metadata.xml
+++ b/xfce-extra/xfce4-vala/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-verve-plugin/ChangeLog b/xfce-extra/xfce4-verve-plugin/ChangeLog
index 9b7c7fc0bdce..3a5eb1ba697f 100644
--- a/xfce-extra/xfce4-verve-plugin/ChangeLog
+++ b/xfce-extra/xfce4-verve-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-verve-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.25 2015/07/25 12:21:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.26 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-verve-plugin-1.0.1.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index 812eb882ae0f..5501069111ee 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -7,12 +7,24 @@ DIST xfce4-verve-plugin-1.1.0.tar.bz2 353998 SHA256 a3196f818c7ad57d19cd6581e168
 EBUILD xfce4-verve-plugin-1.0.0.ebuild 1043 SHA256 1d8db105f176cde3a64739583ee2cf731fe7c61344e4cfb3ad6a2e3d950b4b1b SHA512 fb8ced33d9953d40594a14619270e67a941fbd6f2d25f8863467c5fbb62d4827c467c65c6ce6b8e6ea2332f69a798d8d058d3854d793166fe3544b2d68f37d39 WHIRLPOOL 4e1bdbf65fcbac2d7b11deb9d783ede0ec287e3da07f921352e923bda4224c054e8ffc44bda69fee8bf9b91d965e5591705f6d5566448ddf2a7d5f49874906d2
 EBUILD xfce4-verve-plugin-1.0.1.ebuild 1070 SHA256 45482e9f2ad5a5e234c7a22f98a4460e98adeba2dafe28b369916561c41d4636 SHA512 8d08bf8e6597565c8166bbc518ebf42188966e9844022266aae2378eca2592299157187ce21846224105e8d20cedc825ea7c6dacb5e150d1f0fd361b0127bf60 WHIRLPOOL 6b1b9b49855ccc89d1b29e77e96891a1ed4cd712f70e5109eb9de6159c3cfc369e0e3d16537d29f2e4f41866c605a0879b2d8df9feb7f1f588a061d975c3a5a5
 EBUILD xfce4-verve-plugin-1.1.0.ebuild 1078 SHA256 670185cea12459e6da110a96406598a06e92bb658abd25583399d3a92c2cad8b SHA512 c126f3d53f8b8f5d4984bf6e863a51b699a9adee659e59e4d1c386cbc1c90437374375bc3cf0ba4356604ac4c982242fd96ff49bd616d388b9e749ef87c8d115 WHIRLPOOL 60b017366c7c17a729945b4d86b6574d9be986d0259a92ba5d4fb0de0b39fb1a938758067cccbaf90ff7a48645944bc0c0fda8508ffc6cc7d8af949b527e1ec8
-MISC ChangeLog 3653 SHA256 2da5e6dae7f236c3cfdeb7d2b174c014425e2528616b2be25f89191da9131e4b SHA512 653332cedfa8332650d4dacf9a69b1e383f6168ec0fee576980a80314c01aa5ce606b414c12fde7430b8e5aa7051db33a0b0e262966503fc643d53bf14bb8cca WHIRLPOOL 0f41036705701dc0074904c8df73f0631f8f2687191b22eaa28772e3d57ff923f630f4945e19a2090c082f17d39af6f449ebc871a0fb0889e74661adccf9aaaf
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 3751 SHA256 9b823d7468ec5d34d4c8920d53aec8579b4f3cfc69aee39eb41fb85cd8ff3746 SHA512 c01e399bc03304c9c58c6ef49f5a2eced3e617dcae13591a5da94a9b79efdc7d10837acfa1896e1596276a1a8a5329fece0e83b8192ac78fe59f5bb26d6e539f WHIRLPOOL 1952c3485ea4b8d16dce758ba9e94001ebe899bb5cdc0f4f17c040632fbaa48359e299252f25e5528353e04fae46eac276f17adbf2890eca4a69be7e6778738a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzf1UACgkQCaWpQKGI+9QZTACfS4EPZh/vdXX7+MJhuNk+40Wc
-JSsAn3+e2teNpCXvM4SuRbZ+Jz8V8aRs
-=5s8I
+iQJ8BAEBCABmBQJVwenaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VFawP/2P958lsRfmchUuc7/MgemR0
+LWidpyAfAQ/s/WTo8GoC5gUGDZbPKV+MP3ip0nGZka0pJUiMrOlD0QR62uvcvQ97
+5Qg+1Sg5HVmQRTYOr/VOuHnta+6d6CRE0Ms9VerucF5UxypL4P6jN+5wJ/kFxnYs
++C0drlIdQqVHMfd5coONAUQJrwnNJCfDUNH+9+B+qMFF0JbrqIHNuZ7ldJ1gQqVg
+g3JPv098zYNOd1RPgZuqdGYSLg4DfYxj78cQx7UrQwsKBODOfMQkCIwLBM5EuUXZ
+qVp0cEUJ6vwcKADjaWnib8xEZYZN02eBNitA+BQ4zMorCIcqP/9PaARiBVOBws7n
+KFbijpIH3GfRng4Yo4ybg0cvQQSMSWHVFKH+1VgIrSgMVWxLYo7hgjbPm66MYQ40
+cWleJR5guAUf6VDP4qbX/CBRSZZ4lRle3ZX+TIBww5HOqioOG/8LsvY6yxemmKCT
+7l7X7TW8GIUj9rO+K6U7l85gUbMgMQSxXBF7YzJdKpbKN4Ezhqr7ZH69Q3ZR1djt
+tqQBA3wXcNmkIVo2cut/WWmiWL5Mg7L8i/8ThU+2z6tHuZPb38Atl12ptpQn+r4M
+M7xb97iyJ0PAtlC8oy2CEs9VJno6l7468cuRIWg+Y53qvHbxu9QrqEuscxQaRcfI
+fjgVqtgKXHvhFTA8xGyq
+=e+Yv
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-verve-plugin/metadata.xml b/xfce-extra/xfce4-verve-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-verve-plugin/metadata.xml
+++ b/xfce-extra/xfce4-verve-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-volumed-pulse/ChangeLog b/xfce-extra/xfce4-volumed-pulse/ChangeLog
index 42c5afc72c53..b61cd2d9e6c1 100644
--- a/xfce-extra/xfce4-volumed-pulse/ChangeLog
+++ b/xfce-extra/xfce4-volumed-pulse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-volumed-pulse
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed-pulse/ChangeLog,v 1.3 2014/01/28 14:18:08 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed-pulse/ChangeLog,v 1.4 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Jan 2014; Agostino Sarubbo <ago@gentoo.org>
   xfce4-volumed-pulse-0.2.0.ebuild:
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 239715d22503..e07bd26adf1b 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST xfce4-volumed-pulse-0.2.0.tar.bz2 282403 SHA256 6930034a30bfa54106f3c76ea8e50f578426f5e6151c0e82fda04e6d127de550 SHA512 efa5bcb3558eda0b36f2bf0b737409571f69af7454f542a3dbd777e94d40b3f0107567d3fea3fc019b3eb77450b2bebde7aff8b72b0c30d2afd9a316e6ea77a6 WHIRLPOOL 1800a5e3db8e4a81a2c622aa9c33db4778391f253992056f3f4402ed337bce98c8e199d79b411e96d7d8abbb68a7d58d83471d3014dc9cbf367c87c6be26e091
 EBUILD xfce4-volumed-pulse-0.2.0.ebuild 873 SHA256 cc450f4e57cb8fff6ff15f9a02df8c048da66349dab2a724c30653ae71a4de19 SHA512 3c71d5d5b2cd3d442760b6c5d0adec5aafa6f237bce324a8b2af5df48fe57fb6b4ac50ac57062dded600eba2a8e820953a1edcb836be0901246178850d4b5125 WHIRLPOOL 8b194cc9ba0b0c01674e779e9da78f137a8ce463495fd24f26cd6b4785e95a0b7c2eb8b8cdab4dfdc7b6a9e9f7dd764098dd6f421b19945e7b58bdbd18c6beba
-MISC ChangeLog 609 SHA256 98c146ac9b4bd7a785a331d9687fdb20bf5ac66103d38b760fb4b9d24752f34f SHA512 6e6207850f2de08c984eaf3248444e6c445594f59564703076a1ccfa63f21f43656031086b893d98627f66145418a124cebe797a4551be1ded63957c438eea5f WHIRLPOOL 29a6f2ed10c7c0e1928995cb682198c65a191d27d3f84f1c17efa2ee9f439b5d321127e556392e1ff0e905f01e6c4cfc1eae9bbc1c25c958d78184025a703e6e
-MISC metadata.xml 250 SHA256 45803a0054186fda303cf676c636a7b132e0ea4fa3498c912041616aae85cc07 SHA512 96bad63df7d33f3af6da63fb48f4ad8fa079a090ee520532fbc5e9c0293c4a03262b14159fc55767581c593ae87ed0953d62065e072663e6ea0f87bde641bd0a WHIRLPOOL 92c71085168f734f4dffcad92cffb68031d9aeb493b8a148f90fbfca0eb0cafaf68fd53b75e7aafbe16a9c0cedf4be6310f7322d2edb8a7d1606a844962b66d6
+MISC ChangeLog 709 SHA256 75ed087d50697d7fed9c8f33ab83de3d07a53fca7025cbe7ea25eea6c34da5b5 SHA512 6f82e2398ba8ba512d3ca74f3a8c8699e2449e74566548374cbe8b39f1b3677829eb5eeb1a344680d62058ccd7d7888a153022a3437ebed7aa9ca5756ab03eb2 WHIRLPOOL 00c1e7a432f2f76fe696a0f46ee9a07167e53c0f8a2a7f9c71aad4d5cf68a6b1a0821db71cd7bf27f788c903b28c570141f82dcee042f32c06485dd6f59450da
+MISC metadata.xml 323 SHA256 e47ab462e9a6bb0190324f2d2051a25d8c91bd3533f39edf061f56ea69eca33d SHA512 563ced22728de428a2bfe1be1a37180f0183c34f51955c0d565d14192626f2930ae1b0374ef34931c6935d7b0d07c98885bc726a71dc7a95387f07258fd621ee WHIRLPOOL 4f32165b22a32dada64e2c2d3a6a2231ea5f3800cc73da932ec11fe457d08c02f26dc47441371c1682412c221cccc51254877701e88e3e6c8b9f503a7e9718d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVf8XkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEsYQALjTRdPbF+VHGxpZhOdzPmHf
-UO/ICPZKVsinXrCo69g+HCtR3TRKqZ3ZbZggMe1E3z8+9UODZFjYKPzw6vRlKk+V
-dEhH6d7ikKtn8wwxfzh47c5K3DM0WAboW/pWUq8KFa9ESu3mWWAR4f02sm7UBGx3
-BGNLIsKCPsmhTCzLaXVBnUgWxhkQNjLTmJSHew3+5bqtTYuAe8TomnmafJWV2UCL
-3NVq0+aOMUccIB4IANhvoe3jBiS2K3s1WdW215oQYtvmzOtwIMWQJwa1UCsh1dW8
-yD0S06RrSBAGGoM03C/bucGAWWd5C28h7mRAKEf1BwMnyLwae9aYtmZ9YCuUnB8j
-3RNjsuqKSTH5vJidxvLCXvp7ZqsBqrtZH0ejau1P2EUFPyVp5j3zyycLxjgS+hHz
-/zwPttlq7CIA1ygl5qo48eoOSM3CsJ0uH//mShiarzvdAV4n06Z0T7IJTtJT/Ato
-hF6LTSotfBhIJhyCo62pUUmfqBPC5XeHiDJjVU1TPqpYbBd1zoyTKMA9YhGvhHsL
-K7iPJOweXQxGOvnMZgMlYz6/SajPPgNihFlSOk1l6BDH28axFUYoOz2vbt3DwceK
-fTg4hYQcLeLqZY98sD8kDvzVWh5yw0OBXfNJAEyFw6Ndnxu08/meRrF4lm9QHEPo
-5qVNJ61hJ9en7fB6Vud7
-=wX7b
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VEHoQAMzQBs6v3UP6mpRNJe+VQkF1
+GREYFGM73lizfbPzay1mYPrc8B/X7lwWCggDRLiKhV0bkPNv7dQrnku0LZq3t4JM
+mCMQXismkte63MKgvLyhaTTJ7FfrkzmIMGhHifio1EMsso6SVgxZ9Fg33U5Eg1c3
+os9hUZLD/oZijw6i+cHgsuVoy5tZ8AYJ52Wok27ZvdH/kp0EAQ2zZJTEnmpixpSX
+cszhy95pwjbRp2FVk+kraqBlUkdrpgBqBjdgc0AviIAQgF1D4+H7jUy3Y3xQh/6t
+RS2eeQ+uE2lvH37P99wP+80P959WDezjrJcUWMZqa9Zo47Y+/kdDO4EnRhYN9OA6
+53flDzXv/roW+DIoao12WVebq/6Dx5QpCb0Stdi/AwTETY8h8ADhcCNszC3doZYW
+HJL18kTCCYmU1uv83HqoCY1msc+w3Sd8K6E0xFsv+BldLzNsKt9T5xhNf12a6WZ2
+DvBODp2WKZxytSlBnuTBq92+Q5k77o+1VSY47sc7fetOr76IxDoFhqRmw/60NbQr
+dyK48MEeYTV8oyFG8J/7NwtT+5zXDGfxzlNNaOZ8UiV5YkT5NMlEySlTrqStdbnu
+FtqZRWA/sCl1hKSihXLurW87QfDFRvRkhXZz9tMZhq5TAGYTHyWG3SacKabuqZFV
+omFyRN86xINUj0CW+dn+
+=Ve48
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-volumed-pulse/metadata.xml b/xfce-extra/xfce4-volumed-pulse/metadata.xml
index a4376d0f1021..4d7afe71423a 100644
--- a/xfce-extra/xfce4-volumed-pulse/metadata.xml
+++ b/xfce-extra/xfce4-volumed-pulse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">xfce4-volumed-pulse</remote-id>
   </upstream>
diff --git a/xfce-extra/xfce4-volumed/ChangeLog b/xfce-extra/xfce4-volumed/ChangeLog
index 73c03b9803d0..62fd30829628 100644
--- a/xfce-extra/xfce4-volumed/ChangeLog
+++ b/xfce-extra/xfce4-volumed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-volumed
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.23 2013/10/29 01:38:05 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.24 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   29 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
   xfce4-volumed-0.1.13.ebuild:
diff --git a/xfce-extra/xfce4-volumed/Manifest b/xfce-extra/xfce4-volumed/Manifest
index 94d1ce635434..fc6e4dfc9467 100644
--- a/xfce-extra/xfce4-volumed/Manifest
+++ b/xfce-extra/xfce4-volumed/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST xfce4-volumed-0.1.13.tar.bz2 88518 SHA256 4ceca3a59b65630e849b89133f220def775009017ca2c3d689df27b7745040a9
 EBUILD xfce4-volumed-0.1.13.ebuild 1008 SHA256 5584ddcf8489f13267e2a5c9401487d27f8d031db71fe086f38ecd25ce75b758 SHA512 9321e3712521b87766a39e2c6128bd4ad0d601d35ada9af1271fcf873796a61eb84c57d79b29394e358a87fd88c4896ac4bff9e8ed000e2f856e1d63b0f3b715 WHIRLPOOL cc9348f9967aad31fbdbe35622f4dfe6376c6ff3534a321a270af3bb0c06b9b69046280eaafff68eb54eebbdebe90c7a916668f7d248d497aa60717f18771b27
-MISC ChangeLog 3088 SHA256 5edae4459aa2055e46d5bd246465e6fba90ca068d0c6e06bc22e2ced5ac08ad8 SHA512 83ed312624526b4df05f024018d64f4f5132d9c01c0ca25b34bcd992eaa5358ce9ca67b2356ec36120d7c9ade58104176675b5f1f7241562202371a46afbd2e7 WHIRLPOOL 7062142fe8aed925a40b022cabcbb6083391e805d4bf89a46ad6726dca3e556772e49fb8ac9e43b90c9dc5c9a1e5d3bbfca92caf875f2853967f0482ce38e49e
-MISC metadata.xml 244 SHA256 80e263164f883ca00d1df26a18b9a5cec91eedc6079b16a121aa54dd9e63a99a SHA512 aee63ef19456b5ee043c2923fa5cef3b8f8c5adf98475c7baa6e63b484d4120ffbe0d6fca672b2ed7cfa595230eb533cdc71a535e850aad4b9912313f4e93793 WHIRLPOOL cb3de929aba3edbe05a2ad24f3978bb094d8e70fad37d8b030d1acdca1f36b12ae229a10fbc8f108f3fd3279a73a3ff14f81d157dbd7e1bade5e134052d72295
+MISC ChangeLog 3183 SHA256 d8811c6c9db5c14d3ceb0231a46be7c2b6418181a9a90ddf61fd2650ec1eacd9 SHA512 2948469b8a5be99a1f08191a3fa32bb3e4bb4778772c63e8852275a4a53010b236023db9fcbf7e11b9a484dbd969334764e6cc0d8dbe19f7ad676cc43760db70 WHIRLPOOL b8234a6d46a7b014bdf2a2a4d5fd31ae4ee9354df7376459e06ac10765436b003f05a0f68a3ab47520a5c8d6da6bebfb82001a194a515eea13c4ee94603d30f1
+MISC metadata.xml 317 SHA256 954022da7a925341fc68bd745a2e8b3979f0755a5e017c090843bafd87fde9d7 SHA512 9b63dcd7b5a0f574a18d4505d6aa601ccb9b80409e21bde7fa942c1bd9c4d871a2a6c78c9fcd95dd37c88dfa98a315b304893fff0ee32d966501b48b2481debe WHIRLPOOL 884bdd017f4cba328e352fe6246cf2963d9b3cedd091fcb8fa117e5654d9ade6246059413e4521e8a462c30d564fceebfb9733a792b02bd6fe4cf0b0c680268a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVf8XdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiG1UQAJZs2WfuWMWu49s1irOOzOCh
-ZmQQTRKx3dCPaRHwvgxdrvagRfWPQB38SSLtUdpSkAt7bUTQ1DpKOsTG2BO4/A1F
-kFPgU9dG1Q7ZdqW6koA4J06QNfb3nFmJE7qObGpVabFwYBW+//kpusSiCvAv0reI
-OaUgTfG1kzlB1LcY2Zl2BvJy81kFOzKAJiD3rMsNe+atY9O2kmcXM9f/joigR/fW
-BqzAKmcpvSmGovSbRrCMtcVipplbQ9Zp8xlc5KgRx3xqtTHNLiCqcsfbQAO3ZBst
-X/3UKnQUtXO1FYGw/abfFzrRfbkM92aflX8ICSBGDJoLVxcPrWWj/488HpOygC05
-0L//bFMIprrlIXT00dUKhK4VXc9E8lV4sf8NDJmfLPiBsuV96PjY6ejdrgvP9Wam
-nVGjKztsmMIBPIv7sKAvXWHy9YnLDpSnwutkgn06OPikkA/YEt9UYcJWPSSvsjTm
-K5gQ2UUO5SCScAYDaaZwiI7cHsdkt0cysp5+OKidLfHiJwMPwno5YNlRaGcAJ7ab
-z6BvWFajjw5mkIbSSXHJ1Otj19GHNPnscm02T45Y8M1SxZ/a9PIl7/Ai5OBHae9v
-xYnU+zQ7bl2S+B7KGs/J9G0i6CIHkSDfF+vFNYktMs7I6gmxQXTNRriyAnj6HO0j
-1Obzrdu0hjYY7ft+oNvw
-=PrpS
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V3KoP/RdmKL1jLWaEFDRt53z5/pf7
+EweXkcizltZaHFOiaBl5Wq5ZhoNAYCEeTol5t6Sj8sf+K8iC8JT5cU03SUN9x61e
+xKWNUVJi+nhaL2SBwM0p4N9RaUYlZaXRznL35fED7WYNK5eKQVKUazDFRGGbqqEd
+mmxXQ0azfcWRJclgHWOsgZFF8Cfxd5YO75IFQtWklX3cbTaJ0UtCh9suu04A3/nJ
+cRPDPQfMyw1GM/xwOJ7qCNrHAW/8cjXu62qTFTA45RDWRA3SZA9Oa4+pGHVk2abu
+iydTEasJ/2ZuXpyfxCmfuS7pAoDjiN0JMv1D+fo6V8ecJFyhddSXIi5lG7o8vp6y
+lA96RbcUfIOqTStAHDKm00BxTAS8M+fB6GU2Qj63XfPJisvn9C2gY6ReZVvqi+aq
+WbKrQ4PA6HxX1Ng/rxt0w3mDNkXhIKeJ2U33wASsSCLPouIaQz9trYEjOjP/fL1H
+y/FOeA9OdmEG7ckWD1JXKn8DJh264YwhWWp0BrH8sHyQh3l5pjOx7QwwiLgfkdwg
+ubLgRTx5jMBLH1derXgQazkE4GnMt3bmuLiY3O3/RkIn0D/beFL5pHuPr1CSvbGy
+Uo1joIUx+QOJlXvnCOUMK9piEVMb6yrqEuLgrbBCR6MATPsalrGcDxEq2mO1MdMb
+ZqvDQq7kuvE0HuhCNxch
+=Ihph
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-volumed/metadata.xml b/xfce-extra/xfce4-volumed/metadata.xml
index b1565f538ae0..dfc88d55b130 100644
--- a/xfce-extra/xfce4-volumed/metadata.xml
+++ b/xfce-extra/xfce4-volumed/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <upstream>
     <remote-id type="launchpad">xfce4-volumed</remote-id>
   </upstream>
diff --git a/xfce-extra/xfce4-wavelan-plugin/ChangeLog b/xfce-extra/xfce4-wavelan-plugin/ChangeLog
index f8da7977efb3..e3ad554b05bd 100644
--- a/xfce-extra/xfce4-wavelan-plugin/ChangeLog
+++ b/xfce-extra/xfce4-wavelan-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-wavelan-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.31 2015/07/01 17:03:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.32 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-wavelan-plugin-0.5.12.ebuild:
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index aa4d769b98ae..346d6c58b559 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -5,14 +5,24 @@ DIST xfce4-wavelan-plugin-0.5.11.tar.bz2 293840 SHA256 fe06c7ffc29c2d4ca7bc452b3
 DIST xfce4-wavelan-plugin-0.5.12.tar.bz2 302148 SHA256 67dce45739f063b95e2bc2232c625277685887b1f84088316d919671b5500ac4 SHA512 a25c6c576c5f8a76bb595137cf92fb6e18c7f5807bbe203d11cafdcbfdb9f6a4d8b7fd2322f448dab307eeb5067d44d1e41393b4aeb71fc1f0deca72af7c67cd WHIRLPOOL a258f17b2d958c0f41b8ef830365094ae8458a8faa47fe549de9b57c4ea51aeefb19de4afae3d9e6eb32bcfc9eb6e5a282da5f484db633d36ef69c1fe9c0babc
 EBUILD xfce4-wavelan-plugin-0.5.11.ebuild 943 SHA256 803dd32c453dcf4731c35e72bae7a56d96138a45ce5998fa1573f7b55cf57047 SHA512 971b20caae1fdc0e01a6b92d5e2d55ee2692b00b547634d0b5c3a6c8db9cf1f315f690c61e4becda77bf59c197d94daa94a7e8df958fad269895c7ac2efd8ad1 WHIRLPOOL 287b52ca4261c348265beddb1b17ca0493d7a7b427212ad00ebde67197529f6d3b4261666341e7109984fa746529df668b26a12b941133719c8a2f0471249150
 EBUILD xfce4-wavelan-plugin-0.5.12.ebuild 947 SHA256 f4f0350e425447c6d72afbf32e21de650b58363c6792c741af3789ee325ad41a SHA512 c0f8fd37de644798014eab4b68a12934c4f0009a5643ba962349789cf5600df154af997d18496b01f55d38e0d675fba36cbf2a8cd1ad57f7f7be291670dca6db WHIRLPOOL eafe1a815bf7e37ae96f63296e57ef64207d8de8a9d1030857da5d8719e67633fea3d0cb125c3d398400802a9e4318371ed2ed9c958033fa7f3562330eeeefb8
-MISC ChangeLog 4295 SHA256 9345c3a9cf6d8491fed057d0b9a1517606db811ae2812d16450b18dfe80c6973 SHA512 c8aae7e162db732b82d97e76c1ae83c163d06f5a698c696af26c4a8c965cc6e29e65cf8dc40f59fa81344d5b8adf02b82f5197ec9632c8348eb430993f5547d8 WHIRLPOOL f01727bba1613e1a7bed3b135d756b15c1bfefbd0348af70c935b5b2938ba470830bc3386287e01d3557e2e04cd30e3e2469ede0913ac08f4365da4c6cd34e46
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 4391 SHA256 27f0b406e473f3642c2e3f711a5c549c2ab9dd6a100c745debf4319ed4604eb8 SHA512 392342365810e0bb4351664e4b82f4bf5d56e8e789866d050d9757891b33bb2e9b3f28e8ccd8b99b201eeee9fc7b56779c8be3974a7caffd791f69e143f55270 WHIRLPOOL a04f4384d4b062ad2cf61f961cc085daee377a9e3b9f8d0c8126d98ff0a82c5d652226b1524eb7d5d9ec3ffe1fa168f606189706cb634f079326b1a75b87b0a8
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUHMkACgkQG9wOWsQutdbEUgP/Q++xvzrGrsFFr+8ny55CS+zI
-2R0lzN6hEumcu2msmx96UUP8HmDdtwRl5+1dJd1Fj8kKjjKd91UHU5Fv822mauVQ
-8oILzIye3XYAdKfjS1RcuKl8ovKHOgpNrhc2kDtqw2z+9qQ3PWrQVNXzTi4NcRGb
-zzTjpazqU2UH+mUANCE=
-=iwdU
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VIG8QAL3Euu5xJiOY4L4z3u3BDX1m
+qEM9blNqlCsAoCzhDRPx9LAA7JGFFRzVBKqettnNBptlZWZlwVPxfsxtYJBNXVMs
+c6Cp09NLg6fhJhiRXY7Bexb03UY2arVvf/QJWBXcWw7MHBfOFpZ9pwib4iHEgjz8
+Ml0CJrJqtFzA4jGZL3wvuAiPQZCAS49BdIV1/ybTwGXCGrE5Tr4hq01mc9CFHKQS
+eZRUGd9ni0ycIOcCDeb+bLZf+RMrauv0Sye/Zq1FuNlegEhKN2VNOlxCdyR6RkBp
+SoXm+2mZizHXdDzumd0oWtQaCka2RLJS26nNB017BnXFeDE6akTWrYs8k+jLcaDr
+Ka6JSRae8zWw8QRgfMa1aIyE8b3MxWyEqS4uIQSGN7f/O6Jqc4Co4xlROsicHoey
+uosGZ6uC2+zg2xohIT0cDbdGVOVAOy/zhcjBoQKnuSMeUjTXYvuWQTAeM9CZH4x0
+trEhu0p2/EUE0Nj+0MZK90vLF8PZI9FTBPFNwh0DYCEOjTNUVKZ9i+GkqmSDT6F4
+JvYjlcaGy+83BrsvsHglF05RD7hNI06Gqe/c9YlBMsLjQwP21lu0K1INnjgVqRxD
+diGZtOHKHVD0S2NJdQr9NQhmFRDm1BXsQDhk5eNIrCuDSr8e8FS805QYGq/dtQjj
+LGBi1/rSpJ6eMzAKoaMl
+=L3JM
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-wavelan-plugin/metadata.xml b/xfce-extra/xfce4-wavelan-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-wavelan-plugin/metadata.xml
+++ b/xfce-extra/xfce4-wavelan-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-weather-plugin/ChangeLog b/xfce-extra/xfce4-weather-plugin/ChangeLog
index 5cb31cd96f32..b93c2c6c23a6 100644
--- a/xfce-extra/xfce4-weather-plugin/ChangeLog
+++ b/xfce-extra/xfce4-weather-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-weather-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.46 2015/07/01 17:03:33 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.47 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org>
   xfce4-weather-plugin-0.8.6.ebuild:
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 0baf5bc69615..cde795aaa01a 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -13,14 +13,24 @@ EBUILD xfce4-weather-plugin-0.8.3-r2.ebuild 1391 SHA256 4e4a55e4005a369559911baa
 EBUILD xfce4-weather-plugin-0.8.4.ebuild 1105 SHA256 5ba2a559164fd9d594fbcd2c6a88d4c9aaadd5bfe1f891d505213b674bfbc175 SHA512 e59bc8ec99950cb5905567da45db20af59de3a92ddd7753e86b1dab0c5894f5c1625f776e4a4a91be02c1f972defc8b6aad84dfd744ffc19b5637a331af37176 WHIRLPOOL 3021081a1fd4388dfb4ef28cbabee1d95ebb76841f9f58171bbf4f57cb3fda50823d34c3a24813584905f3743a5ce9b4f54f3f090b8a521601f0f74a660bb15b
 EBUILD xfce4-weather-plugin-0.8.5.ebuild 1115 SHA256 022ac88ae9c06400001cb831a561bb08f140647822d772db85285089e8a0aa0b SHA512 aedd61659b8203a487896cefb8631a6df7e311e094c4f461cc448276dc5942fbf0325eadf5a25e9274fcfc0cc695085508e8b904a4f788fb4ec1e07d445a3b0b WHIRLPOOL 8987049924ac3e2ee67fb40abe6f59b673a7dc00a0f4d41e40537200ca218ec226723935badfe15e6a3fc06c4302e1708e1fd3e4952cfc17ce29b46d06d9d9da
 EBUILD xfce4-weather-plugin-0.8.6.ebuild 1114 SHA256 00a7fb6d1996c895b514203348dde377ee3b1c84c11362af12111cb6fc7bee12 SHA512 e846e7d9cb0affb534caf6bd6e6720d0870516b360920f558c6292c56c134e98908834a15a980e8ec6d00e25b30030144680536b66cca4510810414049927c36 WHIRLPOOL 8f17863d56ff949b18e317b10a39e52e369d009f27579fefe8188dba0c025af0c33d60f6062fa3c6ace61cc1fc3791cedb536656880dd38d110a681de72aa5e3
-MISC ChangeLog 5582 SHA256 19a884b1c4a04a0a2f11699abce7d4279693b36138844796f2bab6e6c38916c7 SHA512 d537b85895c73f98fc23263e002452e3b4d4c6aafd0b56cfc06e8ed56fc3d5ed151aa3cdb5cd873859af7803c7974d40b60f0e92ec4ea20499e810db3f93a9be WHIRLPOOL b21e46ce88054f8ca42eee00c73b26bc5001d921bb16164adb948077b21c29e82ab895c9e3496c0992f4f0c1f684a766b1da46ac1f0b4516c209b5c530ec974b
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 5678 SHA256 68c29f4c774d86bfeda247714a8961f98899d636199c62121f8ba56e286e3eb9 SHA512 e82b386b6a646a50a58781d0d77b6c320bb1fbda72a9b2c0925d715473b9926436e6b2b928bd7704f71d51180d2a2a02cdcb60141655cabc975b3e435323c202 WHIRLPOOL 231a9abbae3886ec6454652f7dde45cdb8188213431b28d251a31dd6af478e0579c890d2fa93f38621ce123106f2755285295702fb6d97c11278e01dbbafc1f8
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUHOIACgkQG9wOWsQutdZX4gP/dEdNxlA+qkqF7FWyQXkKlES5
-HoXZtZCPOC3afzIVK8VALBZGzlhmSvOyuuOWymkzkBi+h8YzxhFzwaGzFT5zYBM4
-RVhQR0Ptn8tViQ8n4tq21ZiLq8D2LAAY6zvZqC7PFogSy5J2CmBnYoUr6nYvNvb/
-EhSMQPLbysTrR0QTXcw=
-=NjXb
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VbOQQAKpnPASmRPF7DpkWtPwew92E
+Ut4w/kdkaCelnmWEavU+qZqVMB2QB3vNhk5h6YIMNd334fmgVfdFc4DLacNji/iP
+9cUD9yqyz8lfBoRrhO9HUR8CjrV4gGcQ4yF3EtyUA0rbaxR12P7MNlr++OVuRasX
+N2kF6bBeT0rNXn4z8cQWTI9S4Q5UFLBln9UtA8uSMeV79ICUq+HCbYbH8eKtNFSr
+n9Ri5vtvGHoCIyhrYb+yLPvTqrx+DsPbRKcFiJyDQpqIlxuvaW+XojR2VCYKyHpO
+NTzfM5c74RlsJo597cUhPBo8y/pRb9WxpFRlY/XAwuITgpHdZv/8GWGY5ZmJzM8X
+1oyeSFXTBvTZaw4sRf109o+xvkM7rndJs0T5+cuClrxZOgFtgnEJkxU7n4defv6f
+qvxAeSC2w9fKthvHfHIrblMGD1QNjwmbOiMjlsjIkWOx7acP64xLFHUWihv89Or7
+tWEbc0dnD2fI9N5dQgH/uanYyhQFeqpjZ/cAkCwTBV4BdQUwmStf/su6+CyocWeS
+qrAbQreiy4wPg5H+iYbw6/siPrvPWLXjYh9pLmTgkf9ZK5dJZ2QawsWmGj5/s7x5
+FRWBC5LRMDNZ4FX8XCyQaKrMIY9RWdhYrrSaNgI0ZsZn/7tTSYiUsj+chEfpFBLI
+fjFTtFkt/2BXUM+OKlm4
+=h9L+
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-weather-plugin/metadata.xml b/xfce-extra/xfce4-weather-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-weather-plugin/metadata.xml
+++ b/xfce-extra/xfce4-weather-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-windowck-plugin/ChangeLog b/xfce-extra/xfce4-windowck-plugin/ChangeLog
index 9ef5e4fd88f9..941171f3fce9 100644
--- a/xfce-extra/xfce4-windowck-plugin/ChangeLog
+++ b/xfce-extra/xfce4-windowck-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-windowck-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowck-plugin/ChangeLog,v 1.3 2014/01/28 14:18:11 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-windowck-plugin/ChangeLog,v 1.4 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Jan 2014; Agostino Sarubbo <ago@gentoo.org>
   xfce4-windowck-plugin-0.2.4.ebuild:
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index 19d06439e722..1deda8f9e598 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST xfce4-windowck-plugin-0.2.4.tar.gz 75442 SHA256 2ce551f16a1ec8ee847c36e0d3bd9a71b6b4945821f43d54dc91433cac0a5117 SHA512 43798a8714926eb03b2f92f8dd813572030965133b672bd07c485da77efef96114ed412dc7a5de730b2bc21da561ca34c44147147c75f266d8bc393f2550557c WHIRLPOOL 64cac071593b844a1ecbe19f207b52668754e869aa3299623060b63d8fbc02939b1c9d5a2c8a1559f0ba5177809c8fb0233463612bbd9d33f349e841b0406852
 EBUILD xfce4-windowck-plugin-0.2.4.ebuild 1185 SHA256 46efbc586fdda8b93ad02f4cd3ee12e022b6e7d826f2e1ec5229c24bba294a77 SHA512 7830f32f6335499ae0e0692143e501dde824e8c65cf3e2e96f0513eee3d78222c0b5b9f04c2322b612d5496d02d2539fbd14fecf64333a360027c9866201b056 WHIRLPOOL 8ff5dcc40bfcad51103d05856e3018fd8336e5e5781642fbbe31fea9a1ff8e0d31a028536a5f76575b5a5dc59919228d8bae3c57399729f17dffdbb0847bcccb
-MISC ChangeLog 623 SHA256 f1dd35a69dde8775841fd744c4230c25c08be50d98130f0cc47e2eaff58fb412 SHA512 8e2288e457890b93b445d3838ca1e32a6dcf17ce30fe537dc6210d4a1fb2dba8a67891e0e8577ac2c1fb10226a73e4129add5a9593e4ce23cb748034d0531e1e WHIRLPOOL fe4824d90427d749b987e4f2b2a6c2b790027e868412e885e2f4ed31941cea4b5693804252f8adca2ab0a93a623c616fc77da1a0498eb576d55a299f9053761d
-MISC metadata.xml 256 SHA256 2a1870122f028049c0c5901494a23e81581cb77a3cab1c47cfc48b8a42649d33 SHA512 20a5d6c831dd8797a6f00f4058d7db61f788b843bde5c60c875016f8987b06ed2dafd8d1d6865d6431b4fce2c1e99b08db6b7e7de3e7ff48201683f9b64e7f59 WHIRLPOOL e4e020f7a65f13cff837e771507830d49f9967a0eccde01b86ae404b9f50cdd77f6a19984210b90b9278fa02be1d8272b7d71e3022f17bd7d80fa6aaf820df5a
+MISC ChangeLog 723 SHA256 a53f76dd6a8bd2750a857d68bf01edb0b2354700b51178544d816b589c73cb72 SHA512 d1a7d4bf24a67747ec42b13b6177cb71e741eec88535766d701349b927519a2d638bed099032816e5a193e304039b881cc800548a2b71745d5282f60240a42c1 WHIRLPOOL a1d25206438a016092f5cf68d541dea4c4b2e29a6ade84378080be43032849fb9174d38d56e9cb59ac2e14586ea1992384f64b2fb3028e54e459f3d4d0e63c47
+MISC metadata.xml 329 SHA256 67c81ed3173f11bad9f92c99f5f40c98e892d2a5b90dbc3a5ac9d7a2f5228714 SHA512 a2f10c48b3ad067ac6bf643a47f176f57e0a5f91393c4dfecfbf589860273bae08e8cfb3ef545e1f3ec7ea5877534c70c12ebb01b00ef4a05bce26a9b5e7f9a8 WHIRLPOOL ece2d7fbb4bc2494528a47cfcf8bd2b3f336bc6911c63c9c284f43056f2acbcd637e1fc6393dc313a74e9a8c1b9b4488cccadd069425f0a8cb9c492582f4f06f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVf8XsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWVYP/2EjD2CZtAuXKsh4t2oxO2Bo
-GLOhvQGxecOS2IA6N0hZD8POupoLquzJB+d2tX0vrfzkMOV39AZTeQutjBE08+1U
-kvM9oVAvuOxRMa3Fj+VOfmC+I60cDZkUtMqTLD0M1koSjHU1UmWE43zb06cIwSjG
-KsZBU/T0mnYRK3CYz1D8A8a1dQR+c+hfpWonlEykwTd91tJtzczBstYqeFhmJOmj
-aCRNfdEolzKMnAO/aRP4v4XT/RBuXGu1bXF/8gAi34EesqdXCtyb3pgjZeUITXik
-vuxIFKeZ/5PX/W3GQBJ5hAs7PMx2GA/ifyWh4QUbDzLvHpOLSC9fgBsYaKcBtQ3c
-dQx0BOMeFcV664F68uLvaiNgJ1CdhpslFY/rhG6jimY9hOLKFDRJbIhpI7jHXW1v
-B3DXajb4NqC925cJHjt5Bu1AjVc1QjdnCj26WXDrWg12fejlP/9vqPlCc6bCGXg0
-sFnRiZDzn3zPXB7h3wcp/S010FAvcg5tSYAOFCdcwxBM3Pv6FeTrfTfSAK5rIYf+
-D5y3PFfEwH2H/t1RtM5gpuzMD+14HQHu8Qy8rCjejlokm8fPJ0zvjzUgo+4+NhiX
-I97+NnvOpNSXIy/Mff+2ojgdiboD/F9ZvxHfRZFtSRHUpkyG4lTBYHBYerVaTNqs
-DlkZvWIpFbzXVSB9vcrx
-=6B5x
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vh2YP/1f54fGMxBLKkkWlkKJZBxDS
+C/kTZfKcGh33PkereSsi5lOms5B5yoxAs7dKa+ArRNex8ADuFPtJ6qaLqVbRkluM
+E+5c+sMV8SZCHpt51LlL6Z4MqRO+xXQB0SSnbiZMF8VRYK3e1VHBqu8SgVQa/mXE
+nDKYTiZ8KOvhFjhXTYsLrmGO/hboVQoTs94U6lIw6mrAEDxiD6xnAUqbaVZNCDos
+5NfEG8yKQOABJWOiTYgpyjJ93TDp4klWvEBQ20Iuzj4En009t4mMQKRop9sWLEyp
+m8tUGSbjZsvUkptOv49umrtRyrbUpH+rPjWNZyYBpmtVlXah+zi8/KPr7GKhLAWU
+xAAHo8oN5AIwcVodgA0fLyLg9fOCwtHK1I8L40J3M9Nf0cyVgNcVP/uuHjYWJXWU
+BzVtEe9hjhkLP6WLzjc7/xfiQPfzBVoUFycbCpgMiLwb+q4pErKe6myM/62Fd8iT
+BnVtiVC8ky06jo8W7zKHFo+huANHmXrDg2V5UMk18lOzDPaTsZsRKKPvc/qpLOKu
+lxdB37M9bnWgjaurL8WWYIklO1rga087NMw2WGGN0/M5jYSGhE0iAgRNathdikbj
+lsZvSOEoAA/vB5sY/kuHNgMty8xSun4Bno2AYCNV+IsIPkb5LecLakZMwXd1nnoD
+MemaUIqHbcDYhCdzj+mp
+=c/Q7
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-windowck-plugin/metadata.xml b/xfce-extra/xfce4-windowck-plugin/metadata.xml
index 66aa4c768689..135ca289e4d4 100644
--- a/xfce-extra/xfce4-windowck-plugin/metadata.xml
+++ b/xfce-extra/xfce4-windowck-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cedl38/xfce4-windowck-plugin</remote-id>
   </upstream>
diff --git a/xfce-extra/xfce4-wmdock-plugin/ChangeLog b/xfce-extra/xfce4-wmdock-plugin/ChangeLog
index 2fb0231efe84..b97e1166d048 100644
--- a/xfce-extra/xfce4-wmdock-plugin/ChangeLog
+++ b/xfce-extra/xfce4-wmdock-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-wmdock-plugin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.18 2014/08/10 19:54:11 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.19 2015/08/05 10:47:48 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   xfce4-wmdock-plugin-0.6.0.ebuild:
diff --git a/xfce-extra/xfce4-wmdock-plugin/Manifest b/xfce-extra/xfce4-wmdock-plugin/Manifest
index 4d4207c736c4..974f5e6e2453 100644
--- a/xfce-extra/xfce4-wmdock-plugin/Manifest
+++ b/xfce-extra/xfce4-wmdock-plugin/Manifest
@@ -4,12 +4,24 @@ Hash: SHA256
 AUX xfce4-wmdock-plugin-0.6.0-LINGUAS.patch 435 SHA256 775bbfe11b02ecb419609292976dff90f60faf91cbdf41b7ca205836b8df87b5 SHA512 673e64b5da0a577781b23b3cf4a4c3f2121c8be144539970b39bd91165fce5245657aad5e53c57e33031f4e65d8e625b7a24a4abb3f18f74acf7edf50ea2f31e WHIRLPOOL f92b2d6f7bdd09859833372780d26812dabd1fef6b0fce9bfa3618d24f98110e86bd07a760b725ffe0308e3be99bc33ce149e942fc4395fb8c243b9007534536
 DIST xfce4-wmdock-plugin-0.6.0.tar.bz2 344743 SHA256 922bffc31ad0da8ecc5281751e500576ce79a85176212c7ddf80f9af316acfad SHA512 4057021d3a664200b1c096047e81611813cfb9e268193d299097430c0c499280d67d326917fd303c21177cc714cea8c81847d3445ddc93860516b55eb6a0ad8e WHIRLPOOL c8e79a6e1b66edf9638c92ee20ab68e149bbb130aab0c9a8ca06a08f2562c1f884beca641389367c4f9c5e9f05f3e0c081621e6e03d3179a7e471e38bf91424a
 EBUILD xfce4-wmdock-plugin-0.6.0.ebuild 1100 SHA256 55c3c50ed5720379dc9d3637bad98ba51ffe98c12a9ecfcd00a265a112b62f78 SHA512 e0380cd781e89ac1c86567ad4669bcfffaf11422ebd850f442c2a31e36fc790410d29e5ef63a6b385d06e432b0cb7b61ba7f58879ee349687f0864fadb55b5f9 WHIRLPOOL e9a01f79dfceeb105818c46cd8789ab17ec8768605da8ec8958ea8d3de34a05d1674e1c3503cea3f5671e6cb127b90424d2a8b7db492a9feead433d3856bb3e5
-MISC ChangeLog 2892 SHA256 18a6e38425dbbb06eddbee157606349dee33ae392ce19c6314dbde30f0f23b62 SHA512 c9de5d129ab5314117e2e76d4bf57b4218444e95c5920471305cbfa4bc7a6bdaf03ed32042337c7e2a0b8424de0526f06afc95669ad7c88e15e1c94970a93704 WHIRLPOOL 4d889ca61189679733f283df5fb9ccc191f03a07375a4fbff93aabc621325ad088609104b3ff0b32d26811d0d0694d8a632c8198195722bc0783b1eaec7d318b
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 2989 SHA256 1c63e71a278198b977861994d5652a4ce4952f1a4472ccc34b9806e0facea3f4 SHA512 7f7a6cc661808414dec5ff3738bcfa82de96790fb76aeae58bd03279d4fa06331ec40f9dfc9c07ad76cb96ee009b830d4c0fc95b70a7f0083c6b4ec1ffa47ce3 WHIRLPOOL 9527394ff3d82adf48b2d2987337c1776be31956027619f77f1f93816530ef86c6cce6cd8505714e649a15e7b9c2b384db2be0accd0c96876d1c11536b6ee930
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPnzeMACgkQcaHudmEf86reCgCfSaS34Mz+gd8jjddmHLwu68E6
-8t8An2d8/rJ/qnUxW10P2lB3X3QbZngC
-=oio0
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VioEP/AiyIyxbQa6q8hlTVFUH9s+C
+NVfbNa6NC1P3IbyhlfZE+YZ6FM4cCL2gHt0V7EZfqvmZnCwGgq2QV6p+GY/S1+Vl
+ARS7jpVfkHZUCtZFGIhgjghUDUMZGo5jFrGtxNDcUIWJa9SKEtR+lcDo4GYy7P06
+6GBc9zedX5cBmUlMRt0ZXl59zhZXL9BZ6raeXfASg8bLprkbAQHoeCkhTTcy63YX
+80awcFNXwOsdJtFhjqHRVxAttk0PmlXXSuve8ID0AHQbwc1pXGeQyVC26nAEr36e
+r8nEGwjQ06mcJUbDUelBSznz874RXBmaCGZG7laqLSBL02gFdx8Zyui0GtMIputD
+kMKZrrFVv+iuK6ipnAMh6LTr6niQ/8QrOG/CJ5Mwh/Ujk8taqFJT7iWxdCjFnBbb
+g4I90E6bDL95rhggXQ1jP/a2PkVcdOB/4yoRvTNTPyt1bYPsM5D4O0ixJVe/ql1r
+kYc6zmJQ6Amq4mvULxL+QW/6zazsfqOh8YSHqH2TwOlw2fIDW44p08bad2E30Mfp
+GiTGQDkZrbfYbMLlpSl6/jKVoVBBNWYNXd/4veItYGnAxHB59nzUYn8K/grxpAYF
+xIc0vPQBK7twX8hmXS5aZLT17ILxPnovt6tMfzfnpc7eSY4js5zcClNf4Zz4XHUi
+uqY1wsy6DcmGxgl41A4i
+=0Kw6
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-wmdock-plugin/metadata.xml b/xfce-extra/xfce4-wmdock-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-wmdock-plugin/metadata.xml
+++ b/xfce-extra/xfce4-wmdock-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-xkb-plugin/ChangeLog b/xfce-extra/xfce4-xkb-plugin/ChangeLog
index 3184fd933ef7..bce1c6d166c7 100644
--- a/xfce-extra/xfce4-xkb-plugin/ChangeLog
+++ b/xfce-extra/xfce4-xkb-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfce4-xkb-plugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.56 2015/07/25 12:21:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb-plugin/ChangeLog,v 1.57 2015/08/05 10:47:49 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   25 Jul 2015; Pacho Ramos <pacho@gentoo.org> xfce4-xkb-plugin-0.7.1.ebuild:
   ppc stable wrt bug #553500
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index e0c5947aa166..0a7c6fb8b995 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -8,12 +8,24 @@ EBUILD xfce4-xkb-plugin-0.5.6.ebuild 1088 SHA256 8e9d46ef8a30a9b9931e03c4b9a361e
 EBUILD xfce4-xkb-plugin-0.7.0.ebuild 1199 SHA256 7df597a2cd8a1e8b648c0c2072587e0a4b300884792cc98b27e1925bd1678f11 SHA512 2fd820298234bcab7e1c32fff68376af7b993ccfb1c2ddf7d7471e1adc62d4775f30aa95291119576f4833ab6cae7f176a0779ce17c26697417aaff52922fd20 WHIRLPOOL 2831e1c1b9a3de51a7aa4fa02e76bda2aa94a788759c48fb0b90f9a6f2c89f3162d4de0787e1cf2509b9091379873e1a0825b5df2b40093cbaeebb1d8e914946
 EBUILD xfce4-xkb-plugin-0.7.1-r1.ebuild 1238 SHA256 80fe8014765d33203019f95c63211e09b755d8d4b9e68a05056e11868cbb7289 SHA512 5373b32989228b1300581e640347ec4796df66a9630bafd8f625c15ded785cc6b0e7dd50fce463d36628ee7a2b9dd77bbe09d9c95084a209d5fcaecd5ee08793 WHIRLPOOL 4ee968c3eee75ca1c6189e193c60641c28abcdf2e74dc85026d655f9a1aa1eda6c4a4a18a33f4f0a1acb4080671391f5dd0654f76a2c491b6f243a88bfd32f9a
 EBUILD xfce4-xkb-plugin-0.7.1.ebuild 1207 SHA256 a2599f99b830f8841bd0561ae372afaa0d16f32c61404b510cc176e59890398b SHA512 c4ae9ab9e35d7e0ccfc14fdd42433c7c605e5d51c6701e9805d647c0af81cd98cdc58baa6834efa68fc62ff28f8dfb991a5995736bd51b83af5f5e1901c3e272 WHIRLPOOL fbbd594af50a025101efc7f03d5692f24e62a27feae362212cf66d5418e89577014721aace326f30ac402aa61d2f7d8437008b2fb9a803c8d5b3181c5f562047
-MISC ChangeLog 7665 SHA256 5ba03573de341c583a9bc8346844db1cd52fb9b764e85a068a8997af285c0e98 SHA512 d6b913cb4784be0b7b4d1821e3ec7ec7a42c61fc209137e9f07178c7f79f1098c55dad0b1cf19af1d78bb53b56e6abf68fe4dac16377f88e05131d4c68496fe3 WHIRLPOOL e8aa24e49f293bb4e762d00ab47ac77fcc9332f8773631d53959feb1c626a9b872cefb109247a15361b3ffbfacab38dad6baa3605de6d65230176e684b996880
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 7763 SHA256 a948f3aa3a832fad50a19bb63308cff5aadba56730c43eaa513a75d630544786 SHA512 7ea2f128876b12406d744a9035ff50d20462b92cf4be9b63fdc717c77dbf8b5fec43153354fffb11ee5d3a726884186e9dfb0caac70622ee34ecb6ce0da48544 WHIRLPOOL 567233e4ff00dfe228dff6ccb5c9e66ce45b704b0dca2c324c2d5558f1e12da0469073d6d8c20501adf8b1540157fb34dd8453d1e1715af38833796a9628bde8
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWzf14ACgkQCaWpQKGI+9QPUwCggWwIczEo0JjRiyfQqZeFOnZf
-8ZAAnA7oY1dwM3FHTbrH+LZ4pl4cDds5
-=D8Ws
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VsiQP/jXA0AVmR2BKZIotpxCxlQPz
+OqQy/B/EwAbFwq5EH8JDTEkoNG0o50coIb2psy5f39Qe4XPHAZQYboHew/Gsnyic
+LZNKKS8YdesnWjgZsq9U0xvmWjvP34wjYjHD9iOdyuNycv1WTtwJghbtBmpPwGFu
+DORyavTj25Y918G/4ylZqdQlWXy0P/zG2uTeauStssPS0qh2McjoaC6YFXO4mCcL
+Wx3FBUe02LHVUK+tWMk57EoD1Au3KoWGbiy+p3I/xsA8SdmK4i6cCJ8TY8WMgmw9
+/pMJOvya9enw3cHOXFGkK1OtZdhAkF2MFeQxYJlgR/IhKR9hOs3xDqqHlxnYOnW1
+fNxa7Vx6BQkj4WFAnfAjBDveesPGZCvcIWP1iTpV4MRR7+OtROI/hr/ASjjG3fuP
+hc2POufslWLcdJZP0H8h1JBSpUxAiEGFD2H0nayS5DQRsdivhgYt/avcC4vRVaaB
+AY0e9O2R85g4TZCbo36XB8kr8gSPe0WwI5iXgSLvO6Sdx0zbxYi6tpYCNdSH3OSQ
+AwLYorjDS4ut6g4uqgglkjfIcoCY32mO/1bxFLVEGvB4NfqTuQKXnXF3Q0wBlbCk
+WjzJj+2HUODAu1E2ucUSolqpwqbX5rWOyOR5rCOk3iVWNuxouC2uKjJdGNOeGE/v
+MekmN11eFLQvZPsWfCPo
+=Gzm9
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-xkb-plugin/metadata.xml b/xfce-extra/xfce4-xkb-plugin/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfce4-xkb-plugin/metadata.xml
+++ b/xfce-extra/xfce4-xkb-plugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfdashboard/ChangeLog b/xfce-extra/xfdashboard/ChangeLog
index 7bf2bed4590a..02a634354452 100644
--- a/xfce-extra/xfdashboard/ChangeLog
+++ b/xfce-extra/xfdashboard/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfdashboard
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfdashboard/ChangeLog,v 1.5 2015/07/01 17:04:45 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfdashboard/ChangeLog,v 1.6 2015/08/05 10:47:47 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> xfdashboard-0.4.0.ebuild:
   amd64 stable wrt bug #553500
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 0805064380c1..feb84b6e4b2e 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -9,14 +9,24 @@ EBUILD xfdashboard-0.2.2.ebuild 869 SHA256 485319fdd3f09e2e37f1d6aacba9c20682341
 EBUILD xfdashboard-0.3.0.ebuild 871 SHA256 d7928cd8fe797db99ecc058b88982b9b4430d28eb5d50b3e12f630b407f8104b SHA512 b97e9d0c6f4994880f097cb552aa3d35697b36db1544fefe11cbf7e562983a0af89e70071578b7341ad4c79c827ee0f955bbb1dbdc9248d121ea4c3ce4827387 WHIRLPOOL a3779bbc3c20153b91727b77a4a8ee396bbfff1947aeefb255d915e35a22e053f1a01df2505275d4aa936931cdd42ca2890bb048ba87e54b49b7d00283f37387
 EBUILD xfdashboard-0.3.2.ebuild 871 SHA256 c6a032dea70c2b9ccb9512c22b1510609fe5c70a920e93a2c022bb25852222b8 SHA512 32a85e7733407a74450710affefbb72f1c890a366396f01ca24b59b079d81c973efc7d38d2fee510d5e0b428ada45c7216390f0c6b3feb087db6c1de03180f1c WHIRLPOOL 6405818747e41a50d925eca9e8a2a2f998141d175fa7c490636de4909eb59d29258b2d35047da437ea67325f6fc06255bb894c568e4f5165548922a3fc14eeb9
 EBUILD xfdashboard-0.4.0.ebuild 1002 SHA256 6616b87e1de3d3037ec7f1a0ee8230b61b069903eb7629a34beb33163fdd5610 SHA512 6e643efb776668953855a8db7a71e1bee8a7d5e7089e0abc25af20450d25af2d0b8b7f1cf1b7137c45b8301dd29ad21df5419a2510897a2c428af131c1da7e0c WHIRLPOOL 44b3cd919d72b6614843a58e7c7879bb4477da4ca4cf7a660d12f59d18f07787424d493bae7b47d122b3314f109cb0c1a7873c4051cb3c211c7846352c9f4769
-MISC ChangeLog 975 SHA256 26925134a7c3799efc31b1b566d15900b155bc47332b072c8ff35e4bc8302a3b SHA512 88782dd962db5603c79561dd20412f06e4463ce7caaa4f869df76af45b4b178829bfcb461be9030a36617b976c8e8e35fe78f1c74c9dad9c4e1abc0d82b12910 WHIRLPOOL 5bf82906045524d6dd3cadaef65fd1d203e6d6cfe22c99e0c6715ab03fe64bdd65e09d4a7191580abc10cc2e2265fcf918d28921a28cd0eb9e441f870ea24302
-MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
+MISC ChangeLog 1071 SHA256 a3d2f08bf495d68d22a6f5c4195a3747af15ba68dd6d415794bb1e3c208b359d SHA512 c654969f66a782906cd4e2d477d0f1374490c7d4141cc29795d89acc12de54af5347c3ca9da2c56deedea4590bedbbc550cf742f7ac6facf9d824cdaefd94c6d WHIRLPOOL f1603c186398548e849e063d70794832d3113342b1833e354d306e40593216ff2120454a2c6ef5b244a29412e4505f8a195ad05267df1905aa8ccbf8540ffc7a
+MISC metadata.xml 232 SHA256 5a2f48040768044fca7c2b103d22ac7289c271fbc0a25e187f6a064be08a2248 SHA512 070a5915985874b6a0680c888bc37bd4082af740b23947c7d25d167a1cfd4bc80c6f59a03b27e221a2d3317110faa79c5f32c6d065afff17f729d75572ef0eea WHIRLPOOL 8ef60433aa4dbfed1f64c295fdd9b07e79f1ab4041839af3ff355e175e252b76963123aa5a3d48ba6bf2ed2762ebab8dde6f85dd45bacf51614bfd043f82eb7d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlWUHSkACgkQG9wOWsQutdaHNwP7BGl0X5ASzjzdpIKAMvxh8oCV
-23oWzQ1dWlg2u+m2L/kFODyPU4eG8ZxVB5mvHk9CT9WwLcARnr7MgxjW3ns0ToUr
-lN2xbOsT/qE1/oRvrJCucIoiCDOxKh7xwKGLJKLYOt5I4CNnk/acgfA23CUiB0JL
-7AvBga0j786gKnHCLRc=
-=SFrn
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VteUP/2Ki8fUndTwAUShJMqguIH01
+c988hTqYUGTWBtKQjVZwSn5Rt6lm8AADOcI8xGvVWOvGOM/YtuxwqgFntcvybaCK
+aDzmdmV9srhVa/3uqv0PV3JsmAXjBXgkDyV3PWeEyIbdphhGrr3nDidWVQPUQw+W
+vhBaE8NnGIoTQu6oQDXVvPNG99znjmsbVxAj1C1/HkLBeU1p5BKh4NlDCPktNTi5
+kbVm9Jegyo+P/y5wdbikvkmcjPiTTz2r1HQm1EaiZLVGP9XtiVNcrQjBR2Zaxgc7
+gAqhf2n2lwkGUEcNSjuDUUG1/8U8O2EV4Bk4my7QCmgNX7izVGM51/1MpxPlvlNI
+h6IeZYqv3HzmCO4lzYD68jr03IqBNPoSYKdxBZjzCW0c4Na/NHGSAokzTgbJW8KM
+imNIBFbcB8xvxCpKJhd1jh20NzjxDPmm0avfJ/g20VKOQf99kKqUuCiYPMq9OP/J
+8hUeOJbQu/r8Anu6g8tQAtkKBlbrSu1g7QHkAYlZQgOcZ2X0+iRq4VVlFRJ7FxPN
+WsOkJ6qwv9UhYGGphQjUtqtU4iQZiebWP0pnekyWhbe0paszMz5JQISn1nDh772B
+gpW8Y2rydYvC63Bd4A2VeHHdTt7szwYSfkdKOTImFrbmv4hEo0Gb2vWqT9CiVWOX
+rf2ZD9icb/HaRqD2Dw22
+=iRFr
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfdashboard/metadata.xml b/xfce-extra/xfdashboard/metadata.xml
index d56729e92f8e..008cf479f615 100644
--- a/xfce-extra/xfdashboard/metadata.xml
+++ b/xfce-extra/xfdashboard/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/xfce-extra/xfswitch-plugin/ChangeLog b/xfce-extra/xfswitch-plugin/ChangeLog
index d814c9e33ceb..e36cec968ec0 100644
--- a/xfce-extra/xfswitch-plugin/ChangeLog
+++ b/xfce-extra/xfswitch-plugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/xfswitch-plugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfswitch-plugin/ChangeLog,v 1.11 2012/11/28 12:19:52 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfswitch-plugin/ChangeLog,v 1.12 2015/08/05 10:47:46 perfinion Exp $
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> metadata.xml:
+  Replace herd with xfce@g.o
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfswitch-plugin-0.0.1-r1.ebuild:
@@ -50,4 +53,3 @@
   24 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   +xfswitch-plugin-0.0.1.ebuild:
   Initial commit.
-
diff --git a/xfce-extra/xfswitch-plugin/Manifest b/xfce-extra/xfswitch-plugin/Manifest
index 89f4e8487490..1e1787140fb6 100644
--- a/xfce-extra/xfswitch-plugin/Manifest
+++ b/xfce-extra/xfswitch-plugin/Manifest
@@ -3,16 +3,24 @@ Hash: SHA256
 
 DIST xfswitch-plugin-0.0.1.tar.gz 314589 SHA256 44fede57f181b507277ae406a6e56f215bb4ba29b60442e6ccd166e7df98a738 SHA512 58b427d5d099f9e351911cb30707a6024e10ae90f7c978aafba5824f76f5ecdc615979e7a060146ca6cab85f69f8dc10e553884e37737c4f674dfdd3d1fa634e WHIRLPOOL eb485695620f3b6be4485da9a7eb560fbb44188457ca92a92b1ae98cf6c3d1725db0ff06da1f79ba9e607f6d9bf143690e73cc3803d0ba1a710fed83058c785c
 EBUILD xfswitch-plugin-0.0.1-r1.ebuild 1151 SHA256 05bbe9765c69578ab6e2716acfe38ebc20d79b42c04a7a7393c2573a4adfd182 SHA512 b61b06b948bbf06a5b06d7b1d74732f316314f5056352e4243ca2083cf0fecbf68d37bfcbd7b7e592b3341f12730c55e1021e2a8df69ec258140f9034ffdddc7 WHIRLPOOL 2a55b00dabc95831ba7ca318dafeb5cba8b87befc7dcef7fe66b6b8f125eaebcb92c8ead365a8120d34712190cee0af11172257c1be1fecd9352d69cd1131cf8
-MISC ChangeLog 1787 SHA256 facad39020a48798662cbdf0bbcb0bde2f1899d75da3054fbba69e20fb2dabe3 SHA512 0d99cf441de84a271b30481d8e55739b085eac260190acaf4b5e61d778159f65ec3bec01e332cd6dbd8eec8b652cb7465badd70de8c12d41a74d82bf9bd92881 WHIRLPOOL c811f4ff3faf4aba3e37b804ca2cfaa1dae68a66b3d6318f9c420df852b7e2f50239831e261193319932ad8852d3ab5e37dddb857394c68c0dc073c85c401268
-MISC metadata.xml 293 SHA256 76427fc7b45d622dbb4ca0de37d9da2df955ef675be4af144585150d93f5eed6 SHA512 ab7a6c934353e1a81a9dc65c29c6a45100ff98a6e3f21b7fb93a242d6bfaebbe0124e69cce2ba4a25d4516d327498b577bd21dbe29ff5cb0473830e8e87df33d WHIRLPOOL 19caa6f5ad0820e52fca0370bb25ac2133562d1785918b10c7da3de15717b4c941aec213f3b995e16eb3c116efc679f32fe4fef8d45c22687a1251d16d96c7be
+MISC ChangeLog 1880 SHA256 5817270e0273f78ea36567d3bb989f439a658771a6e601c144a3e7941b062a65 SHA512 83de3c313f19eaf852122c2bd8764d7028482177fefd10b76bea680dcd9f555321b14a57bfe26dedf151852cd0a6cab6482da56c84381b51bac0b2b3e37528bb WHIRLPOOL a0892359c39335a10d63d23c28b37eef6535bb0645d02d7086b44e96002e0cdb99330e841d9593e803a8f2ecc378d8e3638ec428bbdf7258eff31780a6aa60ff
+MISC metadata.xml 366 SHA256 00b8c6a52cc47ef5250b5ea730071f6df13677891a5c67c31399a75173f0480a SHA512 f88c4b619eca441ac16db48ea1980e3b921639fc9276fa4435ac4078c17b99b8317081913bac77c4711b87b10417937829ad52dc151d3882d1e032a9dbc4ec07 WHIRLPOOL b07b9a9075a2d512236d1c28af45329bfe43292d3a64e3f964f3c493fc9df2d6fa99afe600e2079b1c96a2aff1267b528e9fb7cb41b53af1ddeb90335e8a571b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQtgEzAAoJEEdUh39IaPFNiBgH/0rPIcWondwu/Cb4LFhCTO5Z
-3MCuWQLbWi5jpicOMEoe+/UDBj6v22CEo9RT1rWscyKd3JU0cS77NRElna7h+CzQ
-HYLbu2tW7hI4MMBQFwckHMUve1mN6/rN3tShz+PCE6TAS2vmQ0S/VMRTDOgqQKxg
-r5yh0oC4h3Fgf41mYIZrHOcrpYBNm16ammy1IPj1lP5Q6O//azRhuFT1M1VD6V7g
-FXpc1W5oqDWXQuihjPz2t67SlR27oU8TW2AHNLY40Ssv5y/7pB6a/dxSq/GSjGkf
-pKSn76pixIVI53XXXYzVnsBL1dk8/jLDHAvKoezNQOBVAXWNB8QLAX4mYqYEhgw=
-=lIVf
+iQJ8BAEBCABmBQJVwenbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vba8P/033ZbrKcZ/tLhL4eM0MGoab
+EV6SRLYizLmlTq5yiownFLtQ/C2OfKhZGVwHkBw8IXDr+BUboEJ5tNc6+W1Ye1jI
+ocHWeFslBmexf2unGUxqW37d3J96zLNdJLBV6ATmhMbo29ItQYqTWaXMEej9/Vvm
+jZU+svidxa6VpT1oUCjNYWoHtUysioWIWHcKhJOIdSIx/1vna5dCE2mt4u3hSjsV
+bWBwwClLBKD2SxsLGivCdJiTIi+NCkIGIbiwPDAP68YGfKfQbJEsOiPpYNCiJRbv
+rWcFP1v+2TaPSgTcIvIc3HPU6p4+rrcM+kr3duCuWQoIh/HVi/j2PlPKQ7kcClos
+UezvybN4IDLF+gua1Dk0TKpUjHTbYuHO/Ipb+oFhITvSiQ1EwOV+aoQT/Jgu3gnB
+qSGUZS6k51AvwahGmu7gQ4ew7JqO9nvTDiJxD3/IlgepETVi8S0nxuTEHLDwkhFM
+2yAjka6C1rUz37niLPlV7PSuyG8ZzP4PVgKD3fZLDllArFSmO/t8Zy2aD3BTJ7hs
+GeU2pyFp20Tk1g4T8Myj4ZexoJSebvmWnufCnhMZoN/w4vkuYehq407AoFyaV/yf
+CL/xcW0CvqF1YjOEL0w6ziMCQZ30mrC7aVWTj3gQdo6WmK5ynFfA+9SYcs2dIjlj
+zvANccVzonT4UQDiisG2
+=5y9i
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfswitch-plugin/metadata.xml b/xfce-extra/xfswitch-plugin/metadata.xml
index a16265a9d686..f6d547ab5488 100644
--- a/xfce-extra/xfswitch-plugin/metadata.xml
+++ b/xfce-extra/xfswitch-plugin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
     <flag name='gdm'>Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
   </use>