16 files changed, 89 insertions, 53 deletions
diff --git a/media-sound/aacplusenc/metadata.xml b/media-sound/aacplusenc/metadata.xml
index ee7258ac28eb..9c160a7a0b31 100644
--- a/media-sound/aacplusenc/metadata.xml
+++ b/media-sound/aacplusenc/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">~teknoraver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 9b3dd597145d..66cfd45a7245 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -12,12 +12,13 @@
   <use>
     <flag name="ifp">Enable support for iRiver iFP portable audio players</flag>
     <flag name="lua">Enable support for programmable title formatting with
-      <pkg>dev-lang/lua</pkg></flag>
+    <pkg>dev-lang/lua</pkg></flag>
     <flag name="mac">Enable support for decoding Monkey's Audio files</flag>
     <flag name="podcast">Enable podcast support</flag>
     <flag name="systray">Enable system tray support</flag>
   </use>
   <upstream>
     <remote-id type="github">jeremyevans/aqualung</remote-id>
+    <remote-id type="sourceforge">aqualung</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/cplay/metadata.xml b/media-sound/cplay/metadata.xml
index c870d0eef0ab..6fd5a891d174 100644
--- a/media-sound/cplay/metadata.xml
+++ b/media-sound/cplay/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hukka/cplay</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index b646a7696407..456878486386 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -12,5 +12,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">darkice</remote-id>
+		<remote-id type="sourceforge">darkice</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/fmit/metadata.xml b/media-sound/fmit/metadata.xml
index 06aa47c465ca..34b1f4859d25 100644
--- a/media-sound/fmit/metadata.xml
+++ b/media-sound/fmit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">gillesdegottex/fmit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
index e5864294f689..a7ec7781ef07 100644
--- a/media-sound/guayadeque/metadata.xml
+++ b/media-sound/guayadeque/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">guayadeque</remote-id>
+    <remote-id type="github">anonbeat/guayadeque</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 9bd34ad90df6..baec16632ecc 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -10,4 +10,7 @@
     <flag name="celt">Support CELT low delay audio codec (<pkg>media-libs/celt</pkg>)</flag>
     <flag name="opus">Support <pkg>media-libs/opus</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">jackaudio/jack2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4300293596d8..127ec81d774e 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -12,5 +12,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mixxx</remote-id>
+		<remote-id type="github">mixxxdj/mixxx</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mp3val/metadata.xml b/media-sound/mp3val/metadata.xml
index a4e0d354f696..9883d35b70f1 100644
--- a/media-sound/mp3val/metadata.xml
+++ b/media-sound/mp3val/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
+    <upstream>
+        <remote-id type="sourceforge">mp3val</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index dc07436a9456..a824cdeb5ff0 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,41 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
   </maintainer>
   <maintainer type="project">
-  	<email>sound@gentoo.org</email>
-  	<name>Gentoo Sound project</name>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
   </maintainer>
   <use>
-	<flag name="adplug">Enable the AdPlug decoder plugin</flag>
-	<flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
-	<flag name="curl">Support for web stream listening</flag>
-	<flag name="eventfd">Use the eventfd function in MPD's event loop</flag>
-	<flag name="faad">Use external faad library for AAC decoding</flag>
-	<flag name="fifo">Support writing audio to a FIFO</flag>
-	<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
-	<flag name="glib">Enable GLib usage</flag>
-	<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
-	<flag name="id3tag">Support for ID3 tags</flag>
-	<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
-	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
-	<flag name="libmpdclient">Enable support for remote mpd databases</flag>
-	<flag name="libsoxr">Enable the libsoxr resampler</flag>
-	<flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
-	<flag name="network">Enables network streaming support</flag>
-	<flag name="nfs">Enable support for the Network File System</flag>
-	<flag name="opus">Enable Opus codec support</flag>
-	<flag name="pipe">Support writing audio to a pipe</flag>
-	<flag name="recorder">Enables output plugin for recording radio streams</flag>
-	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
-	<flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
-	<flag name="soundcloud">Build plugin to access soundcloud</flag>
-	<flag name="systemd">Enable support for systemd socket activation</flag>
-	<flag name="twolame">Support twolame MPEG-2 encoding</flag>
-	<flag name="wildmidi">Enable MIDI support via wildmidi</flag>
-	<flag name="zip">Support for ZIP files</flag>
+    <flag name="adplug">Enable the AdPlug decoder plugin</flag>
+    <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
+    <flag name="curl">Support for web stream listening</flag>
+    <flag name="eventfd">Use the eventfd function in MPD's event loop</flag>
+    <flag name="faad">Use external faad library for AAC decoding</flag>
+    <flag name="fifo">Support writing audio to a FIFO</flag>
+    <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
+    <flag name="glib">Enable GLib usage</flag>
+    <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+    <flag name="id3tag">Support for ID3 tags</flag>
+    <flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
+    <flag name="lame">Support for MP3 streaming via Icecast2</flag>
+    <flag name="libmpdclient">Enable support for remote mpd databases</flag>
+    <flag name="libsoxr">Enable the libsoxr resampler</flag>
+    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
+    <flag name="network">Enables network streaming support</flag>
+    <flag name="nfs">Enable support for the Network File System</flag>
+    <flag name="opus">Enable Opus codec support</flag>
+    <flag name="pipe">Support writing audio to a pipe</flag>
+    <flag name="recorder">Enables output plugin for recording radio streams</flag>
+    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+    <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
+    <flag name="soundcloud">Build plugin to access soundcloud</flag>
+    <flag name="systemd">Enable support for systemd socket activation</flag>
+    <flag name="twolame">Support twolame MPEG-2 encoding</flag>
+    <flag name="wildmidi">Enable MIDI support via wildmidi</flag>
+    <flag name="zip">Support for ZIP files</flag>
   </use>
+  <upstream>
+    <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index 17237689dcfd..451f4c376053 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">flaviotordini/musique</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index a9281abedffd..e4c0bc23acce 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -16,4 +16,7 @@
 		<flag name="search-screen">Enable search screen</flag>
 		<flag name="song-screen">Enable song viewer screen</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">MusicPlayerDaemon/ncmpc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/playerctl/metadata.xml b/media-sound/playerctl/metadata.xml
index 1621dbd7fa0b..42a351ac3998 100644
--- a/media-sound/playerctl/metadata.xml
+++ b/media-sound/playerctl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -9,4 +9,7 @@
     mpris command-line controller and library for spotify, vlc,
     audacious, bmp, xmms2, and others.
   </longdescription>
+  <upstream>
+    <remote-id type="github">acrisci/playerctl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index c16778a62799..4f4416b228ce 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dvehrs/podget</remote-id>
+		<remote-id type="sourceforge">podget</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
index c40ffdb947c3..dd26272a674e 100644
--- a/media-sound/puddletag/metadata.xml
+++ b/media-sound/puddletag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -13,5 +13,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">puddletag</remote-id>
+		<remote-id type="github">keithgg/puddletag</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
index 67a86a3f2fe2..fcffe09fdb56 100644
--- a/media-sound/tuxguitar/metadata.xml
+++ b/media-sound/tuxguitar/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>j.scruggs@gmail.com</email>
 		<name>Jonathan Scruggs</name>
-        </maintainer>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -39,4 +39,7 @@
 			Adds an icon to the tray that controls midi playback.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">tuxguitar</remote-id>
+	</upstream>
 </pkgmetadata>