Fix metadata.xml

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

20 files changed, 50 insertions, 87 deletions

diff --git a/media-video/aacskeys/Manifest b/media-video/aacskeys/Manifest
index 1b17ac247068..d2f5b9d812f9 100644
--- a/media-video/aacskeys/Manifest
+++ b/media-video/aacskeys/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX aacskeys-0.4.0c-aacskeys-makefile.patch 1575 RMD160 224e86ebd679529ed62881c5ffe248890ddeddc4 SHA1 23ea5ee674b9f2eee332f54af7c052a8619d7414 SHA256 7dbce874f89bc298eaf9d7acbc5071a959d0d18bf9126dcf35847596a095a456
 AUX aacskeys-0.4.0c-libaacskeys-makefile.patch 2559 RMD160 124642a065caa64ebe102c1aaa734cffde08b78b SHA1 581898ccdeda05e8533b4df84112d1eace918567 SHA256 d89c2c588856b89ee55d268c9422b3ffbe76d4c88856ea091eaacd5516db76aa
 DIST aacskeys-0.4.0c.tar.gz 4118637 RMD160 81159c4213fcffb24a7e0121f98bdfac5cf37a4b SHA1 c2fd4df47d3aa2e39d7fe5e44991c00361898283 SHA256 54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43
 EBUILD aacskeys-0.4.0c.ebuild 835 RMD160 4de39de4cd690e3e55dfefe48f8975d5ec4eeaba SHA1 06685aa6ec728ad04911d727b896902e934bfd66 SHA256 b6a920e7257c6f1d55ae0e39fd93639c6cf29341159b67a8f04707fb14d4f09b
 MISC ChangeLog 572 RMD160 13f91f29ef72df45a255cdbb791d6669cfd79250 SHA1 2d2a04485221bbe65dc54c0a609d09e550a1b1d4 SHA256 9c2ecc72f604f8de76d19364c2284c5421c4fa9fe7cac7bfe7e53375b4d6fcf4
-MISC metadata.xml 316 RMD160 229c4c47d8c437ddeffa48a87bab2f4510300707 SHA1 7d8890b7a58926425383b1023c52834004e7f614 SHA256 e5d532954d62c3afc9bd884dde20283d1f8a648b8434dee9746f4cedffaa039d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwsXpAACgkQNQqtfCuFneOKJQCfZ804DOt7cds2awpgms8Kwr1z
-iMAAoJuQgetRzYl2CrfMKLmrYaLGfiV8
-=jJ6e
------END PGP SIGNATURE-----
+MISC metadata.xml 386 RMD160 3bee529a33fb0d029658729f7f808173d8c24bb0 SHA1 56f53f39c042df69e826d7b9a8143e68e860b3ad SHA256 45d9a30cb04e1bf475c04aa11b78a205aa050d14b238d5ac8928fd1c42a66c97
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
index ff943da766a0..413d6414f00a 100644
--- a/media-video/aacskeys/metadata.xml
+++ b/media-video/aacskeys/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<longdescription lang="en">aacskeys is a program to decrypt all required keys from an AACS protected HD-DVD / Blu-Ray to decrypt it.</longdescription>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">aacskeys is a program to decrypt all required keys from an AACS protected HD-DVD / Blu-Ray to decrypt it.</longdescription>
 </pkgmetadata>
-
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index a5729ea24a4e..4118cc608bb3 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,4 +1,4 @@
 DIST blinkensim-2.7.tar.gz 88416 RMD160 ed3aa61ddd8eb1daabb94721bdd5d3a37f1b5531 SHA1 a9c23ce8cc94f5c76d07ea616549cdb2f76778cd SHA256 5fe4a0675e5dd06661ec3c3dfddda1dee511f3d6f1093d5517bcd1621a2890bc
 EBUILD blinkensim-2.7.ebuild 872 RMD160 bdf2fab179c24f0ba641c1437c6cf21b26d43623 SHA1 76f01e155a217067d6d0849b4021db6b43ea5a29 SHA256 a2c4f201f05801b61a0f3bf5ed3a354c8a6317cd8732b4572b8fb2aaacb583a2
 MISC ChangeLog 1361 RMD160 a6d73da3ac0367ac3a8ddd62eb5966d145f390b5 SHA1 53c313911e54548f4f482697f62d980ac393475a SHA256 789c4e7746d3362ba505bdee8ba113202370118d774d2b4743d72058a657f71e
