gentoo resync : 31.10.2017

12 files changed, 7 insertions, 223 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index d123ce263fa2..88bcb4b0bd95 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -5,4 +5,4 @@ DIST bino-1.6.1.tar.xz 814212 SHA256 f6e4b07a8e9ff6c929da6200d4ddd1482c46d4aa851
 EBUILD bino-1.6.1-r2.ebuild 1920 SHA256 6dbaab6fa0587ee511a19133afee7df694f1c9feb149324ea4225e728be1124b SHA512 19f58814ac6d9ffde3ccf6d3fe0bb3a00b1a21f7dc25a1c65dea226a29a3dabf911936bc04826bbabc0f4d74c1884204a4ae86d79d468873a4a9d359aa29c69a WHIRLPOOL f9f6042ecd13f5676a7c0cd8de89dbe6b3c97400e8c38ef88144f28c38fd638a7ef0add69d1b1507edffda95e135f761f91ee5dfdc2334428fdea15babf90a27
 MISC ChangeLog 3245 SHA256 b63ae153a74e11c3d7a9a4a5e192271e150650a797c3408d81ae199d9912e21d SHA512 0225490bbb5da33d9bf58fae0e8e39158b9fd0dc78c22ddfa59df9fb93e12cb65614700ac7098f9c7dcff4f9726d7a1967158cc49f99efbe3ad10e029393b5cb WHIRLPOOL 952b339389d54d20b1c82b9ee753a638405374f61ee372421fbf52b940204ab76fe42a89af41af1f307b0efc7c8ef0c81a7d8544c0df0b11eec335dba4776344
 MISC ChangeLog-2015 1524 SHA256 fe2f67d068461a3a0a991b086b9dd337f53db05176b8f773dad886fb267571f5 SHA512 d2ac9eaeaf3144be3bf8b1507a9fdcd801c8a6ff0e584fd86e84f249d74ddc63261858b74e414781f69bef21df094ad85750f4553d1c17b8c925f659140c66e4 WHIRLPOOL 4ff9f6ba21568f8019de13c17d83f6cec60174c6602cc038d5d6fcedb649aca507d66a3dfa64b08b944b80ed09989bfad55d4860c694e806093f9f16bbbea7ca
-MISC metadata.xml 571 SHA256 717121e3a97e1d6d6c46a32a716ec128a1533983ddb96fcaf7f14b2dda19963f SHA512 2aaecbf779b16167d1591ea253a977559c8e4d2068c5eb390b800a9b80927aa0a82a1b5d50738c609f2659176f515fc40a862d99cf68bdbebcf3d4beb5600b0b WHIRLPOOL ced955086147ec7c610ad644a9009f6f8f11696bc3841a1acd816b5cd5859ac3d7ef6c8c0fadfeeeff9907222f414bed1f939a6032f769da058716190a6bc107
+MISC metadata.xml 218 SHA256 5cf6149aa61d5766a37e6007402f458490a05ce9a95c2df2130100f573ac0248 SHA512 0638775f9972e2fef88460010f6942f90d793a15cce4d8561953438f87b7189dac11fa010eee616d1b900f84cb0761b9633690429ec018bf81030a27a73357d8 WHIRLPOOL 500184ef479fbd90364e8a39cf51af4c1ba4bc8e0e739147e05344b8035784db0977558152412b2a8eb3a7ee88fdaedee8f5d778023dae5aebc191fe0b97a026
diff --git a/media-video/bino/metadata.xml b/media-video/bino/metadata.xml
index 27e43716e9b8..1291c4cfa4db 100644
--- a/media-video/bino/metadata.xml
+++ b/media-video/bino/metadata.xml
@@ -2,16 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cuchac@email.cz</email>
-		<name>Jožka Kejzlar (cuchac)</name>
-		<description>Maintainer. Assign bugs on him</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index ea488552af15..c087a9937a2d 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,6 +1,6 @@
 AUX dvgrab-3.5-gcc6.patch 993 SHA256 148885d4de8ca880d93ed418913aafc08529dacda5cd0d1095682ad49451ff78 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0 WHIRLPOOL 1563c74a7fcb358d2d6c275e8d42fe60a900a8958252640fc8a10b08408a6564130d2d2e933c5aa726883be44187e390316802d361ed242911fec04b27e04c92
 DIST dvgrab-3.5.tar.gz 205268 SHA256 5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 WHIRLPOOL 2e1227a1845c047e0b8161afa6b50cf1d271758fe4a47a77b7f47c46f1cc568e4fb72d8d795c5f1a0976fb12f0d6ff461c0326af002be5b3f1c6a5a3a4ebec90
