Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

20 files changed, 252 insertions, 146 deletions

diff --git a/media-tv/channeleditor/Manifest b/media-tv/channeleditor/Manifest
index ba2c5c3bc81e..40bc1b5980ec 100644
--- a/media-tv/channeleditor/Manifest
+++ b/media-tv/channeleditor/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX build-1.9.2.1.xml 1204 SHA256 64603ef0711cf5ddd2c71e8c6bcbb341f53a2e02c8f53b63e9c6baee8fe27fb2 SHA512 70ac356acd71f8846adb063274280285fbec2d693f89918da531e5825b38ed4281d84bbe385ba67f33e9ef5fc7451c370383790accdf11840cea2d1f327d2117 WHIRLPOOL 8f08a5f36b571d09316b55aa8fec3770c14d7330f7a8df8ab1b1f9d4cb59fb5ee7730d962a009ae257165c0a92f8e5a088315b6d5b2dc60a24e559d3acc88bef
 AUX channeleditor-1.9.2.1-messages.properties.patch 18594 SHA256 3759fc5a5f8784593015fcc47ab6466fbb40d7110d3dc9e3eeca32b3186a6d42 SHA512 2a023617e7231f1a140ec92a8ddd2997182de8fa662d728ece01d8a3fede358d2c2bf180e038f094938db2ca3aa6857fae11e9a53885d95a6af520d88ff62347 WHIRLPOOL 39dbd086663a587f3fb9144b943ba64223e4b168d2854e53441e0b363faad395951e3c9e714f522a9b95583c7476e87aab6c94d127f0021f50831f7467fc837a
@@ -7,11 +7,23 @@ AUX channeleditor-1.9.2.1-messages_en.properties.patch 7226 SHA256 60543cc1571a4
 DIST channeleditor_1.9.2.1_src.tar.gz 317608 SHA256 590ef8daa83244833136f317fc5599c7d998a186ee4f76c9953e4546605435d8 SHA512 84147868aa8b1aacf4ef31a7665822bc7ccd4f7372aaa040aacd8ee42581db1d67092b6b09cda6e447bae2c058fe4ceaab28f3e2a268a54dc5ac25452e64d7d9 WHIRLPOOL 36d1efd40f8931c6d26c28705a3681264d443a8af4c8fffd9cf302be8437a6bf18090d721217c9e71e447d3e2d0c7d95f445ec9bac9f58f7489344004c6479e0
 EBUILD channeleditor-1.9.2.1-r1.ebuild 1523 SHA256 778507b2bd17dd20d4a8655f534296bbc02bac46075bff28632051463d7d423a SHA512 2f6332b6107f4c333c277561a26a8c5e6e88dd68779f67ca188d688c554464d00db6b858d401c55e079077e09c8b6cf8331edb5bdb4ad89161415143b99abb0f WHIRLPOOL 7c8f92fab5c7a348ec2a9a53cad375fca46512658c0b49992268c46039106506004f47f79d44d49ec59f0c1334dfe8c2bf6288826482b98e68174f0f70f02cf3
 MISC ChangeLog 2129 SHA256 6dc4a42b860ccefa67b28f9fbb3c724d8eae6ac97cf997694defed27371456c3 SHA512 e6cfb0b92a95284160406e271a62c12dba1182746d32a67bf3e2407ac3555ac508416bbb1cc03d8fc0ab401fb70ae067e179b1e7a99ebfafdef9b863aa1c12c6 WHIRLPOOL 28a62c624ae6ffab4de92a6f4b240c289f9a0d3da874b52463529644666b2475e11b975676d5bfdbc0970a7823f3f81cb68baf4a787be7b9ec274941d4413264
-MISC metadata.xml 258 SHA256 656d0d140c305dc93146600df840c2fcd924d9c419dd882cbf481d7b38bfc829 SHA512 8f66e030ed7f1c871d195ab6324d28c7544f3343ff8c9f483885e7c76f5a62ef4dfc29f96140b3f3449fbb2a1c1e9a74c3530e417bc733c9763849d7b2931a5b WHIRLPOOL 2f99104306eb415e549169649b32b4e228a2ebf9440c9cb5b6a285ef694e8e477d8aee752437fa8eb8fc846dc0cc1dc5ec8904e0b225ba8f5612f1062f048fdf
+MISC metadata.xml 341 SHA256 6dc0c2e51b7ae16e0109eaa3cfe9c2371fcb1407e44490572824c4a3d1e3efa3 SHA512 f987d09eda2735a97d19cc26ed014c2cad6b7cc68c29ef3bbce73c1f5702b86115f506123a9a3deb47c7e8aa5f31db64710fdb6a3d9f435025484b7724928913 WHIRLPOOL e89350da8a3f8cdff05bc59b89c782442652f857494ef710bdde2f79a274ea615dce4955820f9dc7f5ecbf0f37c7816113c6a106c8bcfc0235f151bb1ae63582
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlE09AkACgkQlcuUeyFa0U0r0wCcCevQta9Ck57PbUpMKaVpxHqS
-4yUAoL4b4XKFaHZW9jyxbEaR4iGnfWow
-=WthV
+iQJ8BAEBCgBmBQJVfvHeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOY8P/RXQvgh80OPeXh0SRbPsCtAV
+yeX5YGOQ+MCk+1csNCxsPBHPhVKmW8OSyUDyqLnnOw39j1qFbcusSkJW0hdOd9jg
+zOCLlGZZlPQatLQjnTTRJy3IvF62EpVdevh2D6dVi50j85eeOij8ofHtAr9OZKI8
+8b7i2ZthozMXSKg6eJFYfyK6wr0T/HoDi2Cd+S8sUJtNknZ4AKBn7FvE8j9+4KlX
+sACcRVMc4RGCoE1wl7XjRy5kMbCRQBnwOl5/3ZWOLQlpI1QUa4YYykV7un1im560
+8fuqCv3liHNIiJZhCF9QSMpPAOJRoNU5J7WcqJ18eB0KXq70us6NcbOC27F95kbK
+jTaI7fj4BZS5WWJjFYiaZQ1ILqO/H8KK/95lvlxtIbBduC6M0FK4tZ2UiA4xfPWt
+G6Kx/3UZ+3guQQBuPH2gFBQzcMBXYY0fQO4/NJppsTAqVN2bywUgH9cLCm75l+iA
+HyNRjnPzF+Ob8wF8Tq6DJWdcgZelNRFw6Z1XMamUqo8ROj2QJV4+hlyvffZA0/iM
+HRJY60KPhDidZzFAS0AM2dv2mlFXg1kndFF6TqkKmoAZlFdPFUd+d+8Cc7W33iTf
+afjMGgV2bg1mp6/4yyJTg8D5gQBRj5EN6kYN5pCAqn0hfa163ilMT7o87tRW25qv
+uGj+H2DMXfDU7vSc1JS6
+=53UN
 -----END PGP SIGNATURE-----
