gentoo resync : 10.02.2020

15 files changed, 49 insertions, 36 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 674a0fd8a123..083ee3b9a3b4 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 3afd441be502..c98ddead1c19 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,8 +7,8 @@ DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-18.3-r1.ebuild 9604 BLAKE2B 51a6fc43bc576276f81049a5c3cea4fc94b16cf67bcb760437f9ed841d349c4bda26d476d510c07d90061cc9e4cbc95dd4ef9f33e6573e6b067f714b84129ed0 SHA512 a9ea9f100e85c6733e60cc4bdc1d878fcd4dbf0e91ae2963aeaf500ba21f5ed571b402a4a1aa996d08db47a381f2e9d3399216d7f4f3fcd803944aa313586fc6
-EBUILD kodi-18.4.ebuild 9488 BLAKE2B 7f278c00289c8e2fc6451168a62368ec1246f8713003ac81f53d4f558a9a2aad9f248717580e3eca29d53ef137751ebe770a1967676f8d5da92ea2d1047e06f8 SHA512 9166241c682630730ece6102827c6a41c62ab7fcd503b01b8464b60edee20ac9dcf28919806c74a4a11b6083620e047b7cdc466a72f28c860fc1655318380f11
-EBUILD kodi-18.5-r1.ebuild 9455 BLAKE2B 6af53fccd8cdc987743446019e7d600e1d4337e6ced4b2e1be3262b72f42716adf5ec1891b341a0ae88e876f822ec69f8a9668680a095ffce9029ed82c44a07f SHA512 c0089e4a92881919534e14a79eea653fb01bfe268c09cb189abf9f6c12e721f08997c715f0bb6328db92af03dbf4018bac5d56df5ae10c9805b9f81b69f9e58b
-EBUILD kodi-9999.ebuild 8890 BLAKE2B 6bd3fdc563714568ed4ace2cba97d7f6d528c42de5dbcb55653525b57ee7d8898ffdeb533f72d30b21501987843e2d87725698885519bfbc20647505c484aff1 SHA512 8706b41a2757493d1890084a9dbc991f17ead0b4f97b2db4d6624fdec4e1852c1c6b637467581accb093cea9aa8d7cd5aea30dd87712ac052c07be882d652fb8
+EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de281d0a6540dfe9f6d203fdc263465274e9440cf1919dd64eff769b41a9d44db5aaddb34f9f33dffe5c0a9ca43 SHA512 81a975e03150e5da65928d2730299649fe94ef5538f4577cfeb26eee39cd888b7fec2b5fc4d9d8b814ff8e74c619f4ef00d840a05dd279547524f1743ed19d89
+EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
+EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
+EBUILD kodi-9999.ebuild 8933 BLAKE2B 628426f420f50a98366698d3fd41040bdceb7505fc5d77a8fdb076b42ea196c67e80a90c7490a15a94ee8301c560e233bd19c7a2a44f7e2e10ed73de04a86d6f SHA512 9ffb0ff474db08d9e77519954117e2c8c9f0d499ea000f3b68c21475962eb9fbcbac8bde45e6415b3959c63d1649834cab1fa2c412ae799e73b95d738025d6b2
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index a249ef137d27..ea0a6609f660 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -73,8 +73,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
@@ -305,11 +305,11 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
 	newicon media/icon48x48.png kodi.png
 
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
 	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
 		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
 
diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4-r1.ebuild
index f5af05243ea0..3b37458b80ec 100644
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ b/media-tv/kodi/kodi-18.4-r1.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
@@ -308,11 +308,11 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
 	newicon media/icon48x48.png kodi.png
 
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
 	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
 		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
 
diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r2.ebuild
index ffe5d7416b7d..9b455201ee36 100644
--- a/media-tv/kodi/kodi-18.5-r1.ebuild
+++ b/media-tv/kodi/kodi-18.5-r2.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 96f3f5e54a1d..c78d67f3d625 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -71,8 +71,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+	')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index c3380d5647b7..b3e884218a8e 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -12,9 +12,9 @@ DIST plexmediaserver_1.18.3.2156-349e9837e_amd64.deb 87197768 BLAKE2B 1dfb42a025
 DIST plexmediaserver_1.18.3.2156-349e9837e_i386.deb 74116200 BLAKE2B fd5b152704c9c646fce9e2a139c0ac9d500d2514e2fc050d788bd5a65df55df4d7db8b17b0160623738add3f8ca29d3566741cf3c47866d09ac96f4e035e9fa0 SHA512 4a489b807e5f6b0624a879e29eac6816a3dbd31eb8286c76263904c59c7be481dfd6754a5e14ba6ee2247c851cfd0762ca3e4a3004ca5b343bf53a5a1e143552
 DIST plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb 86833802 BLAKE2B a59b1ff4f4475b87464e6a7fe441258c95e19db86649bfb5110a1f1a2a5382c847a9d146dec48b726bd8d34622da04dfc31d460f9c91f44f551ab5a87e8ff4ec SHA512 b2106a43996ebbddd179101ab7c054ca7576f6cd60892c78354106875a13e22283fdcddfe39041acc2dc60690a40029edd213651938b04f002fe3680da13d707
 DIST plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb 73659238 BLAKE2B 3be12b14359f0e7f46f40328414855ece7c36d4cdd0c01dc30cf225ec3e7aef06504b8c2117f634e4ea0960aa387e2d2cfacb2e697d788befa1b76bc973aebf8 SHA512 9641ff170ea3379cf0b6351167206b2923194e831868b1c2245da7bd3a63af12f17ba27c42bd4b4cb8f00bb844e1be6b7427912d1f06096c6e701f579f918d66
