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.

18 files changed, 80 insertions, 20 deletions

diff --git a/games-roguelike/FTL/metadata.xml b/games-roguelike/FTL/metadata.xml
index 2dca1f17c9be..d3dac0e4e47c 100644
--- a/games-roguelike/FTL/metadata.xml
+++ b/games-roguelike/FTL/metadata.xml
@@ -1,13 +1,19 @@
 <?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>alex_y_xu@yahoo.ca</email>
 		<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="bundled-libs">Use bundled libraries.</flag>
 	</use>
diff --git a/games-roguelike/adom/metadata.xml b/games-roguelike/adom/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/adom/metadata.xml
+++ b/games-roguelike/adom/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-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index aff940f0be4f..20d5bdb15528 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/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="sound">Enable and install sounds</flag>
 	</use>
diff --git a/games-roguelike/crossfire-client/metadata.xml b/games-roguelike/crossfire-client/metadata.xml
index 19f7d9af42ad..d1369608956b 100644
--- a/games-roguelike/crossfire-client/metadata.xml
+++ b/games-roguelike/crossfire-client/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">crossfire</remote-id>
 	</upstream>
diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml
index c9a8db431846..17e87cfa6121 100644
--- a/games-roguelike/dwarf-fortress/metadata.xml
+++ b/games-roguelike/dwarf-fortress/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>alex_y_xu@yahoo.ca</email>
 	<name>Alex Xu</name>
@@ -12,4 +11,8 @@
 	<name>Chris Reffett</name>
 	<description>maintainer, please CC on bugs</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/games-roguelike/hengband/metadata.xml b/games-roguelike/hengband/metadata.xml
index 53afe19dbddc..ce01e2d60d5a 100644
--- a/games-roguelike/hengband/metadata.xml
+++ b/games-roguelike/hengband/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-jp">hengband</remote-id>
 	</upstream>
diff --git a/games-roguelike/mazesofmonad/metadata.xml b/games-roguelike/mazesofmonad/metadata.xml
index 7ca9c091535d..3fe6fc73f4fb 100644
--- a/games-roguelike/mazesofmonad/metadata.xml
+++ b/games-roguelike/mazesofmonad/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>haskell</herd>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<longdescription>
 		MazesOfMonad is a console-based Role Playing Game. You create
 		characters with their strong and weak points, and try to complete
diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/moria/metadata.xml
+++ b/games-roguelike/moria/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-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 5570ca33dc3e..bc1f6a1e476d 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>aranea@aixah.de</email>
     <name>Luis Ressel</name>
     <description>Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">nethack</remote-id>
   </upstream>
diff --git a/games-roguelike/powder/metadata.xml b/games-roguelike/powder/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/powder/metadata.xml
+++ b/games-roguelike/powder/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-roguelike/rogue/metadata.xml b/games-roguelike/rogue/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/rogue/metadata.xml
+++ b/games-roguelike/rogue/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-roguelike/scourge/metadata.xml b/games-roguelike/scourge/metadata.xml
index f243e01d74db..b647087f5878 100644
--- a/games-roguelike/scourge/metadata.xml
+++ b/games-roguelike/scourge/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">scourge</remote-id>
 	</upstream>
diff --git a/games-roguelike/slashem/metadata.xml b/games-roguelike/slashem/metadata.xml
index 17ecb6b48aa0..e6496d76eca8 100644
--- a/games-roguelike/slashem/metadata.xml
+++ b/games-roguelike/slashem/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">slashem</remote-id>
 	</upstream>
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index f9cf8272b6f5..4d20bef84c98 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/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>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<maintainer>
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<doc lang="en">http://crawl.develz.org/wordpress/documentation</doc>
 		<bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
diff --git a/games-roguelike/tome/metadata.xml b/games-roguelike/tome/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/tome/metadata.xml
+++ b/games-roguelike/tome/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-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index 8fe1f5ee178e..ef84733c70dc 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/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="server">Compile server support</flag>
 	</use>
diff --git a/games-roguelike/wrogue/metadata.xml b/games-roguelike/wrogue/metadata.xml
index 196d419134e9..0de71ed3d396 100644
--- a/games-roguelike/wrogue/metadata.xml
+++ b/games-roguelike/wrogue/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 lang="en">
 Warp Rogue is a gothic science fantasy roguelike game. It features RPG-like game
 mechanics, recruitable NPCs, and a consistent theme.
diff --git a/games-roguelike/zangband/metadata.xml b/games-roguelike/zangband/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/games-roguelike/zangband/metadata.xml
+++ b/games-roguelike/zangband/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>