diff --git a/media-tv/channeleditor/metadata.xml b/media-tv/channeleditor/metadata.xml
index d9abec5a1bdc..9a66f97c7923 100644
--- a/media-tv/channeleditor/metadata.xml
+++ b/media-tv/channeleditor/metadata.xml
@@ -6,4 +6,7 @@
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">channeleditor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/dvbstreamer/Manifest b/media-tv/dvbstreamer/Manifest
index 619a8a5c18ab..7085c916afcc 100644
--- a/media-tv/dvbstreamer/Manifest
+++ b/media-tv/dvbstreamer/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX dvbstreamer-1.1-Werror.patch 1333 RMD160 947cf9482e4d86a400a7c59ecebb1d1ed22158c8 SHA1 242b4f4babc8874c172ceebf677b6087280d667b SHA256 c5f6548c9365720a9762a302d9a81ee257808a39529bcfaa9dc9e61a6e00e5fd
-AUX dvbstreamer-1.1-libtool.patch 2570 RMD160 72329f1adbadf14f52029da3932e0efb9cfea275 SHA1 262212b816596f672aa6db9ff0dad90a309b9faf SHA256 331c360390251b07c5b61564454ea701155a602aae5370f5a25494a2abe6e350
-DIST dvbstreamer-1.1.tar.bz2 1215626 RMD160 084fc02ff35d011cfbc6eb72193d64968695eab4 SHA1 55f593e97cebb0be7046ca10cc79309aad3d7715 SHA256 52315b436f00174ab8feac262bc9217a213facb7a7c5298159084f754ab46a23
-DIST dvbstreamer-2.0.0rc1.tar.bz2 676762 RMD160 dc2db09f561d825ae75a2481378de69640705870 SHA1 d18b54e835b55d3ed2966043c5ead770d1f56612 SHA256 8e89768452dc4096a38ab68817c6759fa005bfa480a8d9f1142fe70c6d052200
-EBUILD dvbstreamer-1.1-r1.ebuild 911 RMD160 022f2c04d72e0ce82b5f36cde052591f53f468f5 SHA1 d1c39b1a84e049cb0e2e889edd67a437be901402 SHA256 7b4d424e535a58259490fc5c40040d79157cb7fe52a3f6383e0a0cf2c68b5cb7
-EBUILD dvbstreamer-2.0.0_rc1.ebuild 853 RMD160 7f91510aead1633c538db19869dc0d833ab65cb2 SHA1 8c4ee89a02fa6a06d207834e32134394d42a50e0 SHA256 19ea846003d6467d3223e39b9e66e472b0a7946023a896d44c880eb828c0dd4c
-MISC ChangeLog 2862 RMD160 7128c131829d064968b433ce943232c059dc1ca8 SHA1 0fe29544d754c128dceff68ef34123a0db5e4aa8 SHA256 3194eb33ba2b6f78288e8d38fe94999b4ddbcd68e9fe3b2be1618ecda9f746ac
-MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
+AUX dvbstreamer-1.1-Werror.patch 1333 SHA256 c5f6548c9365720a9762a302d9a81ee257808a39529bcfaa9dc9e61a6e00e5fd SHA512 92a996b11c75add1cee9162a8f33c31bc3c1454aa35eea3c283322f8a39d49db0c8a395f1def0aff078eb7e99b097edbc88e7959f52ca5d0313950a429e91cdc WHIRLPOOL 547246a6246d0be731d8615a1506d5dd7dc692819b2b9a53d5d734435fa1007bae97b966f011cdeedba9bb684050728b54e6079cf943f396911cd049e1be4c2e
+AUX dvbstreamer-1.1-libtool.patch 2570 SHA256 331c360390251b07c5b61564454ea701155a602aae5370f5a25494a2abe6e350 SHA512 6761c233075a205811f05e657d805ea637b85fd0bc59f876ee9a53cc1973b557d685a769d082dfe04d3bf294b9ace5f7a0946c6a9b1e3e3b0a42ec3bfda1dc1e WHIRLPOOL ed08297df460de13bae9129fca8aee4da14a9a2e527825f5d28f9b19a23de7ac6795a44d1107667289fe2cdf380c2c8ca6b8b9dc4024f9c328ac83bab57cdf43
+DIST dvbstreamer-1.1.tar.bz2 1215626 SHA256 52315b436f00174ab8feac262bc9217a213facb7a7c5298159084f754ab46a23
+DIST dvbstreamer-2.0.0rc1.tar.bz2 676762 SHA256 8e89768452dc4096a38ab68817c6759fa005bfa480a8d9f1142fe70c6d052200
+EBUILD dvbstreamer-1.1-r1.ebuild 911 SHA256 7b4d424e535a58259490fc5c40040d79157cb7fe52a3f6383e0a0cf2c68b5cb7 SHA512 822c13fd70b60ea028e5c5861d293ed02fff794929ed77d79cfbce3f7ad299cf6f73a773ad61c95708a198f99510202ebb47fc2ecdea0cb83be01b427143a9ac WHIRLPOOL 3fabcfec833480bc65eee2ffd72a05704db8b536bee37ec29600ea2f23b68bc60d8760c7cdb2234fa5aefae3a64a9a9a5db9a75b252d16729a48af11a40b25ce
+EBUILD dvbstreamer-2.0.0_rc1.ebuild 853 SHA256 19ea846003d6467d3223e39b9e66e472b0a7946023a896d44c880eb828c0dd4c SHA512 994c1f41be610a1d2a6968f5025c37f84987aedeae97f1dd4b4b1f5840076c13204f367baabdc030109c6cff7d34634d3f37e85aed5e15bd8f91354a86675ac4 WHIRLPOOL faaaae1825924aadd5229c631f512d3b56c7efec1ffb0154cd66672a66d204a790c74dc980582eccb5b7b0963089253615197d492f6452cec045f00b573583c7
+MISC ChangeLog 2862 SHA256 3194eb33ba2b6f78288e8d38fe94999b4ddbcd68e9fe3b2be1618ecda9f746ac SHA512 afb02fff20608e03546bcd41131b4c195e9c7f90a3baf75aae5ca10718f927fa5594c020f72935b833ab6c58c6cff8b0188618bab4a6aaad489653f57941e179 WHIRLPOOL ed11c5dc9fa927b47399a6e283f42e80c1a39d650669ac3d79a2ace84efb37befc682591f63f53bb97b798ddb86bb9dbf3b78a2c649e3940ec077a51dc099794
+MISC metadata.xml 243 SHA256 2527c59800e17d37bd375b3ce6ea133421b1aa3feaebf8b8da8df6f4abaa8140 SHA512 2ee9799ab463e3207dbb76a39c5e6b71e7b07c68cb23dddf3021ccdc49a31b3131778adcf63f1ff28efa4c136004fd0c99c065652cfbb7857d57adce4a19221c WHIRLPOOL ff07d586c7c2296800a8ac496bd6440b504f16d342d1c21f9803844a1244dd2a1595e7deeca59b71894037f3f48ee717a7025584efbeacd4087a9928fd71cba3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0
 
-iD8DBQFPO/rGdn07HTTCgIoRAlCeAKCKAqcjo+SY5U+tEOwsRfBEJgCeQwCfZrJh
-opNm/DEt2ItOaz0mgoj5p14=
-=ZFBF
+iQJ8BAEBCgBmBQJVfvHlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimqEP/3bZ/mBbletbk1qe8IkWliHr
+Gl1bB+hkZjehUpwVtj3gjIcolvacmraqkAu1mjSIsvAz1vZrZnCZ3EVUw3RdrY+Q
+6exf2Xa4tHpbyJBav3L09avo+BbOvDlPD+P5nCoxGy4Pf7Xabo5CuMOzUUxX9jJ2
+6vrkogT2iROnAOJHgbImBwCu90hI6CBZUFuWERLIPXVSL4nL0fpL6Y2JG0Z4dU7l
+fbPJdYaUABMgib67kY+uiRUvwE5A+Fta7NvtJKknLn8fwGWFrSahwP8rt45vBfIn
+eLt+I9zBJ7gIS68XAuqEt+Jxp5TLXGez8Rhgl0FQky00dLFIZsPcXcKgwRNAgBXc
+w1h05PzDDJPjBe1BSvJ27qRcRY/hTgAZHUYGHtln/bomtNZqp5WvySG5WX+RCw+9
+UOoE6H6C2N9WRO+nOBGqjtT8iJrhWmqli2FwVb499ZyzSLe3KRR1QK2NfgqzdHMw
+MwBBvjYO9ECA8FxCLcVEj1oTi7S61qAurAm84sj25PMqc+XUskOGlroC0gW36nuv
+9VKb0JwUIajnjq7hP2G/FDCmO9GTDdhs+uw7AiN2T+fbFkdWRzurovbcw07p0pgA
+ZZDippYiRIBxfhIoiBoEvLboVWI8EgGVatW8CFz1D1w3t545RjkSKurj/o6ob4Ul
+vqFVPC/JYZ+odHIDz2jS
+=L3ib
 -----END PGP SIGNATURE-----
diff --git a/media-tv/dvbstreamer/metadata.xml b/media-tv/dvbstreamer/metadata.xml
index 740fefd7217e..0a94620f9cce 100644
--- a/media-tv/dvbstreamer/metadata.xml
+++ b/media-tv/dvbstreamer/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
+	<herd>media-tv</herd>
+	<upstream>
+		<remote-id type="sourceforge">dvbstreamer</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/media-tv/dvbtune/Manifest b/media-tv/dvbtune/Manifest
index 40b5764f65f4..7b433890dce5 100644
--- a/media-tv/dvbtune/Manifest
+++ b/media-tv/dvbtune/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dvbtune-0.5-gentoo.diff 256 SHA256 11d615cdca7b5f46a6c9091418781e0bf1fd8e2a8f6783ea2295fc81ddd154e1 SHA512 4b6dbb50362215a76da799f9e14f8523bc0024fb272b286d3efc19a8aba5b2f1e7c3de0a3490f244622e041b5817d33725587ea187c6c77ca2806d91f6df68cb WHIRLPOOL c09e5da25d6c07e11876d7f5213bccca3ee4e0dc8f70fd8c10919c049411d9cf597a7810ff69cc189d3fea44d0a039165cb9d34772647beb4b748faf9371b885
 AUX dvbtune-0.5-r1-gentoo.diff 470 SHA256 ea1865f743aa7d6b074fa045df42819a67d25219210dc92b88f96230c484d051 SHA512 0cefd5b9673e115cc360d72b211ef806ee16797443c35a78ecdc188c2c08eb4d54af7a1ca72526e18bae13de61f0126f5bc1eddcd7b0c9b5ed92ea46ae0b701e WHIRLPOOL 3028303c768a47cbd904d686e562ebcf83330e26e6115fef8afefe77028ab9e86af72609b0d86b2f7ec21394c36ed5895161e438018883cbe7fdfd625b2f5804
 DIST dvbtune-0.5.tar.gz 20601 SHA256 e6113080ca8a07202584edea0ac15d5a0948fc30361b7002d39bcb439ef79378 SHA512 0c6e8b8b4185b1b63638f0eff3e07b2c5e4b3bb9d95debb1625973cec2293315754487702ba9f7ed6bd6a0a518b09c8333d9ac4cd40b61f56c311c3d624fd365 WHIRLPOOL 26308845c14a3b25830a98673bc827d11704dccaa570738dd99a47e234ab767cb47f7d225d63f5f9abab6f6db01335f11bb9bb6aa47708c726de9e335d40e0f5
 EBUILD dvbtune-0.5-r1.ebuild 742 SHA256 86a49f79307764c3529991f3e37df2efbcf6ca78768460b46904701d44214263 SHA512 189a498e538656ce935910d66d0048865d1d34284870d7ce7a298613b60e6112e63c470f2cbc3cb4ee9495fa6be49fbaa3b2d73597700ea8a374ed25e0529295 WHIRLPOOL 9fa5d8088e3be41ee81486e06e88565f22f3168ca609554a024b76fb6e4417e0298b43ad590a429ff035a7595e5579f3d98ba2acd452f8f786d77ff6698943be
 MISC ChangeLog 1661 SHA256 4693b1b094d873170b439a4ca6f5bf9fc128ee71f1b6577cf0949662bcb7db6f SHA512 3d1b700a269393cf2b868f10ee319311ce9b180ef36f04f35be185a1354905d672fc3fb58f2242b1278699b0c2914a768f75b2035bc1b8d42fa8faa8bca342d4 WHIRLPOOL d422895dac15fe8f23b266a5970db862862d35c5ee1ea9176dffc069b7491bd8e2eb90a79a95e3fbc1780328fa1f87fa25091da5ed48aa619174001d1b96d1d9
