Replace herd with xfce@g.o

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)
author: Jason Zaman <perfinion@gentoo.org> 2015-08-05 10:47:50 +0000
committer: Jason Zaman <perfinion@gentoo.org> 2015-08-05 10:47:50 +0000
commit: 7c9f2987b333c87b9f9edeef1a3cc0ca5922825e (patch)
tree: 221c1dfd49a479a5a0c7a4eb216e3a03f220264f /xfce-extra
parent: Replace herd with xfce@g.o (diff)
download: gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.tar.gz
gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.tar.bz2
gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.zip
122 files changed, 513 insertions, 160 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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>
author	Jason Zaman <perfinion@gentoo.org>	2015-08-05 10:47:50 +0000
committer	Jason Zaman <perfinion@gentoo.org>	2015-08-05 10:47:50 +0000
commit	7c9f2987b333c87b9f9edeef1a3cc0ca5922825e (patch)
tree	221c1dfd49a479a5a0c7a4eb216e3a03f220264f /xfce-extra
parent	Replace herd with xfce@g.o (diff)
download	gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.tar.gz gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.tar.bz2 gentoo-2-7c9f2987b333c87b9f9edeef1a3cc0ca5922825e.zip