-EBUILD dvgrab-3.5-r1.ebuild 705 SHA256 95a346b52531c0334492837e978dc6abfa5bb8090cdc9b511541eff8817b6f86 SHA512 a699bb08474f3754b57da8068fa6221d8a8f8ec2326b77fbbf9e142dc859d3514f842469ae0e786d3989d4473ffc2605493406a505bade89cbdc0901d24dccc1 WHIRLPOOL 032bffa68a3efb35e520876130d7c47b9cd5abef15605c60331f5cb420cfd01c343ed2e5cf4133cf463789121e0524e16273c8ee180e2f1a405f9930e8006a16
+EBUILD dvgrab-3.5-r1.ebuild 704 SHA256 f7c9f9cdc6a585810aa4a5babdeb5043efc51c5fabd70c2a922d84babbb0bf2d SHA512 743bba4dc56f754df181c289b70f3d61889ad0df3363e79ef1d992e59d16a40437c81ddfe7159ab2be755f791fb9498550704e7ff36a46547bf686abd6dc6636 WHIRLPOOL cd2e7a3dd7aeb3d20e42bfe4b90ff98de192b40f37a504350430c6dffeeeecdcb8c958b7014e90774348da72dd837412611bc5b712955946e1d6517e161f0ee3
 EBUILD dvgrab-3.5.ebuild 787 SHA256 7e9d068f8b384cb3a059111bde0715e9d209595d75430c3bdd23f2ecc41874c8 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590 WHIRLPOOL 1162d359095aebdd0994f4e12ecf300a528c4532b49b25f5f87be02279390a32649832d77eb58d8f32297ee947bc2e477e10d1afbe6adb09dcb26eeb15fd5075
 MISC ChangeLog 2423 SHA256 949a1dca7c8f62690e96b7d147d655a81c8aa217416adc82d91c0acd868c47fe SHA512 f167a747b4a4a1219bbb258953fa7b214bbd0e3cd9d3d3555d0c1427597f6daf01417ed62012b7cd0c3c9d05465b06dde4d1545c88a8b69de7061ae0590e6bc0 WHIRLPOOL d10dc3b734fdbe8c7a642604a79cfe68184a387640f44b1ecc65d7f7f618d70b68fb759cb8551aed7bece912a7011e79ebddba89987d91cdfba17b6c03cf152e
 MISC ChangeLog-2015 5696 SHA256 64bc6461429e8463504a76dbb34828f176b11e0e8f450113092e0c2e9fb3c42d SHA512 9dadbc48f3900866e0f6bd8fa870a5c060aec213f2cf5e6340212b661b4d56ec3c084fb1908a128f96e2cff35429c22865d869b2dff53945bff3002d52af50f8 WHIRLPOOL c2b70f9814f24e3f02684fd81175fed1cdd59c1c2365d903c1f00cf34f85afa57a5d9fb811dbc2d4557034ae8350611ebe9572e59c36da85c40e0f979a2ed17d
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
index 4c9372683ce7..82f7abd7a6c2 100644
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE="jpeg quicktime"
 
 RDEPEND=">=sys-libs/libraw1394-1.1
