13 files changed, 80 insertions, 50 deletions
diff --git a/media-libs/exiftool/metadata.xml b/media-libs/exiftool/metadata.xml
index 04d9b0a428be..55368156ff45 100644
--- a/media-libs/exiftool/metadata.xml
+++ b/media-libs/exiftool/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>graphics</herd>
 	<herd>perl</herd>
-    <longdescription>
-      ExifTool is a platform-independent Perl library plus a
+	<longdescription>ExifTool is a platform-independent Perl library plus a
       command-line application for reading, writing and editing meta
       information in image, audio and video files. ExifTool supports
       many different types of metadata including EXIF, GPS, IPTC, XMP,
@@ -12,6 +11,8 @@
       ID3, as well as the maker notes of many digital cameras by
       Canon, Casio, FujiFilm, HP, JVC/Victor, Kodak, Leaf,
       Minolta/Konica- Minolta, Nikon, Olympus/Epson, Panasonic/Leica,
-      Pentax/Asahi, Ricoh, Sanyo, Sigma/Foveon and Sony.
-    </longdescription>
+      Pentax/Asahi, Ricoh, Sanyo, Sigma/Foveon and Sony.</longdescription>
+	<upstream>
+		<remote-id type="cpan">exiftool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/game-music-emu/metadata.xml b/media-libs/game-music-emu/metadata.xml
index ae573a60407f..1d206b9a1f24 100644
--- a/media-libs/game-music-emu/metadata.xml
+++ b/media-libs/game-music-emu/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>
+	<upstream>
+		<remote-id type="google-code">game-music-emu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/iulib/metadata.xml b/media-libs/iulib/metadata.xml
index 097975e3adc2..4eaa0cb9c7a5 100644
--- a/media-libs/iulib/metadata.xml
+++ b/media-libs/iulib/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<upstream>
+		<remote-id type="google-code">iulib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/lastfmlib/metadata.xml b/media-libs/lastfmlib/metadata.xml
index 2c95920f27e9..f7ba5352d13c 100644
--- a/media-libs/lastfmlib/metadata.xml
+++ b/media-libs/lastfmlib/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<maintainer>
-<email>dirk.vdb@gmail.com</email>
-<name>Dirk Vanden Boer</name>
-<description>Proxy maintainer and upstream developer. Please CC him on bugs</description>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>sound</herd>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer>
+		<email>dirk.vdb@gmail.com</email>
+		<name>Dirk Vanden Boer</name>
+		<description>Proxy maintainer and upstream developer. Please CC him on bugs</description>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="google-code">lastfmlib</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/media-libs/libkate/metadata.xml b/media-libs/libkate/metadata.xml
index 775ac77083fb..479ab999d31a 100644
--- a/media-libs/libkate/metadata.xml
+++ b/media-libs/libkate/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
-	<longdescription lang="en">
-		Kate is a codec for karaoke and text encapsulation for Ogg. Most of the
+	<longdescription lang="en">Kate is a codec for karaoke and text encapsulation for Ogg. Most of the
 		time, this would be multiplexed with audio/video to carry subtitles,
 		song lyrics (with or without karaoke data), etc, but doesn't have to be.
 		A possible use of a lone Kate stream would be an e-book. Moreover, the
@@ -12,7 +11,8 @@
 		karaoke use, but can be used for any purpose. Motions can be attached to
 		various semantics, like position, color, etc, so scrolling or fading
 		text can be defined.
-
-		More information can be found at http://wiki.xiph.org/index.php/OggKate
-	</longdescription>
+		More information can be found at http://wiki.xiph.org/index.php/OggKate</longdescription>
+	<upstream>
+		<remote-id type="google-code">libkate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libmp4v2/metadata.xml b/media-libs/libmp4v2/metadata.xml
index 06366c0cd35a..2dbc62f18142 100644
--- a/media-libs/libmp4v2/metadata.xml
+++ b/media-libs/libmp4v2/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <use>
-    <flag name='utils'>Install command-line utilities</flag>
-  </use>
+	<herd>sound</herd>
+	<use>
+		<flag name="utils">Install command-line utilities</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">mp4v2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libofa/metadata.xml b/media-libs/libofa/metadata.xml
index e1774e3d9ad7..1f84290ed170 100644
--- a/media-libs/libofa/metadata.xml
+++ b/media-libs/libofa/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>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="google-code">musicip-libofa</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libtiger/metadata.xml b/media-libs/libtiger/metadata.xml
index 9f7961dbff6e..f8d4166ac6fd 100644
--- a/media-libs/libtiger/metadata.xml
+++ b/media-libs/libtiger/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
-	<longdescription lang="en">
-		libtiger is a rendering library for Kate streams using Pango and Cairo.
-
+	<longdescription lang="en">libtiger is a rendering library for Kate streams using Pango and Cairo.
 		More information about Kate streams may be found at
-		http://wiki.xiph.org/index.php/OggKate
-	</longdescription>
+		http://wiki.xiph.org/index.php/OggKate</longdescription>
+	<upstream>
+		<remote-id type="google-code">libtiger</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index f60740b05b35..94a045d7e45e 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>video</herd>
-  <maintainer>
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="postproc">Enable additional post processing filters</flag>
-    <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
-    <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-	<flag name="sse4_1">Enable optimization for SSE4_1 capable processors (Intel Core 2 Penryn and later chips)</flag>
-  </use>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="postproc">Enable additional post processing filters</flag>
+		<flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+		<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+		<flag name="sse4_1">Enable optimization for SSE4_1 capable processors (Intel Core 2 Penryn and later chips)</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">webm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index e770d1bc9a96..e6945e27bb60 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/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>graphics</herd>
+	<herd>graphics</herd>
+	<upstream>
+		<remote-id type="google-code">webp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/mutagen/metadata.xml b/media-libs/mutagen/metadata.xml
index e1774e3d9ad7..a54ea4d207c6 100644
--- a/media-libs/mutagen/metadata.xml
+++ b/media-libs/mutagen/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>sound</herd>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="google-code">mutagen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 9be90a258970..5fbadba646a6 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/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>graphics</herd>
+	<herd>graphics</herd>
+	<upstream>
+		<remote-id type="google-code">openjpeg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sk1libs/metadata.xml b/media-libs/sk1libs/metadata.xml
index 5c77ec157444..89e5e5b8ea55 100644
--- a/media-libs/sk1libs/metadata.xml
+++ b/media-libs/sk1libs/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-<description>Package adder</description>
-</maintainer>
+	<herd>graphics</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<description>Package adder</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">uniconvertor</remote-id>
+	</upstream>
 </pkgmetadata>