-MISC metadata.xml 371 RMD160 7f5d2ec558e236c5c99e8033fd4763d1004ca618 SHA1 c7d904fc5141eb7639310e75a2ba84545ea51277 SHA256 39b923aaf4fedc88505ef5228d35bf98ed5bf9d42f4d32daf9b05b9d2a14c265
+MISC metadata.xml 365 RMD160 6aae89ae850af2d58a0666fe2a8cd970c71a5565 SHA1 4162f25bd1246b7c0eee0e54c69d9717e1ae6ade SHA256 5c444e7f6c1ee761d45d058aafe856a5b14fc879dc4c8521da0779523c41710d
diff --git a/media-video/blinkensim/metadata.xml b/media-video/blinkensim/metadata.xml
index 3d79708a62ee..284559a05f2f 100644
--- a/media-video/blinkensim/metadata.xml
+++ b/media-video/blinkensim/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-video</herd>
+	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/blinkenthemes/Manifest b/media-video/blinkenthemes/Manifest
index 66528f76e598..4b5e634c464d 100644
--- a/media-video/blinkenthemes/Manifest
+++ b/media-video/blinkenthemes/Manifest
@@ -1,4 +1,4 @@
 DIST blinkenthemes-0.10.tar.gz 4059605 RMD160 dd1872dc11f1d29383743e5d065748a8dcf72e03 SHA1 e4f4784798289ef1da6d0f964807ae051e9b1bd2 SHA256 be5853aeefe2f60cb549b8a94787ba707f032da27d2071812320fd956518bff9
 EBUILD blinkenthemes-0.10.ebuild 670 RMD160 2af520e5920f72ffc4ffc0f500834af8b9480b84 SHA1 dd1ddac5c7bf34f5068dca8b1727f75a6d462af1 SHA256 ecfd11925ef71adeee419008cd6e79da974deeb0a1ef64ff404c3f48d56cdf96
 MISC ChangeLog 1083 RMD160 de5740dc85916c1d49bbfc6970a7f99ae7906339 SHA1 705a84a26eadd8cd1f4c15ae2e7fa86e03b62ccf SHA256 06a37fe89fe462cb7bc084c0c0f07369a4d1798f20f3368df2ec910b8eb67810
-MISC metadata.xml 678 RMD160 6b6fc0686bde93ce7d38b58be98d8e8889f739e2 SHA1 65412bc11126a520fa37ece0d08e90d498b52b72 SHA256 2f140ee17958e15b946b7bf0975c297146e131548e40f274e8d2ded4457cc0e0
+MISC metadata.xml 672 RMD160 82de46dc19f378df7742c6bc63be541287bd2aaf SHA1 26dc7a91125b342fcbddfd24f2a9e6a843ecc9bf SHA256 4e094da3cca5951c2c8427ef6e8b4f339e5322543d6c47c41024af866bcf0ebd
diff --git a/media-video/blinkenthemes/metadata.xml b/media-video/blinkenthemes/metadata.xml
index f6e518da2db5..950e903bf988 100644
--- a/media-video/blinkenthemes/metadata.xml
+++ b/media-video/blinkenthemes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-video</herd>
+	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/blinkentools/Manifest b/media-video/blinkentools/Manifest
index 3c78c614dd2c..b8e5673cc329 100644
--- a/media-video/blinkentools/Manifest
+++ b/media-video/blinkentools/Manifest
@@ -1,4 +1,4 @@
 DIST blinkentools-2.9.tar.gz 560904 RMD160 9ab26421d0439ac20f6ed99f26ff55bdaeb6933f SHA1 a7b6df044e93dc7ff83002fce250cf87891f73d4 SHA256 1fa92c4b3a679085464edc6a194b80b3feea9ccea7e82cdbcdab9ec29aba5920
 EBUILD blinkentools-2.9.ebuild 699 RMD160 c9d317cbc5a39323c9a206bc4637fcd417ab8ee8 SHA1 916ee065921f1f3682ee20fc9a0fd48b96417cc0 SHA256 21d5cc7ef962ab74a05c3511fb35f574fc20ab465e8ca7442f6905195f670653
 MISC ChangeLog 1117 RMD160 1e281e64a5039bfc309e3d3cb3d963df3870e4e2 SHA1 106f423b829c6d01ba2e8d3ee0cce0bd7bf7fe4e SHA256 007fda0dbebb8fcee6673ee761a98a260a6fc839b4648817e45bce94b3f5a838
