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.

9 files changed, 34 insertions, 12 deletions

diff --git a/sys-firmware/alsa-firmware/metadata.xml b/sys-firmware/alsa-firmware/metadata.xml
index 8987e55f2c06..f16125d4f480 100644
--- a/sys-firmware/alsa-firmware/metadata.xml
+++ b/sys-firmware/alsa-firmware/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>alsa</herd>
 <maintainer>
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
diff --git a/sys-firmware/amdgpu-ucode/metadata.xml b/sys-firmware/amdgpu-ucode/metadata.xml
index 5229625eab8b..21e95370563e 100644
--- a/sys-firmware/amdgpu-ucode/metadata.xml
+++ b/sys-firmware/amdgpu-ucode/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>x11</herd>
+	<maintainer>
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
 	<use>
 		<flag name="legacy">Install firmware for older chipsets which are optionally supported by AMDGPU</flag>
 	</use>
diff --git a/sys-firmware/ivtv-firmware/metadata.xml b/sys-firmware/ivtv-firmware/metadata.xml
index fd181aef8957..0146ca0366e3 100644
--- a/sys-firmware/ivtv-firmware/metadata.xml
+++ b/sys-firmware/ivtv-firmware/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>mythtv</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 	</maintainer>
+<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/radeon-ucode/metadata.xml b/sys-firmware/radeon-ucode/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/sys-firmware/radeon-ucode/metadata.xml
+++ b/sys-firmware/radeon-ucode/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>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
index 0c7c58588c2e..cbe72bbc87bd 100644
--- a/sys-firmware/seabios/metadata.xml
+++ b/sys-firmware/seabios/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qemu</herd>
-	<herd>virtualization</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Use official upstream pre-built binaries</flag>
 		<flag name="seavgabios">Include SeaVGABIOS binaries (replacement for vgabios)</flag>
diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
index ab3fa2a01e23..ef17a29ac51c 100644
--- a/sys-firmware/sgabios/metadata.xml
+++ b/sys-firmware/sgabios/metadata.xml
@@ -5,5 +5,8 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>qemu</herd>
-</pkgmetadata>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
index 2f1e0cd35a24..d0c81e19848b 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
+++ b/sys-firmware/sigrok-firmware-fx2lafw/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>dev-embedded</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
 <use>
  <flag name="binary">Use official upstream pre-built binaries</flag>
 </use>
diff --git a/sys-firmware/tt-s2-6400-firmware/metadata.xml b/sys-firmware/tt-s2-6400-firmware/metadata.xml
index 94d2eca26f15..18bf54be7ee8 100644
--- a/sys-firmware/tt-s2-6400-firmware/metadata.xml
+++ b/sys-firmware/tt-s2-6400-firmware/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-    <maintainer>
+<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
     </maintainer>
diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
index c15323fe0db0..2fa6ec138bcb 100644
--- a/sys-firmware/vgabios/metadata.xml
+++ b/sys-firmware/vgabios/metadata.xml
@@ -5,7 +5,10 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>qemu</herd>
+	<maintainer>
+		<email>qemu@gentoo.org</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
 	<use>
 		<flag name="binary">Use official upstream pre-built binaries (only default and cirrus images)</flag>
 	</use>