Replace all herds with appropriate projects (GLEP 67)

Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.

75 files changed, 312 insertions, 78 deletions

diff --git a/games-misc/OilWar/metadata.xml b/games-misc/OilWar/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/OilWar/metadata.xml
+++ b/games-misc/OilWar/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/asr-manpages/metadata.xml b/games-misc/asr-manpages/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/asr-manpages/metadata.xml
+++ b/games-misc/asr-manpages/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/bsd-games/metadata.xml b/games-misc/bsd-games/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/bsd-games/metadata.xml
+++ b/games-misc/bsd-games/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/bsod/metadata.xml b/games-misc/bsod/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/bsod/metadata.xml
+++ b/games-misc/bsod/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/c++robots/metadata.xml b/games-misc/c++robots/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/c++robots/metadata.xml
+++ b/games-misc/c++robots/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/cowsay/metadata.xml b/games-misc/cowsay/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/cowsay/metadata.xml
+++ b/games-misc/cowsay/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/dont-starve/metadata.xml b/games-misc/dont-starve/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/dont-starve/metadata.xml
+++ b/games-misc/dont-starve/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/exult-sound/metadata.xml b/games-misc/exult-sound/metadata.xml
index 1c9acdb0dae6..412ce9fd86cd 100644
--- a/games-misc/exult-sound/metadata.xml
+++ b/games-misc/exult-sound/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">exult</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-all/metadata.xml b/games-misc/fortune-mod-all/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-all/metadata.xml
+++ b/games-misc/fortune-mod-all/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-at-linux/metadata.xml b/games-misc/fortune-mod-at-linux/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-at-linux/metadata.xml
+++ b/games-misc/fortune-mod-at-linux/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-bofh-excuses/metadata.xml b/games-misc/fortune-mod-bofh-excuses/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-bofh-excuses/metadata.xml
+++ b/games-misc/fortune-mod-bofh-excuses/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-calvin/metadata.xml b/games-misc/fortune-mod-calvin/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-calvin/metadata.xml
+++ b/games-misc/fortune-mod-calvin/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-chucknorris/metadata.xml b/games-misc/fortune-mod-chucknorris/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-chucknorris/metadata.xml
+++ b/games-misc/fortune-mod-chucknorris/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-cs/metadata.xml b/games-misc/fortune-mod-cs/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-cs/metadata.xml
+++ b/games-misc/fortune-mod-cs/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-debilneho/metadata.xml b/games-misc/fortune-mod-debilneho/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-debilneho/metadata.xml
+++ b/games-misc/fortune-mod-debilneho/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-discworld/metadata.xml b/games-misc/fortune-mod-discworld/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-discworld/metadata.xml
+++ b/games-misc/fortune-mod-discworld/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-dubya/metadata.xml b/games-misc/fortune-mod-dubya/metadata.xml
index 39a9fb9cd378..d6b3bc689221 100644
--- a/games-misc/fortune-mod-dubya/metadata.xml
+++ b/games-misc/fortune-mod-dubya/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 <longdescription>
 	dubya is a module for fortune-mod, and contains many quotes from George W.
 	Bush.  The great majority, if not all, of these quotes were originally
diff --git a/games-misc/fortune-mod-dune/metadata.xml b/games-misc/fortune-mod-dune/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-dune/metadata.xml
+++ b/games-misc/fortune-mod-dune/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-familyguy/metadata.xml b/games-misc/fortune-mod-familyguy/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-familyguy/metadata.xml
+++ b/games-misc/fortune-mod-familyguy/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-firefly/metadata.xml b/games-misc/fortune-mod-firefly/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-firefly/metadata.xml
+++ b/games-misc/fortune-mod-firefly/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-flashrider/metadata.xml b/games-misc/fortune-mod-flashrider/metadata.xml
index d0f7034945d3..cf1d04477386 100644
--- a/games-misc/fortune-mod-flashrider/metadata.xml
+++ b/games-misc/fortune-mod-flashrider/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>zzam@gentoo.org</email>
 		<name>Matthias Schwarzott</name>
 	</maintainer>
+<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-futurama/metadata.xml b/games-misc/fortune-mod-futurama/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-futurama/metadata.xml
+++ b/games-misc/fortune-mod-futurama/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-fvl/metadata.xml b/games-misc/fortune-mod-fvl/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-fvl/metadata.xml
+++ b/games-misc/fortune-mod-fvl/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-gentoo-dev/metadata.xml b/games-misc/fortune-mod-gentoo-dev/metadata.xml
index bbc3d9c80974..6c3e98194348 100644
--- a/games-misc/fortune-mod-gentoo-dev/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-dev/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 	<name>Robin H. Johnson</name>
 	<description>Maintainer. Also, please submit snippets for the fortunes to
 		me.</description>
 </maintainer>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-forums/metadata.xml b/games-misc/fortune-mod-gentoo-forums/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-gentoo-forums/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-forums/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-ru/metadata.xml b/games-misc/fortune-mod-gentoo-ru/metadata.xml
