Migrate metadata for GLEP 67 and perform general cleanup.

20 files changed, 119 insertions, 59 deletions

diff --git a/lxqt-base/liblxqt-mount/metadata.xml b/lxqt-base/liblxqt-mount/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/liblxqt-mount/metadata.xml
+++ b/lxqt-base/liblxqt-mount/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/liblxqt/metadata.xml
+++ b/lxqt-base/liblxqt/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/libsysstat/metadata.xml b/lxqt-base/libsysstat/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/libsysstat/metadata.xml
+++ b/lxqt-base/libsysstat/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-about/metadata.xml b/lxqt-base/lxqt-about/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-about/metadata.xml
+++ b/lxqt-base/lxqt-about/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-admin/metadata.xml b/lxqt-base/lxqt-admin/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-admin/metadata.xml
+++ b/lxqt-base/lxqt-admin/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-appswitcher/metadata.xml b/lxqt-base/lxqt-appswitcher/metadata.xml
index 34a29015..cd9f9054 100644
--- a/lxqt-base/lxqt-appswitcher/metadata.xml
+++ b/lxqt-base/lxqt-appswitcher/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>lxde</herd>
+	<maintainer type="project">
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-common/metadata.xml b/lxqt-base/lxqt-common/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-common/metadata.xml
+++ b/lxqt-base/lxqt-common/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-config-randr/metadata.xml b/lxqt-base/lxqt-config-randr/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-config-randr/metadata.xml
+++ b/lxqt-base/lxqt-config-randr/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-config/metadata.xml
+++ b/lxqt-base/lxqt-config/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml b/lxqt-base/lxqt-globalkeys/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-globalkeys/metadata.xml
+++ b/lxqt-base/lxqt-globalkeys/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 997bb1f8..0d64ff3c 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
-  <use>
-    <flag name="admin">Install <pkg>app-admin/lxqt-admin</pkg></flag>
-    <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
-    file manager</flag>
-    <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
-    icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</flag>
-    <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
-    display manager</flag>
-    <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
-    image viewer</flag>
-    <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
-    window manager</flag>
-    <flag name="powermanagement">Install
-    <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
-    <flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
-    display manager</flag>
-    <flag name="ssh-askpass">Install <pkg>net-misc/lxqt-openssh-askpass</pkg>
-    user password prompt tool</flag>
-  </use>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<use>
+		<flag name="admin">Install <pkg>app-admin/lxqt-admin</pkg></flag>
+		<flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
+			file manager</flag>
+		<flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
+			icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</flag>
+		<flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
+			display manager</flag>
+		<flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
+			image viewer</flag>
+		<flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
+			window manager</flag>
+		<flag name="powermanagement">Install
+			<pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
+		<flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
+			display manager</flag>
+		<flag name="ssh-askpass">Install <pkg>net-misc/lxqt-openssh-askpass</pkg>
+			user password prompt tool</flag>
+	</use>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-notificationd/metadata.xml b/lxqt-base/lxqt-notificationd/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-notificationd/metadata.xml
+++ b/lxqt-base/lxqt-notificationd/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-openssh-askpass/metadata.xml
+++ b/lxqt-base/lxqt-openssh-askpass/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
index 54bfea0c..7afc11f5 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxqt</herd>
-  <use>
-    <flag name="clock">Build clock plugin</flag>
-    <flag name="colorpicker">Build colorpicker plugin</flag>
-    <flag name="cpuload">Build cpuload plugin</flag>
-    <flag name="desktopswitch">Build desktopswitch plugin</flag>
-    <flag name="dom">Build dom plugin</flag>
-    <flag name="kbindicator">Build kbindicator plugin</flag>
-    <flag name="mainmenu">Build mainmenu plugin</flag>
-    <flag name="mount">Build mount plugin</flag>
-    <flag name="networkmonitor">Build networkmonitor plugin</flag>
-    <flag name="quicklaunch">Build quicklaunch plugin</flag>
-    <flag name="screensaver">Build screensaver plugin</flag>
-    <flag name="sensors">Build sensors plugin</flag>
-    <flag name="showdesktop">Build showdesktop plugin</flag>
-    <flag name="sysstat">Build sysstat plugin</flag>
-    <flag name="taskbar">Build taskbar plugin</flag>
-    <flag name="tray">Build tray plugin</flag>
-    <flag name="volume">Build volume plugin</flag>
-    <flag name="worldclock">Build worldclock plugin</flag>
-  </use>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<use>
+		<flag name="clock">Build clock plugin</flag>
+		<flag name="colorpicker">Build colorpicker plugin</flag>
+		<flag name="cpuload">Build cpuload plugin</flag>
+		<flag name="desktopswitch">Build desktopswitch plugin</flag>
+		<flag name="dom">Build dom plugin</flag>
+		<flag name="kbindicator">Build kbindicator plugin</flag>
+		<flag name="mainmenu">Build mainmenu plugin</flag>
+		<flag name="mount">Build mount plugin</flag>
+		<flag name="networkmonitor">Build networkmonitor plugin</flag>
+		<flag name="quicklaunch">Build quicklaunch plugin</flag>
+		<flag name="screensaver">Build screensaver plugin</flag>
+		<flag name="sensors">Build sensors plugin</flag>
+		<flag name="showdesktop">Build showdesktop plugin</flag>
+		<flag name="sysstat">Build sysstat plugin</flag>
+		<flag name="taskbar">Build taskbar plugin</flag>
+		<flag name="tray">Build tray plugin</flag>
+		<flag name="volume">Build volume plugin</flag>
+		<flag name="worldclock">Build worldclock plugin</flag>
+	</use>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-policykit/metadata.xml b/lxqt-base/lxqt-policykit/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-policykit/metadata.xml
+++ b/lxqt-base/lxqt-policykit/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-power/metadata.xml b/lxqt-base/lxqt-power/metadata.xml
index 34a29015..cd9f9054 100644
--- a/lxqt-base/lxqt-power/metadata.xml
+++ b/lxqt-base/lxqt-power/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>lxde</herd>
+	<maintainer type="project">
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml b/lxqt-base/lxqt-powermanagement/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-powermanagement/metadata.xml
+++ b/lxqt-base/lxqt-powermanagement/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml b/lxqt-base/lxqt-qtplugin/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-qtplugin/metadata.xml
+++ b/lxqt-base/lxqt-qtplugin/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-runner/metadata.xml b/lxqt-base/lxqt-runner/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-runner/metadata.xml
+++ b/lxqt-base/lxqt-runner/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/lxqt-base/lxqt-session/metadata.xml b/lxqt-base/lxqt-session/metadata.xml
index f9883838..54b92bf6 100644
--- a/lxqt-base/lxqt-session/metadata.xml
+++ b/lxqt-base/lxqt-session/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>lxqt</herd>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
 </pkgmetadata>