diff --git a/media-video/rovclock/Manifest b/media-video/rovclock/Manifest
index 59325adbe3e7..d19f19bb7301 100644
--- a/media-video/rovclock/Manifest
+++ b/media-video/rovclock/Manifest
@@ -4,4 +4,4 @@ EBUILD rovclock-0.6e-r1.ebuild 532 SHA256 6f0ba6c6a3eab9e0eece2c959f9d68c427e718
 EBUILD rovclock-0.6e.ebuild 572 SHA256 e5f7275e8b45609e380e5386b36b670c44dbeca077f6c0f162d527a8ed3cf330 SHA512 9d878956d4327a868990ba23775ef9c191664084dae9b44c4f53affe8e12e3e0d0659dc67d52cdbd6517af9d4a655b92c3f82524ad5098c69bddc390cbd3e2fb WHIRLPOOL b2b510e615de9b6fc0718466c27ed1c1a64a583c49e3d3a47f88a89da6b7cc57c17164e6c39d31b78a6382a65a8be0d21024f18d2bfc14aa47bc85e7a2c8d4d8
 MISC ChangeLog 2784 SHA256 b62e453970beff8b2141e097fbfec0d9f296502f78e42d11c5aa93f2a2dd19df SHA512 30f0a49702745806ba04ae6110e06970c1054a5fc215b29cc443b074646e80021d20892dd1584754a47c30cd20d2477c993e5ba1a7b7e4aa97e62bbdc3b61056 WHIRLPOOL fc4f306b2342b607a2130c7abdc7d13b61c5d32eaf26d1eda1d0ef6942df17abdbf0a5657ad851cb11ffe139d181a0e2143dc538fcefc5b8f66b1dba9ebf410f
 MISC ChangeLog-2015 1212 SHA256 38d8548bfbcb847b1dd06f1e38867b37ae2384d830e0a8cb77664e7115230a68 SHA512 95a6504c80cd54cd1e0e014899f6bc1731e22689db7a8db19332cd9635630a7959ac2d466c391878017b99f3ce1cf838ec8ed3674b6b77a483a1d41d90da9048 WHIRLPOOL bb32bb35b19997c837df41f0b29dadf969aa67539b3e6d5a9543f0781527275e6191d58ae97d1ec9e2c47d3916f6050a7340f5d3fc0e5a83c527428cf88a50a6
-MISC metadata.xml 358 SHA256 c71c31bd5ac545584fd6de8b529b10f1a70c7fdc579aebc1a4ce2a640e82e09e SHA512 d89a94b77c87e59624239584efb82cd64e56cba5cb6e5de911b1d045a31efb70178ddbefc4731abc3178bf4690796be8052478811cd205f7b9cbffaf06f1e1c5 WHIRLPOOL 2ef257ede7dbc95fdaa686a92bd70f49dadaf8ba28bfd58d55023e8e2e1fc166eaef670df7750cda792a13bb17d7741d74501737af4b932974f6403360d804c9
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-video/rovclock/metadata.xml b/media-video/rovclock/metadata.xml
index cf27bc86144d..6f49eba8f496 100644
--- a/media-video/rovclock/metadata.xml
+++ b/media-video/rovclock/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>se.witt@gmx.net</email>
-  <name>Sebastian Witt</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 21c9771f6d87..af2ed1eeda57 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -2,11 +2,9 @@ AUX smplayer-14.9.0.6690-zero-bidi.patch 410 SHA256 b1dc553f744fdbeddbdf3cc25012
 AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 SHA256 98b2691eac48a50fe851366f225a7a1017ac3769f9478639bf292bb9c45142db SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9 WHIRLPOOL fe60ee7fd20ab4cc3c9286295163413c8e798bcae6c25930b501094c25545235cf92aae9d50f4f9694bb0ed5c47ae9d8a1c9ba776f180c23c6bbe3ac3f3a00a2
 AUX smplayer-16.4.0-zero-bidi.patch 489 SHA256 a61d2b36d9fd3fba0f7c1a6ad8a2fc8a1e76e70e13e8b58a1d2f21a6c53a94c6 SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 WHIRLPOOL 2cb7d823e612aa7caded97fb0872764fe11f8d145b1056228d039be2d376b2cf0cb521fcf8aaec92d76e899e61139e4d7a555ec931352ff43b1b5558f990b831
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 SHA256 dcd18b9d67c3655a835515f80b7e96f8937587f564cb1d4a717c3ef902100d99 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d WHIRLPOOL 2889a475da62c88efd698447a9f39ed5b54c36a22fa100b5bee202e50e3aae498890dd618ab22e77af78aa70124687653d0c73dc8a32ea980f8be050b95c8cbc
-DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
 DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c WHIRLPOOL eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
 DIST smplayer-17.10.0.tar.bz2 5050760 SHA256 3d40a999343c647cc758a8d5026be9d355dcc84317700128578e51db9f982375 SHA512 c06f8e6043a870291cc29eba57b8bb5034fbceb19b24987751467e874a00d4e95f57933708d71375fdc38fdc32de68d77a7d9180c3eee1f9011eb1cfa421bbb0 WHIRLPOOL b4738ce430fadf60c743a05dcf1e491ec37d88a4ff83db75ac238f479a6031efe8bfd1a70af389cf2bd22cfd5236adb4e22e7c7a23321a53966e9a1f738d0db2
 DIST smplayer-17.10.2.tar.bz2 5030251 SHA256 48d2f3b72bb8881a37ab9204329160c3bdfc0bbfff248c6dc9407e2dd35b8396 SHA512 ca90d5c0143411ebb613ece4a0675eb3a1f7265b4c05f99196e9cee354fd1e903435ae6010bdef360f8d78611c640ba0061e28ff4308cbf635090346bba0268c WHIRLPOOL cc427e40dfa43ed86d0dcc663c357c46e5c7ce3c1e3313e896e9640e8bd0d9ecdb83d04ef076c464ae4dc16b11bbfe5240b23668574342ec49dcab5d8ffbff75