index c1f4cdf9b82d..a71777cb0cad 100644
--- a/games-misc/fortune-mod-gentoo-ru/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-ru/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 	</maintainer>
 	<maintainer>
 		<email>qnikst@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
 and other russian gentoo related resourses.</longdescription>
 	<upstream>
diff --git a/games-misc/fortune-mod-hitchhiker/metadata.xml b/games-misc/fortune-mod-hitchhiker/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-hitchhiker/metadata.xml
+++ b/games-misc/fortune-mod-hitchhiker/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-homer/metadata.xml b/games-misc/fortune-mod-homer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-homer/metadata.xml
+++ b/games-misc/fortune-mod-homer/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-humorixfortunes/metadata.xml b/games-misc/fortune-mod-humorixfortunes/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-humorixfortunes/metadata.xml
+++ b/games-misc/fortune-mod-humorixfortunes/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-it/metadata.xml b/games-misc/fortune-mod-it/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-it/metadata.xml
+++ b/games-misc/fortune-mod-it/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-kernelcookies/metadata.xml b/games-misc/fortune-mod-kernelcookies/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-kernelcookies/metadata.xml
+++ b/games-misc/fortune-mod-kernelcookies/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-mormon/metadata.xml b/games-misc/fortune-mod-mormon/metadata.xml
index fc42e0073f29..d0c5184cf4c5 100644
--- a/games-misc/fortune-mod-mormon/metadata.xml
+++ b/games-misc/fortune-mod-mormon/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>theology</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
+++ b/games-misc/fortune-mod-norbert-tretkowski/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-osfortune/metadata.xml b/games-misc/fortune-mod-osfortune/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-osfortune/metadata.xml
+++ b/games-misc/fortune-mod-osfortune/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-powerpuff/metadata.xml b/games-misc/fortune-mod-powerpuff/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-powerpuff/metadata.xml
+++ b/games-misc/fortune-mod-powerpuff/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-pqf/metadata.xml b/games-misc/fortune-mod-pqf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-pqf/metadata.xml
+++ b/games-misc/fortune-mod-pqf/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-rss/metadata.xml b/games-misc/fortune-mod-rss/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-rss/metadata.xml
+++ b/games-misc/fortune-mod-rss/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-scriptures/metadata.xml b/games-misc/fortune-mod-scriptures/metadata.xml
index fc42e0073f29..d0c5184cf4c5 100644
--- a/games-misc/fortune-mod-scriptures/metadata.xml
+++ b/games-misc/fortune-mod-scriptures/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>theology</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mormon</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml b/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
+++ b/games-misc/fortune-mod-simpsons-chalkboard/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-slackware/metadata.xml b/games-misc/fortune-mod-slackware/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-slackware/metadata.xml
+++ b/games-misc/fortune-mod-slackware/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-smac/metadata.xml b/games-misc/fortune-mod-smac/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-smac/metadata.xml
+++ b/games-misc/fortune-mod-smac/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-sp-fortunes/metadata.xml b/games-misc/fortune-mod-sp-fortunes/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-sp-fortunes/metadata.xml
+++ b/games-misc/fortune-mod-sp-fortunes/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-starwars/metadata.xml b/games-misc/fortune-mod-starwars/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-starwars/metadata.xml
+++ b/games-misc/fortune-mod-starwars/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-strangelove/metadata.xml b/games-misc/fortune-mod-strangelove/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-strangelove/metadata.xml
+++ b/games-misc/fortune-mod-strangelove/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-tao/metadata.xml b/games-misc/fortune-mod-tao/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-tao/metadata.xml
+++ b/games-misc/fortune-mod-tao/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-taow/metadata.xml b/games-misc/fortune-mod-taow/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-taow/metadata.xml
+++ b/games-misc/fortune-mod-taow/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
index 875353e4569b..ad8a9863be2f 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
+++ b/games-misc/fortune-mod-thomas-ogrisegg/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
 	</upstream>
diff --git a/games-misc/fortune-mod-woody-allen-it/metadata.xml b/games-misc/fortune-mod-woody-allen-it/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-woody-allen-it/metadata.xml
+++ b/games-misc/fortune-mod-woody-allen-it/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod-zx-error/metadata.xml b/games-misc/fortune-mod-zx-error/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod-zx-error/metadata.xml
+++ b/games-misc/fortune-mod-zx-error/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/fortune-mod/metadata.xml b/games-misc/fortune-mod/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/fortune-mod/metadata.xml
+++ b/games-misc/fortune-mod/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/funny-manpages/metadata.xml b/games-misc/funny-manpages/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/funny-manpages/metadata.xml
+++ b/games-misc/funny-manpages/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/gBhed/metadata.xml b/games-misc/gBhed/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/gBhed/metadata.xml
+++ b/games-misc/gBhed/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/games-envd/metadata.xml b/games-misc/games-envd/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/games-envd/metadata.xml
+++ b/games-misc/games-envd/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/ggencoder/metadata.xml b/games-misc/ggencoder/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/ggencoder/metadata.xml
+++ b/games-misc/ggencoder/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/gtklife/metadata.xml b/games-misc/gtklife/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/gtklife/metadata.xml
+++ b/games-misc/gtklife/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/katawa-shoujo/metadata.xml b/games-misc/katawa-shoujo/metadata.xml
index e2230c40ed48..d919d15ebc8f 100644
--- a/games-misc/katawa-shoujo/metadata.xml
+++ b/games-misc/katawa-shoujo/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maksverver@geocities.com</email>
 		<name>Maks Verver</name>