-MISC metadata.xml 521 RMD160 a645564a8448c2b59ec18ea125ab8f8db77b602a SHA1 afc523c1a1bce26a468690b08a26a88473e1fb8e SHA256 bb3b8a0c4724f03eb549a1232fc2ea80eb08fca3e6360cf3fe983bde5cfb89e0
+MISC metadata.xml 515 RMD160 49704286d7664ca2b6a25c097697983df0676a36 SHA1 1aaaf07c42b9e96142f04ab05f436715780d48ce SHA256 15c25c57800f26a8bae57af73382af7609be671a20e4909128674ea1ea8f015c
diff --git a/media-video/blinkentools/metadata.xml b/media-video/blinkentools/metadata.xml
index 379b7c00d01e..ac44c06197cd 100644
--- a/media-video/blinkentools/metadata.xml
+++ b/media-video/blinkentools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-video</herd>
+	<herd>video</herd>
 	<maintainer>
 		<email>media-video@gentoo.org</email>
 	</maintainer>
diff --git a/media-video/flvstreamer/Manifest b/media-video/flvstreamer/Manifest
index 0a1ec90e8eb0..d9838fcbb5cd 100644
--- a/media-video/flvstreamer/Manifest
+++ b/media-video/flvstreamer/Manifest
@@ -1,4 +1,4 @@
 DIST flvstreamer-2.1c.tar.gz 77308 RMD160 d057451cb663ee6e6ddf8e2be713ccce7624ac93 SHA1 109c524425ed943cf21a0d25ea3a2a669b2cb112 SHA256 1bba81fcd1518ec05af1017522d4ef92b9a2ae3a0da6a09396050cc7cc550729
 EBUILD flvstreamer-2.1c.ebuild 985 RMD160 0756fbd0312c6b9b00f84e81da6f010d91488b97 SHA1 11ab3e639c6a2b98e91449f7d436e56936fefdbd SHA256 c25eb5e9258449b1cc172ae997a7042559b576f3930df4195e9593c3097f397d
 MISC ChangeLog 1851 RMD160 046874dde7ff7e32b517c19f67525f28391b1488 SHA1 fb5ed286e1605f9499dfd194ad24ec4b3b79de6e SHA256 146d7ea15cefa42d1ed8cdd2f84124b8d398a18fc3030bea9ad0c145e2a712b9
-MISC metadata.xml 322 RMD160 5767330dc0a31aad9eb12bc2285b53b19f21ce8f SHA1 0d25b9db188cf0613d9e606eb7a312d9f51f8b25 SHA256 f209fd21093cba883428650fff0174fd9471beba34e35d5edfcb925aeb374a4e
+MISC metadata.xml 284 RMD160 2fb6ce03acf78dfb326b41efbdbbe74e2f3c23b2 SHA1 5fb60b2e981972b2f6be66ac47c7d1102e8014ed SHA256 f1eea625e7b032b2c73bb64f2252cc705c33cf66c4f978fd95b1086bb16b4add
diff --git a/media-video/flvstreamer/metadata.xml b/media-video/flvstreamer/metadata.xml
index ef608c968fcc..662c2b16ab57 100644
--- a/media-video/flvstreamer/metadata.xml
+++ b/media-video/flvstreamer/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<herd>sound</herd>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+  <herd>video</herd>
+  <herd>sound</herd>
+  <maintainer>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
 </pkgmetadata>
