gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-video
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
55 files changed, 581 insertions, 582 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 9691e9ced868..4cb130c7fefa 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
index 40b8faad5675..3661510ea3c4 100644
--- a/media-video/bdsup2sub/Manifest
+++ b/media-video/bdsup2sub/Manifest
@@ -3,4 +3,4 @@ AUX build-4.0.0.xml 1836 BLAKE2B 39b481344bee30e17f5a825b8d6eced1f6c410468da5382
 DIST bdsup2sub-4.0.0.tar.xz 199796 BLAKE2B 293c7d0433103a3087fb057b938b1cf2d42acc01ccdeb8c815f124c3a6b61f20bb211d88f9f4a7e516f4f7aa54200d2c1ec36adbfe700321543f27a9408269f4 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
 EBUILD bdsup2sub-4.0.0-r2.ebuild 1175 BLAKE2B 6aa6772e05051dde6fb0471d843666fd32bccb6d808fc90cba53f5c0994a086dbf9c0b625756a56440d670e761e5c3c11232974ca55de44632194930ad74b147 SHA512 1cf68cb7898a039a58cbcd794466e10c6249895234b6ac3add213cff2b862016b342a2796c550b141291ad7c63416fb3adfa6529b2a0bcadd552c4778093a3b9
-MISC metadata.xml 381 BLAKE2B 20afab01fc23bf5b640a7f71b67dd87f3420093c9c4b4db5e4b48d5d347c536da2a752af0dadb35e4566192b526e8df3bdb589daa1f11f2d44543170c377713f SHA512 5f9298ee19a292eea7612e7055b7c689f8ad7c86be2f820aec2b6b1afcf2bb5ab01ace028656a0e9daca9791e45c5b1ffdb70d959014b7bd0e42fc5f2f1da8bd
+MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
index 66883ac6cbda..17f11a20c014 100644
--- a/media-video/bdsup2sub/metadata.xml
+++ b/media-video/bdsup2sub/metadata.xml
@@ -5,7 +5,4 @@
 		<email>media-video@gentoo.org</email>
 		<name>Gentoo Video project</name>
 	</maintainer>
-	<longdescription lang="en">
-		BDSup2Sub - A tool to convert and tweak bitmap based subtitle streams.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index 893360f01962..b31d4c7a9de5 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,3 +1,3 @@
 DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4
 EBUILD blinkensim-2.7-r1.ebuild 634 BLAKE2B 21a535a066fc123411567dc7329e4a7b9f6d86bf9adc28efce6333a75571e41fa6601fa3df8c1e1aa833ab3f4d789aca83f84e81ddce4ef666260c9e4b6e2170 SHA512 49dec858034fe4c1d46312d375ea84f3bf5e24375eabfadcf753983950c0fcc0d0e016728c3bc68c69d5ac254b0bf537100875a7e20b736485d16bc23d3043c8
-MISC metadata.xml 360 BLAKE2B f7cfcf7e66ea5a7ae30864099416f896879b5fa28422420e6e597e6c0fe190a8ecda1518c1cc277a13444099f08eb31f27835b07194d8984e7dd04a8df3a4375 SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782
+MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/blinkensim/metadata.xml b/media-video/blinkensim/metadata.xml
index 19114582cda0..811585329983 100644
--- a/media-video/blinkensim/metadata.xml
+++ b/media-video/blinkensim/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-		Counterpart for the blinkentools and viewing the Blinkenlight-movies in
-		blm-format.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-video/bluray_info/Manifest b/media-video/bluray_info/Manifest
index a8ca74dc25a6..a14e86c74414 100644
--- a/media-video/bluray_info/Manifest
+++ b/media-video/bluray_info/Manifest
@@ -1,3 +1,3 @@
 DIST bluray_info-1.3.tar.gz 188192 BLAKE2B f88020721f7295b9bdd46687cd436c6a5bf38efc1fafc1bdfddda41a7c1a14fbee02a93b69b38a1703f089c9ad4a3576c9f750283a94ec2de09841bc1ae679cb SHA512 cf14733bd3b3fe9ebdace130c880fd695f0a60533a4b397f339789b2b11a15515f8ad24e87ccb428e73b74826ddaa5c2df0c1c9bf7907bdc5b1824f73d22c1ed
 EBUILD bluray_info-1.3.ebuild 396 BLAKE2B 8d4af62ca5f6c951b07a76f095efcb857071dd55d3078970f2e63e950f78f8d0a3c1472edeb56b4c456c66da23b4390254687de7964751d2b01f5825b5fcba8c SHA512 b7d8e775d0eeb099ba8d0b1597b99dc387b5044577b647900b9b029aee363d58aff51452ef18b1e2716d855808ee0dbc866b57d4dfeb3fa3ef96eefb06d8472e
-MISC metadata.xml 384 BLAKE2B d1f133db83ef9d58080ab2f4487c726eef210227d2cfada80b66525c4f884fa8097fc9a5ebccbe6bd49719a03649a807b30a079d61193a9a4adaccff46019481 SHA512 910f46c7c56a20f5f0b26b3562dc3a0c9f200686278af88c764e1ceca51b0bb89c5cf85e22b304b5b4c810cc8be7bd83ee6593da06b47552e1e30a518c0ef56c
+MISC metadata.xml 296 BLAKE2B 7cd52a625e12df596d664f663a8c5bd4caec4b9c9dd57444a8b0de293d25605cbdb055a2da23024221e4b36de80ed7d8354350e1a678efb0dfdd7324ec64905c SHA512 c7495179a8c155308211600cec6bb7d89f59eb0edb1305c9ef966f2ad1de5c58fa3c25f151040b84a9f3076658f02e15678c4e2c2793883e29c68f63764b4949
diff --git a/media-video/bluray_info/metadata.xml b/media-video/bluray_info/metadata.xml
index 96634d3504a6..86c4a20deaf2 100644
--- a/media-video/bluray_info/metadata.xml
+++ b/media-video/bluray_info/metadata.xml
@@ -4,9 +4,6 @@
 <maintainer type="project">
 <email>media-video@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-Display information about a Blu-ray disc
-</longdescription>
 <upstream>
 <remote-id type="sourceforge">bluray-info</remote-id>
 </upstream>
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 739a268728ef..87b1a1e33837 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,6 +1,5 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
-DIST devedeng-4.15.0.tar.bz2 1759602 BLAKE2B 31f08dec66623f68fba17bbaf657d5865796ca63b37f3e0a72213692ac1fa79fd14123d33112dc4713c42d682fb216fa61b971454efa4304ec7ce10015af4c99 SHA512 90a1dd5f2e7dfd78bff38fb682e021e6bb489a0ca16cc29b533926b242e4a3322372ad383acf61338dea7873448f649534fe9a2ac9e22294de490b95df55a4f0
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.15.0.ebuild 1121 BLAKE2B 5d961fb2a7dfbdee2e6e20e133f79259412bb1a988c54d95172abbccbf3d9fe4dc041d95ad9cfd27ab4487c0b6968abb88e6ec2d7a058800ffff918f8abc139d SHA512 e338aa2952ce0c481e0e9e04822a10be592f8855860322e7031a1bd90b3c40a91f6e13e42d46f86f7922019e9bdf596728cf5611be580343a10d5caea50c4d14
+EBUILD devedeng-4.16.0-r1.ebuild 1125 BLAKE2B a06d89364e532a6987ca081b79d0b2075a702e731fb811773a3183e82573a59b023a41f44c80b62da909d39f866b0983b3316e27241d339bc7c76cdcf9fc19af SHA512 73f4022a734e0933300519bc10c770aa5c541577a5a87b10d23b255efedd8db84a2a9dfe997167de5310ee148bd879f3e8b35523088b0b6062c364ee52140966
 EBUILD devedeng-4.16.0.ebuild 1121 BLAKE2B 5d961fb2a7dfbdee2e6e20e133f79259412bb1a988c54d95172abbccbf3d9fe4dc041d95ad9cfd27ab4487c0b6968abb88e6ec2d7a058800ffff918f8abc139d SHA512 e338aa2952ce0c481e0e9e04822a10be592f8855860322e7031a1bd90b3c40a91f6e13e42d46f86f7922019e9bdf596728cf5611be580343a10d5caea50c4d14
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.15.0.ebuild b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
index 03b4b6840a40..a2069a356968 100644
--- a/media-video/devedeng/devedeng-4.15.0.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 xdg
 
diff --git a/media-video/dvd9to5/Manifest b/media-video/dvd9to5/Manifest
index 5611615faa2d..e24ac7df097c 100644
--- a/media-video/dvd9to5/Manifest
+++ b/media-video/dvd9to5/Manifest
@@ -1,3 +1,3 @@
 DIST dvd9to5-0.1.7.tar.bz2 11803 BLAKE2B 33ce2e5490f6c1dc3bafb58d628d705fb6fd14c3322e7fd49fbc598852aeedf6fc942604457da3a2e41dd838c58bbedfcac70ff03c61c0ccf8fe926c187b90da SHA512 5329ad810d181b62d3b57b48f21dc8114fb11806745ab611e1aac5980f3e732c740aaddf17de7ef6f23769c9da934e646c01e82c9aed3390b5a2f9ad704f5f84
 EBUILD dvd9to5-0.1.7.ebuild 586 BLAKE2B 29ba7a787df5d7c3e4a3696e3bc14487f0f3e8f4b88c40e8529bdb855ff58ef627de99774029e7b3345fcc29d0b105340cc064793ef532b0b5393322b33b1b00 SHA512 b3f87f0630c3a56e13ae1d125cbd1e1b0ea67d0b7b1ac7b6eef71f9ab14bb037fd9830c313ad5b52ab5da7cd5b93f7ac89d9568d705210ea95cebc0b997ea86a