-EBUILD plex-media-server-1.13.2-r1.ebuild 5111 BLAKE2B a695cebc1611c173f517c3618efd7733eaadc365d8a9d9519321d55fa0e34cf3101ecc630baf5614387cd3216d1aaf8d2eb76ccc904845d64918a4dde0ea4096 SHA512 9b31ceffb0f1de25250d865e11543851a08f53ba2568f2108bc98b069d295d97ea300baae50a5f9ce2a63aa36242f0162896dfdd6e9b9a428f0effe4a5de4348
-EBUILD plex-media-server-1.14.1.ebuild 5107 BLAKE2B 045768a008b2c7a20ec999bb7a04703aa86020c17cd7038255476793e5633873a239edff0580770d3b8d7d644dec336edae9380af5ae18c0949f8d87f636647a SHA512 a66db8f7a13c4d45b94f4c2f1f29d61c22eabcaf035d00226c860fcb44aba68d709cb9304ca85e0fc530cffe870668c7acba57fc11ea7ce483fbebef21d04802
-EBUILD plex-media-server-1.16.4.ebuild 4067 BLAKE2B bfc37ad99b0bada0e859a83c23a906944209d7c6b38da471f79802dca89716a274513ce85e84f4fd2a083b723733a9191262755356dd30429f5dc47307699685 SHA512 cfd87eba01fc50238bdcd94ca01d74e74281b58f9d4f71d6bd1e8e97189ab7a6077bb1640f5f23cb62febc27701d2c332da2bc4460af595fd74d93f0032b3d13
-EBUILD plex-media-server-1.18.3.ebuild 4433 BLAKE2B d2f1488336132a93aa99d408587d04cac5058b641d698529c10d4034daab6f84782f5a6367f8feb07547f6054e7dc6e3371587f0a6a9aa0025dba6e1fbdbc7e8 SHA512 913127571255dc119a7544087b69a34531b5d64be14abe9a6085cfa0d790efdd80f59e06318a4a918f00190ceec557409484f59b905600d323e7deb7e3fb6e43
-EBUILD plex-media-server-1.18.4.ebuild 4433 BLAKE2B ac17d0c743950abc3fdcdbff7b006b7b2a2d99eaa1b9058c665cbca469a95b9c827073a35ad26b953fd7209634aca36e253c7af83b11ce2aa3c16b51dd31ab84 SHA512 ba54d4449d13e425e7d36bfdb8091aeb47327a37ef539232daf129821e4a28e09cc5cdc84d4ad8723802e9a8aa830de0e1713eddc3124bca559da5cc3acb576e
+EBUILD plex-media-server-1.13.2-r2.ebuild 5123 BLAKE2B 04f0a4091a90979384aa6efef6ed6b28a54b513cda64aac9bcdf70cd34e75af2c35f6ef42872e66ee700c7fce9be5bf7642ef71dd79b2e410c3cf088fc54ee0b SHA512 9155367e90b151a3fc3b24335918180a887034ac02b066e2b5071d8f287f14bb3cd839f3cf1fa02fc91f78dd613971ce8633641eb239e82cf8ddfbef9666d5d1
+EBUILD plex-media-server-1.14.1.ebuild 5143 BLAKE2B f900cd6ef41a11d4dad5dd9890df908361cbdbacfd7c84fa92c305587041824f240134afe2f765b2495ec6fdb7850080a61db93ac1cd0c467a2f3b8ac541d611 SHA512 e80505106e73d0eefe2813a477ace830a18ea094797cf5674225a3482078a1193e3acd328bb3874f969d835205baa787c2e2eb6d0580c1c6e340c029b46f490c
+EBUILD plex-media-server-1.16.4.ebuild 4105 BLAKE2B 7f7a2c21fad0b0b8de58cba982a27dbeaf6897a59dd7fd55bd3940881d7122c3edc751dd7a998e7e5a59de65979a055809fdc53554f2a4e6357cf4fdee13a8fa SHA512 676006b0c5ab0d2b2aa46aa202c6fa1dab64e4e6ce6ce606ac81f3cf25ad108bacde2bc0b0929aa6eafe34777242f001d297b4090252bc1d9661ab39b3bbc65b
+EBUILD plex-media-server-1.18.3.ebuild 4471 BLAKE2B eccc5c50e3776b2a75f3b9e5e39fbf173b9810296bb1ab9a3d8ebbf55de1352a93f625f1db8b7af6fcca5e266d07e8eae551388546823cd9c26fdedcb16a485e SHA512 2e250e2a7679bb20dabe8aa25ddd8c864f0de3878b97303901e400824250d64b8c26deab08c4ae9b811951efff600d7af463fa570cf70c9f785f5caf59b30605
+EBUILD plex-media-server-1.18.4-r1.ebuild 4447 BLAKE2B 1a38bf8e223d4510721a39a2565ee67c78e7f35ce066fb71455e252ac7790c3a7f3b883642b1285831e17b284506a8cad6921e8a9fab8c5186bc607bfd673ded SHA512 94d04736749f38a941fd5cde705d1e782871995b4e95750da307dab8932fb870237a9145e8ce1ed316e5a0d4f7b84248edce8f30bd459174a70e81e48bb04f97
 MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