-
diff --git a/media-video/kffmpegthumbnailer/Manifest b/media-video/kffmpegthumbnailer/Manifest
index 552e81365ce2..c822b71fb027 100644
--- a/media-video/kffmpegthumbnailer/Manifest
+++ b/media-video/kffmpegthumbnailer/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kffmpegthumbnailer-1.1.0.tar.gz 9098 RMD160 47b2a311c12b0d83c055f153b2f741e6b36402d1 SHA1 127622e2f7bb092593795dada6b8d7c986cd22d7 SHA256 5b488a4e77229847c7d92f7fc5f7760ba3e4977c83565b741446202a0073f2b2
 EBUILD kffmpegthumbnailer-1.1.0.ebuild 586 RMD160 26b8e5ef449545937effbff3b299acb3db807ff2 SHA1 55316be9e43c4ad34ab192a740cf012499bd9fe6 SHA256 0ad82878e8bae2c7e34308b35c7de4e399d14b2a925e490220f365d31d0c6e34
 MISC ChangeLog 911 RMD160 2612e03b00d0f0fef21fb54e4505235e02f05856 SHA1 c8eab8c64bf0ec1cebbd00e2b4831fc8a8af3305 SHA256 93aa50993e707a087f24bbd64495a70a9e9312c2f37a4b6f547fc7a45d761dd3
-MISC metadata.xml 258 RMD160 9d6d04cf69bffab3267ce13fd333f58fa2ae43f9 SHA1 342c0f9bdd8c65f881231703756683088a5ee950 SHA256 563cc6c72ffe55d2b24892066f00f3b8ec7db63156fd13136f8fb8b04599615e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw/cXUACgkQkKaRLQcq0GLSvgCgk7fdAgCuYGa8pahANXYgaLne
-8/sAn2V3lnRPByJo5YFtzAgMXN/gePpp
-=UR8O
------END PGP SIGNATURE-----
+MISC metadata.xml 252 RMD160 7b9ca6e920aca01a15141ac4e06b38a75c52c9bb SHA1 b32cad0db979f5b47edeb4d98eabf7e9cb45a963 SHA256 40f16141b65ddf3127b81baaafda09fc17f69649c75e9b0acb3b23bce4864f89
diff --git a/media-video/kffmpegthumbnailer/metadata.xml b/media-video/kffmpegthumbnailer/metadata.xml
index edb90cc5f265..914f6144a6d5 100644
--- a/media-video/kffmpegthumbnailer/metadata.xml
+++ b/media-video/kffmpegthumbnailer/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>kde</herd>
-  <herd>media-video</herd>
+  <herd>video</herd>
   <maintainer>
     <email>media-video@gentoo.org</email>
   </maintainer>
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 4c0351ae480b..80dfe51e65a8 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST mediainfo_0.7.36.tar.bz2 1247406 RMD160 107b38b0b9c61a3409040694529f62a6d523b6d8 SHA1 5e44bfae61d368cbd1ec3c2362adbfcae2b6cd00 SHA256 9d5c4ddcddd290cbdff9949eb227101f22e4650227bc68ab2e67a6c6ebd979d2
 DIST mediainfo_0.7.37.tar.bz2 1254806 RMD160 60133d769123be6b9ba12720546725c141df64db SHA1 ba8bd5b68d98d4b008224650344977fae813b149 SHA256 34b9c114a16c6e6e55f4c94bd607a5bd90a37fd88ca9a445d80d4b1adf955469
 EBUILD mediainfo-0.7.36.ebuild 1932 RMD160 5e54eff56ef73e5537bbf185b3cc6b69f477bca1 SHA1 e44e53285a2e1cfa59951230c862521281469e55 SHA256 5ac7f76cf0dc7ddb7088620f804f5247b8797c49957d6b006e0f4c42e336eab5
 EBUILD mediainfo-0.7.37.ebuild 1934 RMD160 1c4509914e9841d904489c52819e205f35641aab SHA1 22003acb018ed4cec0138ec4bb7c6dcde4719616 SHA256 ad24f080f00ea3d9ea1e0400815793b94f291ee6fab1b7bb8b2daa46e878c455
 MISC ChangeLog 1609 RMD160 b4eb6464babd7bfa90fd3cb2070afcdf3cb6af89 SHA1 bdaed2c89fe6dcaedbeb2679b5cd194a2610176b SHA256 46d6e0d366c2dcf9fe6bb7e058bbf8297933ed7e4bbb38872239919b6f0ac14b