-MISC metadata.xml 341 BLAKE2B 402770fa47e7035e4cc56885dc61b0c4d5ef3764f30664f1b2b0f577453b4ed33a0b9c3de26930d6f76561f790272319d35594abb5aa261522137a58b593bc26 SHA512 46233755a2b2654e19356ea2680101440b4b8c592dd4af1d472ff0837dba4c8dcfa38d9d7ee86e0079def89361974ba48faba4e147403ff140787c13bdd7e888
+MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-video/dvd9to5/metadata.xml b/media-video/dvd9to5/metadata.xml
index 7856c21806be..80088c21d0ab 100644
--- a/media-video/dvd9to5/metadata.xml
+++ b/media-video/dvd9to5/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="project">
 	<email>media-video@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-A program to rip double layer discs (9gig) to single layer discs (5 gig).
-</longdescription>
 </pkgmetadata>
diff --git a/media-video/dvd_info/Manifest b/media-video/dvd_info/Manifest
index 61d09e8840ee..c905a16b2c02 100644
--- a/media-video/dvd_info/Manifest
+++ b/media-video/dvd_info/Manifest
@@ -1,3 +1,3 @@
 DIST dvd_info-1.1.tar.gz 260999 BLAKE2B 38a9a0b69cd507dd663afdcedba196632ecef6d1193886ec02348d2de2200fd51d3315814180a3c9c170d60042ac91972281c5c99108b5d7f41cca1af8ca3c78 SHA512 30c70d96fa79b221a653d67510261f1186e3c7a79045ac53df2219ee896f18030cf27dbef8ca73fd62282670f5781ba75cf6765744b51f66da77979c5688acc0
 EBUILD dvd_info-1.1.ebuild 391 BLAKE2B 3717534ffb9b6f250644a10a1ebcab8feb649e1085eea62a095536e08c417a47dbcc24a99f0b15dba21f86ce909b1bbb3ced5c019bf974de2f8af25eadb60f5c SHA512 6fd5d59455059bd3026fa2496c933e020daf9d73860c91390e47a8e010b0dd0869bc8ccfaf6493e41096ed17dd53aad658166ebbca2f32c7f26de067bf0ad931
-MISC metadata.xml 393 BLAKE2B 27c71f86daca1df0faecc8321f3ea4f2901da674089cfb684cc107614f2626b099bf4539de1d5164d75e3af294afec8c50e63c3533924c6689c4a3c0f75beec9 SHA512 a3937872ff78c4f5b587c162cd15ee0cebca15ce66abe47b8f38b05eb2c561025593cdee9b20602dde0a4afb5478e77c3309411a38f4a21b0173bdb4cc15aba2
+MISC metadata.xml 292 BLAKE2B 96d30093aa03ecf498f6956ba0c5de4b636c1ceaa17b061e8b153de3e6d38c8eeed4cd36ec768a2049de46c12425a3f8ee5ce4b31301671debffb06faea2bcac SHA512 413e9f62a54ebd373f66165b2a59e4ad7f31a01fc42492229566bfbcc65d6ac86623b98163936255ce69a5b22e56da79d06f47ef91412a291a3101453bd8bad3
diff --git a/media-video/dvd_info/metadata.xml b/media-video/dvd_info/metadata.xml
index 5ff86fe49d84..a2c97907617d 100644
--- a/media-video/dvd_info/metadata.xml
+++ b/media-video/dvd_info/metadata.xml
@@ -4,9 +4,6 @@
 <maintainer type="project">
 <email>media-video@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-DVD utilities to print information, copy tracks, etc.
-</longdescription>
 <upstream>
 <remote-id type="sourceforge">dvdinfo</remote-id>
 </upstream>
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 132a835adc36..fb485a9dda72 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,5 @@
-AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd96e66a52fcb5a3c1b9994098e1e1b647783ad47f7856f80e556ac4f8047693e0498bc8876f236730b56714883dbe SHA512 77dcd602e5e31886a5cbdb01fc58ed8aea216d16eaaf5a136e59a6b2fb0b0484cafb521ccefec5424edd7834cd36fa1e435477055a0c43bef7959aad7168eb26
 AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
-DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
-EBUILD gaupol-1.7.ebuild 1585 BLAKE2B 35ec5e82c552ce47683019f57409a27851fa5c5a3ab12e9983ec9bff0d68e2a3a7a1154d71f3e4f1d93251bb1d5e46513341d4a143022f6c867dd742a20e0b05 SHA512 38839496e3327a5f18e348cce0f67b0f72913c52962ef56c4b07c13228d4fe5c699275b26670b7bee69f781580bcb1daed10daf4171c2cd96b5662c47971271c
 EBUILD gaupol-1.8-r1.ebuild 1702 BLAKE2B 42721f492e72e06660ece7a89656dbd2b599c88cec606d138c1d46efe3fcfcb9fea45d27489278de92f51690d7b79bcadac7947c22a6a50f4f910b4d34270944 SHA512 3b8e5fa0be5d0c1eab7b4140bb364c053a10f346662ce8e08c8eb2babd207f7976d9385587aedecf3632bf5f26798463fadeb7dc2100f0b00a2da6fdf1775b40
+EBUILD gaupol-1.8-r2.ebuild 1736 BLAKE2B 08bff30c8af0c03cd06a0e5444c763d32a0d25cf1d7dcaf00359352a56f8cf1e0f59bf53221f65efec87023beb950618f6275944e938eaf0c50171e0f809e688 SHA512 bb1fb647bd51aea88c84009340bdd53f781acc0e1b096bf6b533013d121da1ac09584068101cdbb256fd32f9e2bde2d10c2effaad71946d2165010aa77ae4b8c
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
deleted file mode 100644
index d8a90669de9f..000000000000
--- a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 7778eda0e6e4280fb43aa78721561e43d3e866eb
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date:   Sun Aug 4 21:19:20 2019 +0300
-
-    Accept any en* language for spell-check tests
-
-diff --git a/aeidon/agents/test/test_text.py b/aeidon/agents/test/test_text.py
-index bf6c4ac1..a2261595 100644
---- a/aeidon/agents/test/test_text.py
-+++ b/aeidon/agents/test/test_text.py
-@@ -78,14 +78,16 @@ class TestTextAgent(aeidon.TestCase):
-         for subtitle in self.project.subtitles:
-             subtitle.main_text = subtitle.main_text.replace("a", " a")
-             subtitle.main_text = subtitle.main_text.replace("e", "e ")
-+        language = self.get_spell_check_language("en")
-         self.project.spell_check_join_words(indices=None,
-                                             doc=aeidon.documents.MAIN,
--                                            language="en")
-+                                            language=language)
- 
-     def test_spell_check_split_words(self):
-         for subtitle in self.project.subtitles:
-             subtitle.main_text = subtitle.main_text.replace("s ", "s")
-             subtitle.main_text = subtitle.main_text.replace("y ", "y")
-+        language = self.get_spell_check_language("en")
-         self.project.spell_check_split_words(indices=None,
-                                              doc=aeidon.documents.MAIN,
--                                             language="en")
-+                                             language=language)
-diff --git a/aeidon/test/test_spell.py b/aeidon/test/test_spell.py
-index 66369e0e..ff94f150 100644
---- a/aeidon/test/test_spell.py
-+++ b/aeidon/test/test_spell.py
-@@ -21,7 +21,8 @@ import aeidon
- class TestSpellChecker(aeidon.TestCase):
- 
-     def setup_method(self, method):
--        self.checker = aeidon.SpellChecker("en")
-+        language = self.get_spell_check_language("en")
-+        self.checker = aeidon.SpellChecker(language)
- 
-     def test_add_replacement(self):
-         self.checker.add_replacement("abc", "xyz")
-@@ -50,7 +51,8 @@ class TestSpellChecker(aeidon.TestCase):
- class TestSpellCheckNavigator(aeidon.TestCase):
- 
-     def setup_method(self, method):
--        self.navigator = aeidon.SpellCheckNavigator("en")
-+        language = language = self.get_spell_check_language("en")
-+        self.navigator = aeidon.SpellCheckNavigator(language)
-         self.navigator.text = "She knows the fighting\ntechniques of Panzer Kunst."
- 
-     def test_ignore(self):
-diff --git a/aeidon/unittest.py b/aeidon/unittest.py
-index 8c384806..d80c5a22 100644
---- a/aeidon/unittest.py
-+++ b/aeidon/unittest.py
-@@ -50,6 +50,15 @@ class TestCase:
-         with open(path, "r", encoding="ascii") as f:
-             return f.read().strip()
- 
-+    def get_spell_check_language(self, language):
-+        """Return spell-check language to use in unit tests."""
-+        # Allow any close-enough variant as different systems will have
-+        # different spell-check engines and dictionaries installed.
-+        for candidate in aeidon.SpellChecker.list_languages():
-+            if candidate.startswith(language):
-+                return candidate
-+        raise Exception("Spell-check dictionary {}* not found".format(language))
-+
-     def new_microdvd_file(self):
-         """Return path to a new temporary MicroDVD file."""
-         return self.new_temp_file(aeidon.formats.MICRODVD)
-diff --git a/gaupol/agents/test/test_tools.py b/gaupol/agents/test/test_tools.py
-index a9fbdf8f..e1547476 100644
---- a/gaupol/agents/test/test_tools.py
-+++ b/gaupol/agents/test/test_tools.py
-@@ -36,7 +36,8 @@ class TestToolsAgent(gaupol.TestCase):
- 
-     @patch("gaupol.util.flash_dialog", OK)
-     def test__on_check_spelling_activate(self):
--        gaupol.conf.spell_check.language = "en"
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.application.get_action("check-spelling").activate()
- 
-     @patch("gaupol.util.flash_dialog", OK)
-diff --git a/gaupol/dialogs/test/test_spell_check.py b/gaupol/dialogs/test/test_spell_check.py
-index cbe7d61a..d74860fb 100644
---- a/gaupol/dialogs/test/test_spell_check.py
-+++ b/gaupol/dialogs/test/test_spell_check.py
-@@ -32,7 +32,8 @@ class TestSpellCheckDialog(gaupol.TestCase):
-         aeidon.SpellChecker.add_to_personal = aeidon.SpellChecker.add_to_session
-         aeidon.SpellChecker.read_replacements = lambda *args: None
-         aeidon.SpellChecker.write_replacements = lambda *args: None
--        gaupol.conf.spell_check.language = "en"
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.application = self.new_application()
-         for page in self.application.pages:
-             for subtitle in page.project.subtitles:
-diff --git a/gaupol/test/test_spell.py b/gaupol/test/test_spell.py
-index 72b74e33..5018abab 100644
---- a/gaupol/test/test_spell.py
-+++ b/gaupol/test/test_spell.py
-@@ -37,4 +37,5 @@ class TestSpellChecker(aeidon.TestCase):
-         Gtk.main()
- 
-     def setup_method(self, method):
--        self.checker = gaupol.SpellChecker("en")
-+        language = self.get_spell_check_language("en")
-+        self.checker = gaupol.SpellChecker(language)
-
-commit 340b3bf6bb7cfdf5be9e973f25f5a616ef504702
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date:   Mon Aug 5 02:31:32 2019 +0300
-
-    Set spell-check language for assistant test
-
-diff --git a/gaupol/test/test_assistants.py b/gaupol/test/test_assistants.py
-index 6969b273..4d6dfdcb 100644
---- a/gaupol/test/test_assistants.py
-+++ b/gaupol/test/test_assistants.py
-@@ -109,6 +109,8 @@ class TestJoinSplitWordsPage(_TestBuilderPage):
- 
-     @patch("gaupol.util.flash_dialog", OK)
-     def test_correct_texts(self):
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.page.correct_texts(self.project,
-                                 None,
-                                 aeidon.documents.MAIN)
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.8-r2.ebuild
index 25b70f293bfa..e08179fb61d3 100644
--- a/media-video/gaupol/gaupol-1.7.ebuild
+++ b/media-video/gaupol/gaupol-1.8-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx xdg-utils
 
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="spell test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +25,7 @@ RDEPEND="
 	x11-libs/gtk+:3[introspection]
 	spell? ( app-text/gspell[introspection] )
 "