-EBUILD smplayer-16.1.0.ebuild 3747 SHA256 5495cb5c8c79801add78e516b552076bf02098677d7275178156e3eb7fdaff74 SHA512 072e6535c97787f9b2da55c948c594b44ac8cd2941f821c24b765ad6e5c8c2e9d3cdc8d69053040cda130ecad3459de00ae3ad307bb3ba4da40485724f8bc7bf WHIRLPOOL 652c6519800a5cd7beb13605cbb79171a695c5db776a4ad40d52262265710816e81187c312083523b9424e3ee7424f9d50ef855e4169922c7a031c5e843b51da
 EBUILD smplayer-16.11.0.ebuild 3501 SHA256 8b8576a541dd209193044852c8fe75c9a4bd155f27214cf8389bb84e29dfdf8c SHA512 0e28a728350d06be20f0be25a2a11b4a3b4aae59208bbc0c9ade099fdea35bc74ae0186a64faba4d06470ce6a6269b40c597c86f02bc903dd0f6cc113dfd2f54 WHIRLPOOL 22a97e4306915b17c120da2378d2322ca7b9522405dcaa58db0a877b7a9da0209acfac8f4e9b6c96de579b41efa91cb6c70345ac85a2c63380408462605f38a4
 EBUILD smplayer-17.10.0.ebuild 2913 SHA256 bc604aa435419ac39a913848bc4c6a9d244bddf46d26cdbd892c4bd6d10d0272 SHA512 3c82575cebed11917065588c76bfb6aa0e63c95c96b59121f8d64dc14ae539d9d5184ff009d24248ca818d2ed4e2818fa91e843c4d082f29fcee1b541ae26eac WHIRLPOOL 1fed048d96edffadfd46506780f8077b3f971e7e5d19b2aa084a2c5d9419670d9ac57d9a0db064f9218039c97a946ec630316a0c9440df207506ac4120dff024
 EBUILD smplayer-17.10.2.ebuild 2913 SHA256 bc604aa435419ac39a913848bc4c6a9d244bddf46d26cdbd892c4bd6d10d0272 SHA512 3c82575cebed11917065588c76bfb6aa0e63c95c96b59121f8d64dc14ae539d9d5184ff009d24248ca818d2ed4e2818fa91e843c4d082f29fcee1b541ae26eac WHIRLPOOL 1fed048d96edffadfd46506780f8077b3f971e7e5d19b2aa084a2c5d9419670d9ac57d9a0db064f9218039c97a946ec630316a0c9440df207506ac4120dff024