-MISC metadata.xml 269 RMD160 d9e8a46336e09771dd82336660c1a690262a78c3 SHA1 51df7a7cc6b94793b41995494c5b7b7933ba2992 SHA256 39516d1fa0c577c030212706990f3762f634949696b4f4b4f53b118b04649f84
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz3pBgACgkQ9/cejkQaxBCm2wCfQF1mAJ5dnztFvQHOhggA/QQA
-k64AnittQ+jwDYwA6uKsmVqHW1qfXmtA
-=7ok5
------END PGP SIGNATURE-----
+MISC metadata.xml 341 RMD160 fdfe7b44e753ea7571e619dd8566cafbcf4eb5ec SHA1 6605883a3ff2065f65794950f03b369b3d425cbc SHA256 1a88f8af2a22f2bd6207cee41a53337b452f6caace96b0b475aace50f27461a8
diff --git a/media-video/mediainfo/metadata.xml b/media-video/mediainfo/metadata.xml
index 76146a9069bd..64a67d01c3e7 100644
--- a/media-video/mediainfo/metadata.xml
+++ b/media-video/mediainfo/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>media-video</herd>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
   <use>
-	<flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
+    <flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
   </use>
 </pkgmetadata>
diff --git a/media-video/tivodecode/Manifest b/media-video/tivodecode/Manifest
index b9fac3f44838..bc36adbc5f10 100644
--- a/media-video/tivodecode/Manifest
+++ b/media-video/tivodecode/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST tivodecode-0.2pre4.tar.gz 124685 RMD160 ebd31816e02c50808fce88606c0b359a431d94b7 SHA1 efabe4aee461e6da90ddc52abe9ae025c4185032 SHA256 788839cc4ad66f5b20792e166514411705e8564f9f050584c54c3f1f452e9cdf
 EBUILD tivodecode-0.2_pre4.ebuild 657 RMD160 ccd2a027c637bc4d5c1ea4baf0236e0ce31359d9 SHA1 a054782054b65da0654cc83d451cb4e2f9d6015a SHA256 b0005ec6174876740aebbbc4729e1ee30ae36859efeddbab8eb3e7b39a1fdadb
 MISC ChangeLog 530 RMD160 4c9ae4816ab2e04150e866bf6c6c30a2208e4c1d SHA1 12801641f08a1a25ee25bd80ad19cfc191010020 SHA256 0a2bc64ac0a39f1c6275722dab00d8550f19d9551bf3a85b3caffb3a5ee6e003
-MISC metadata.xml 396 RMD160 af6c4a62682e916302ff0a1f292fdd291204778e SHA1 9ed2476b636af0aa7d2a53788f762a55e9c036fb SHA256 e0e4b44053d31a511fce68a60aed1bfb412f3b1272d32433d4d49e6cc1281cc1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmGFhgACgkQkKaRLQcq0GIcXACcCrTckszUFKJU+bfqvNpTYpkD
-oeoAoJbNsVwGJkR6yPmkPjUYu1q5E3OO
-=zkAw
------END PGP SIGNATURE-----
+MISC metadata.xml 466 RMD160 3fbdefc2f959f629218b76854a01ed118ef7129c SHA1 5bf902dd8427bf4f98b322bc969e62cee6631e44 SHA256 3b198c8e6278da72ccc45ed61edbb515c72123efdff6a705060b4d56798844d3
diff --git a/media-video/tivodecode/metadata.xml b/media-video/tivodecode/metadata.xml
index ab5067dec818..9edaf1ecebed 100644
--- a/media-video/tivodecode/metadata.xml
+++ b/media-video/tivodecode/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<longdescription lang="en">
-This software converts a .TiVo file (produced by the TiVoToGo functionality on recent TiVo software releases, or from files downloaded through the web interface) to a normal MPEG file.
-</longdescription>
+  <herd>-video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">This software converts a .TiVo file (produced by the TiVoToGo functionality on recent TiVo software releases, or from files downloaded through the web interface) to a normal MPEG file.</longdescription>
 </pkgmetadata>
