gentoo resync : 24.06.2021

1 files changed, 9 insertions, 24 deletions

diff --git a/metadata/projects.xml b/metadata/projects.xml
index 2f513f76018f..4ef31da182ee 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -253,10 +253,6 @@
       <role>Team Leader</role>
     </member>
     <member>
-      <email>maffblaster@gentoo.org</email>
-      <name>Matthew Marchese</name>
-    </member>
-    <member>
       <email>sping@gentoo.org</email>
       <name>Sebastian Pipping</name>
     </member>
@@ -597,10 +593,6 @@
     <name>Common Lisp Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Common_Lisp</url>
     <description>The Gentoo Common Lisp Project handles Common Lisp related packages in the Gentoo package tree.</description>
-    <member>
-      <email>ulm@gentoo.org</email>
-      <name>Ulrich Müller</name>
-    </member>
   </project>
   <project>
     <email>containers@gentoo.org</email>
@@ -734,7 +726,11 @@
     <email>ejabberd@gentoo.org</email>
     <name>ejabberd Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Ejabberd</url>
-    <description>The ejabberd project maintains the ejabberd xmpp server software and its dependencies.</description>
+    <description>The ejabberd project maintains the ejabberd XMPP server software and its dependencies.</description>
+    <member>
+      <email>flow@gentoo.org</email>
+      <name>Florian Schmaus</name>
+    </member>
     <member>
       <email>hanno@gentoo.org</email>
       <name>Hanno Böck</name>
@@ -1115,11 +1111,6 @@
     <name>Genkernel</name>
     <url>https://wiki.gentoo.org/wiki/Project:Genkernel</url>
     <description>The Genkernel project handles the maintenance and development of [https://packages.gentoo.org/packages/sys-kernel/genkernel sys-kernel/genkernel].</description>
-    <member>
-      <email>maffblaster@gentoo.org</email>
-      <name>Matthew Marchese</name>
-      <role>Merge man</role>
-    </member>
     <member is-lead="1">
       <email>robbat2@gentoo.org</email>
       <name>Robin Johnson</name>
@@ -1459,6 +1450,10 @@
     <url>https://wiki.gentoo.org/wiki/Project:Java</url>
     <description>We maintain everything Java-related in Gentoo, that is, most of dev-java/* and also packages in categories like dev-util, www-servers etc.</description>
     <member>
+      <email>flow@gentoo.org</email>
+      <name>Florian Schmaus</name>
+    </member>
+    <member>
       <email>fordfrog@gentoo.org</email>
       <name>Miroslav Šulc</name>
     </member>
@@ -1673,11 +1668,6 @@
     <subproject ref="common-lisp@gentoo.org" inherit-members="1"/>
     <subproject ref="emacs@gentoo.org" inherit-members="1"/>
     <subproject ref="scheme@gentoo.org" inherit-members="1"/>
-    <member>
-      <email>ulm@gentoo.org</email>
-      <name>Ulrich Müller</name>
-      <role>Developer</role>
-    </member>
   </project>
   <project>
     <email>lua@gentoo.org</email>
@@ -2673,11 +2663,6 @@
       <name>Georgy Yakovlev</name>
       <role>ppc64 helper (musl, systemd, power9)</role>
     </member>
-    <member>
-      <email>maffblaster@gentoo.org</email>
-      <name>Matthew Marchese</name>
-      <role>Documentation Helper</role>
-    </member>
     <member is-lead="1">
       <email>mattst88@gentoo.org</email>
       <name>Matt Turner</name>