-MISC metadata.xml 162 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81 SHA512 bb817dae86e8c763aedea0a8707f51c45e61369de77bac004dddc63cd4a14494a01af06cefee45653690d846a7f956c16d5a87ce7b39fdb0c402925c3e42a640 WHIRLPOOL f77d307bcaa0f3fe6376136e35bf4a2fac39ccef6c4ff2a2343254e9e4d1c90dd301ba35bb830779c3c392974dd38ce1ed03eeb7d91bc5c2713e53732df840d0
+MISC metadata.xml 240 SHA256 4f00c17b79d418ce3758a8b77e7286cd2169fac1468d67d0d8d3d38bf53259dd SHA512 5f82e8e24961a6b8589f79437adcbb831547fc5324596f9002874d6aaa4e63d1bc1be315d479ad9281115857728c50e5fb52c4be3e1dc5c6da52a3eed3d0ee1d WHIRLPOOL 4ba6d459d904ac570391235d9339662a0c71397a684b2bb714f7028a3129f4445851558e114ca92ac86ad92c4cde62a298425ebc7c467ce3b34817d2b875fedf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfvHtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEPYP/2lnhTX3zJmQOX0ofx2eGsEP
+EN6+4FlE9lLwShbjEBSJ1SHFyHA3NH3n3fiHsEUHrwMFBgcvBb04ItNBbZeRiVEo
+9IHByYnH2aolmogavWZjlg89BZwGVgKmHR0sW8dYZnVdng5nM45BSTYk/eLKlhP8
+YeqV9m0BvA0QOltBVctDlpU6rQKYDZ09y7oTkhqKh93fbdG50Qs9mar1jCPdMA1h
+lh1f97rS/8BdF5EBIWCZMfAtvmQcFAXZqbIPxss2DHd9axF/H/HtMsktRC30J7PW
+3wh/cRKj/XlgayEXSp3qIp3y/6ZyP02y/qidVuk5ERTm3GZjc11+ChTrQNIRcbiC
+A0cS2zBfE5EjOW9AYMT3J8Ng73Md+DZfQiD2Kih/oBup4GdmuIJXu50nSi+Y6Kep
+zZOtYHyOrzGaDcQvtarlZY8oPBUdxTajA53R2W2Nx8vtLOHmxeaSaIOlj+a2q9hU
+FTb6G7ANugnIeBMcxHBDxN4X33PS1dFMck+WlMFc1HMDCppKOHHAGoXCGnHtTHcb
+IlKEZK7hbUNmITrjQwywDkshjTAB3Fj757THPzu82TjgEp9wMaNe8ZVkXQKzV2Nh
+AAAwU8Psj5XvtsilzBlAhWigXJDaVBnRiAeMysnEUf02HOf75uIQF8ZusyM2TCok
+I8AKdAK14ptmkQO5wdG/
+=y73d
+-----END PGP SIGNATURE-----
diff --git a/media-tv/dvbtune/metadata.xml b/media-tv/dvbtune/metadata.xml
index 740fefd7217e..d95d55ae0fab 100644
--- a/media-tv/dvbtune/metadata.xml
+++ b/media-tv/dvbtune/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
+	<herd>media-tv</herd>
+	<upstream>
+		<remote-id type="sourceforge">dvbtools</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/media-tv/ivtvplayer/Manifest b/media-tv/ivtvplayer/Manifest
index 9c4b03dcfcdf..c2ca8abcda45 100644
--- a/media-tv/ivtvplayer/Manifest
+++ b/media-tv/ivtvplayer/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ivtvplayer-0.1.3.tar.gz 24159 SHA256 4727057b97a5e527e9617cd14e6ee9d892532fbb5e455d70166af07c1724aa17
 EBUILD ivtvplayer-0.1.3-r1.ebuild 1055 SHA256 80f680c58039fa0bf63b600feffb2ab351a43b50c8a455da20cde277a258bd90 SHA512 ec266e6a0b3b6f61495c174a24c729ea55b39f38051633f27468f83ed660cda76a85cceddc8315845559d340463a8c5098958dff45de378f8e37a91fcd622d20 WHIRLPOOL cc0db15f927d403ea1b428efaa26e388e57c78d0c37e362f0a9db0bed6710e0feb4ea261ce65796a757073e48add15c9bfe9586beb94f9e5eff90855f51ac579
 MISC ChangeLog 932 SHA256 941171b957c12457e45316711237b6c2412b1b721b80c77b787384227bd8cb2d SHA512 90a559d24944cc237d992485319fe40cf9f8d32b6889d08e7758447fd9f716ec47ed920df54efae06805eef5ac5caa2cebb1e75ea248cb3ca6fb3ce6dc470318 WHIRLPOOL 682410de5e8e4a46028216c0b15c9180ad4851ac08bb08adb7f1b9968841c73a09ec27a87246e853297457c6fcf1826746b388ac3d15a43dbd68695832dface4
-MISC metadata.xml 161 SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd SHA512 424fd25c6815aa6c23b359460d8a81ab3e27a45856e999b9d1c29b5a2a7696fdcbe188f921514c20d00297bfa5e5f86cbffcb4f29c96bd9a890e63e3eeba6e4a WHIRLPOOL a203e25d9233f506f39ead5eb4fda479c0b78d602762bc779bcf1d37e3d4dcc1ea27c5d10bbfe3c72499945c4caef560b37d1988c60d2ae13a77f6914f5df473
+MISC metadata.xml 242 SHA256 3726a2b64aa316aa84635e9b8a2a82a8ee570dc68aa688983e8ede70fe27588e SHA512 28909c40d1e4bfd6c7ff65b3bee9f749f93196e48a13c30fa06777f3698c44649b29551420fb948eeebc55f7d4a30ee8599cbe5ce906c4760a1378b4828f5118 WHIRLPOOL 8d3e769b1c597bd5fa8cbebac3bc05cdcca042fc0d6163251cae587619f7bbc9034c0f3fbac867c69f2d02090c181f334f7c5102e77af6ae0c90a6401c59193f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn3gkACgkQcaHudmEf86p/CwCeISXGkQ65OX46OR9DUA/7ASfU
-ITYAnjgT97KO5hsb5v0xFNq1GzMwReMD
-=VfMI
+iQJ8BAEBCgBmBQJVfvH+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigRQP/jHl1DtDyJO+MFzIntvdsecS
+XzSr2Cc6ryYoFQNojTj8DYmw2b2RkBexgED7Ntk/Ev64WvNaOUOMy0NjE4KffxTP
+5XIVzRr6B1lGvZ3illYHmHZrzXhGbdYDd6qr+xHvthnhU3fUOqaZL0hlO/tsaSqs
+u6FVUWLNd8nslMUMxExkX2N9+2TLdPdAMwcsvkzslH+a1Vp5TrWN1LUYgNkCwlIe
+vATqe4oMvLmtF0n1rQRqMVvD+bTMLvmYmf/XReSxfVusT1eFDCpEfuOCNz7Ps8Fb
+7ruub6PGdQ4kzO5YCIcEiVXI84dd/sq8syW7eH3acAynQZRWgut+6Tqe9/EBEku7
+aq7OPfuWSIWg433PmB/vzvqRShG6uPFsRCSw01K+kpWNVdjlzwOvSdaa5C1wKgpQ
+qB+/MXmnHAzcvLn5YVoLHlTPOKYOHOqF8Bujwdy5adZS+D+c4fVB5SbHMgRLJnKr
+AE8ANQ1OwmvITe7RlMQU8BH0WjSi3LHKHtmreZbpN6EYYoZ/QHAw7PTkVvz4+0jF
+f/SpIE4CZ35vj0XuGxeLBk6MWp/ajzTv4DZaOwqDI07QCzEr7FRECK9Puo8U2hId
+AQRp2aLKTTf1443s+aI6ik4fCRegMItw7dshW8Kb2yufKUPGRGlJ4yt7eTfKWDUX
+tVMW1Io5/xOVgtw+FsVq
+=vFQK
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtvplayer/metadata.xml b/media-tv/ivtvplayer/metadata.xml
index a6b9e38a1b93..eba6f2829624 100644
--- a/media-tv/ivtvplayer/metadata.xml
+++ b/media-tv/ivtvplayer/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>media-tv</herd>
+	<herd>media-tv</herd>
+	<upstream>
+		<remote-id type="sourceforge">ivtvplayer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/me-tv/Manifest b/media-tv/me-tv/Manifest
index 5c33c695a0e5..4ff3d3674529 100644
--- a/media-tv/me-tv/Manifest
+++ b/media-tv/me-tv/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX me-tv-1.4.0.10-gcc47.patch 643 SHA256 9a68b0e2e3b27affa01242034b8e8b3f12858880dfb2f48028ee6c11cd8e4918 SHA512 e01cb109c5674ddfe08535cfd4f45f347180d8db98ce10a1ec521feddf297e781293138e2ad2eedb9eca1f0b780f8fc83b8ed8779576ba66784e9bd0bb7cbb33 WHIRLPOOL 9b31bc8ca62c5a6b014d30e51c4bbf5be9329340af3f9f23257a6edbd352c4bab330b6bc955816fac023a4128ea7c344c6f54041a882eab662ca68606b98e59a
 DIST me-tv-1.4.0.10.tar.gz 549653 SHA256 a0ee03feb3271c5cd68e5d36f938d2f967db462d28627d39b1d57be60b02f38c SHA512 98988a343f900c6b7a276ada47025f9a703a490eb499f3aad9fb7163c73113061dc205a29b454f06e817ef24d44ae58981fd5a19dfb0a48be669394e91bd5ee8 WHIRLPOOL 8f263ed8ed1dec94b67d607052ce04f2c2d62607d8fdddf1703888905512a9ced76372c81dd210552b3df512adb6b4876e131bf2d288b51444775edbe28ce119
 EBUILD me-tv-1.4.0.10.ebuild 1266 SHA256 d45351eab6bc674caab2ee4b45b5e7abee9e29882e742b6eeffea119cdb3b5ae SHA512 99bb90c9b009064aef21caab0ccdd1300da2c365047d69d1c0c9f961ce9873095eb9ab8c4b09ed701b45d7fbbfda52413fd13bf70a782125578547ed83200cb8 WHIRLPOOL 7829b005a584f5d73988f3fe474721705378fc9f47078cd4b13d73c83f40d24ac49e507cb806dc18b9aa612e319a2651952f1490c3f33e6aa6ed8f2dbe357ee2
 MISC ChangeLog 687 SHA256 823a288059bf5cb8ef7642cef4c18ee65a26bb0e03c70cbb27aea0992a60a920 SHA512 1b1fdcb634b877e4d65c5402182d5910bac9e9387bc3c6d579c8fa0deb95da06d8918de23f303fdd9dc7751cf59ff160b4da126ff811d20aaadd843f2e13cead WHIRLPOOL 0f916fcc6c2352ca84fb433d5d2f4cbd4baacc09f90f99f03e7d025619e00605ce6d8d0d70215b778c2caba7ddc85b469d2e834470aa03ed5f2a7f2b67b715ad