diff --git a/media-video/undvd/Manifest b/media-video/undvd/Manifest
index 07b759378ba0..e3370cb63008 100644
--- a/media-video/undvd/Manifest
+++ b/media-video/undvd/Manifest
@@ -1,4 +1,4 @@
 DIST undvd-0.7.5.tar.gz 52662 RMD160 bf5f69c1ee3628e723fc9cd50c10aa2723eacb74 SHA1 893aad5a8dc0d0d4f03580ac3dc95cdeef45b94d SHA256 53c4543b0de559de69e6b24ad6b665e85c607f01f887e8e55d810946fbc6497d
 EBUILD undvd-0.7.5.ebuild 845 RMD160 2080eab756a4d72068f4c93af2ff8b515f511b02 SHA1 9fe80545ecb376dbcb05484255bab1c3cc9e8e8c SHA256 80603fd8b584774f27cca030b7522ff09ee26cd31a8c9f0dd88f3fff31fef9dd
 MISC ChangeLog 1807 RMD160 21e9b7aa718f22d86685558b60273913e93b29c2 SHA1 d662e044a0d224cf1b1029818790479d805db4a5 SHA256 a384a3e737a22c3b8ee113ba0699795472fd4f28669f71268004a37299ff63e2
-MISC metadata.xml 332 RMD160 4fce6572ce2a838389d7d0be736aa4cd6fe57a71 SHA1 9f62b7e36813e4fbd73851aa57aac7a383421af8 SHA256 cb8aa514e8669d288d950fcf9a9578ba277544c5666326f529e8d1bfb3aff532
+MISC metadata.xml 342 RMD160 5fbc5c2b8926cf2fbc68c58545bb8bd45f6b1e4e SHA1 33f6c4698cb34ec077baf742c1b450f609f36e9f SHA256 13484b9a426be4564c5bfc2898b1bb8d60e22ffc705643c631dcb205543272e7
diff --git a/media-video/undvd/metadata.xml b/media-video/undvd/metadata.xml
index a25a4966d86a..0b2603905c3f 100644
--- a/media-video/undvd/metadata.xml
+++ b/media-video/undvd/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<maintainer>
-  <email>gregkh@gentoo.org</email>
-  <name>Greg Kroah-Hartman</name>
-</maintainer>
-<use>
-  <flag name="ogm">Support for OGM container format</flag>
-</use>
+  <herd>video</herd>
+  <maintainer>
+    <email>gregkh@gentoo.org</email>
+    <name>Greg Kroah-Hartman</name>
+  </maintainer>
+  <use>
+    <flag name="ogm">Support for OGM container format</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 12f6e43b2b64..8ca7e7d06256 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -3,4 +3,4 @@ AUX ushare.init.d 2164 RMD160 adbee9c14af514ca8c91dfd0c9f37114828965ee SHA1 cde7
 DIST ushare-1.1a.tar.bz2 65864 RMD160 6194ffec031d20fd897f2c7cf71c3c810238713f SHA1 1539e83cde5d80f433d262d971f5fe78486c9375 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
 EBUILD ushare-1.1a.ebuild 1484 RMD160 ad2822145045ee4cae54c2e78792265474e8ea18 SHA1 fd7b9444c95dfc5bfbd54626a22b3f77a70f70af SHA256 a03b18019162d3fad929c139c69465438bd8e5a9f2436713d07f6d5bf7ef84ba
 MISC ChangeLog 610 RMD160 62969eca5434acea74b94f9f7100405cab9ccb16 SHA1 7435dea800f3809c5386310195c46870ce0f8735 SHA256 e7ddbcc4af37bdb8ebc0226ca57fbffd911e8e620335f711925d643c8394d35f
-MISC metadata.xml 317 RMD160 99f736c1280d43332906805dbef8b44ce79aba6e SHA1 240b0fc4e6b35df3d600b861507cd0053aebba01 SHA256 6e0c6717c1e0982384eb2b3c9357414f6e2476366ec0227b79718bb1444fa182
+MISC metadata.xml 325 RMD160 c13b582c543062bebe26ba528099f118a89bdd23 SHA1 166336d7ee3f81fe2be6ac0c265d2903c070f3cb SHA256 24b9cc6b2e1e3c8011e0133aea0e8156bfdf6896f42bac864d444672bc6c9ad3
diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
index 36d9b6b30a55..15d401e0d8fe 100644
--- a/media-video/ushare/metadata.xml
+++ b/media-video/ushare/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<maintainer>
-  <email>darkside@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
-</use>
+  <herd>video</herd>
+  <maintainer>
+    <email>darkside@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
+  </use>
 </pkgmetadata>