index 8b47a10cad28..3633cd824ba6 100644
--- a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	net-dns/avahi
@@ -59,7 +61,6 @@ src_install() {
 	# Move the config to the correct place
 	local CONFIG_VANILLA="/etc/default/plexmediaserver"
 	local CONFIG_PATH="/etc/${_SHORTNAME}"
-	dodir "${CONFIG_PATH}"
 	insinto "${CONFIG_PATH}"
 	doins "${CONFIG_VANILLA#/}"
 	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
diff --git a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
index f37b60268a7b..57039153cea1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
index 1fa5d4363cc5..b939c7a780c1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,10 @@ RESTRICT="bindist strip"
 KEYWORDS="-* ~amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
index d4dc6a7ad1a1..8f2e0be664e2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,10 @@ RESTRICT="bindist strip"
 KEYWORDS="-* ~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="dev-util/patchelf"
 
 RDEPEND="
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
index 994795f17759..ff7382861de2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
@@ -27,7 +27,10 @@ RESTRICT="bindist strip"
 KEYWORDS="-* ~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="dev-util/patchelf"
 
 RDEPEND="
@@ -63,7 +66,6 @@ src_install() {
 	# Move the config to the correct place
 	local config_vanilla="/etc/default/plexmediaserver"
 	local config_path="/etc/${_SHORTNAME}"
-	dodir "${config_path}"
 	insinto "${config_path}"
 	doins "${config_vanilla#/}"
 	sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index 5957cc5518de..ba4509f02383 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -1,5 +1,5 @@
 DIST tvnamer-2.4.tar.gz 45272 BLAKE2B d00c584b95f2f1e3878dbf8618c9829412838b5ce72086b52620960a5d2a7b79768a78ae5e67230d7a83f12d1918f2428c5c0cccaadd1f08e5d4b1908ae31d34 SHA512 9271dca535910abed3f5ce24de4e65f7b951d2b6f80e07854bef06d52f7cdf40be8eb76934467ebae08bf919503a434c527a37caade1a3e696fbceb4446884fd
 DIST tvnamer-2.5.tar.gz 46030 BLAKE2B 4bad31df673b11671c8fb57c8e5d4ec8e7513ac63df6bf09d02943e06acab1c8d5f4d40f1d56b5e6a489ab27810aa85f82257df0b795a3ad5fdc4f63fcf5d976 SHA512 56233576a4f6e0b93535667f7d4e823cccba2bce785aaaed10415f5da1a3883fc29396a20fbffdca367fb9d3d748c6efa5b670eee43eece2631b28d640a5c180
-EBUILD tvnamer-2.4.ebuild 502 BLAKE2B ae58c1cffcc8c537b53e4df173cc17854fee032de606edc9516642db3626e6df48961842b4c694743ac86ab340ff06fd535a42eb328479c4c333ff1456299aea SHA512 519a1ada18c5952940e059768d99081231c0ed83db177a702d85fa78c825bedfd646e951e1059d21d94631608fd31aad4fb4abcbbecba70ac10f8f9ed277b7c5
-EBUILD tvnamer-2.5.ebuild 504 BLAKE2B b481e07f3ab5cbc8046fb553e4e49edc49c56b0c3dc3684149bfc8cb82c9f38308cc6562549dcf4e561fe6248b92c4a9aa84ba2724f39a9636b785c14242dc9c SHA512 07f5138412e5fbbb90287242027fd4daa19b2f0c2628a57d1746b0a57270846a9ac51dfa5a957b10de46391e44a6bf021c61c884d970997c5e9f1f96e12fd735
+EBUILD tvnamer-2.4.ebuild 492 BLAKE2B 1f9ffa330d3c1d13615a8d97538b087e4948690b6f427b4e72281c987fd24c27ba19ae6f041737dc33a15549b348648e91ce0f92d0fcebdd1384e6ec41ec6040 SHA512 5ebff75ac001625b6d8a7e9c2b805771bb808ee7358f6d280b4dd9ca08c2c3da1413272a13ab6d971dd8d484cfb1096225501332973575f8896076f0803a5380
+EBUILD tvnamer-2.5.ebuild 494 BLAKE2B b1db24b3ab41583c8b0c5f7598577d5d1e671a600eb5c6f1308182bf144e1f6132e42c7eab4298259f84211b735e4f2767c6e0ebca1158d9fc24ec4c0b6382a8 SHA512 f8abe622dfd872f61be4161806f6396881710a4e61348ba0af350972e41fee8231c2c7346f21e4046e75feb281bfbcab06349468793824f9d643a9171420e7e4
 MISC metadata.xml 379 BLAKE2B 79d429f9497154662e75f4693ab95c5251d65ed6ea06d3870e1f2a639cd470a9207d02ade929f10f9d0d7b0e91ad9629a899546ea02f40b6a4e5aeb5f846716e SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6
diff --git a/media-tv/tvnamer/tvnamer-2.4.ebuild b/media-tv/tvnamer/tvnamer-2.4.ebuild
index f871b3f6214f..3dfad7ee909c 100644
--- a/media-tv/tvnamer/tvnamer-2.4.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
diff --git a/media-tv/tvnamer/tvnamer-2.5.ebuild b/media-tv/tvnamer/tvnamer-2.5.ebuild
index 366b0815ec75..7e3ec1affa5f 100644
--- a/media-tv/tvnamer/tvnamer-2.5.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"