-MISC metadata.xml 582 SHA256 13ceb7e2a6ee0d99d331decb653867160294a0dd9fe7dc5019b96c2b341c0dd0 SHA512 fa5c2db6ad77bda6c418c40c0cea75520017ac728c6567d33e04119a1be22164758ad2fc520b8196cf6f7decc8984ff8ebe92bbc3a96784878e8bc51c095b728 WHIRLPOOL 4c602f8827d47c4081ad1fa3e77ded34bd1139ef10e5ab7651b76ebe2072167d39e81414c9094c0decc58316664e7e5a2c8cbeba70c2cfe8634a53596ece95bb
+MISC metadata.xml 659 SHA256 4a684bce81b35136c894cc707b979ccf8447a1e40256378fe317aaabffe30590 SHA512 05b73e5539c88ece2ad6b3d13747eeff540db834967fdf3458b50453e910dee110d061fdab35e3be062f0e99e3fa83bb0907be71fdc175a99aff9a726fd6aa85 WHIRLPOOL e12cf272662955d886056d4dde6fa2f75de9b8a4c04c91a6d228b5e9d6227938248e95ee90ba8a38d2c537cc948b0d970d87105f204ac0ddde7d771120b35ed6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn3hAACgkQcaHudmEf86pepgCghJZreLNQXoIqTkJr+7R3bDIC
-6tQAnRTFPOOmgZXdUXobUVycvMNQM/kF
-=8bry
+iQJ8BAEBCgBmBQJVfvIFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqEEP+gPlyhVwNVS9ytMsA9zb2w2d
++8if7+KBYBbVKk8v8YuCqKZGhDQRrFTOptgWZfBf211JHOYoVzw8nANoZktnm+8O
+QqvetZTwdv/V2/4WVX5WEaoVXrhsFSUxQ0npcDQVg6JUY/LEKy9sATrqgut2i3gc
+kvkTM5ejcF5BFUh/b4z1WmZdIgGueqta+gLbOgRuUMqD2jNvA4drO2KUti9DqBeI
+sDhuW+9ptXQWUj75Yt0e72uIpPKLRzvZFvakypE/1q49Bax7Vj6ev2MgOhKrdt5Y
+mrNooaqjuLVwQh+MTvC8TdKDYXXD2Cmkuy0w0hDLhwDewLB6SDIvBw59Jg/XO9JH
+/yV4azfvKusTSrG6K++vZRRZR4brUfxf0PNiMaiWUlBJZ2XRQF7YCRuBujEdnSbL
+F2sUdfNAOerx1jK2Cj50nFn25czmSJkXT5Rae8N7J3E5h2F5LkIE0BF+Az5ZRihm
+N5+27JPFXdOX4GZt3OsFN1yGsH+MyL2eW+uttt9UHSkHFT94YYK8PMyrYC2RAo0I
+JaLI0CuAUwfgzcbaiqBJJKdyyr93IbMISLL/1ue0b95zXYg5y25rpcFQt2Q3Fxu0
+BJ2T+Zy9MwxQG78Y9ZF56c7eNgX8OHcEjwXqkXrmNx6oGo8RDWr4nlIemPF834pb
+HfhoVy2lS43LxdQyQeOa
+=xZHc
 -----END PGP SIGNATURE-----
diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
index e36b2841ccad..9541ffbf9e5a 100644
--- a/media-tv/me-tv/metadata.xml
+++ b/media-tv/me-tv/metadata.xml
@@ -12,4 +12,7 @@ Me TV works with DVB-T, DVB-S, DVB-C and ATSC devices that are supported by Linu
   <use>
     <flag name="http">Installation of Web-frontend</flag>
   </use>
+  <upstream>
+    <remote-id type="launchpad">me-tv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 4db6bb556536..262137256b40 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX bash_profile 63 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9 SHA512 1338a6871ba04100b3c74f91140be834ee659cb7fcf3aa1bdd251631e47690fae88b8eb80984ff5e35b2a4cf9b3fb1b0be8205fe220c82b19e9d935cc790d5b6 WHIRLPOOL 10220cf7662f150863b47529a90c831407ce93d272d64960cfa727992d0b4dfe2e13de2c62d7a4b27f924526307822fa488d9551f6e8f62a47f63a89dfaee9fe
 AUX libdir-27.patch 586 SHA256 556b665471532472a0d2f579f641968d4ef4b89a04cee0137ad15da32a8a7198 SHA512 74bc38daee18bc65f2c4a44076b288df44f3952e1d9cd12c88881580c8021853a667709ea07861ee8d2a28c0abfd62595bc04e046798fae36fc5e7091c752228 WHIRLPOOL d79bc9092bd9d9ef70c16bacdff57ba06b79db384c1171e29c667e24a8c27e79c0ab7d44d7992eb7640782d1bb1e9aa36399a324c33987e2210a66916fefdcc2
@@ -34,21 +34,23 @@ EBUILD mythtv-0.27.4_p20141018.ebuild 9796 SHA256 33a3fac86f5ccf881754397293f009
 EBUILD mythtv-0.27.4_p20150124.ebuild 9796 SHA256 93059df4c373453876a9a4d878f170cab6c54bdfc3787d083e0501cf655c7643 SHA512 3899fea02ac1eb7238b2170c5cd6321768ec28c9a0d7e6bbbfc0eaf32693723b57635f34af8f9cfff3ca498f65c12efa67bcdf2ab027a33fe96f6efd3d9ba67b WHIRLPOOL f93ad28ee310643d8f7e57ecf98a9a36b4c107ddacf0fac438643d86875eefea12a33b3fbc08a4863f6da964a2a2bebab3c0816c570635a62c3d91160457eb53
 EBUILD mythtv-0.27_p20140321.ebuild 9613 SHA256 3d6dc9bc5ae79b382a963ee769b2860324ee3f1f703dc4ffece6f7d227b712cb SHA512 1ad81f2b56f1baacea1d7a4979822998e28c5e95369f4c0c878ba170b1bad68ebb23096a1a2631da3eee5aa74980721221b35e35315d065ff795440ec7ee8242 WHIRLPOOL a342740c569c08c8aee61bf08385ca7abb1af8bacee74fad2a5d84418bfb7a361e6338f4864d4b129750b736888b74c82bf3798b2cc7eaaf8c6881b6bb1ab25c
 MISC ChangeLog 81901 SHA256 e83480f2621dc6df80bc3b767be5ac5d34f758c74cbd57379a54597f39149121 SHA512 aeb591213defe41734d15bc9c12e415bd27c8f89033dfa2da390accea57caf92261e6cec1045e50c96d56e2fe4dfa2dadb22484b35669f262eb416a529349aae WHIRLPOOL 0ed7854bca5fe581560a3fc3bb7574afea899ac9d457f675b75eb8b965cd503f54f6398ce46b65a036bd7fbc053e892cd786d73c27bccd26f2677aa093ab66b4
