*/*: update maintainer info

Closes: https://bugs.gentoo.org/849758
Signed-off-by: Matt Jolly <kangie@gentoo.org>

28 files changed, 47 insertions, 91 deletions

diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index ad6c8d27e1b3..6c3a836f2615 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -9,14 +9,10 @@
 		<!-- for the LTS 0.103.x branch only -->
 		<email>mjo@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="clamapp">
 			Build applications (clamscan, clamd, clamdscan, clamonacc (also has its own USE flag), sigtool, clambc, clamav-milter (also requires milter USE flag), clamdtop, clamsubmit, clamconf).
diff --git a/app-arch/createrepo_c/metadata.xml b/app-arch/createrepo_c/metadata.xml
index d3f01feb9062..d68ba2954545 100644
--- a/app-arch/createrepo_c/metadata.xml
+++ b/app-arch/createrepo_c/metadata.xml
@@ -5,8 +5,8 @@
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="person">
diff --git a/app-arch/drpm/metadata.xml b/app-arch/drpm/metadata.xml
index ed3bc9d534c9..ebbca5189fad 100644
--- a/app-arch/drpm/metadata.xml
+++ b/app-arch/drpm/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-			<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+			<email>kangie@gentoo.org</email>
 			<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">rpm-software-management/drpm</remote-id>
 	</upstream>
diff --git a/app-arch/zchunk/metadata.xml b/app-arch/zchunk/metadata.xml
index 40e1e399be6c..b8751b9a4831 100644
--- a/app-arch/zchunk/metadata.xml
+++ b/app-arch/zchunk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-			<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+			<email>kangie@gentoo.org</email>
 			<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index d22a53b6412b..cbd660b825ba 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
diff --git a/dev-python/pytest-twisted/metadata.xml b/dev-python/pytest-twisted/metadata.xml
index 864118bb47ad..a1c7503f6e85 100644
--- a/dev-python/pytest-twisted/metadata.xml
+++ b/dev-python/pytest-twisted/metadata.xml
@@ -2,17 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>Matt.Jolly@footclan.ninja</email>
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">pytest-dev/pytest-twisted</remote-id>
 		<remote-id type="pypi">pytest-twisted</remote-id>
diff --git a/dev-python/python-box/metadata.xml b/dev-python/python-box/metadata.xml
index a825fd0ab27e..f82e4094d819 100644
--- a/dev-python/python-box/metadata.xml
+++ b/dev-python/python-box/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">cdgriffith/Box</remote-id>
 		<remote-id type="pypi">python-box</remote-id>
diff --git a/dev-python/sabctools/metadata.xml b/dev-python/sabctools/metadata.xml
index 5f55022d388c..96af7f755660 100644
--- a/dev-python/sabctools/metadata.xml
+++ b/dev-python/sabctools/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">sabnzbd/sabctools</remote-id>
 		<remote-id type="pypi">sabctools</remote-id>
diff --git a/dev-python/tavalidate/metadata.xml b/dev-python/tavalidate/metadata.xml
index 9656208a7595..5a7da36b5a4b 100644
--- a/dev-python/tavalidate/metadata.xml
+++ b/dev-python/tavalidate/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">sohoffice/tavalidate</remote-id>
 		<remote-id type="pypi">tavalidate</remote-id>
diff --git a/dev-python/tavern/metadata.xml b/dev-python/tavern/metadata.xml
index 9b4279b94b19..0e4ef7c4e398 100644
--- a/dev-python/tavern/metadata.xml
+++ b/dev-python/tavern/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		A command-line tool and Python library and Pytest plugin for automated testing of RESTful APIs,
 		with a simple, concise and flexible YAML-based syntax.
diff --git a/games-fps/alephone-durandal/metadata.xml b/games-fps/alephone-durandal/metadata.xml
index 2a5f1108e681..9c1f70adf763 100644
--- a/games-fps/alephone-durandal/metadata.xml
+++ b/games-fps/alephone-durandal/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>Matt.Jolly@footclan.ninja</email>
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<upstream>
diff --git a/games-fps/alephone-infinity/metadata.xml b/games-fps/alephone-infinity/metadata.xml
index 2a5f1108e681..9c1f70adf763 100644
--- a/games-fps/alephone-infinity/metadata.xml
+++ b/games-fps/alephone-infinity/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>Matt.Jolly@footclan.ninja</email>
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<upstream>
diff --git a/games-fps/alephone-marathon/metadata.xml b/games-fps/alephone-marathon/metadata.xml
index 2a5f1108e681..9c1f70adf763 100644
--- a/games-fps/alephone-marathon/metadata.xml
+++ b/games-fps/alephone-marathon/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>Matt.Jolly@footclan.ninja</email>
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<upstream>
diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml
index 62d4b84ac671..f0f5b0080bc7 100644
--- a/games-fps/alephone/metadata.xml
+++ b/games-fps/alephone/metadata.xml
@@ -5,8 +5,8 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<upstream>
diff --git a/media-fonts/intel-one-mono/metadata.xml b/media-fonts/intel-one-mono/metadata.xml
index 9a8dddcde994..551441a281b8 100644
--- a/media-fonts/intel-one-mono/metadata.xml
+++ b/media-fonts/intel-one-mono/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>Matt.Jolly@footclan.ninja</email>
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">intel/intel-one-mono</remote-id>
 	</upstream>
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 03338d90b333..d79a1ed4affd 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 91438397ce77..c70b5b4fdadb 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -89,11 +89,11 @@ dev-qt/qtbase -renderdoc
 # media-libs/roc-toolkit is not keyworded in most places
 media-video/pipewire -roc
 
-# Matt Jolly <matt.jolly@footclan.ninja> (2023-08-10)
+# Matt Jolly <kangie@gentoo.org> (2023-08-10)
 # 'ssl' USE required for curl's nghttp3/quic support
 net-libs/ngtcp2 -ssl
 
-# Matt Jolly <matt.jolly@footclan.ninja> (2023-08-10)
+# Matt Jolly <kangie@gentoo.org> (2023-08-10)
 # nghttp3 has been tested to work on amd64
 net-misc/curl -nghttp3
 
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 55ec28d2d0de..b0ebeb503d6e 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -42,7 +42,7 @@ dev-db/spatialite rttopo
 # Mask testing on stable until we have stable qt6
 dev-python/pytest-qt test
 
-# Matt Jolly <matt.jolly@footclan.ninja> (2023-08-10)
+# Matt Jolly <kangie@gentoo.org> (2023-08-10)
 # net-libs/ngtcp2 is not marked stable
 net-misc/curl nghttp3
 
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index bb3459e0d327..022e47cf5ab5 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Matt Jolly <Matt.Jolly@footclan.ninja> (2024-01-30)
+# Matt Jolly <kangie@gentoo.org> (2024-01-30)
 # Google does not provide an arm64 toolchain
 www-client/chromium system-toolchain
 
diff --git a/profiles/arch/powerpc/ppc64/package.use.force b/profiles/arch/powerpc/ppc64/package.use.force
index 843c330072db..d197a47b1d51 100644
--- a/profiles/arch/powerpc/ppc64/package.use.force
+++ b/profiles/arch/powerpc/ppc64/package.use.force
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Matt Jolly <Matt.Jolly@footclan.ninja> (2024-01-30)
+# Matt Jolly <kangie@gentoo.org> (2024-01-30)
 # Google does not provide a ppc64 toolchain
 www-client/chromium system-toolchain
 
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 043790e263d5..a85510a59ee0 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -27,7 +27,7 @@ sys-devel/llvm -debuginfod
 # librttopo has not been tested on this arch
 dev-db/spatialite rttopo
 
-# Matt Jolly <Matt.Jolly@footclan.ninja> (2023-08-16)
+# Matt Jolly <kangie@gentoo.org> (2023-08-16)
 # Fails tests, potential false negatives #911402
 app-antivirus/clamav system-mspack
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 08bf9c9a2542..b18e1cc72b3c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -294,7 +294,7 @@ dev-util/schroot nls
 # bug #870211.
 dev-lang/rust llvm-libunwind
 
-# Matt Jolly <Matt.Jolly@footclan.ninja> (2022-09-09)
+# Matt Jolly <kangie@gentoo.org> (2022-09-09)
 # app-antivirus/clamav JIT support requires LLVM <=13
 # ebuild support is there but currently failing to link
 app-antivirus/clamav jit
diff --git a/sec-keys/openpgp-keys-danielstenberg/metadata.xml b/sec-keys/openpgp-keys-danielstenberg/metadata.xml
index 83de7fb285e4..6649b9d477b3 100644
--- a/sec-keys/openpgp-keys-danielstenberg/metadata.xml
+++ b/sec-keys/openpgp-keys-danielstenberg/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/sys-boot/plymouth-openrc-plugin/metadata.xml b/sys-boot/plymouth-openrc-plugin/metadata.xml
index 529f0157bd8e..5f0cea7780d7 100644
--- a/sys-boot/plymouth-openrc-plugin/metadata.xml
+++ b/sys-boot/plymouth-openrc-plugin/metadata.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<maintainer status="active">
-			<email>Matt.Jolly@footclan.ninja</email>
+			<email>kangie@gentoo.org</email>
 			<name>Matt Jolly</name>
 		</maintainer>
 		<remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id>
diff --git a/sys-fs/bcachefs-tools/metadata.xml b/sys-fs/bcachefs-tools/metadata.xml
index dbf11eaa9455..48e79cd6a8f8 100644
--- a/sys-fs/bcachefs-tools/metadata.xml
+++ b/sys-fs/bcachefs-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
diff --git a/sys-libs/libmodulemd/metadata.xml b/sys-libs/libmodulemd/metadata.xml
index 133909780d76..8b31faedb4d6 100644
--- a/sys-libs/libmodulemd/metadata.xml
+++ b/sys-libs/libmodulemd/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-			<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+			<email>kangie@gentoo.org</email>
 			<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">fedora-modularity/libmodulemd</remote-id>
 	</upstream>
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index e38482dd4b76..2499b3f5ccaf 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -5,8 +5,8 @@
 		<email>chromium@gentoo.org</email>
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
 	<use>
diff --git a/x11-wm/fvwm3/metadata.xml b/x11-wm/fvwm3/metadata.xml
index 41f1d6eda8d2..278a0067ac68 100644
--- a/x11-wm/fvwm3/metadata.xml
+++ b/x11-wm/fvwm3/metadata.xml
@@ -5,14 +5,10 @@
 		fvwm3 is a multiple large virtual desktop window manager.
 		The successor to fvwm-2.6, Fvwm3 is intended to be extremely customizable and extendible while consuming a relatively small amount of resources.
 	</longdescription>
-	<maintainer type="person" proxied="yes">
-		<email>Matt.Jolly@footclan.ninja</email>
+	<maintainer type="person">
+		<email>kangie@gentoo.org</email>
 		<name>Matt Jolly</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="go">Enable building <pkg>dev-lang/go</pkg> code (FvwmPrompt)</flag>
 		<flag name="lock">Enable screen locking</flag>