diff --git a/media-video/smplayer/smplayer-16.1.0.ebuild b/media-video/smplayer/smplayer-16.1.0.ebuild
deleted file mode 100644
index 274d93b77475..000000000000
--- a/media-video/smplayer/smplayer-16.1.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr
-hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL
-sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-inherit l10n qmake-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="http://www.smplayer.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsingleapplication[X,qt4]
-		autoshutdown? ( dev-qt/qtdbus:4 )
-		mpris? ( dev-qt/qtdbus:4 )
-		streaming? ( dev-qt/qtcore:4[ssl] )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		autoshutdown? ( dev-qt/qtdbus:5 )
-		mpris? ( dev-qt/qtdbus:5 )
-		streaming? (
-			dev-qt/qtnetwork:5[ssl]
-			dev-qt/qtscript:5
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.6.2[libass,X]
-			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
-		)
-	)
-"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch # bug 487544
-	use bidi || eapply "${FILESDIR}"/${PN}-14.9.0.6690-zero-bidi.patch
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		"${S}"/Makefile || die "sed failed"
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \
-			-i "${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			"${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \
-			-i "${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \
-		-i "${S}"/src/smplayer.pro || die "sed failed"
-
-	# Turn off nasty share widget
-	sed -e 's:DEFINES += SHAREWIDGET:#DEFINES += SHAREWIDGET:' \
-		-i "${S}"/src/smplayer.pro || die "sed failed"
-
-	# Turn off youtube support (which pulls in extra dependencies) if unwanted
-	if ! use streaming ; then
-		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \
-		-i "${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
-	pushd src > /dev/null || die
-	use qt4 && eqmake4
-	use qt5 && eqmake5
-	popd > /dev/null || die
-}
-
-gen_translation() {
-	local mydir
-	if use qt4; then
-		mydir="$(qt4_get_bindir)"
-	elif use qt5; then
-		mydir="$(qt5_get_bindir)"
-	fi
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake
-
-	cd "${S}"/src/translations
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of licenses
-	rm Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
-	rm -r docs/{de,es,fr,nl,ro} || die
-
-	emake DESTDIR="${D}" install
-}
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index c230e0a9fca3..0d00a0f168d7 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,5 +1,5 @@
 DIST subtitlecomposer-0.6.4.tar.gz 1638176 SHA256 030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91 SHA512 585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e WHIRLPOOL dd8d230e010fce0099fff13b421e2df27f3f74799b542dd9f61c0b9cb08ae6973e3aa3f8d8d49a278a85e0e022524ec3bdd7473136a77b5169d0c0e2ab1305cf