@@ -13,6 +11,14 @@
 		<name>Alex Xu</name>
 		<description>Proxied maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="system-renpy">Use <pkg>games-engines/renpy</pkg> instead of the bundled one (experimental)</flag>
 	</use>
diff --git a/games-misc/little-inferno/metadata.xml b/games-misc/little-inferno/metadata.xml
index 2133b024aaef..4f2cd2a3bba5 100644
--- a/games-misc/little-inferno/metadata.xml
+++ b/games-misc/little-inferno/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
diff --git a/games-misc/lolcat/metadata.xml b/games-misc/lolcat/metadata.xml
index 8a24ef8c3bd0..b4e05ca8d01e 100644
--- a/games-misc/lolcat/metadata.xml
+++ b/games-misc/lolcat/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">busyloop/lolcat</remote-id>
 	</upstream>
diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
index 2f384c0e3613..f0276886f7ec 100644
--- a/games-misc/lucidlife/metadata.xml
+++ b/games-misc/lucidlife/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
 <maintainer>
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<maintainer>
+<email>games@gentoo.org</email>
+<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/nyancat/metadata.xml b/games-misc/nyancat/metadata.xml
index bc44a06a0e1e..3399fa888fbd 100644
--- a/games-misc/nyancat/metadata.xml
+++ b/games-misc/nyancat/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">klange/nyancat</remote-id>
 	</upstream>
diff --git a/games-misc/opengfx/metadata.xml b/games-misc/opengfx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/opengfx/metadata.xml
+++ b/games-misc/opengfx/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/openmsx/metadata.xml b/games-misc/openmsx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/openmsx/metadata.xml
+++ b/games-misc/openmsx/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/opensfx/metadata.xml b/games-misc/opensfx/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/opensfx/metadata.xml
+++ b/games-misc/opensfx/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/papers-please/metadata.xml b/games-misc/papers-please/metadata.xml
index cad5a2aa1773..a72b0564b3fb 100644
--- a/games-misc/papers-please/metadata.xml
+++ b/games-misc/papers-please/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-misc/qlife/metadata.xml b/games-misc/qlife/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/qlife/metadata.xml
+++ b/games-misc/qlife/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/rfksay/metadata.xml b/games-misc/rfksay/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/rfksay/metadata.xml
+++ b/games-misc/rfksay/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/robotfindskitten/metadata.xml b/games-misc/robotfindskitten/metadata.xml
index aac5d18a769d..cc673760de96 100644
--- a/games-misc/robotfindskitten/metadata.xml
+++ b/games-misc/robotfindskitten/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rfk</remote-id>
 	</upstream>
diff --git a/games-misc/sdljoytest/metadata.xml b/games-misc/sdljoytest/metadata.xml
index 7a55811def1a..c5d4d9f9ffd2 100644
--- a/games-misc/sdljoytest/metadata.xml
+++ b/games-misc/sdljoytest/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sdljoytest</remote-id>
 	</upstream>
diff --git a/games-misc/sex/metadata.xml b/games-misc/sex/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/sex/metadata.xml
+++ b/games-misc/sex/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/typespeed/metadata.xml b/games-misc/typespeed/metadata.xml
index 712b1eb014a5..c2df896a988a 100644
--- a/games-misc/typespeed/metadata.xml
+++ b/games-misc/typespeed/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">typespeed</remote-id>
 	</upstream>
diff --git a/games-misc/wtf/metadata.xml b/games-misc/wtf/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/wtf/metadata.xml
+++ b/games-misc/wtf/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/wumpus/metadata.xml b/games-misc/wumpus/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/wumpus/metadata.xml
+++ b/games-misc/wumpus/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/xcruiser/metadata.xml b/games-misc/xcruiser/metadata.xml
index 1a97e4bca997..cca3221afe60 100644
--- a/games-misc/xcruiser/metadata.xml
+++ b/games-misc/xcruiser/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>games</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xcruiser</remote-id>
 	</upstream>
diff --git a/games-misc/xpenguins/metadata.xml b/games-misc/xpenguins/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/xpenguins/metadata.xml
+++ b/games-misc/xpenguins/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-misc/yadex/metadata.xml b/games-misc/yadex/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-misc/yadex/metadata.xml
+++ b/games-misc/yadex/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>games</herd>
+<maintainer>
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
 </pkgmetadata>