-MISC metadata.xml 2969 SHA256 3fbadea0013956319bc49d768a964cbe85bfc7a44ff0362fbf11f01b2e6c55bb SHA512 7e0beed5ac330b613ced235f4c96c5b8dc91b5654f2af2d75e875017cf0b74052452e228c7b15740f9d4c6ce92269fa5ce810cea25f48eb5e5148be099eefe30 WHIRLPOOL 29b27d53bf25ba393fc045a9cb9a87079907f5f6f7cccffe62289fa034ef41f2d1da09cdee0cd30bdef26d85b1e4a4a39e4e9e83a0d00424354918a11d831db4
+MISC metadata.xml 3071 SHA256 3b8fed2b3f6c3a75f78347e9b90a5fc13b874dee9af5911b529cbb84b42a912c SHA512 f9936a770f552605210e87d466f3f876587b590c77b51756f6f71e44f69f140b49a4e8146001f8240d7290f08b7e145c44299fee09656df8629c76494246a577 WHIRLPOOL c85b86857e21cdbb689dbe333d1ced11b4a36dbc6a870b39feef7585783a4becb76de28b9d68f52a85a920b5add8509062526be81c2a0eeac87e623be37c251d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVDnJWAAoJEIug43o+kWudHvIQAIIsenUpv/kpYJPMb2lt3aQA
-rE3Sm0O4kgBqUs+1ZTIZZ9djxj6d/FK4O+NROeIaF2mIHggVcvHikGmOVIdzikp4
-N1J2BmrOJ3josGEm74xeYpZDuMnCC8dOBJOa1PYyIwVqHOUBS3z6lxriAOu6nyud
-EPCdRuCtsErzsl1so1Kp64zvreok74hJ6HJ5+QXlA9TmLjSWhHUeIqRBF4kGiqog
-ooitnVqRPEP0dCwhD/kOQTmHo4S5LeM/g/s6H5M0rS9ENLbKyMbNgD9EVJuwmDC6
-Bivc72uCOPu08Fx+0ZtWBXFE8I9b2HK7sEZd4egzebr2gTIzNMMWKAj4WsjmXUBe
-Jjyu1RdEd9l/0tXrUik6qcGmQcj7b1d9FSJv+soy4kUx+sEP7VJUHZOoIwY9zMod
-ls/DljZTdxf6iCmM7t5YiGkX4q5XYdPqprbagF1bewTa03gvqmk8RpwLFg5tG1Ps
-dfO5hFc8W96i7XteyYq3POPfvaWFC0ktOny8OcFHhd/k/eB6ciBpD1mDHitBvuOy
-fjYXWyQEZWH3jzLoFhO5iTuSaqKs8xH5WkvtMzAE9T6/yJMzwSH5i7Qc9PgTqUkb
-n3xcMsrC+Bo5Ng98cu+bPBZI2dGEzWOHak+XGMlpMufujd138S0DVvaRuj1CYABw
-8IZJozHOPVQGPsvI/H5B
-=PADb
+iQJ8BAEBCgBmBQJVfvIRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQcoP/jcG/i/Hd3KMsrzU+CSJ2n1o
+083e9eq0gMWwe6mab65AGcHPJMEtbKGmpTy+ERRfwqu/BfVobBIUl6a0G366VvZJ
+yUAHW/jXdgleegg7vWl6EAmKpo1Kh+9tWtE5X8VipPINbuzeXxlDUkLc+aT70oqo
+kMRjfZTbWhD8QRRy1ftebQz3ym3AL8p3Es5z69LT/277XTyQziOtRuJQy83xKzYu
+JRIe2qgBgOPRvktnCfAg9gwKmHPT8zecchhmSk/TBN+BCAE5ujDR75xgOwmVZSBi
+n/0LMmkVCbMeYkDJmisgOTNgNkBByXwZp7BV6Win9tl4pkY+U+shpRRzUt06ZhaU
+K2oHlL60kli9sPqSGW2+1IRP8Ia8kypGMnZPxotVeWzIJAe1xWg5+Nm8yEO+gj+n
+9/y85z5/Frf1HHMCbnthFUHA5lKmCouczMRLiDsnPmP8wZUIX2ffbvg4+EFNkaut
+2Czd93zwE3ICVDjhl48JRdmRB9BSq5fe1LzGCaFiMnSRRW1I16lloWQHwAy2FIFW
+Ee+uqDT9orkt1UjTcSTmsO8QyPEgExJXJCYOj1gssqm9w8i7ja4BK1ZuoAQapBSE
+9VpQXZb5ULZ4y3wR7MsQJj1ttVu4icNj1fAUhuHSiVf1Wv0+yuiFwxk56dKvF2ll
+OZYPr//01CmYDtJHfmle
+=OzqG
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 0495cd3fa6fe..fc7ce65acf25 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -1,52 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mythtv</herd>
-<use>
-	<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
+	<herd>mythtv</herd>
+	<use>
+		<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
 		this is needed if you are using ALSA dmix or SPDIF. Note, you will have
 		to physically type your device into the MythTV configuration since it
 		will only give you /dev/dsp devices in the drop down.</flag>
-	<flag name="altivec">Builds ffmpeg's codec libraries with altivec
+		<flag name="altivec">Builds ffmpeg's codec libraries with altivec
 		support.</flag>
-	<flag name="autostart">Uses a custom autostart configuration gleaned from
+		<flag name="autostart">Uses a custom autostart configuration gleaned from
 		experience with MythTV since its early versions and discussed with
 		other MythTV maintainers and users. Does not rely on KDE being installed
 		like most methods do.</flag>
-	<flag name="bluray">Pulls in libbluray for BluRay support.</flag>
-	<flag name="cec">Allows you to control CEC enabled TVs via HDMI. Currently
-		requires a USB based CEC -> HDMI injector between your TV and video
+		<flag name="bluray">Pulls in libbluray for BluRay support.</flag>
+		<flag name="cec">Allows you to control CEC enabled TVs via HDMI. Currently
+		requires a USB based CEC -&gt; HDMI injector between your TV and video
 		card since no graphics drivers support CEC natively.</flag>
-	<flag name="crystalhd">Allows you to utilize a Broadcom CrystalHD hardware
+		<flag name="crystalhd">Allows you to utilize a Broadcom CrystalHD hardware
 		based video decoder to improve the performance of video decode.</flag>
-	<flag name="debug">Instructs Qt to use the 'debug' target instead of
+		<flag name="debug">Instructs Qt to use the 'debug' target instead of
 		'release' target. If your MythTV is crashing or you need a backtrace,
 		you need to compile it with this option otherwise the debugging data is
 		useless.</flag>
-	<flag name="dvb">Enables support for Linux DVB cards. These include all
+		<flag name="dvb">Enables support for Linux DVB cards. These include all
 		cards that work with digital signals such as ATSC, DVB-T, DVB-C, and
 		DVB-S, QAM-64, and QAM-256.</flag>
-	<flag name="egl">Support EGL video output.</flag>
-	<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
-	<flag name="hls">HTTP Live Streaming support</flag>
-	<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
+		<flag name="egl">Support EGL video output.</flag>
+		<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
+		<flag name="hls">HTTP Live Streaming support</flag>
+		<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
 		Cable boxes. These are typically found in the United States, where such
 		support is required by law. This will also install Firewire test
 		programs and external channel changers if the internal changer does not
 		work.</flag>
-	<flag name="jack">Allows MythTV to use JACK as your sound output device. You
+		<flag name="jack">Allows MythTV to use JACK as your sound output device. You
 		will have to manually configure the path to your JACK settings.</flag>
-	<flag name="lcd">Tells MythTV that you have an instance of
+		<flag name="lcd">Tells MythTV that you have an instance of
 		<pkg>app-misc/lcdproc</pkg> configured on your machine and it should
 		output information such as current time, show name, episode name, etc to
 		that LCD.</flag>
-	<flag name="lirc">Adds LIRC support directly to MythTV allowing for built in
+		<flag name="lirc">Adds LIRC support directly to MythTV allowing for built in
 		control via a LIRC device.</flag>
-	<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
+		<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
 		scripts in Perl to control your MythTV setup or communicate with
 		it.</flag>