-EBUILD subtitlecomposer-0.6.4.ebuild 1612 SHA256 5be4a03ffa8f7887922bfa3acd0d0ce16c810f45fefb542c4ea76171e9c26b05 SHA512 63989c9933fd7f2b97ba37afaefa42eaf7d30f1e6bf842401726f52d19caacaf8a10843f59324e3235af70e5875ccc8f16264c1e3f649e45803718db71512034 WHIRLPOOL 9bd094a9f1d982ac62b50a4c030ec475a4b7d6bd625bed9959827adc77627adae1bccec3555a920ed1c14fd97c5d3e72906492d06fb7431aac035b08be3e36a9
+EBUILD subtitlecomposer-0.6.4.ebuild 1637 SHA256 1fa299de98ba8876b0ee03270ce6f1168bf02365a530f08ed9c095f81269147d SHA512 e85d6ee1a174bb5156349091358affc4690002c6da7e7b89a1db707ed3317ec786af9999a927d29451684eb705e04c9997299dbaef07f2ec41ec4a76634703e4 WHIRLPOOL c2a1d3378d7d87bffc313adf78ea91dd7945aa804fbd2f475993989a7075cca8de1df01d1e4ace1fba763aacafc8434b5ce302de0350e1d9b79cf4ec2090e576
 MISC ChangeLog 2680 SHA256 aa5163bc7f4e6bac687c48582573c4f910cd2209b86c57a8a3c8752aec178aeb SHA512 f309dee6c3c5c0ea9563c5a1465c115cacd2f446b9f6aa3d20cf4e38c4da1bf4a4badbd449d357888639d5b4718a9760182a6c5955d104ab08f7ee0d973326c4 WHIRLPOOL 368081c4a4471e4df6a8cb2274418575c6c4c1f7387bcb513df38b5558a333b1623fb7de5a0c48584e8492611cab46fd6a8c7d1a72914e328c9f692f35ce2a46
 MISC ChangeLog-2015 4303 SHA256 8fbf6df920152c7a6953cda30519cb39003c6935ecbf978a1a794fedebbb321d SHA512 051769557133ad778f806c21c6eeaa7fcfbc260eafbd582899db8290f670b8ec893420cc5468bca3c54be5886d2cf8c97693527c763b6272f792509ee9ce1682 WHIRLPOOL d16444385880b5ee96bb89f40deb0208fc59fea21c6bb3da2ec32a2e504f26bcd9bf89ab1d4e789fc4653d8c9c808ad106ddfa72655e596e6c3899dde65fd370
 MISC metadata.xml 524 SHA256 0223aeb186e341e81fb32f4688d26f686d80baddfb14d0374b868f5199bfa77c SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe WHIRLPOOL 1deec3d27f03dc880ca628ceae9fdb5c834b83a72829e04899ded18b304269ccbbc72655703894df30d3e48fbc4cb2164cd7f753873f48ab08a1089deae66cf2
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index 0e0cd925cc05..46d66e312171 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Text-based subtitles editor"
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 95332d209d76..2f6851e044f8 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,4 +1,3 @@
-AUX subtitleeditor-0.52.1-build-fix.patch 2193 SHA256 dd5ac3b27f1068ea00a666c595bbe1ba4be81730079df600027e8b1949267b9c SHA512 424a5b6ab459d3e5b3363e9f58987b4e11e18258e7019c975967eef3b05f3c9525f34d8a29ad9077e0e16668a253c51487fab152b5951b702f77f6b81b1a0555 WHIRLPOOL fc1221678e44ec2b49f0402416f84e49d36c5ecffd46c9c80fe2aab17f867b8827d5f1f676ad8c3032edf66f866339c9316f5348053b7d98b7fabee37b452306
 AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 SHA256 54c8592c328f03deca7e1a60f903f6f4e0d9b8ce10649c84c9489fb1f5a6b71f SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650 WHIRLPOOL 6103520de7be5f1a423816e61195fb506a21824468ed196dfde46ba210819e0d9bbc07384746c3f10d8c66ffc2629815ca20dd938184448ca451be956cf4e028
 DIST subtitleeditor-0.53.0.tar.gz 1778388 SHA256 8fac7430fb552438d075ef3809d4a0f04a764d4dd0723a3ef18b2b695fecf920 SHA512 8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b WHIRLPOOL cfd7bfd2324fe10dadd6e8c7c60487072d15dee3c6f0a57358abee4e5f92c945ba95efb036516ecadc0beebf52380b835cb35ae8af389110597ab5305a979639
 DIST subtitleeditor-0.54.0.tar.gz 1783077 SHA256 aa9c539f3a0984deef257339e2b9f5c8728b8245113695cf6d42459f011aa2ab SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c WHIRLPOOL e67f2d94ec004e40855b440af3eafc7d78c859326b46a69c11fb633e650fdb3c0f44da9a9e3dadcf0a87ff598984d7cc1eabdf6fecb625b6357f4ec2dae4fb6d
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
deleted file mode 100644
index 9cce5d2d98f2..000000000000
--- a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
-
-https://gna.org/bugs/?23714
-
-https://bugs.gentoo.org/show_bug.cgi?id=550764
-https://bugs.gentoo.org/show_bug.cgi?id=566328
-
---- a/src/subtitleview.cc	2015-12-24 01:52:29.322622155 +0100
-+++ b/src/subtitleview.cc	2015-12-24 01:52:44.210491213 +0100
-@@ -1363,7 +1363,7 @@
- 	{
- 		int num;
- 		std::istringstream ss(event->string);
--		bool is_num = ss >> num != 0; 
-+		bool is_num = static_cast<bool>(ss >> num) != 0; 
- 		// Update only if it's different
- 		if(is_num != get_enable_search())
- 			set_enable_search(is_num);
---- a/src/utility.h	2015-12-24 01:49:42.205104858 +0100
-+++ b/src/utility.h	2015-12-24 01:50:23.387737071 +0100
-@@ -91,7 +91,7 @@
- 	std::istringstream s(src);
- 	// return s >> dest != 0;
- 
--	bool state = s >> dest != 0;
-+	bool state = static_cast<bool>(s >> dest) != 0;
- 
- 	if(!state)
- 		se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
---- a/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:24.125428454 +0100
-+++ b/plugins/actions/dialoguize/dialoguize.cc	2015-12-24 01:06:42.630277006 +0100
-@@ -23,7 +23,7 @@
-  *	along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
-  
--#include <auto_ptr.h>
-+#include <memory>
- #include "extension/action.h"
- #include "i18n.h"
- #include "debug.h"
---- a/plugins/actions/documentmanagement/documentmanagement.old	2015-12-24 01:17:13.914730337 +0100
-+++ b/plugins/actions/documentmanagement/documentmanagement.cc	2015-12-24 01:17:23.339640430 +0100
-@@ -178,9 +178,9 @@
- 
- 		ui_id = ui->new_merge_id();
- 
--		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
--		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name);
--		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name);
-+		#define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
-+		#define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name);
-+		#define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name);
- 
- 		ADD_UI("new-document");
- 		ADD_OPEN_UI("open-document");