-DEPEND="
+BDEPEND="
 	sys-devel/gettext
 	test? (
 		${RDEPEND}
@@ -37,7 +38,7 @@ DEPEND="
 
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
 
 python_test() {
 	virtx pytest -vv
@@ -47,7 +48,9 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support requires MPV, MPlayer or VLC."
+		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
+		elog ""
+		elog "External video previewing support requires MPV, MPlayer or VLC."
 		if use spell; then
 			elog ""
 			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index a3cfd1bc15dd..0f104a27d08b 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,5 +1,10 @@
 AUX gpac-0.8.1-configure.patch 3221 BLAKE2B 702dc30844d48091f13b01c344a877095c09250a274be64610d49553691c24bce3b8cb4cb41bbcb06e5655a3ed9ced23a5120a90d32a5bf59508a5ac401964cf SHA512 4217ee7034ae70bd7edf9ce2c3b0d090841c314bea27a9368da34b84dd593d9d5553955423f229912f6d8d1561ba7f25330b11bb2ab0e334d6051ce6c391b993
+AUX gpac-1.0.0-makefile-debian.patch 508 BLAKE2B 1f8c39abf868392df1bbbd9836272895a9c324dde43eedf27763e49974fcb8bb796c1d7828389a36bdc9bf6cee7eb5f2e74aa7ef31408af81903014995565d8b SHA512 1f1a57934eca75f41a876bd2c2fca89d44e9b807ef32139cdabf733a24b22df0d863c0e28cc87227418804973a6e475de88638e380d92d3e4c5d64b8cd90d2cf
+AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
+AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac242c5e31248d26cc59f646bddb78670f5370ffd65db3bdd2025aa1d17e554f6479e9aab5e6d68c3b73c081bd2a230 SHA512 1b141de1b6bdb58970e4e3361e70ec1ff7675935f2039cd28e80deb4c21c118c56f1dca5bd6539b12332cbc2a1c13298568cc90c981e84fecea23914185d2ca8
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
+DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
 EBUILD gpac-0.8.1.ebuild 3307 BLAKE2B c3e648d567676021dd9410d0a9b3d155b46df03672fce0c20979d0ed49bc331c32e3c897d70a97b373636be062995a682fa7cb39452bdafa26927bec1c4b767b SHA512 e82f9528bb74a55059118839cefb2e3af0ded030d9e99184a639f5cfa5f47ec880c1e3ca3f997db800c3eb8cf051548dad9d2ba82e93a61f6631c66414c40560
-EBUILD gpac-9999.ebuild 3116 BLAKE2B ebce6b15686887a082521e278f48b33045641ce1c4fd891d5fdbc00d08e841b0c13ec9217ced028a087643f9cc2f487489fcc406daf757ec2add2031bf036c27 SHA512 0a0772d18c18c0a6e5af1878c000ddbf8657afe38486f3ad357d659eaba4650b750b47b0270a2bd2d1b0d094587bcfe86dc4168f3e99539ed98e064e2f5820a0
+EBUILD gpac-1.0.1.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be
+EBUILD gpac-9999.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
new file mode 100644
index 000000000000..8bb8074b1ce8
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b147725..244b07c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+ 
+-ifeq ($(IS_DEB_MAKE),undefined)
++ifeq ($(IS_DEB_MAKE),)
+ 	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+ else
diff --git a/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch b/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch
new file mode 100644
index 000000000000..c5b1fc4ab56f
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch
@@ -0,0 +1,33 @@
+Index: gpac-1.0.0/src/utils/gzio.c
+===================================================================
+--- gpac-1.0.0.orig/src/utils/gzio.c
++++ gpac-1.0.0/src/utils/gzio.c
+@@ -93,10 +93,10 @@ typedef struct gz_stream {
+ //local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
+ //local int do_flush        OF((gzFile file, int flush));
+ //local int    get_byte     OF((gz_stream *s));
+-local void   check_header OF((gz_stream *s));
+-local int    destroy      OF((gz_stream *s));
++local void   check_header _Z_OF((gz_stream *s));
++local int    destroy      _Z_OF((gz_stream *s));
+ //local void   putLong      OF((FILE *file, uLong x));
+-local uLong  getLong      OF((gz_stream *s));
++local uLong  getLong      _Z_OF((gz_stream *s));
+ 
+ /* ===========================================================================
+      Opens a gzip (.gz) file for reading or writing. The mode parameter
+Index: gpac-1.0.0/src/utils/zutil.h
+===================================================================
+--- gpac-1.0.0.orig/src/utils/zutil.h
++++ gpac-1.0.0/src/utils/zutil.h
+@@ -262,8 +262,8 @@ extern void z_error    OF((char *m));
+ #endif
+ 
+ 
+-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+-void   zcfree  OF((voidpf opaque, voidpf ptr));
++voidpf zcalloc _Z_OF((voidpf opaque, unsigned items, unsigned size));
++void   zcfree  _Z_OF((voidpf opaque, voidpf ptr));
+ 
+ #define ZALLOC(strm, items, size) \
+            (*((strm)->zalloc))((strm)->opaque, (items), (size))
diff --git a/media-video/gpac/files/gpac-1.0.1-configure.patch b/media-video/gpac/files/gpac-1.0.1-configure.patch
new file mode 100644
index 000000000000..e471157af6b6
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.1-configure.patch
@@ -0,0 +1,117 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+----
+diff --git a/Makefile b/Makefile
+index 303a413..1ef750e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -284,8 +284,9 @@ ifeq ($(GPAC_ENST),yes)
+ endif
+ 
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(lib_dir)" || true
+-
++endif
+ 	$(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+ 	$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+ 
+diff --git a/configure b/configure
+index de8ea99..4f5a6a8 100755
+--- a/configure
++++ b/configure
+@@ -105,6 +105,7 @@ has_dvb4linux="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -264,6 +265,7 @@ GPAC configuration options:
+   --enable-amr-wb          enable AMR WB library
+   --enable-amr             enable both AMR NB and WB libraries
+   --enable-static-bin      link statically against libgpac
++  --enable-static-lib      GPAC static libraries build
+   --static-mp4box          configure for static linking of MP4Box only.
+   --enable-depth           enables depth handling in the compositor
+ 
+@@ -706,14 +708,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-    CFLAGS="-O3 $CFLAGS"
+-else
+-    CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+     want_pic="no"
+@@ -1710,6 +1704,8 @@ for opt do
+             ;;
+         --enable-static-bin) static_build="yes";
+             ;;
++        --enable-static-libs) static_libs="yes";
++            ;;
+         --disable-ipv6) has_ipv6="no"
+             ;;
+         --disable-platinum) has_platinum="no"
+@@ -2357,6 +2353,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3049,6 +3046,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+diff --git a/src/Makefile b/src/Makefile
+index c483c8d..b24d5bb 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -347,7 +347,6 @@ filters_svc: $(LIBGPAC_FILTERS_SVC)
+ 	@echo "LIBS $(EXTRALIBS)"
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
+ 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
+ ifneq ($(STATICBUILD),yes)
+@@ -355,9 +354,10 @@ ifneq ($(STATICBUILD),yes)
+ endif
+ 
+ else
+-
++ifeq ($(STATICLIBS), yes)
+ 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS)	 $(LDFLAGS)
+ 	mv $@ $@.$(VERSION_SONAME)
+diff --git a/configure b/configure
+index 4f5a6a8..baba248 100755
+--- a/configure
++++ b/configure
+@@ -735,10 +735,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+ 
+ #look for zlib
+ cat > $TMPC << EOF
diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild
new file mode 100644
index 000000000000..e5828cfed456
--- /dev/null
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/10"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	media-libs/libogg
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	mad? ( media-libs/libmad )
+	opengl? (
+		media-libs/freeglut
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	theora? ( media-libs/libtheora )
+	truetype? ( media-libs/freetype:2 )
+	sdl? ( media-libs/libsdl )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+	)
+	xml? ( dev-libs/libxml2:2= )
+	xvid? ( media-libs/xvid )
+"
+DEPEND="
+	${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-configure.patch"
+	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+)
+
+DOCS=(
+	share/doc/CODING_STYLE
+	share/doc/GPAC\ UPnP.doc
+	share/doc/ISO\ 639-2\ codes.txt
+	share/doc/SceneGenerators
+	share/doc/ipmpx_syntax.bt
+	Changelog
+	README.md
+)
+
+HTML_DOCS="share/doc/*.html"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	local myeconfargs=(
+		--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
+		--cc="$(tc-getCC)"
+		--libdir="$(get_libdir)"
+		--verbose
+		--enable-pic
+		--enable-svg
+		--disable-amr
+		--use-js=no
+		--use-ogg=system
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable dvb dvb4linux)
+		$(use_enable ipv6)
+		$(use_enable jack jack yes)
+		$(use_enable opengl 3d)
+		$(use_enable oss oss-audio)
+		$(use_enable pulseaudio pulseaudio yes)
+		$(use_enable sdl)
+		$(use_enable ssl)
+		$(use_enable static-libs static-lib)
+		$(use_enable X x11)
+		$(use_enable X x11-shm)
+		$(use_enable X x11-xv)
+		$(my_use a52)
+		$(my_use aac faad)
+		$(my_use dvb dvbx)
+		$(my_use ffmpeg)
+		$(my_use jpeg)
+		$(my_use jpeg2k openjpeg)
+		$(my_use mad)
+		$(my_use png)
+		$(my_use theora)
+		$(my_use truetype ft)
+		$(my_use vorbis)
+		$(my_use xvid)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	einstalldocs
+	emake STRIP="true" DESTDIR="${ED}" install
+	emake STRIP="true" DESTDIR="${ED}" install-lib
+}
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 5c4fcbaddd14..e5828cfed456 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git-r3"
@@ -11,17 +11,18 @@ else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
 
 LICENSE="GPL-2"
 # subslot == libgpac major
-SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+SLOT="0/10"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	media-libs/libogg
 	a52? ( media-libs/a52dec )
@@ -30,7 +31,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
 	mad? ( media-libs/libmad )
 	opengl? (
 		media-libs/freeglut
@@ -53,31 +54,30 @@ RDEPEND="
 		x11-libs/libXv
 		x11-libs/libXext
 	)
-	xml? ( dev-libs/libxml2:2 )
+	xml? ( dev-libs/libxml2:2= )
 	xvid? ( media-libs/xvid )
 "
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	dvb? ( sys-kernel/linux-headers )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-configure.patch"
+	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+)
 
 DOCS=(
-	doc/CODING_STYLE
-	doc/GPAC\ UPnP.doc
-	doc/ISO\ 639-2\ codes.txt
-	doc/SceneGenerators
-	doc/ipmpx_syntax.bt
+	share/doc/CODING_STYLE
+	share/doc/GPAC\ UPnP.doc
+	share/doc/ISO\ 639-2\ codes.txt
+	share/doc/SceneGenerators
+	share/doc/ipmpx_syntax.bt
 	Changelog
-	AUTHORS
-	BUGS
 	README.md
-	TODO
 )
-HTML_DOCS="doc/*.html"
+
+HTML_DOCS="share/doc/*.html"
 
 my_use() {
 	local flag="$1" pflag="${2:-$1}"
@@ -97,14 +97,13 @@ src_configure() {
 	tc-export CC CXX AR RANLIB
 
 	local myeconfargs=(
-		--extra-cflags="${CFLAGS}"
+		--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
 		--cc="$(tc-getCC)"
-		--libdir="/$(get_libdir)"
+		--libdir="$(get_libdir)"
 		--verbose
 		--enable-pic
 		--enable-svg
 		--disable-amr
-		--disable-wx
 		--use-js=no
 		--use-ogg=system
 		$(use_enable alsa)
@@ -139,6 +138,6 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-	emake STRIP="true" DESTDIR="${D}" install
-	emake STRIP="true" DESTDIR="${D}" install-lib
+	emake STRIP="true" DESTDIR="${ED}" install
+	emake STRIP="true" DESTDIR="${ED}" install-lib
 }
diff --git a/media-video/h264enc/Manifest b/media-video/h264enc/Manifest
index 1c20c389928e..8b0a6044cf1e 100644
--- a/media-video/h264enc/Manifest
+++ b/media-video/h264enc/Manifest
@@ -1,4 +1,4 @@
 AUX h264enc-10.4.7-libaacplusenc.patch 905 BLAKE2B b79273fbaf4fcfe3f176881c601ce9927bd33535392a0c95f770606f64cc1b69b4b407b919ca50d18a66c0a5c0c49c9c49f8b0972beeabc59b29d5016cb1af1c SHA512 1030a4f24da0499151e576328b0c5f292116012c63862a3d43a22bbd600c174c139ae4ba3dfb84abaeb7d83547b8e113d4062c8bfd82c9f7a859f1c025b693c9
 DIST h264enc-10.4.7.tar.gz 138481 BLAKE2B f1571eb79c7d627eb8534a28d5c9ae337e3d1bb8fd416ae83754cb9f4d055c8f8937e228991e8ae15f6c5a657fbc5931acdaa6fe56cf71e89ce1c5b4ba820a27 SHA512 09d133e8b4d16f513b790b4517a276d48fe400c2a09a80ee2ae229a9224a9d225d54b5b48b5b60ed6ebe1f181f8b96340ad0e44a9e1e1eb7e6889809edab0bcf
-EBUILD h264enc-10.4.7-r1.ebuild 1050 BLAKE2B 57fe76462e06faf9883a10b6c20b5465f063d9642be83a81c67881a6801a1b58aefd669110b9ec1c785ca86b074c9a7934e6fe30aca490f9e181d2685a7e8179 SHA512 533e7555e96f54940febe627eff029beafe3db9c096ad131082621245ad7db5c44c3bce55b2484e02827d78fd8fdf0f145466e1fb9ff50b3f581ca4e2c2c34e5
+EBUILD h264enc-10.4.7-r1.ebuild 1054 BLAKE2B e6e73562f95a866c5b11df2257ee2e64d5e1e88a09eb144ee315b21b800cbba7de9bee22e850793d23823a5f81f685d4cae1dfbe7e2ff23af9e922e746e0b851 SHA512 f4c734af6f00f5a03948085f367f71edf1ce6e8a0f66e58a9bc8d1494d53e8ad6fe6897316e32347c8216ff62192da5138a68b8f057e9116b072c7a6520404df
 MISC metadata.xml 300 BLAKE2B 351f5c58f1fe3b1c3db8a0210ba10a0d1f4a1d4749a3f06e2f9c93dc7fdbe583a1a06b6647e28e95f917c86aa29999f8c1aff7b3f2736dcc6044c8c548bc52cf SHA512 80a1cbae96078c5801ca3eff3e34f00bb4d22211ffc91f493dfa162d7e86134f9f6cc9d9192f238bf0620e2f65b5a34b2530d6a99863707d188ecfd6d611ed9b
diff --git a/media-video/h264enc/h264enc-10.4.7-r1.ebuild b/media-video/h264enc/h264enc-10.4.7-r1.ebuild
index 51adbd9620cd..4659f64d0e25 100644
--- a/media-video/h264enc/h264enc-10.4.7-r1.ebuild
+++ b/media-video/h264enc/h264enc-10.4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="Script to encode H.264/AVC/MPEG-4 Part 10 formats"
 HOMEPAGE="https://h264enc.sourceforge.net/"
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index e78de5d6a112..66c483187ee0 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -7,4 +7,4 @@ DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e15669
 EBUILD handbrake-1.3.3-r1.ebuild 4248 BLAKE2B cf150d3f99321b3e207e03e8c7848daecb3169515f3a3a209a8c830b0730874ee75deba489a261f9fcbbc38ba4105714511c2a49ddfc0477f6d462de1378391b SHA512 353c1965d4be68265adb6deaa6f9bf3d74747e32d9600705ea78960c1b2bd156aafc1ff0230482eb8003f3ae874e97b4d65c47c410e838545bd3a8e2754b4d8e
 EBUILD handbrake-1.3.3.ebuild 4210 BLAKE2B ce314d9b36abaa3585ae77e29857dd00c6a2e1de5ef59a0a25fbff200d19ac6bb01f5b0e19839af3a9dac014493e38346a912acbfe1f660bde0a497a16eee35a SHA512 34e6de849f3536f2a432c54de9f97a1e36fa16a80edc37f2e2ed6d890747d070bad8dd06035cc8d6c1a62da6507eba865c8b5379c28abc2a44ed5d53802f14df
 EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
-MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
+MISC metadata.xml 881 BLAKE2B b93483d20041e7125f725d81c22cfd416898fc3477d20ba07d364348a258e868efe4444f91d36bac07f0a3881aedebef7580f5fcd0aa5b3f8a59a05e49418dd2 SHA512 ec78ed56c9011af44b902eb8e9f418515d4bc7ab9feaee142b2808c15f8a69638de43196ef38246c696b2258124b472a0831dabf5671b5ef4000ebf146f634b3
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 66de5356243a..83b12addd42e 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -5,14 +5,11 @@
 		<email>thev00d00@gentoo.org</email>
 		<name>Ian Whyman</name>
 	</maintainer>
-	<longdescription>
-		Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
-	</longdescription>
 	<use>
 		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
 		<flag name="gtk">Install the GTK UI, ghb.</flag>
 		<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
-		<flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
+		<flag name="libav-aac">Support for encoding AAC using libav's internal encoder.</flag>
 		<flag name="numa">Adds support for x265's NUMA capabilities.</flag>
 		<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
 		<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a2ba93f39cd9..e3dcb5ccc3c2 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,7 +5,7 @@ DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543e
 DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
 EBUILD mkvtoolnix-47.0.0.ebuild 2708 BLAKE2B fcae224ed255e1e3ae82e78d901b14e7e230fc9ac77d02901df03b9ca3f866af9695313ac1337ccf3f3b2480c7f71639926b98422388ec8c033d2146a3bb5ebb SHA512 aee260c756079917131a64721a109b65358081f9a5eb2098034e15fac7f601b69e35811efd28da20c601765505194a8d1f30af2aca66a0ccbe0292ab8152951f
-EBUILD mkvtoolnix-48.0.0.ebuild 2706 BLAKE2B 07481d7cfd66f1137b138c16d7577fbba959eb3b8bcfef8f0bf0143211218adf25ffb07a4b2971388ee344317c8ceea1cecb88120de99903584a236845632fee SHA512 f6ecef9f22cb61de35dabc1d8bf734640a1ea3d6aed141a0e6c33f027c851851b3468e598c98e3be92965c58dc246d1dbe152ae2f072b2e2a36a2912e66957d9
+EBUILD mkvtoolnix-48.0.0.ebuild 2704 BLAKE2B bd58d60ce6c5f1d4365223b149790fea8558ec0aa458d0b21e08fe144d3140c3a3d8ea8f477ebe016da21b2db538eb4a21b31c10d6946718189d4de6d6af572b SHA512 754cd160947385bdc5e8cd5cc66bc2140c7706848b35baa2e9ec9b5f13017fa807c6c97d41609bcfe874a848a73df94b3c4998e97260c0e37a2368871f894a52
 EBUILD mkvtoolnix-49.0.0.ebuild 2817 BLAKE2B edcad3af622e3dfa6f0942454b506ed552471341a7bfbfd1f6d3bbf1c913d345303cfb6262b780bf1428524e9b54199085c6280bf1d99f35d6736e05de8da5a6 SHA512 1d694727f37dff80e79fe4a32cca3407425d9d6c37e2d5587a8732a37a4ec2b1d15b0978c9189fda03b4157a50c76d830bbe9b7a18ca561bb1098d2940b801fa
 EBUILD mkvtoolnix-9999.ebuild 2817 BLAKE2B edcad3af622e3dfa6f0942454b506ed552471341a7bfbfd1f6d3bbf1c913d345303cfb6262b780bf1428524e9b54199085c6280bf1d99f35d6736e05de8da5a6 SHA512 1d694727f37dff80e79fe4a32cca3407425d9d6c37e2d5587a8732a37a4ec2b1d15b0978c9189fda03b4157a50c76d830bbe9b7a18ca561bb1098d2940b801fa
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 4de6b68ba82c..8b911a01ce14 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 1b2a5430b1ef..3eca912fbdee 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1,4 +1,4 @@
 AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539
 DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb
-EBUILD photofilmstrip-3.7.1-r1.ebuild 2141 BLAKE2B 5018c0076339c9571ac84a955b232c3ccbc1b816e3c62cb7cbb57ad1d8c7dee671939ec721ca19dfebcfcf0158e8b15905a8513c077ad4500be9fe63f6a45b48 SHA512 15b71ba2c85dfbf838475a972b274ba51d10a8c6bef9436a2088f3fc16447624c0b4b4034455f8efda556f709244aa4c931bf6fe0f1d30ca3ebe4830daabf011
+EBUILD photofilmstrip-3.7.1-r1.ebuild 2145 BLAKE2B 3267b0722f89fec4910143062c028e36e9a82a2bfefff26d0f4ad126069248170d8fba4365f3dd7cde378700f3d0d0117b6943da17181c09c5f03da62849960a SHA512 f106d02d147f5eb542578f3fc2fc0762754e565196984e6fad410087c4a6967e4ad05b19367b2f55dd1463c542f12d2b1f97468e1f65726c75d15c3e735a3260
 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
index 642f93edc0e6..28f898ce3108 100644
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1 eutils xdg-utils
+inherit distutils-r1 optfeature xdg-utils
 
 DESCRIPTION="Movie slideshow creator using Ken Burns effect"
 HOMEPAGE="https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 82beaaccbb55..b843ad3de5ea 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,8 +1,6 @@
 AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
-DIST pipewire-0.3.7.tar.gz 1095307 BLAKE2B 31f266d39683f53ea8cd7823d40b241bae29a59c2658f390fb9178dbdbbe1f7145638b5bd1bdae0dc13a30c1d8d2f44ff224f230211e75ab5936cfb8ccacc928 SHA512 2adaa8689b77c5a3a4710f979d23a737daa66f37ebfca9cf95f6c6a1dad770c52a2998959d52c45540b5b885568146b42981d106a2653ff8f167e0b531ee92f9
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
 EBUILD pipewire-0.3.10.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
-EBUILD pipewire-0.3.7.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.7.ebuild b/media-video/pipewire/pipewire-0.3.7.ebuild
deleted file mode 100644
index 7396ae3ab65d..000000000000
--- a/media-video/pipewire/pipewire-0.3.7.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
index dcbaa5c808df..9d97afa63731 100644
--- a/media-video/raspberrypi-omxplayer/Manifest
+++ b/media-video/raspberrypi-omxplayer/Manifest
@@ -8,4 +8,4 @@ EBUILD raspberrypi-omxplayer-0_p20160217-r1.ebuild 1068 BLAKE2B 1fb694b3a2487b33
 EBUILD raspberrypi-omxplayer-0_p20160528-r2.ebuild 1130 BLAKE2B f5bf083c0f2aa4591fb6453a6708979487dd99b2791e4d687e20bf97288a6d799e130e4dc923313b4c7790344ceb8fee908e6846c930cb26287d56ce7d7b6a50 SHA512 46e9e58f8fbc17adf465ca5cf18056f8f461ec849b91176f9ed96cf4c1a785ec2fcbfeb3d9961aa9cef96616fc03fb3c17c3e34403dabe8d7ca83aad084baed9
 EBUILD raspberrypi-omxplayer-0_p20160528-r3.ebuild 1201 BLAKE2B 82f21e01576c9ec997d464f1e29fc93dd46895e074896f84cf25b1c03cd8070036b1cd937ffdeb6cd5f4bfcbd65303dc1c4a0f6e3d085612115d5a2d9b494ea8 SHA512 289f39d62a0a3d4ac0534d2060c91284709f15ac05ce889e7edeca7bfa9d2de5618a8bd948443605fc531bbb1766876b708198bae913903528304f31bc93c336
 EBUILD raspberrypi-omxplayer-9999.ebuild 1023 BLAKE2B f5e6889287bf8f4c571ac856eb0dde6a34300b43507e66e79a6158e92b814ffd5f244bd11afe2436f9080e2e5438832c779fcb19871d0224a48cc594993fa78a SHA512 7e1a47f4931183b411b09b4db4d9e517c7b087545410673aef0851421a04e75cefb1d2f6f9ae7c062d6df4bd39d288ff1313d63b3f1dc449157881f54d56e191
-MISC metadata.xml 417 BLAKE2B 61c4b93783c4781a6cc65040e95930246eec81e9a7d2907acb2062d552bdec0913491d960a4cac60d9fe6dfb9bdf83729be1b1855bbd5f5850ba90bbdbdcf039 SHA512 9558aefbd95a7ffef7c3714d41582531eadee6b1d6579338f036f7964ffbec1d217460d3a5cfff674cd0f915ad5efec9c97670769fb5abf19c57e5ccaa88c9b5
+MISC metadata.xml 334 BLAKE2B 15d5f7c9703eadfceff441baeb65825f2424949cd0d0c1181615c65bc7b7411e5988aaffbdd3c11d3c82a798e44f0c567b7ac004b5e9e501ec49b8cb2fcad4cb SHA512 e11d2fffe221a77abeb9d7921240732d0f531ab24f0c7663fed7d36a4450a806e97f27329ab7cb63eec9803f377fbe6e757d7bfd50fbb584640e92ed942d9320
diff --git a/media-video/raspberrypi-omxplayer/metadata.xml b/media-video/raspberrypi-omxplayer/metadata.xml
index 8cad57807703..8f71182580ac 100644
--- a/media-video/raspberrypi-omxplayer/metadata.xml
+++ b/media-video/raspberrypi-omxplayer/metadata.xml
@@ -5,7 +5,6 @@
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
-	<longdescription>Command line media player for the Raspberry Pi</longdescription>
 	<upstream>
 		<remote-id type="github">popcornmix/omxplayer</remote-id>
 	</upstream>
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index c28b85fa42bb..79ef09517d14 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,8 +1,3 @@
-AUX shotcut-20.06.28-desktop-file-validate.patch 1188 BLAKE2B 45ca39e3264e056f9c986cdef4653a9fa2d3240e3379c5df0c565051eed8f0b183823a1f36d000635861023052ee3e92264dcb65b3ebca5b1829dbc27328e973 SHA512 88bf004acea6569ff5bdd14af53763932e47673dee0f5ab4d930a8b2abb6d75c66386ac174b2ac3990a6022f531a2934fb5144fbed6701cd03a47feb305bc8ef
-DIST shotcut-19.12.31.tar.gz 5475620 BLAKE2B 47fd90ddf40da3c08d3dab31b7170b02aab2f3e6b9d3d7446d53192c04b22b7e053cffe21632f1370d699ff00dca0d057f9a49d29ddeb225f039104abbc8ddee SHA512 714d5b3e184e9d0786bc64635e51fd61570e0404c0ebf0fa5c8a12cb85c9091c75ac61e4963bd400b5722f310ae590b2c2d83aa4cd7acbcb53545f224f0ca766
-DIST shotcut-20.06.28.tar.gz 5797885 BLAKE2B 3f241d6bbe4a89410a2e96ec8bde9446ee88c452ee76f77e4d145f44a37c0d5d116f43e4d0e844b5a112998317f3378c84819bd63c9a02a5aff30338859340b6 SHA512 cd9b96ca467c669138902a94975a5f23baa266b1eb92de0b0446e6f6616a9927aac430c6bd41c4f00de4e5b6d99bfbdf074d339f98ef219a38e3572d8670d78b
 DIST shotcut-20.07.11.tar.gz 5801379 BLAKE2B 93f91fc0d31583e2f53576a7c768e9c0330da07ebcacf1a9d66020a826bbff430fc6032c48f288936ac14f8eaf5a592297c818c72bdde73253a90cc6ce304655 SHA512 8590855f252dbf1a1e4aed078da93ea730e4dec2c67420f57babf59e37a8f4d76c808a14872ae68fa400e5057e9be9d42c567c4f0db3e869eefd5115b814d30b
-EBUILD shotcut-19.12.31.ebuild 1283 BLAKE2B ba6043c6d7e302ee74dcd3cc2aaaf263f2813163894976d80c8774bfd017a3e9e49bc692a6a16128051d63798f779d14e8547fcc2ed08b9c5051daa81cea0f32 SHA512 63429e04bed1860bdecaa6ae4f063ab182f41c04cd74041c567729abd48d0f70a925c858d9efd4cf2115cddff55ce8ae6061bca35aa7fe98ead7d0131512b018
-EBUILD shotcut-20.06.28.ebuild 1344 BLAKE2B 15685a73385124b2df3185b62aa78f0f9de4ea2328843a87f45a371a52e3b36adb757289c1fe38ef281d65dc2366665c6b87761e19fbef87cd715f6504b6fc58 SHA512 880fc97a7c7c9840e3b1311b898b9eae81502b63198bd9fd569844ef514a332ca460a24bbe725c6685672fa0a0fc095e0c29b087fc7b8cc8470f13253ca274d2
 EBUILD shotcut-20.07.11.ebuild 1275 BLAKE2B 374fcc45610b70160505916485ad04505418bd4ba753b2c9825c15035f69de3edd07b4b5e55d92dc9bda837341176a6c73d9fee754b81ef50cf0a37e9dd63360 SHA512 28bb405ff61c814598a1bbc4ce11768af02fe23470307611205ba31108dc632d69723fece19211816c33d2967259f9a93dd896a0f2152f541ba14cce04400659
 MISC metadata.xml 451 BLAKE2B 7438699cd72f469998316ff1f3efd8bda67aab68f0fdbd405bb24b286e75f998a82b88c01c7d74d63fadeec47f58c381c51652854ac3dc8bd6a3a687fb8cb42f SHA512 58f1a6ddd5eef3a6cfd81936d61e34ea29aa7a26e5e841e96218642fa9fafc5529c3c6e0283f8c1e948a11eb819163e03056335d989933f390854f22aeb61ed0
diff --git a/media-video/shotcut/files/shotcut-20.06.28-desktop-file-validate.patch b/media-video/shotcut/files/shotcut-20.06.28-desktop-file-validate.patch
deleted file mode 100644
index 61b29f298d77..000000000000
--- a/media-video/shotcut/files/shotcut-20.06.28-desktop-file-validate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e4f9128a5580ed53b62640a3a754d8fc58d04337 Mon Sep 17 00:00:00 2001
-From: Henrik Pihl <ahvenas@gmail.com>
-Date: Sat, 11 Jul 2020 11:43:50 +0300
-Subject: [PATCH] Update org.shotcut.Shotcut.desktop
-
-XDG standards tell that comment fields in the desktop files shouldn't be redundant. My Russian and French aren't good enough to replace those fields with something else.
----
- packaging/linux/org.shotcut.Shotcut.desktop | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/packaging/linux/org.shotcut.Shotcut.desktop b/packaging/linux/org.shotcut.Shotcut.desktop
-index a9cf44da2..c5a4eff9e 100644
---- a/packaging/linux/org.shotcut.Shotcut.desktop
-+++ b/packaging/linux/org.shotcut.Shotcut.desktop
-@@ -5,10 +5,8 @@ GenericName=Video Editor
- GenericName[de]=Video-Bearbeitungsprogramm
- GenericName[fr]=Logiciel de montage vidéo
- GenericName[ru]=Видеоредактор
--Comment=Video Editor
-+Comment=Shotcut is a free, open source, cross-platform video editor.
- Comment[de]=Programm zum Bearbeiten und Abspielen von Videodateien.
--Comment[fr]=Logiciel de montage vidéo
--Comment[ru]=Видеоредактор
- Exec=shotcut %F
- Icon=org.shotcut.Shotcut
- Terminal=false
diff --git a/media-video/shotcut/shotcut-19.12.31.ebuild b/media-video/shotcut/shotcut-19.12.31.ebuild
deleted file mode 100644
index caace2355100..000000000000
--- a/media-video/shotcut/shotcut-19.12.31.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="A free, open source, cross-platform video editor"
-HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,jack,qt5,sdl,xml]
-	media-libs/webvfx
-	media-video/ffmpeg
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtx11extras:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
-	virtual/jack
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/QT.*private/d' \
-		src/src.pro || die
-}
-
-src_configure() {
-	append-cxxflags -Wno-deprecated-declarations
-
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		SHOTCUT_VERSION="${PV}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/media-video/shotcut/shotcut-20.06.28.ebuild b/media-video/shotcut/shotcut-20.06.28.ebuild
deleted file mode 100644
index 40181162303e..000000000000
--- a/media-video/shotcut/shotcut-20.06.28.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="A free, open source, cross-platform video editor"
-HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,jack,qt5,sdl,xml]
-	media-libs/webvfx
-	media-video/ffmpeg
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtx11extras:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
-	virtual/jack
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-desktop-file-validate.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/QT.*private/d' \
-		src/src.pro || die
-}
-
-src_configure() {
-	append-cxxflags -Wno-deprecated-declarations
-
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		SHOTCUT_VERSION="${PV}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/media-video/snappy/Manifest b/media-video/snappy/Manifest
index 50ad466dca6b..4633ed6952d8 100644
--- a/media-video/snappy/Manifest
+++ b/media-video/snappy/Manifest
@@ -6,4 +6,4 @@ AUX snappy-1.0-string-concatenation.patch 921 BLAKE2B 5e8726793991b93e235529a219
 AUX snappy-1.0-video-texture.patch 1126 BLAKE2B fba2134c9a44429046c63b93db40d744ff1e658c8a5736b0e187f22b4b5a91e40b6774947deb9d9f36f390a0a75a08044b06f2cb9202cb31501c61bc46204aa2 SHA512 b139b5ed43ce85240015467330f17f244bcca59533d203c29d60955ba9992d8cca9f2715d928551fdb5cc92c0618ba60df6a51ffe798d19bbc0532dccf58a810
 DIST snappy-1.0.tar.xz 282964 BLAKE2B 9855e3c9397ccde1122c22066cc33e98fda93cb364c03d8649a823dddc9de81bb9eaa89002f3fd1410b6910433e554d231774524da1cd917138c3154c6ed153b SHA512 d8a3fd3a598efde4d699cc8fa13bee1239917a877627b26d5d278af5fd1824f02acf5ce685f8bf994087b3374de9917a5aa4f6f6ebe94f385c8d3bf91887eca9
 EBUILD snappy-1.0-r1.ebuild 1360 BLAKE2B 4867a12555dfab28d6b3db9cf9c214796322cab950c016dc0f095d2b00524c9340fec05c72d1af2e0f474c980ac5100b118ca2f5391194f703d0a262e9adcdba SHA512 e40cee3f9d1a7bcb0bee096b876e36afc7eef9f09fdeb43497b6ba2a1a8b471f30352d866324bd788dad45273f584389eb3cba7a88f499563999bc7676c0be26
-MISC metadata.xml 393 BLAKE2B 94ed85d3b0c56a2899ed92e265ad292cd1312b8b961b332aab70f5c007d4202bd266b72adae9345497829762df1c798798e0eed918e49daedbcd5339d26ab123 SHA512 511964afd47b90bb56df75a1fffbbb39c0f6143e3677a7454338e731638099ee24593b0b7049c3d9ba6cf5e56b6dc655d8253f35cd184cc927395e0f871579f1
+MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-video/snappy/metadata.xml b/media-video/snappy/metadata.xml
index 96905b59e4ed..42b76fdc5c1b 100644
--- a/media-video/snappy/metadata.xml
+++ b/media-video/snappy/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gstreamer@gentoo.org</email>
 		<name>GStreamer package maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Snappy is a gstreamer + clutter media player with powerful features in mind
-	</longdescription>
 </pkgmetadata>
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
index b0a12b33718d..5199ba4ce0ad 100644
--- a/media-video/sonic-snap/Manifest
+++ b/media-video/sonic-snap/Manifest
@@ -1,3 +1,3 @@
 DIST sonic-snap-1.7.tar.gz 16760 BLAKE2B d3bc2d55d12aa0e02949a815cb3c1b2402ad7980b7d52c240fef513b3aadd3399d113fc6b8ab7a727fc6cfd8cf6c158887fe0be64f5bdc9ed585f190d7ab39f9 SHA512 0c2fe5a7403ac003aad308d064a4d981a25f52e478943125090cb96d337aebe0a9fef160217b4f37cfd1991c0517f5f869f60f4c93a6abe9a127821f7906a664
 EBUILD sonic-snap-1.7-r1.ebuild 1720 BLAKE2B b17b6d4c5648b77d843fa6eba630a0a3ab51870a87d9fae3edbb886800342e8cc6c2c5c62446094c9a368b9c4cd9008d36175a6f75126cd1fd6c8eb8e2b01d57 SHA512 b986c0b5656afa101fab3254559c0243a583720884300b7be7896a2acd6d0051afcc5f95445ec97a2d2b79cf8fef76bcdb5f7b5573bf2c90a1d3e62786bfbf39
-MISC metadata.xml 389 BLAKE2B c2aa867a3cfeccc38b53de2725cf6eb4d19732253a83838b7873e59c37ecb115940dc019ef20d0415b54655693a498754a7d2a8b2a56d767f934a906459fc367 SHA512 231e6383dd068d1b4a52f8cee7293a4adb9c7f527f16c1023fb9cb8f8407c758cb694c4166c55b5494eb9ed5fef7a368ed1ccde52210d77cae4cb71901fcbcd8
+MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/sonic-snap/metadata.xml b/media-video/sonic-snap/metadata.xml
index ee0dade075ae..2a705e39ce78 100644
--- a/media-video/sonic-snap/metadata.xml
+++ b/media-video/sonic-snap/metadata.xml
@@ -5,5 +5,4 @@
 	<email>media-video@gentoo.org</email>
 	<name>Gentoo Video project</name>
 </maintainer>
-<longdescription>Minimal webcam app for sn9c10x based camera controllers (mostly USB), with optional MPEG4 support.</longdescription>
 </pkgmetadata>
diff --git a/media-video/unifi-video/Manifest b/media-video/unifi-video/Manifest
index 7f43b7cdd734..f2da487e2194 100644
--- a/media-video/unifi-video/Manifest
+++ b/media-video/unifi-video/Manifest
@@ -4,7 +4,9 @@ AUX unifi-video.service 209 BLAKE2B fd4d96fbd353c795621ec6ad2cb23d8c27132071ebee
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.10.deb 162697298 BLAKE2B 6cf3d93916830f781ba075abf222402609c8e9935149fc5729767ff05333c61db22709762a992ff510d4898d9b4860f3d61bd50fe0e2d55522a7eb8be7fc378a SHA512 01927d893e7d258641d38daa3018670cb8913d371a984d8f7595322ea0bb7d1879d9ba16125c8dca927d0a274e52922a5a3d1df60f31f7fc3a09de0cc7cc3766
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.11.deb 163522410 BLAKE2B b6a81fc0cf04a5bdd15c5e8e58b2df35718a990faccda103e3600fe79a333904522047fce2a0acf92c53679fe39ca48f6982e5473536bfc308df99f02219c2c8 SHA512 6af7f87d6011021395ca420a89d213feefabc8547cef620231f58a9a419c404ecb9650c88b7ef48bcc9a10f685d8b897f3d6781d47f92166dd453fecd6ff7912
 DIST unifi-video.Ubuntu18.04_amd64.v3.10.12.deb 190853456 BLAKE2B db6286274f31d35a70eff1c311f27accf5bb6d2def29c2662d4b5585b62e06d2b883a1145af6ac21dda548cab18fc187359acc72b0ffc56876fb64cffb9d9023 SHA512 9f63e96b0dca35d8ac28a642bd03bcfc680c4f7b3278845cbeadf8f21779e67aa24773888f9e82f6a9eed23747c5f24fafa75fa556c6f91211fa26a1b25d9c2c
+DIST unifi-video.Ubuntu18.04_amd64.v3.10.13.deb 178800688 BLAKE2B b35f91e77514fcf0165298473be503f6d977cb9f8f53e88f5bb700a2c76a3636e2f475c93c395eab6af4a215074521e47e1dc2d868695c1de83968b64e157cc8 SHA512 58d03b1004ba6da58b52c20720137639167647539c135c71c6abb36b80e37c4f33f0d0ae4092f98858bed8fcb4a3c9f05cc2a0a25e96fee957da176b9b6801d2
 EBUILD unifi-video-3.10.10.ebuild 2065 BLAKE2B 9d3cb1f004b187bb6ca76de8e163f94e1d0a84f23372ab2553b72d6877e88e172a567d782994a2e63fe9dcbf2698c7612d89d575b52fd0ff2ddbc9d83576e054 SHA512 b7c7efd2e4217dd5aa2db083b259be912eb42114011ceeff355719a33c82e473043c296e4e47d2058d1448a4c435cfc8f729516bdb08f032855ccb19a6c60fe0
 EBUILD unifi-video-3.10.11.ebuild 2065 BLAKE2B 6265b3e87d70f11a1725ddad67f99b538d69b6e83afa528f0a7f4da8bd13ea80737b3bb4b43441a61c7d0f677b6e61dc85fab7cf84811e43c64fa02a80aeeba0 SHA512 ea3b4096d304a9a003569eab4fecc26c6188cc99e9b10ecdacb14440accdbf8d8d2d71c5e21c0f04b09682cd189e7fd0d1b657e64b7d4a546646a0fdca38308d
 EBUILD unifi-video-3.10.12.ebuild 2065 BLAKE2B 6265b3e87d70f11a1725ddad67f99b538d69b6e83afa528f0a7f4da8bd13ea80737b3bb4b43441a61c7d0f677b6e61dc85fab7cf84811e43c64fa02a80aeeba0 SHA512 ea3b4096d304a9a003569eab4fecc26c6188cc99e9b10ecdacb14440accdbf8d8d2d71c5e21c0f04b09682cd189e7fd0d1b657e64b7d4a546646a0fdca38308d
+EBUILD unifi-video-3.10.13.ebuild 1960 BLAKE2B e304c36dad47b883fb3d84757542d55a2cb923fba2e9889530f1566c7c683ce9025a46fbcc10f2aaf799e7b2ad86c35dee731b81a2969b16f5e399ef2cffb975 SHA512 1bc3cc8370caf4c5d13256b94931a74971b626a1d231e6dfc73ae39f8624af18659769c29a2c1c58cb0038a9a7b602b127266b6596b485aec93ea709bd1d8bb2
 MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/media-video/unifi-video/unifi-video-3.10.13.ebuild b/media-video/unifi-video/unifi-video-3.10.13.ebuild
new file mode 100644
index 000000000000..957103a94d4d
--- /dev/null
+++ b/media-video/unifi-video/unifi-video-3.10.13.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+MY_PV="${PV/_beta/-beta.}"
+DESCRIPTION="UniFi Video Server"
+HOMEPAGE="https://www.ubnt.com/download/unifi-video/"
+SRC_URI="https://dl.ubnt.com/firmwares/ufv/v${MY_PV}/unifi-video.Ubuntu18.04_amd64.v${MY_PV}.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="dev-db/mongodb
+	dev-java/commons-daemon
+	sys-apps/lsb-release
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/jre:1.8"
+
+S=${WORKDIR}
+QA_PREBUILT="usr/lib*/${PN}/lib/*.so usr/lib*/${PN}/bin/*"
+
+pkg_setup() {
+	enewuser ${PN}
+	enewgroup ${PN}
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}"/data.tar.gz
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/commons-daemon-move.patch
+	sed -i usr/sbin/${PN} \
+		-e '/require_root$/d' \
+		-e '/update_limits$/d' \
+		-e '/ulimit/d' \
+		-e '/coredump_filter/d' || die
+	default
+}
+
+src_install() {
+	export CODEPATH=/usr/lib/${PN}
+	export DATAPATH=/var/lib/${PN}
+	LOGPATH=${DATAPATH}/logs
+	VARLOGPATH=/var/log/${PN}
+
+	insinto /usr/lib
+	doins -r .${CODEPATH}
+	into /usr
+	dosbin usr/sbin/unifi-video
+
+	dodir ${LOGPATH}
+	fowners -R ${PN}:${PN} ${DATAPATH}
+	dosym ${LOGPATH} ${VARLOGPATH}
+	dosym ${LOGPATH} ${CODEPATH}/logs
+
+	dosym ${DATAPATH} ${CODEPATH}/data
+
+	fperms 500 ${CODEPATH}/bin/ubnt.avtool
+	fperms 500 ${CODEPATH}/bin/evostreamms
+	fperms 500 /usr/sbin/${PN}
+	fowners -R ${PN}:${PN} ${CODEPATH}
+	fperms -R 0400 ${CODEPATH}/lib/
+	fperms 500 ${CODEPATH}/lib/
+
+	echo "CONFIG_PROTECT=\"${DATAPATH}/system.properties\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+
+	dosym /usr/bin/mongod ${CODEPATH}/bin/mongod
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	if [[ ! -f ${DATAPATH}/system.properties ]]; then
+		cp ${CODEPATH}/etc/system.properties ${DATAPATH}/system.properties
+		echo uuid=$(uuidgen) >> ${DATAPATH}/system.properties
+	fi
+}
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
index 3a1dae32b4bf..d3ce7cb19462 100644
--- a/media-video/vstrip/Manifest
+++ b/media-video/vstrip/Manifest
@@ -1,4 +1,4 @@
 AUX vstrip-0.8f-gentoo.patch 2047 BLAKE2B 253332bd66e176f39a685ced6f49a6478044c8f8d0ceae89aa8ea57d74f8963d19d8a86a31eec28ea8acdae2db0c0997384d907e5772b374b2261b183c68a6d1 SHA512 5c8ac7a49a50b701108b06bc5f3305d2a4553d74fe30c7f628cdc5c9f4391dbf1e75764a2900727ddd6e706bff9386dbbde63269facf563a1b59b96c593de6ed
 DIST vStrip_08f.zip 409157 BLAKE2B cdb31341d014adb10b8d83b09d11896351d298b49eefce2b506eaca26883ca14ad8f007e42363fa961e9839b548ce0c7fd1edf9d4aea17c1a5d135bf0feb9089 SHA512 5b8fa07e923709aa0defcbe3ad6fced02eddd5cacc7c33a5ec777e1d64d1e33f3163c82c7fd74eb80f02833c75593e7fe544fa93a56271926a51dbc663f39276
 EBUILD vstrip-0.8f.ebuild 707 BLAKE2B 0887d8b33fe182756582b4cb2c502903f66eae219b4ce64142f08e99c4d9f55c66cf598a87d85b9c3ddac77e6556000a5a219282c6753fc78e85e8f4d746efaf SHA512 bb73ba73219c40bf016389972ccf20eb5b5002580c8eaa5a8a454fab8e8a21cd23d412e5b8dabed5cad9b0b91fed0de837dc9ad174935b3e659c77a1c463a29b
-MISC metadata.xml 331 BLAKE2B 2f1f2817c5fa0b56ac253d45b5bd1d1fa3093488a9f8d89ff3cf24fe0b5693891cfd58a8e7535147f81645a6f8b2b6661b7aba33532a2b7d519e8dc9c949e8e7 SHA512 b01bf58ac5f7ecdc703ffc83ca687e07153770a7880084c245e6d8b868329dcca116680d3d7e41f1637343f9d825417f615f18a117952222f82f7d655f5d9d0b
+MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-video/vstrip/metadata.xml b/media-video/vstrip/metadata.xml
index 346d6849468e..80088c21d0ab 100644
--- a/media-video/vstrip/metadata.xml
+++ b/media-video/vstrip/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="project">
 	<email>media-video@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-A program to divide a non encrypted vob by individiual chapters
-</longdescription>
 </pkgmetadata>
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index a4ab8f9645a1..2325cc1b7305 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,7 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-encoder-0.0.20190214.ebuild 2069 BLAKE2B f77cab7e07231377dbc85448b377c60dec0ac663ee487736f9b4b1bcfc320a1e5f8e6582173b844f2525175b649dfc3646b89c70e008948a4db4198570a97e65 SHA512 05e6d5749f6fe09542c086da53d20aa803b4736acd367a8fb6226901897d72eb6b9e7c09a79c050dc102971349368182aa2a247c7fc7ebd899454f29ccb254ad
-EBUILD x264-encoder-0.0.20190903.ebuild 2071 BLAKE2B 362439e044f4f9669008c52a067de93f120c652e4d7d1f2c373a17f7f617925117d5fe260be00f59fb31b70ca4f86241f635d773307350e2f4fe5b72043de062 SHA512 584335789c74c47b4fd988b9239abb663a0a442eeed21f4b143c767e15896bd669ec47ca24fd04296dde1befb74259b55cf2a6e3b32e6b9e921bdf835c65cb8c
-EBUILD x264-encoder-9999.ebuild 2071 BLAKE2B 362439e044f4f9669008c52a067de93f120c652e4d7d1f2c373a17f7f617925117d5fe260be00f59fb31b70ca4f86241f635d773307350e2f4fe5b72043de062 SHA512 584335789c74c47b4fd988b9239abb663a0a442eeed21f4b143c767e15896bd669ec47ca24fd04296dde1befb74259b55cf2a6e3b32e6b9e921bdf835c65cb8c
+EBUILD x264-encoder-0.0.20190214.ebuild 2168 BLAKE2B 396282c2737cc9d1482bcbde86d3b96d578504976538b01d55aac329331ccd1e83051576e9ed451dd201949d751fd33ab5261add285a41986b433ae09b3a0c64 SHA512 0e1f119a776b55e8f207bce50628a06774e63196afb28ff9e2b12194dccd8040be12f384e0844e85d92ab8d8a69f8055599ee9c26e21ac62d26771bb7dc09a94
+EBUILD x264-encoder-0.0.20190903.ebuild 2170 BLAKE2B 9d96559f334d3f873e1e00b7e9e15282044068ef676a126a3ecb3b37f03a1f1cf7ff93eb0299569a892ab7868470886a44e637f7a2f8fb945bf11a051187e664 SHA512 7392975f02968d656f16c8864b57718bd79177b2ad31298d228b1be414dadc210d93c53a9dd8aa1cdce1b6a03e7e9ab50c15060c7ef88f91f59512b6b4d5c4b8
+EBUILD x264-encoder-9999.ebuild 2170 BLAKE2B 9d96559f334d3f873e1e00b7e9e15282044068ef676a126a3ecb3b37f03a1f1cf7ff93eb0299569a892ab7868470886a44e637f7a2f8fb945bf11a051187e664 SHA512 7392975f02968d656f16c8864b57718bd79177b2ad31298d228b1be414dadc210d93c53a9dd8aa1cdce1b6a03e7e9ab50c15060c7ef88f91f59512b6b4d5c4b8
 MISC metadata.xml 530 BLAKE2B 19afea6649cc9611b31fce82055c949d8bbb8de99df320d390591d0e3abe27126b54af9c91bc7b96a8d2fac705427ba2c8cc19bdcddfadc304419a7966c40617 SHA512 01eabe2c536c89cc9ed8cd4295ce68941a626b6675c808294a4828704f9f3c89c87d70f5898f60f326c783a77d7e1dc8213e3bfbadbbca8b71f268959232a577
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 893ddce8fed1..1c576fa216e7 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 18dccd367cb0..13b167268ffb 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 18dccd367cb0..13b167268ffb 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
 src_configure() {
 	tc-export CC
 
+	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+		export AS="nasm"
+	else
+		export AS="${CC}"
+	fi
+
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 9abc9c44c743..b5657b59939e 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,7 @@
 AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
 AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
+DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
 EBUILD xine-ui-0.99.10.ebuild 2028 BLAKE2B 153fb6819a95fab8058fc3d7241419ac9f5b5797042ba077088bec627f3906017da9f349c3af63da76b3a1a74505c2d5a3103ac5689411177355116cd46a12fc SHA512 ae9301c83a7d404229d6b7714f5b761e1224f173f01666ce9fd47c6be74fb765ffc091717674e484af2c15d7954acf1d559c5563eb1f730b6cc23c7da12fa64f
+EBUILD xine-ui-0.99.12.ebuild 2007 BLAKE2B a421631ee8e5fa2e0d57fbfd2be68e2082dc3d4411a36645f483167e8c7cbf80ee170192e437dd7ae6b80479d8ad8bddc9a4ca983b42d5a07c1f9c42e0e2050d SHA512 ef126e93efaabc3cf022fd73d598a79858e4d2bcfe5e26c0526675b0bab0bf0847229e8885b1601bfc7e8d568dde1242e3c0b2829b5c933845e529b6c64e8e6c
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.12.ebuild b/media-video/xine-ui/xine-ui-0.99.12.ebuild
new file mode 100644
index 000000000000..dfd01debeaae
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.12.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="https://xine-project.org/home"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
+
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	virtual/jpeg:0
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99.10-desktop.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 5c57c6023940..4af46f3450fc 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20200628.tar.gz 61748 BLAKE2B 1de2d426e8d871aef8d9ad1ee896b28cc79601bd13712a9e646a313ec52cdb2e2e979b74ea612fdab0c309a8fa37e3c1226bac29461410dbc85f976b1277e1ca SHA512 0f6880779392a1f47138a3757cbd08158d6832b35dff15193faa8937338ef791e03f4e5308f71fe0b6f4515092f681f9dad6a41a9ed32254757a44af34486070
 DIST yle-dl-20200807.tar.gz 62699 BLAKE2B 9f92e8e37385c8936f39443179251f60fa01fcb2ad623852cebb4bc26aa111689d8132ca1871e914162399c26ea575d02a7811fcb6b55e27b1d942db428377cc SHA512 fa38e0acb84fe968086a831c9d090a1a1387e58db0ca753aa25af65e42928542ea71b6a22988dd5e6a728b31de1da4d7dde02d2836bddec0bf52ec6dcbfa72ff
-EBUILD yle-dl-20200628.ebuild 1539 BLAKE2B ec0d0738979a614405e007e710ae832f6500945dcf071a9af867dcad1fd83d71e9f3a071ad9f7fc81d5399795fd7d7cfcc1990535c2bb20c168ed15c9e4a148b SHA512 14734f17e080adab3b92993afd2cb37fdf671a3c40ba9ee4d967d15cecfd2b6be5ff7ea1b1f43a4d2c0cbe8794ab461232ebe1cfe1ba72ecb936af37de4d926c
-EBUILD yle-dl-20200807.ebuild 1502 BLAKE2B 1bff58765f8bacf8731f05a2dd4d7edc7f96942141701af8050979a9eed4a2630984c51d2923de87ca52ea0c0624c999650c3c0d75f69a3005b880bfd1d8342c SHA512 81f71b82c7f6d19b05c034f33d014efdefe8f31368383018704e11e3f6aee694d62605c38f46bf722697b97c2c401c5c910a2daa11c8d989ded53e09f3fce80f
+EBUILD yle-dl-20200807.ebuild 1504 BLAKE2B dd1290e5214a5a70b24ac935912e3a846ff2570560e330494af1b58373a76f9737ff295c56e5a1b5b035eedc431809eaa320bf0af817939037dc8e1925a4d31d SHA512 312b6f70da4b9f95e17857233e2aac9689c8c8462091730d6988249d50c7ada6115fe1da653789dd27511bf9732ae522bdc7fd93801adfa9dd96a1594f1d0530
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/yle-dl/yle-dl-20200628.ebuild b/media-video/yle-dl/yle-dl-20200628.ebuild
deleted file mode 100644
index a05358a9a89d..000000000000
--- a/media-video/yle-dl/yle-dl-20200628.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mini-amf[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-BDEPEND="${PYTHON_DEPS}"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-	elog ""
-	elog "Optional download engines: "
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/media-video/yle-dl/yle-dl-20200807.ebuild b/media-video/yle-dl/yle-dl-20200807.ebuild
index 1f7adb750bb5..97fd2cbc3981 100644
--- a/media-video/yle-dl/yle-dl-20200807.ebuild
+++ b/media-video/yle-dl/yle-dl-20200807.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Download media files from Yle Areena"
 HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-video
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)