-	<flag name="raop">Remote Audio Output Protocol (aka AirTunes/AirPlay)</flag>
-	<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
+		<flag name="raop">Remote Audio Output Protocol (aka AirTunes/AirPlay)</flag>
+		<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
 		grabbers for users not using Schedules Direct.</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="github">MythTV/mythtv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index c639caf0e029..360ad4a759a9 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nvtv.start 531 SHA256 614d245b6b44cf21f33aa879ad4a20b71950cfbfa95e161983c622ffdaa2be79 SHA512 7d01c1d3ac7dad1223ade91d0007fc47c03143c97b594b727604545ba71853b6d29f282edc4f8ee31ac0cca9a67d6ff61eaf1af050ab31d7854fe7154145a81b WHIRLPOOL 659daaf8b8f84d7428b077e894c3a91a5151e7e8450a4f7ca9b70d4345af62328f97dd4c054f19f3facdbf91d8476221ebe506cf079d6dd7eb50525369ca668d
 DIST nvtv-0.4.7.tar.gz 419564 SHA256 f044c6de2df66196fa589ed0d33203bd10d88604f447befce1a6f62eb7b08dac
 EBUILD nvtv-0.4.7-r1.ebuild 1188 SHA256 1575a764a45efbcfc9e948706a03b72de5577373ddf56308dca4ab1cdc4ae07a SHA512 accab918fdec87a2ce6621da3898746f116687c613fc2d9619f9122541eb8c49c55bfd3b3bf2b55b40109407c872c7030e6755b431c9f10b77cab1de404d4e3c WHIRLPOOL 884767df4c83a36881566c88bf8a516540ffc79f6cd74a3165ee511e2e448c01f6fa347916a8ccd722b6c7ebbdd9532bc4f13bc880fd379ec9600524f6b124f5
 MISC ChangeLog 3206 SHA256 c7932bc11f699a3cc4b4ab42085e64c7f15b91f8b88a93b5cc4aee5cdb79934d SHA512 14822890f1a0a8b785d014e2bd459210f8d1a3533d2984486f82671f6b26d33d852cc3ea0a01ba3efe2087f379ed7104fc0cccd17e0863c37f46049c31b65471 WHIRLPOOL 584f5f39b0ee1eb12e93e2b1b5311308413a920319fcb0a21da4e43f7c7ccd318028509fb31b9010fd12e2be731b10caebbb66397a523e8752f4d18b09722a0d
-MISC metadata.xml 312 SHA256 f9fd1c3e47569e52e4e7e9a70a991332e3fbc92d6d83048021928e81fc02023b SHA512 9a21b5fe946c6a1d6699e4a25a3999043ebc5d00041a64cc887d7a2b2d61c61369eb18a4f9a6424e6d834412c21cc07c9dff436adba3e2755b0bfbff1b6b7a7d WHIRLPOOL 0a43228232f417ac0a42e323a7150119cf8b6bf20756ee9de7261c7811811118cb58fac4e8f3114e40b8fa03cfcbaa8ad1a1c0d7f398693839c67f739f11c41c
+MISC metadata.xml 391 SHA256 cd6c70886a64cd00cdf2c9dc222afaf147aea0e3ba698c5c1a51a81c1d132ab4 SHA512 fb925b2e8fe4f05aed31791b3fb8d7b72ffb3ed29091cda610a352e95adf0c8dfd4cdea826b618b7ab6396dd84461c469e800569d5429490a5d0b85a38d94b73 WHIRLPOOL e8040a3f6c0ef56c1dfa7b18bfb44d7a663988a52f631fb8a1d7a2dd672e066ffc6c8a8626c6512e301a28ce69f134a9ba62e61689c5866b5e489bad79a9d86d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJEQNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5CEcQAMWs/Js5MxeoR50bWgdD2073
-6w2W6DyfvDHXq/vn1srpOjbJICSA67SmzSGTsMgdZaZ6PPF6VjuBUC4jy7zKk0Gi
-+W194xwdfdX2/FeGDB2L2Si1Agl78Wv6NyCgni0H6b7af2JA/7RCnenjpyLB1Gzl
-VeOjSHQX1CUIeXE3EidrZbVuvNAcKGPzms7tZ8FIPBcL6S0bP1+IItTwLsCgvjv9
-eGumyYuxHy4tgEVif3wwCQ3rivwieJImDDDAcgfJcHCgxaevjxdi6xbcqrBSo39Z
-j0TUUjTYZcjqlPOoxhzUbWIUeserFrNv6uc7pzEfPnOBBSXRZYB7e74QbI5EXBeD
-cMUnb5EfkxETvL/ZuuEcYJuUPRtPiAWfGKkWDPT4PV81rvcGYXPfzyni3FbUsNjb
-jHnkyqJZdStwjzCs+y2YPPY2fC1Ykn2tKV5UybMme/gPDetEra/lTTkwKqsx9sfE
-kz5mNFl59WQ2C9sbiYd8g8E1P78JYcd+ze7UE5hr4jDFz04yj5AMRwcJUsEW5lE2
-XzrxMyJsr8afIC0/0W4QQoZFG+iu8jTkB9ZTGBqZhjkTArVYphMu3fqJOGIwPydM
-5WP41LeKP9YS1vbg4eXG2WhsSayVfZdaSOeGAU6BVL7jveuxXNrptadCCeVCEfHM
-dVvuqRDzKSJ30S7OcdSI
-=QD/w
+iQJ8BAEBCgBmBQJVfvIZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigAgP/2hRLDxQAXKjTHupfSehg7Mg
++NZZ9AorwemopAQGhy1TkFxKbENJF6HNgtrgD6psTeGA+T511vvlzlWC6PUrL0kR
+2MzPryntD6kR9Kubglu10/IROjS+qGA1VHUO4rpjx6ysKmpzEXbN84HRXkVHhWxY
+L9SRByK9PagCS3GHplWwsimloMirzU6TF/f8Lav7XJcjXF8YThL2P/1YiWuMATiP
+qWTEBxkRwVk3HtrUGmEhJ1TodVIkzlvIU40SH6Ete9H0vaywKJPBbvjzZE8yQtxv
+TW6J+NyiQ1uOvpTd/3pCxDZuNPZ6E8to/q1rc0Aki69qJ+Khk8OUlpAy6rpVR7ae
+IN1XtDQXxfckwdb9MfHn9e/azRvH47kE6LZfEucpBZZ6F5NfHGbNzxUbwzZJDzao
+4yZRPW1UU5Ak9I+TFzfq9rmNh2WZkjDm4xxN1ZWDXhCy4apXSV4O78FxqXym5WVx
+En1ihMjTQPQcDA24bUtKxtUc3V0fT8eM6rud0EgxmaDWdovHZbzzgRRJKkFk7iN2
+QT3Xs64zEF9Y7YOyoxMaXYjInsia0UVO2L6pCg1M3o9sYNaAVTNRQ7IwqGxF5qSj
+rh99I/KpnHSyoyxBzW86DOT81+uzff21epal2FxyNP+EOJ4Lfy3sDfd4/4s2Q1wz
+AMtmJt9NrMgwFdiir4SR
+=+qwY
 -----END PGP SIGNATURE-----
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
index 4d0b2e71f43c..2e8d3be4630d 100644
--- a/media-tv/nvtv/metadata.xml
+++ b/media-tv/nvtv/metadata.xml
@@ -7,4 +7,7 @@
 		<name>media-tv</name>
 	</maintainer>
 	<longdescription>TV-Out for NVidia cards</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nv-tv-out</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index d3adce55889e..e3dca186841f 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST tvnamer-2.3.tar.gz 44415 SHA256 230b5608002f048640e270639cfb43f3301f08127af46e1243a033c8e1c62696 SHA512 b1b0ac4e665a04215cb3d4e738197285c800c554b276e56ccd14af17fc624ffe7dab92b208f9791806045eb1ad0a59d6e76e52464e488f919e48dff2a879d96c WHIRLPOOL e04543a1921c327681fc748d85a9278270ebaa9ac211e069ed78309b3cbed64c86ee5114e0a13827418546ed9ec550c6dc1588ecd5386cf29e9cdabea0cc82cb
 EBUILD tvnamer-2.3.ebuild 567 SHA256 9931af8a54a61c04c1a57be13dabdc497f7e6959f793f7e1aa9bafb8816f1b1f SHA512 a5a7b7bb72304bcd71fe97630f58c19da58363d75b721787bf96b3ba9dd7b28f246bb945ebbc78432841d9765934b1f3bfc9efdbf1c222810b3527b6f61487ae WHIRLPOOL 2cb2bc33ad57f52d68bb70ebf687b580c3ee1ea4bc81dfaf3626d6a29c2445e70f38fb5344eaf09c695a52740cc21b46d918f98aea0eaf2a1c393c7cb6897306
 MISC ChangeLog 675 SHA256 c387316e38b886ff8f81c8658a5887d4a5ad6c07dc9ddaf7068b1b3af1fd20a8 SHA512 5607a1f4f1d1554afe7e81f50a7943ebcbf5eaec48ce89585eecb4fb56548ec7f561add9c080526a4e29de4e725e3c168c5796136ef082fd0142925b67bf6383 WHIRLPOOL cf543e7704dfe6ed7472867ed4c1d81c7bc579718931c8f11662f6697c6ab2367c5792e3749b5111a1ac800624059559b22492b5bd081e29f2ddf5a70ac27d43
