18 files changed, 93 insertions, 48 deletions
diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index e1774e3d9ad7..16a57952d850 100644
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/metadata.xml
@@ -1,5 +1,8 @@
-<?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>
-<herd>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">abc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
index e1774e3d9ad7..4505d60ffe59 100644
--- a/media-sound/cmix/metadata.xml
+++ b/media-sound/cmix/metadata.xml
@@ -1,5 +1,8 @@
-<?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>
-<herd>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">cmix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index 64e10a1edfd5..f25fd5a318d9 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/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>
   <herd>sound</herd>
@@ -17,5 +17,6 @@
   </use>
   <upstream>
     <remote-id type="github">cmus/cmus</remote-id>
+    <remote-id type="sourceforge">cmus</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
index a2ac2e03bfbd..b4a12401c911 100644
--- a/media-sound/entagged-tageditor/metadata.xml
+++ b/media-sound/entagged-tageditor/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>
-<herd>java</herd>
-<maintainer>
-	<email>java@gentoo.org</email>
-</maintainer>
+	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">entagged</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
index 0107465b9dbd..86cfb5b7619a 100644
--- a/media-sound/flack/metadata.xml
+++ b/media-sound/flack/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>
 	<herd>sound</herd>
@@ -6,4 +6,7 @@
 		A menu-driven BASH script to easily tag your collection of FLAC files
 		from the command line, without the need for a GUI.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">flack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
index 0dc3775f83d7..5419d50f3fd9 100644
--- a/media-sound/jack-rack/metadata.xml
+++ b/media-sound/jack-rack/metadata.xml
@@ -1,5 +1,8 @@
-<?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>
-<herd>proaudio</herd>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">jack-rack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 3c171575d48f..d3252e4afcc7 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/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>
   <herd>proaudio</herd>
@@ -28,5 +28,6 @@
   </use>
   <upstream>
     <remote-id type="github">LMMS/lmms</remote-id>
+    <remote-id type="sourceforge">lmms</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 90052b15c004..213c0e54ddce 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>
 	<herd>proaudio</herd>
@@ -7,4 +7,7 @@
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 		<flag name="vamp">Enable vamp analyzing plugins support</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">mixxx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
index 0cb41d4907cf..4cce0e44b1a1 100644
--- a/media-sound/mp3unicode/metadata.xml
+++ b/media-sound/mp3unicode/metadata.xml
@@ -1,8 +1,9 @@
-<?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>
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="github">alonbl/mp3unicode</remote-id>
+		<remote-id type="sourceforge">mp3unicode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 7b22cdeaa94e..1e264d925ba0 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -1,14 +1,17 @@
-<?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>
-<email>tgurr@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>tgurr@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
-</longdescription>
-<use>
-	<flag name='g15'>Enable support for the Logitech G15 LCD (and compatible devices).</flag>
-	<flag name='speech'>Enable text-to-speech support in Mumble.</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
+		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mumble</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index 7d2340766229..c3cf346f2742 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -1,13 +1,16 @@
-<?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>
-<email>tgurr@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>tgurr@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
 Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
-</longdescription>
-<use>
-	<flag name='ice'>Use <pkg>dev-cpp/Ice</pkg> to enable remote control capabilities.</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="ice">Use <pkg>dev-cpp/Ice</pkg> to enable remote control capabilities.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mumble</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/pms/metadata.xml b/media-sound/pms/metadata.xml
index 67d53893f383..d2eb8d6ad86f 100644
--- a/media-sound/pms/metadata.xml
+++ b/media-sound/pms/metadata.xml
@@ -1,13 +1,15 @@
-<?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>
-	<email>wired@gentoo.org</email>
-	<name>Alex Alexander</name>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
 	</maintainer>
 	<use>
-		<flag name='regex'>Enable regular expression searches
+		<flag name="regex">Enable regular expression searches
 			using <pkg>dev-libs/boost</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">pms</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
index 5fcf89fb6d18..c766d891be15 100644
--- a/media-sound/protux/metadata.xml
+++ b/media-sound/protux/metadata.xml
@@ -1,6 +1,9 @@
-<?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>
   <herd>proaudio</herd>
   <herd>java</herd>
+  <upstream>
+    <remote-id type="sourceforge">protux</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
index dc47b1a004a3..b995f030ee7e 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/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>
   <herd>sound</herd>
@@ -6,4 +6,7 @@
     <flag name="libgig">Enable libgig support for loading Gigasampler files and
       DLS (Downloadable Sounds) Level 1/2 files</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">qsampler</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
index e1774e3d9ad7..74533d46cd67 100644
--- a/media-sound/rip/metadata.xml
+++ b/media-sound/rip/metadata.xml
@@ -1,5 +1,8 @@
-<?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>
-<herd>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">rip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
index 14e2445e0a77..cd16bf623609 100644
--- a/media-sound/shnflacverify/metadata.xml
+++ b/media-sound/shnflacverify/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>
@@ -9,4 +9,7 @@
 		Shorten (SHN) and FLAC audio files. This script provides a convenient
 		way to verify shn/flac files in bulk. 
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">shnflacverify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
index e1774e3d9ad7..4482850afa1e 100644
--- a/media-sound/splay/metadata.xml
+++ b/media-sound/splay/metadata.xml
@@ -1,5 +1,8 @@
-<?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>
-<herd>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">splay</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 4c1c02eb7dfb..05909c55207e 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/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>
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">Mindwerks/wildmidi</remote-id>
+		<remote-id type="sourceforge">wildmidi</remote-id>
 	</upstream>
 </pkgmetadata>