18 files changed, 80 insertions, 20 deletions
diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml
index 53e4fff270af..e5e1af1c31ee 100644
--- a/dev-lisp/abcl/metadata.xml
+++ b/dev-lisp/abcl/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>common-lisp</herd>
-	<herd>java</herd>
+	<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+	</maintainer>
 	<longdescription>
 		Armed Bear Common Lisp (ABCL) is an implementation of ANSI Common
 		Lisp that runs in a Java virtual machine.
diff --git a/dev-lisp/asdf-binary-locations/metadata.xml b/dev-lisp/asdf-binary-locations/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/asdf-binary-locations/metadata.xml
+++ b/dev-lisp/asdf-binary-locations/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/asdf/metadata.xml b/dev-lisp/asdf/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/asdf/metadata.xml
+++ b/dev-lisp/asdf/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/cl-ppcre-unicode/metadata.xml b/dev-lisp/cl-ppcre-unicode/metadata.xml
index 38443f050ab4..e772b1669fcf 100644
--- a/dev-lisp/cl-ppcre-unicode/metadata.xml
+++ b/dev-lisp/cl-ppcre-unicode/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 		CL-PPCRE is a portable regular expression library for Common Lisp
 		which has the following features: 
diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml
index f74418ebe7fe..a4fe0edbf099 100644
--- a/dev-lisp/cl-ppcre/metadata.xml
+++ b/dev-lisp/cl-ppcre/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 CL-PPCRE is a portable regular expression library for Common Lisp
 which has the following features: 
diff --git a/dev-lisp/cl-unicode/metadata.xml b/dev-lisp/cl-unicode/metadata.xml
index a1f0819d420e..64ffbd9707d8 100644
--- a/dev-lisp/cl-unicode/metadata.xml
+++ b/dev-lisp/cl-unicode/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 		CL-UNICODE is a library which provides Common Lisp implementations
 		with knowledge about Unicode characters including their name, their
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index 271466f882bb..0cb54e14cb48 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 CLISP is a Common Lisp implementation. It mostly supports the Lisp
 described in the ANSI Common Lisp standard.  It includes an
diff --git a/dev-lisp/clozurecl/metadata.xml b/dev-lisp/clozurecl/metadata.xml
index 7fb197497d83..923f51322605 100644
--- a/dev-lisp/clozurecl/metadata.xml
+++ b/dev-lisp/clozurecl/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 Clozure Common Lisp (formerly OpenMCL) is a Common Lisp implementation.
 </longdescription>
diff --git a/dev-lisp/cmucl/metadata.xml b/dev-lisp/cmucl/metadata.xml
index f2ace0854ee8..43801ace3fd8 100644
--- a/dev-lisp/cmucl/metadata.xml
+++ b/dev-lisp/cmucl/metadata.xml
@@ -5,7 +5,10 @@
 <email>grozin@gentoo.org</email>
 <name>Andrey Grozin</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+<email>common-lisp@gentoo.org</email>
+<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 CMUCL is a free implementation of the Common Lisp programming language
 which runs on most major Unix platforms. It mainly conforms to the
diff --git a/dev-lisp/common-lisp-controller/metadata.xml b/dev-lisp/common-lisp-controller/metadata.xml
index c3581b8c864c..028ea1a0d26a 100644
--- a/dev-lisp/common-lisp-controller/metadata.xml
+++ b/dev-lisp/common-lisp-controller/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
 The Common Lisp Controller was originally used in the Debian project.  The Common
 Lisp Contoller lets you install and manage common lisp sources and compilers.
diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml
index 8fafd6521aef..7737555fdee0 100644
--- a/dev-lisp/ecls/metadata.xml
+++ b/dev-lisp/ecls/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription>
 ECL (Embeddable Common Lisp) is an implementation of the Common Lisp language as
 described in the X3J13 Ansi specification, featuring CLOS (Common Lisp Object
diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml
index 0a0911dbf724..a7073156ef59 100644
--- a/dev-lisp/flexi-streams/metadata.xml
+++ b/dev-lisp/flexi-streams/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		FLEXI-STREAMS implements "virtual" bivalent streams that can be
 		layered atop real binary or bivalent streams and that can be used
diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml
index 83dd1ec0e9a9..b020db36b793 100644
--- a/dev-lisp/gcl/metadata.xml
+++ b/dev-lisp/gcl/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>common-lisp</herd>
+  <maintainer>
+    <email>common-lisp@gentoo.org</email>
+    <name>Gentoo Common Lisp Project</name>
+  </maintainer>
   <longdescription>
     GCL is the official Common Lisp for the GNU project. Its design
     makes use of the system's C compiler to compile to native object
diff --git a/dev-lisp/gentoo-init/metadata.xml b/dev-lisp/gentoo-init/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/gentoo-init/metadata.xml
+++ b/dev-lisp/gentoo-init/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/hyperspec/metadata.xml b/dev-lisp/hyperspec/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/hyperspec/metadata.xml
+++ b/dev-lisp/hyperspec/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 7bbc76d72acd..e863e1a58c4d 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -11,8 +11,14 @@
 		<name>Stelian Ionescu (fe[nl]ix)</name>
 		<description>second-maintainer</description>
 	</maintainer>
-	<herd>common-lisp</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Steel Bank Common Lisp is an open source Common
   Lisp implementation. It provides an integrated native compiler,
   interpreter, and debugger. SBCL is a fork off of the main branch
diff --git a/dev-lisp/trivial-gray-streams/metadata.xml b/dev-lisp/trivial-gray-streams/metadata.xml
index 6dbd467b762f..012307f69641 100644
--- a/dev-lisp/trivial-gray-streams/metadata.xml
+++ b/dev-lisp/trivial-gray-streams/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>common-lisp</herd>
+	<maintainer>
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		This system provides an extremely thin compatibility layer for
 		Gray streams
diff --git a/dev-lisp/uiop/metadata.xml b/dev-lisp/uiop/metadata.xml
index f418045b09c8..1be4b0076f45 100644
--- a/dev-lisp/uiop/metadata.xml
+++ b/dev-lisp/uiop/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>common-lisp</herd>
+<maintainer>
+	<email>common-lisp@gentoo.org</email>
+	<name>Gentoo Common Lisp Project</name>
+</maintainer>
 </pkgmetadata>