-MISC metadata.xml 312 SHA256 e55300bcef4b13f78d6c1b565a41aeb0aad88eb896acc7f8d93aa33095554417 SHA512 7d7ebbe8655ccb852a93870eca63f41ab2b5b3b1c100b61115851f02729b688d2bd99d6aee7984084e21d4fd512edf7973dfd42252e62d04e2e3acb6d20ea3af WHIRLPOOL 04653738236be63f0ac1e974c28aa9025958afc57a27fe6bc654b66a0674fd7e23b35fae110a295bc60f765bb616efc56485676f41d051afbdb53d1fe6968ad7
+MISC metadata.xml 365 SHA256 3dc0fb2c0edfb73f515d8531de9bbb3179d9976df4284a14799a054e281823c6 SHA512 db5330290c9d95af099d4ac14b4a13d4e1f169ad7cac8ddfeeb35407942c299f9300a6a24eb146d08e34fff6627f13ab269f8a4b022dfcd36f8d8d9b629a9dba WHIRLPOOL ecc3071bdecd356fc2d2464b90f1d5113d642970e321b768669b84584b55502eabbfbc1b79f04395452cbed98aa7d98328a0e523bf59fd06a81760f028eeff68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCo4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfvIgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirnsP/2AErEPHrwq15PUUHmzFYlYs
-jhMSanaazKZVl7c5sbF/L1JWcW0t2PVUU0n4UMmQOTw4WxVtU4qEBPcvCW/GHczD
-DSeZjZfsChfb3dsaIcrIz/kJe5ANW+TFx0Pe+YLH3o8DUyGDIuUdt+6bfYdOme3B
-tJaaBz01PuSKj3d5OnjEgRTjq0te82RrtrVtCqVp5tPlYLL0EgMQSrlLiVPCyG7Z
-Viq6uJ+NLdq0dZ51K+k/eUG4wKykwTpuZrB3stNO2PXJ3j/9Ryp8n3MBM6my9jiK
-Ds5RahbkYenWjI2Zn2GIBKswexsGpUv+VY10dsf440q6MsHKVvxzoehcXkFJG6Bl
-jumuZ1torp9hrECRTEjph6YOc7OBz7uYBzvSFKu1jfH0+QcySGdCeGvaJUF4hYZW
-QNHm/gbPX9mNUkw7ySS8OYN2O29isRiPhc7lUyF4iQEtXYUzmax7mFiD10jAB4wY
-dNYMVttdoIwgLJSrwuA+nU9+i54q2k1Ha8Ec3v2NO6RqAMjT8Fcod+6EctIhDGpn
-QPqmd9HLlOmHvoCrBvenpcCg6+syj+QpDhoy7J5/0mxw90sz5vyHInycJEn86pdC
-A0rTqktzUllTnHpxdP5YlkgabJrR5T2wGCigtu7vHQj7vw/xAd5RtpJNT+FdkD+w
-hsEX4Q1XEt3uq38VRTAL
-=hWye
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIdkQAKkrFQBEk5d+mvFnKAwngUso
+U1LQJooP2DwTlwas8+YXCq9CChDPZtyMq/3eC6yvoyYcH8KcS/KchkzujNLD8UqZ
+Hl1aLzuskncdBpD7dMC/aMZy28L9lC7F0Ve9sI/VW5ZEy7+oacDrvW2NHLzR/sj1
+wfDjKa/5iKCSVZQzw1TTOdOUc+B4VTkWX+7EreDbWk5yLib7UZJPA8uMZotbtSLG
+kBvYqZqZzlh6Dy68+EHjh8qRauIQ764bttS5DHMW10umN79MW1fmhqKJGtVZz82P
+SaHFQXHoBxda3DhuhDp+1oMol/6SmRds2Z8z3Rl+ha7slKyatM93Ln6am8t/uva2
+44f9E7paQjBqUFWFTfsQ6UozxDNZZlK5ij7IYEz5WE5EjqC/WX94FS5bCN8v+uol
+EDC2I4k+H27NAA3Am7NlmyV4BUA5Xo13G/hXb7NiJO1PS/6pGYUIQ2ECgQ80VirJ
+LAx1GmfnFsfW5OT5EvMZB+mjFOrRbYsnvM0cgo+WNX/GZUmrqlB3Y+WdB1KU8qb/
+k4Bhm3im3cfqcCxGmmfjuF3Qz8mrEQltb/hOYXOga0VPiR5HdTtaY1yU5KXZ7XoQ
+lLq10Y79zWkYxG7mRLV7B6GrDdcF9zkMiwRMs9jDeNVr+Zj5OBj1jod7BtQimuZw
+hEZE78TWKtj4iV1XEAcE
+=+JN7
 -----END PGP SIGNATURE-----
diff --git a/media-tv/tvnamer/metadata.xml b/media-tv/tvnamer/metadata.xml
index 0e2946b05d5f..6e85dceeed0b 100644
--- a/media-tv/tvnamer/metadata.xml
+++ b/media-tv/tvnamer/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tvnamer</remote-id>
+    <remote-id type="github">dbr/tvnamer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 1d5888b6d8eb..5c09633d7688 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX OSD_RAW_CMD_patch_2.diff 843 SHA256 41ad8460fd67ec56466266fd4e89de712dc8ca99327cf95670a5a0a27b6a9a14 SHA512 57688acc06ac9fcde332e3fba9d4048ac962d7c65c3844ff60e1d48956f7fe0f02315859f427cd5e21695ffa0c3d5cbd46ff953d7d1eca4b3e2ab165f6985e71 WHIRLPOOL 18ef1d95fa4bd2e0e3d353356782d39f84179a9f0f48bb36f5b4705500d7c4030b3ad684a2e186c3c6e64d72d55059f65fb9cd63c170701865b39f406fe9541d
 AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 SHA256 6ea366636aa838d2d1499d314085e3d8eafba91de37ebc57b0be0d069140ba8c SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116 WHIRLPOOL bba297c62a576612ff54dcd741ec8f5f2a1640e79da503b068637bd0341c2dc39fcebf107994a27dbc3302ef92182562fe223368e8de578da214ca0917dbfd2f
@@ -10,12 +10,23 @@ EBUILD v4l-dvb-saa716x-0.0.1_p20140322.ebuild 1654 SHA256 241f64a86ff5600057c669
 EBUILD v4l-dvb-saa716x-0.0.1_p20141109-r1.ebuild 1735 SHA256 1b70bc121e5fd1b529545a24de77a129ec9ea3b67473c21ea435ff5b9997fb77 SHA512 e5c9e8f080e4e19b5f16cba7ef45d0001dbea576cf926e0adc46f9de504db568210cf2e8ef2734a42df08a572a47f142a8deb4865acb74a663de6e85fe7f8e6d WHIRLPOOL 8cfed0390a1c85ac712ab7700eae8b404b0065668fb634d431049e365d7289e23c555686473e533318043e52d909c539af4fc113e1938234d80ff30fe37b2e82
 EBUILD v4l-dvb-saa716x-0.0.1_p20141109.ebuild 1651 SHA256 2bb41f42291435f70d59091d3d932005664ed6105b3898c14467e1cc58b0a4e1 SHA512 ce2a32541b97ce12abdc8425f871b441ab25a924e0dd661554fb642918017d10823c12157a2ee33ac0137ec7ef5de97ccbe9dd67e674cd0093cfa9cb96baab79 WHIRLPOOL 82a48a53778d0684b150b8a2defe475670237d7ce8b6b4fe8d2cfb911d1b90beca6b37d91c9d6b29f73055870d103b81e409de30d9d36e2fd4b31ba2768a6016
 MISC ChangeLog 1745 SHA256 6986bd5ef889327b639fc97fbd322ff57d71eca63e1d201522305b4939e34311 SHA512 cc308432cba30422a4f3ded5397210aedf07779d5faaa2c15a4f41d489b8db98755b8d110a31ca059e0605710facbe276c26da880482a8565705aa8204cc019c WHIRLPOOL 9f2fb5360ef99d7dc1fd5f0b5d927f540cd331d9015d37ea5d8200b83f72cd8ac8adf423e7f757cfd05162c9933cd32e42c981f5e5c6814a3c8946f96f1896a1
-MISC metadata.xml 540 SHA256 15d8b2b052b419939fd1ac6e41136f1924b1d102000b794b2ee3a0aebfbcb8b8 SHA512 324ad178fca0c503f72704ad28bc3eb9185c05e55ebf4d1b043c2cdef764c40f53358c768a96ac629704eaab1ae77c1f69d17da05bcaf7a083e2c9f4fcf67f71 WHIRLPOOL 116509d1e7062d7feb4d02e66b99e836d48c65355816124862f6eaffacc5b1fe3d474e8e24c262e39c98180ed8f8f5c101ba4fd0122597d6d3d932aea070e4f3
+MISC metadata.xml 642 SHA256 96419e76a07c12465bb2b5d54e218d98b704ea2381524a70572c39e8f0831ae2 SHA512 c53c36b0a2fcab4b136786dcede99e2a1ba4f8458cd309a88e0c1142d475aeb2ace4eaa1b4bb6eca024d91f127ce73bf1b5fe0b0c4d525fdc0adc97ca292c7fc WHIRLPOOL b91c867c3011335db8ca94101f9138033a6edba3e57316eba0cf0aa4659ef49ef2fc347310f8f39ff762bc4402b20036281ea302355625068bc6ca23e436c071
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0
 
-iD8DBQFU9b2Pdn07HTTCgIoRCHAGAJ9+MjElH/+8cqsClzheKlEWulpNvACggDTZ
-UjOts8SB9kn0Qs9EXctNXFI=
-=zGNf
+iQJ8BAEBCgBmBQJVfvIoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2zoQAIEa8M9vV7JMa+rPl5FJalCD
+3D0te26nAMQSG6BaY/wq1OrlHrxhVhgpolAwLw0vyJHqM9cIrlXp82RcuUu5povy
+Awuv0ngwZuWnoT4JpMBXMIyvMhRBY/kGCv/LeE9Rqij66349hUAI5Vge/BTafpfa
+GIk7MN7yT+fL+mk/LMZOfiLY6vEqfMgKwiDiIRM7tnPtMlxQKBwK7ZWkwCwHjm4k
+9gGeJfNv5jAHLUgbr1cOHyejXk9SMF1w3q5lIl8BAXfSraNL3uuWabzpuS16tvj9
+6c3XkunJ+76mxaLpgOEYkMZGEU8wgb9/t3qr+1IRU4UFt0ex+057h+q1ecBS17H4
+O/hdoDLadK2op+rBxvfIzu+QG/5PoolpdoEm7TWZwutl2/R0+0/2ImnzKLdqNIAn
+xWLnIqTALHzAw9T1ZzTT97Rt9t632RXC86rzpE2Anvgpd2gb8wj5SAUa4MVWiyfL
+ybjxjWPwQ9bYCqstOotAhzD0Tq+1mjRypsBnJb8pu2ss3OK4RzoEYvoIwvHI+8Vq
+IDdk0PHyxnKEtwVsZ0mVFdJOJqZoUqtKq/6/3wIrgm2OclRnfX8rnTAEDCNPFuSC
+tytHju+wkqplbA++0tfwMmlnD28hognzClbSooX6d80cljD1dVzGa05rUiEMk0bL
+jpzR2cJkN6ze7wQ37z7f
+=jThv
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
index 84f4cbbf1206..8bbb40ee4126 100644
--- a/media-tv/v4l-dvb-saa716x/metadata.xml
+++ b/media-tv/v4l-dvb-saa716x/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
-
-<maintainer>
-	<email>martin.dummer@gmx.net</email>
-	<name>Martin Dummer</name>
-	<description>Proxied maintainer</description>
-</maintainer>
-
-<maintainer>
-	<email>hd_brummy@gentoo.org</email>
-	<name>Joerg Bornkessel</name>
-	<description>Proxying maintainer</description>
-</maintainer>
+	<herd>media-tv</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+		<description>Proxying maintainer</description>
+	</maintainer>
 	<use>
 		<flag name="firmware">Install firmware</flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">powARman/v4l-dvb-saa716x</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 7ce705339ddd..2b88b91af6f4 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xmltv-na_dd-xmltwig.patch 365 SHA256 d8b595ffa31e7fda422065bcb1fb2399e47844c93a1a17fb52aac80f8db39cc3 SHA512 dc905fffc730a2f92ee1ef473214372803529d534f2f5f52db6746461eaf3dbd67c942cec66f65a4d13c4aec4714f6eb32a83680769dfee32a423f099e081f87 WHIRLPOOL 51dc60ce1a8edecc139901337428f113af8f9cce42aa1b7a5c8b40dd949adf30b4b9f445d088d540a46f22e90fff1212fc0f033191a09b26923c4805ee8949b5
 DIST xmltv-0.5.57.tar.bz2 778254 SHA256 4a42a1d239caa988fc6d25414ff0104aa831ffa273d4a571cff8c76c05e0afd3 SHA512 78e79b75b23cd8815403a0a5835036c67c80ff45fba79fae68e50a041ae384f427e18717d6122ea2d5eb57163370acac115946e24a8934a94b1cc72cb24314cc WHIRLPOOL 86624127ed922886d3c291358acdbd29a0b70d591baff83ed491345d5ec119de8ef486e0341499e1fa985fa38b85da9a6989e7e4159675da8876ec870b6cc433
 EBUILD xmltv-0.5.57.ebuild 5517 SHA256 3349af2cb70600e8f529a6540e5617ee1a46b9b68ce44b85bfedf90e471113b1 SHA512 e9e2cdc508eeff10c3b9384d4e0e8421dbd97f535eb91fa00e65f09ef7398cf8160d69205aab67a59b4ae136e3faa07be09f69f82ef1798d37982e22a5a2be6d WHIRLPOOL e36394bcf6c54c579daffce071d7334a97f44c0af21b4e24680cca0483f0c164839b45d4141e7d87038f3196c70543ef1e082c7a47639a856151cba0d4d39730
 MISC ChangeLog 17125 SHA256 339936cf083760ae16d72729719ce2dd7c459a3d6142d535962e4c54d5dba8ac SHA512 7970316fbb87fb3131f7f84178649abe2dc82dfae5ebdee96fa6302b5c25e00679728706b52002809c60b140a1fb60bb306d830af705a55543dac2517722f7a1 WHIRLPOOL c1a6648f0b5035134f597e3f32f0789dd5c253aec18fcbe9c39d5e836e2d9eff5315324e7f240970b062822c9f9720a8aa87ff7cae5a434aff2356a553b713a0
-MISC metadata.xml 1961 SHA256 35b2f85cb1147a0532002fc1566cfc67c4181e00fd576d38914635874a680e38 SHA512 518ee50fd57b65b77bd037af82c72c37d275508002a5261c876986db60ede32a683805cc4103cc06ffb27b39233654683828b21a565c0c131277d69843637029 WHIRLPOOL c2f3c19c82ae8b0b38b241c636f50a4e60a85dd5a48938e002840f08c5ea4dfca940036d39d8c51700eb85c8ba5b490ebb7ef6de8c42a0debe7b82db9aaf22c0
+MISC metadata.xml 2040 SHA256 019d3ee8d41cb9ed31744d02734f75c845bf95b8ec4f2e37e43cd6cd0d8c6d18 SHA512 a559276585e96601fa71f48a295c72b0890c290f176129356697ce55d1214e5610f89b224828233b5b820c8d979a5dc9985939afdd78de334de18fb4a6c646cf WHIRLPOOL 93f8c8cdd77c7af5b0f97b44dad83a18b474dd6c5ae875d9ff63e9927c9051e5d6e5045388c59d0cb17f68faf11254440198d3d5ad708a50b40779e4a195f275
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVfGWOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5hAIQAIDKzvrCHdJfafD4d7z42s/n
-pg/roCZNbtgnHFIUpz0DsIKnX55hupKBdOsUhlq+LQeZ/ipReZpGpuJVuyDPDtFL
-sqQtBVC08eWqy9pQj+xRmMatqrrtpv+5+SXXok+EBkppiCXw0jpwrhgdOC+bKcvt
-BB7F0vna4HxDBjTww5TgB0G3F8C0d9XcJzIzMPgsDoKqz+LhpoZTexTXBu3+awmN
-xkyhWrGROZR3QMiFU6jQX9PGUBhSmZyjVv98tnHG3+tTVTb+LTO++1AO24hh9Ny7
-9whV7A9JHl9QRTyA6Mp321AFzjo2WJR/tuk52LCaV8G9m6tY63a78R3dtcqvjU7M
-U6EH09Xt75u9RgEi5IxbZHqCnR8yE263kMpTT8VCcF2O8rD/WUbjmW4lNbv3+7D/
-blbFfnjG86cqIy/PX9UV5k6AbB6giLydj0h3B4khA43+WsnOpQyI+AIIHb2OYp1n
-R8Wo9Afwe5DPG84q27qjryo01l8/vCL8K/QFrOMf5S53LTlaoNeDmCT2w7sVf21D
-Hc7rLXblSv2ONabn62UlS63qsx4GJ4djB0SQsomgfYsQ5X+xfANqGhIHay/cTnhD
-ItPTsmiG1VaACv7QHXJiArEjwIHQd5SaldOd25p8nNbT5ax9r4/B8NkQq6gYO/Ek
-4eRsgIHi1k3EIy+ywegx
-=fxRm
+iQJ8BAEBCgBmBQJVfvIyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKt8P/isMHZeaKx6CsuS34ucQ37zM
+pTJnL5p7or1s9B4aIQrMSKff2y2BV09+u5QnXbCq+Q8H4kI/hCe2CNTrbNc2IFEq
+wNi8Szv6Vnx/g1l3K4pl4PEVkdQJZW6BQSNnV1GTGjzIrtPnzrpQw6cF3DqdK64B
+DsKjksWyJKCaEsPlfDJTxr/q4bVD1w+3Tr1yCPv5jPg6YWLRc9lwr/G6lyrfxLmP
+Xq6ncTOU81DnSpRjMvr6a5DkiO3BlvdsBwXTGfKMLnkTXDIPMsG6XbGZ3rU/Uy0v
+Cdrj9YDD0pJvkUlRj3315CwRfwBrkT16g6xlkNNjsI3aWB+Ncv8pin7/T0wmsaTA
+GL1VrtG1MZI/WRdI/9+itV72BXslj37tcnuW/ws7Rv/iHMDJplcahnaq7hfDiKwc
+mhy0kFO2Ihj4wVRGTGl6kB/EtNMGpuUat/q0Vib7vVPhnXFIUKwirPTY/tDzzhF9
+MJWBUWbB4BeMjeLV7AFGeV4lC7rY3UrpSPTmDg4Hwbp+7Bb20jzFWEOL4e1lJZKF
+BCNO+mafDepRVJa6qc+SadxugcEEsfLhx8WXs0pbDvVKu2Z6lowj608lzP2SRk9T
+I4ox7s7/WdgYSgbgUUWLjsaAivpLMVf2NwjBMgJqm0xyMIhpZorZ3SEXzOpEnE0D
+sF4/G6o72p8CT33lugGh
+=VwTU
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 6ee084fc1016..49b400605ee8 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -34,4 +34,7 @@
     <flag name="uk_rt">Britain alternative tv listing grabber</flag>
     <flag name="za">South Africa tv listing grabber</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">xmltv</remote-id>
+  </upstream>
 </pkgmetadata>