gentoo resync : 15.01.2020

19 files changed, 345 insertions, 359 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 1bef93c4b8f7..074b051e8b78 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 498894084b52..34153d75d01d 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,5 +3,5 @@ DIST gentoo-vdr-scripts-2.7.5.1.tar.bz2 49537 BLAKE2B a6f01cc7b30b8d289317cbebed
 DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
 EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3667 BLAKE2B d424ade9018e652c8f10da7909950758146c544a1e9c514393d3538b772e3cbd6689e02ba91c0a84da5189354903db41dc6067ca2f3966f5cdf51d2789df9549 SHA512 d48efb3d75d25a15786942e6c1c30c90a31d1f11ad8c2911b6fe33702802a39878360308a9e351e21aa891ffb67781367c5b851eb348d73b83c6c36207214520
 EBUILD gentoo-vdr-scripts-2.7.5.1.ebuild 3546 BLAKE2B ac8e75c6839c65802be894b9db12e4945cd44664503f34ad4175c358c73871022a4ba978519921ce8b0161ef8211fcc06409119624d2c4d001faa3b84913349e SHA512 273fd9d1425e3fff0ea6b783d4bddd407dda669a328bdabcbe488118e228717c8c2fea9de63bd45158c0c7abadcc5152066a8e16727cfbb269350739146d0421
-EBUILD gentoo-vdr-scripts-2.8.ebuild 2382 BLAKE2B 608c0004beffd857fe01d31204ad0a48be735e2ed3cf644c6823468b4f5eef864a48b7c14a25a129bffe93903d70014f6d20f6599e0006419a75dcc8a7d424d9 SHA512 5ba4436020c2c7e5d2ea53b6c9afa0f820ab33847fb4d1ffdd8825be069d8a547e4059de5b6cad74ef48522430d24cd87096b4cfdb9a75f189c55677f9812c1c
+EBUILD gentoo-vdr-scripts-2.8.ebuild 2381 BLAKE2B 5a42866917ed7f81c26e2222e87792b5a1da6c9ada7a666da1530b07ab26cab90a466d2d8d2710fc70c599c1c73b67224485b5051056ef05a2279b664bf03a59 SHA512 05499d1ff6e7908fe09ab4b2cd34a8e5c3d4104256050db2d6569729a606e60ceec634ebdb899d4328ab92f9d78629ade2b57049461301ca36eb9d188a7e331f
 MISC metadata.xml 354 BLAKE2B 74ce746b4c49b338ad17df430f4aa1c11cad86684bf3c3003f2c2c2fc979435b53b5e30a997f009c53ea57d8441d09cc113b45ceaabc0a1d62f58e78ba73daae SHA512 9607950224075c12bcd9a43aef5cc3dd640cedee6689986713b10b2df1441a7694f8a527f03b66c15139dcaab917249ebd0899031432f545fe74a62aeabdce9d
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
index ec0010a562c0..fd2aabc27022 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.8.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
@@ -51,7 +51,7 @@ pkg_postinst() {
 	elog "${CATEGORY}/${PN} supports an init script"
 	elog "to start a X server"
 	elog "Please refer for detailed info to"
-	elog "/usr/share/doc/${PF}/ README.x11-setup\n"
+	elog "/usr/share/doc/${PF}/README.x11-setup\n"
 
 	elog "systemd is supported by ${CATEGORY}/${PN}"
 	elog "This are described in the README.systemd file"
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index dd76610fc1b2..3afd441be502 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 9645 BLAKE2B 9102f2003a7ab09a9d46bf516a103b7376ac6030f6ed34e839792b02807f5d08bd0009136d68a1e622c4e582d5b0aab13cbd02328b77382a896fb2a26ec93dfc SHA512 a68d9e579747b3aae539807f7753f0f1d65161d34b1d574c793745739e5f38487abca33b93d1964aa9cb52bb06f6f9751281a970ef9f00c078313de45118fe03
-EBUILD kodi-18.4.ebuild 9529 BLAKE2B 1320de2aab6b549a7d8558dac07c84ae0af973235ccc57116750fa167c9dd8b6a19f0307c3815fca8b8622605bb12a988b669f906ebf0ea843f0939553e25348 SHA512 86602e065566c58f69b27cfe73bb5bbe3fd7c4d1f7de94a38982970e5217d8c7bc126590dd2a0119f59f81f508d62c41d392016e084c23d9f533fd41974eb2ca
-EBUILD kodi-18.5.ebuild 9484 BLAKE2B 37355976d09a2f57e41f4f267910fe96497170ebc4db273dfad02f0f2b525de684ae375627ee3fad901cdf7195048828020de4c2ad6ca580f03cc212dea6d11c SHA512 4034009ebe07284897f9cd86ccf71b396b720286d34b5500ebe1496381a1b1589c72d670eeac29cdf0951bcb719aa966db4532fe962308447b4a6bf0f84e2e93
-EBUILD kodi-9999.ebuild 8919 BLAKE2B 6146c4c39a8964700b9654b4b6762611819f70f3cdb821a3ccaddc8a511d7f05fd9c40aaf7451cd1bb930b7c0b44754cfd674f3d54b8c97739a8bee294ccac39 SHA512 66da8f35dbeef47e494123302a6da65cfa14a160cffd9eb88e78bb053a5d5a138620469e132c4576c49f676cb5d0120a46439c893332295464901399628edb46
+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
 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 477b728c91b2..a249ef137d27 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
 else
@@ -31,7 +31,7 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
-inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+inherit autotools cmake eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -191,7 +191,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580
 	sed -i \
@@ -291,19 +291,19 @@ src_configure() {
 		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile all
+	cmake_src_compile all
 }
 
 src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild
index d0bde5b7f3d5..f5af05243ea0 100644
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ b/media-tv/kodi/kodi-18.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
@@ -19,7 +19,7 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
 else
@@ -34,7 +34,7 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
-inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -194,7 +194,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580
 	sed -i \
@@ -294,19 +294,19 @@ src_configure() {
 		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile all
+	cmake_src_compile all
 }
 
 src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
diff --git a/media-tv/kodi/kodi-18.5.ebuild b/media-tv/kodi/kodi-18.5-r1.ebuild
index f8dc1e170749..ffe5d7416b7d 100644
--- a/media-tv/kodi/kodi-18.5.ebuild
+++ b/media-tv/kodi/kodi-18.5-r1.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
@@ -19,7 +19,7 @@ PATCHES=(
 )
 
 if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
 else
@@ -34,7 +34,7 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
-inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -107,7 +107,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
 	libressl? ( dev-libs/libressl:0= )
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
@@ -194,7 +194,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580
 	sed -i \
@@ -293,19 +293,19 @@ src_configure() {
 		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile all
+	cmake_src_compile all
 }
 
 src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index c3c40213e110..96f3f5e54a1d 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.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
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.0.4"
 CODENAME="Leia"
 FFMPEG_KODI_VERSION="18.4"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -29,7 +29,7 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
-inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
 	libressl? ( dev-libs/libressl:0= )
 	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
@@ -181,7 +181,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# avoid long delays when powerkit isn't running #348580
 	sed -i \
@@ -281,19 +281,19 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile all
+	cmake_src_compile all
 }
 
 src_test() {
-	cmake-utils_src_make check
+	cmake_build check
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index e79ba761089d..c3380d5647b7 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,16 +1,20 @@
+AUX add_gentoo_profile_as_platform_version.patch 616 BLAKE2B 5331ad91139aa69944aa5c263609985c87315a67f3d5633e8f3976aa010f39f50e563d0b3b5259ebd1ce3437560ba8d95a71e304712a35bb8150ac0684a56107 SHA512 53e99d8a24a23f0c530ab955f5a4a9938c4e06056d3107f899883094690dd9426d0951ea695628351afa3e971a4f59827b6c8dcae323718d24450c74bd78769a
 AUX conf.d/plex-media-server 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe02a12c3ee986c1078ae0a46d974adc25dce252a49c3fd72e0dfe1ba65c49d575e12036fba44ce9b0390da64ec SHA512 d3d68fa58a1c1064803a9607708123302890571e823e5bc26de741bb15bd51db19234636672ff01757cbbcdb984c60663545689fa915761c78c3cf49e6da0f95
 AUX init.d/plex-media-server 413 BLAKE2B f60fe9f653c591cddaf77a0ebcb47218681a63235e82bc016c7d2ee9180df7f6ff24f3784216ea370bdc2d493531492f196200b6ec56ff8b303e69adaa0f108d SHA512 aeb873a00081f20abd27cc76d395908ae0643bd8aa665557adafef2ed97edbe93c18b55818b49227746f9c3ce4b7a81ceb9132f07d8d873bc7b5a932b944a402
+AUX plexmediamanager.desktop.new.patch 350 BLAKE2B f52186623be0ee3e4e1414639c69a39cd83f4a45af4854a6bf2c4f6e3d51dab3d16539d554f80dbb432dcb97f6171097677ae9e24486167802d2cf93fe4c2f63 SHA512 e7e97ef8d39ff0e9220026d282febaa2613f8cc96253a9f801f1f2af5c60c3780391cdada98f921cf0226156a2347db982cf814e6aa446b07e9ae6b1b96c9525
 AUX systemd/plex-media-server.service 159 BLAKE2B d4988890f6424e0b9160e90df0125fbcb32e86443c5b869f66ac6e28c3701fdaa3dd819823edd0c8675792bf4e24e7fcf3bb8894e55539ad8fc5eb9ac9a550fc SHA512 9066840efa43b127dd0d4b26ea0552894db97bf48f89003258095986e7d4728e05bee2f49de856777ed3d0b5ec41654c14505bc9867b227b754aeecd0529abd6
 AUX virtualenv_start_pms.patch 839 BLAKE2B 20d6a53b40a2c714153bc7f04c2bbad568b75197cd450cb52129cc3718fad1db09f9fe2a92e8608e1e95b710e0b4af58a373650ab4017438b63fe61132f13d75 SHA512 55fb8f3234942d10c0d6d1820fbab48b8a9f26f069031946dae551cde8b7d18d61ef36ec994719d2519687dc75e5ec27205702395a8af112bda720b7a62072aa
 AUX virtualenv_start_pms_2019.patch 430 BLAKE2B 397f059ab4a401bb92dc71a763a3c2ce385bcb0d3fc001629b5b9c2a740b862c086bb9d62592897e39e9fa8849671a2b961b8653de27d8c80e66c4b749a34982 SHA512 e6611cf2831701dabba08c4e9cdb8a8689da4cabcc720d4236b8c193ef7bd97e68451c82573f062cd0fdfd8d758cb0f4b7be5f09514b5e08313001e4ad68489b
-DIST plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb 108830880 BLAKE2B 7ed912756b8bdedb695c4cbf99d0565da53904814cedb8e026614b8db9bb638cbd437f35e05915d6d22221c87ecf1136ea9ae08797bca2ebbe4f2e0a861b4841 SHA512 0bda324e733b1e86e8dba7c10f6bab3e9dad5463113c5998059492bd7d4a49e105068d1d9313c9405d7a3c85c99e6528be6c0f1c9f52db115a1da1545a9485b5
-DIST plexmediaserver_1.12.3.4973-215c28d86_amd64.deb 109277946 BLAKE2B 6a868943c77a1355dd0a4dbe88323b937d827dbfe84e729cf1f5c5c7d4a7d44e9af7e69121a7e3cf9f5d60786c9877bd3e303d9d5d301c86f08984afb1062730 SHA512 1befe9196926bf4cabd1f9c746e958efc72392479a844f8c3d9161282618fe28e29dbb9c12ddccf5db5b852ae58cd43dc0d988f00732431e16106021c8618347
 DIST plexmediaserver_1.13.2.5154-fd05be322_amd64.deb 111093662 BLAKE2B 26b1161107a8f9223f7065ff4119a32470c06794a159a42181b9278107a6d14f9fbb582e515223aaa659e9007d9b18299cd65b2a068e1d7dd934d52552a44cd1 SHA512 548c033272d56f6c54ab073536327b285fdbda3192c203a3ea3ff2b6c7afbc79ba7d56d7251f623ca1e09db572c92000d7baa7a8a555d853d85fdb9d1dfb8479
 DIST plexmediaserver_1.14.1.5488-cc260c476_amd64.deb 105175642 BLAKE2B 59f7cc130115ae2179bcf0ddf5ef4583886c11447c423ada2b1da62f83c3840c89aa2b6d9c56e3a358d1da03bc9a6bd340cae7fee1b6da102e9bc785de4f8e27 SHA512 48f25ac27a8dc5d1a4ae74a04793994bb21431ed3069a9808373e0c5a424fd53f577d0912e1e46a155133b094bdafb7edeb5b6c9ef428a08e07e24e055267e86
 DIST plexmediaserver_1.16.4.1469-6d5612c2f_amd64.deb 74427444 BLAKE2B f90973aaadaf8e11fbcaa0aaa817a11b62049b1eaa22c04daf65d4fc21e73eb90d982e3faa66b482fdb4e7b53467246e20845c432920718334c5419c760e85bd SHA512 0753e82d4cd2c5a35f8f62329c3013eff297edd1bf9afcfd1444c3f3f85d33b3aec4a553c70931182d3a45df44dd26ce10ddbee9b59755914c988f0edbe5aa70
-EBUILD plex-media-server-1.11.3.ebuild 4677 BLAKE2B a383ba8725a3b464d4f26df41db9823b6f63d704d7071723a92d03e07b3e40619afefeb64991e4a9051a47c0d2943416aa3da906cccd9033fbb8d91d29a1fab0 SHA512 b2b97885dc31e520aac8278df291c03c81169931940ec65aa5197957dee2bffb18ac32e11c1e049b14a196a9b5c096f210b439efd7800e9cac8d7e3743193682
-EBUILD plex-media-server-1.12.3.ebuild 4737 BLAKE2B a08d70d804e55777bdda1b67ed3438cb94013f93c2020a1c175c4839c0dc3d6f2727045be262a8ff01225666d006899dd11817f9d2309ea6b788744c8ee1c4de SHA512 18e182da95d918349f59bec88f860442dd4bef8778abbde77db8d7cd88db9c83dfb6f654afff9554101880a87542e7309f2e3411a70e159990e1417d86f97af3
+DIST plexmediaserver_1.18.3.2156-349e9837e_amd64.deb 87197768 BLAKE2B 1dfb42a0258c5a4ff93ac38ab4abad5c17ba3c0a26db85554fa43c72ad46416bcd15bea2a33114a17ed59a73c1b4b74953560f15db3df7eb8e00f3aeb090d4d4 SHA512 82920a25b6a73d929ee2dc776ae025d427248513b1590cef80224a2173c70f6354ec32a27d3e8e49d5f67ff3c77c57531a55d031a03fbd82034c301aa99a71ac
+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
 MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
diff --git a/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch b/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch
new file mode 100644
index 000000000000..eaf49067bf2c
--- /dev/null
+++ b/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch
@@ -0,0 +1,12 @@
+--- a/usr/sbin/start_pms
++++ b/usr/sbin/start_pms
+@@ -4,7 +4,8 @@
+ export PLEX_MEDIA_SERVER_INFO_VENDOR="$(grep ^NAME= /etc/os-release|awk -F= '{print $2}'|tr -d \" )"
+ export PLEX_MEDIA_SERVER_INFO_DEVICE="PC"
+ export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"
+-export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(grep ^VERSION= /etc/os-release|awk -F= '{print $2}'|tr -d \" )"
++GENTOO_PROFILE="`readlink /etc/portage/make.profile`"
++export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="${GENTOO_PROFILE#.*/profiles/}"
+ 
+ # change these parameters in /etc/plex/plexmediaserver
+ export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
diff --git a/media-tv/plex-media-server/files/init.d/plex-media-server b/media-tv/plex-media-server/files/init.d/plex-media-server
index 102ac80c287c..102ac80c287c 100755..100644
--- a/media-tv/plex-media-server/files/init.d/plex-media-server
+++ b/media-tv/plex-media-server/files/init.d/plex-media-server
diff --git a/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch b/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch
new file mode 100644
index 000000000000..a7f86de369ae
--- /dev/null
+++ b/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch
@@ -0,0 +1,8 @@
+--- ./usr/share/applications/plexmediaserver.desktop	2019-01-02 13:53:51.000000000 +0100
++++ ./usr/share/applications/plexmediaserver.desktop	2019-01-04 07:52:25.910331212 +0100
+@@ -6,4 +6,4 @@
+ Icon=plexmediaserver
+ Terminal=false
+ Type=Application
+-Categories=Audio;Music;Video;Player;Media;
++Categories=Audio;Music;Video;Player;AudioVideo;X-Media
diff --git a/media-tv/plex-media-server/plex-media-server-1.11.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.11.3.ebuild
deleted file mode 100644
index 0d8c34abcbf4..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.11.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils user systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="4803-c40bba82e"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR_VERSION}"
-
-URI="https://downloads.plex.tv/plex-media-server"
-
-DESCRIPTION="A free media library that is intended for use with a plex client."
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
-SLOT="0"
-LICENSE="Plex"
-RESTRICT="bindist strip"
-KEYWORDS="-* amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	net-dns/avahi
-	${PYTHON_DEPS}"
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/${_APPNAME}/.*"
-	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
-)
-
-EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
-BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-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
-
-	# Remove Debian specific files
-	rm -rf "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	local LOGGING_DIR="/var/log/pms"
-	dodir "${LOGGING_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
-
-	# Create default library folder with correct permissions
-	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
-	dodir "${DEFAULT_LIBRARY_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
-
-	# Install the OpenRC init/conf files
-	doinitd "${FILESDIR}/init.d/${PN}"
-	doconfd "${FILESDIR}/conf.d/${PN}"
-
-	# Disabling due to Bug 644694
-	#_handle_multilib
-
-	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
-	# Plex has its own precompiled libraries.
-	_mask_plex_libraries_revdep
-
-	# Install systemd service file
-	local INIT_NAME="${PN}.service"
-	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
-	systemd_newunit "${INIT}" "${INIT_NAME}"
-
-	_remove_execstack_markings
-	_add_pax_markings
-
-	einfo "Configuring virtualenv"
-	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
-	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
-	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
-	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
-}
-
-# Disabling the follow function due to Bug 644694.
-# We shouldn't register plex libraries in global
-# library path since this will cause other packages
-# on the system to break.
-
-# Finds out where the library directory is for this system
-# and handles ldflags as to not break library dependencies
-# during rebuilds.
-_handle_multilib() {
-	# Prevent revdep-rebuild, @preserved-rebuild breakage
-	cat > "${T}"/66plex <<-EOF || die
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
-	EOF
-
-	doenvd "${T}"/66plex
-}
-
-# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-# so it doesn't try to rebuild libraries that can't be rebuilt.
-_mask_plex_libraries_revdep() {
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
-}
-
-# Remove execstack flags from some libraries/executables
-# so that it works in hardened setups.
-_remove_execstack_markings() {
-	for f in "${EXECSTACKED_BINS[@]}"; do
-		# Unquoting 'f' so that expansion works.
-		fix-gnustack -f ${f} > /dev/null
-	done
-}
-
-# Add pax markings to some binaries so that they work on hardened setup.
-_add_pax_markings() {
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
deleted file mode 100644
index 9269358d163c..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils user systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="4973-215c28d86"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR_VERSION}"
-
-URI="https://downloads.plex.tv/plex-media-server"
-
-DESCRIPTION="A free media library that is intended for use with a plex client."
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
-SLOT="0"
-LICENSE="Plex"
-RESTRICT="bindist strip"
-KEYWORDS="-* amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	net-dns/avahi
-	${PYTHON_DEPS}"
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/${_APPNAME}/.*"
-	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
-)
-
-EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
-BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-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
-
-	# Remove Debian specific files
-	rm -rf "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	local LOGGING_DIR="/var/log/pms"
-	dodir "${LOGGING_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
-	keepdir "${LOGGING_DIR}"
-
-	# Create default library folder with correct permissions
-	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
-	dodir "${DEFAULT_LIBRARY_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
-	keepdir "${DEFAULT_LIBRARY_DIR}"
-
-	# Install the OpenRC init/conf files
-	doinitd "${FILESDIR}/init.d/${PN}"
-	doconfd "${FILESDIR}/conf.d/${PN}"
-
-	# Disabling due to Bug 644694
-	#_handle_multilib
-
-	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
-	# Plex has its own precompiled libraries.
-	_mask_plex_libraries_revdep
-
-	# Install systemd service file
-	local INIT_NAME="${PN}.service"
-	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
-	systemd_newunit "${INIT}" "${INIT_NAME}"
-
-	_remove_execstack_markings
-	_add_pax_markings
-
-	einfo "Configuring virtualenv"
-	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
-	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
-	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
-	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
-}
-
-# Disabling the follow function due to Bug 644694.
-# We shouldn't register plex libraries in global
-# library path since this will cause other packages
-# on the system to break.
-
-# Finds out where the library directory is for this system
-# and handles ldflags as to not break library dependencies
-# during rebuilds.
-_handle_multilib() {
-	# Prevent revdep-rebuild, @preserved-rebuild breakage
-	cat > "${T}"/66plex <<-EOF || die
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
-	EOF
-
-	doenvd "${T}"/66plex
-}
-
-# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-# so it doesn't try to rebuild libraries that can't be rebuilt.
-_mask_plex_libraries_revdep() {
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
-}
-
-# Remove execstack flags from some libraries/executables
-# so that it works in hardened setups.
-_remove_execstack_markings() {
-	for f in "${EXECSTACKED_BINS[@]}"; do
-		# Unquoting 'f' so that expansion works.
-		fix-gnustack -f ${f} > /dev/null
-	done
-}
-
-# Add pax markings to some binaries so that they work on hardened setup.
-_add_pax_markings() {
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-}
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
new file mode 100644
index 000000000000..d4dc6a7ad1a1
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="2156-349e9837e"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="A free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb )
+	x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb )
+"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="
+	acct-group/plex
+	acct-user/plex
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+BINS_TO_PAX_MARK=(
+	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+)
+
+S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}/virtualenv_start_pms_2019.patch"
+	"${FILESDIR}/plexmediamanager.desktop.new.patch"
+	"${FILESDIR}/add_gentoo_profile_as_platform_version.patch"
+)
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+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
+
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}"/ || die
+
+	# Make sure the logging directory is created
+	local logging_dir="/var/log/pms"
+	dodir "${logging_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}"
+	keepdir "${logging_dir}"
+
+	# Create default library folder with correct permissions
+	local default_library_dir="/var/lib/${_APPNAME}"
+	dodir "${default_library_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}"
+	keepdir "${default_library_dir}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Fix RPATH
+	patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die
+
+	# Install systemd service file
+	systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	elog "Plex Media Server is now installed. Please check the configuration"
+	elog "file in /etc/${_SHORTNAME}/${_APPNAME}"
+	elog "to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server',"
+	elog "you will then be able to access your library at"
+	elog "http://<ip>:32400/web/"
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
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.ebuild
new file mode 100644
index 000000000000..994795f17759
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="2171-ac2afe5f8"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="A free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb )
+	x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb )
+"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="
+	acct-group/plex
+	acct-user/plex
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+BINS_TO_PAX_MARK=(
+	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+)
+
+S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}/virtualenv_start_pms_2019.patch"
+	"${FILESDIR}/plexmediamanager.desktop.new.patch"
+	"${FILESDIR}/add_gentoo_profile_as_platform_version.patch"
+)
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+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
+
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}"/ || die
+
+	# Make sure the logging directory is created
+	local logging_dir="/var/log/pms"
+	dodir "${logging_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}"
+	keepdir "${logging_dir}"
+
+	# Create default library folder with correct permissions
+	local default_library_dir="/var/lib/${_APPNAME}"
+	dodir "${default_library_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}"
+	keepdir "${default_library_dir}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Fix RPATH
+	patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die
+
+	# Install systemd service file
+	systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	elog "Plex Media Server is now installed. Please check the configuration"
+	elog "file in /etc/${_SHORTNAME}/${_APPNAME}"
+	elog "to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server',"
+	elog "you will then be able to access your library at"
+	elog "http://<ip>:32400/web/"
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index d17002259581..5957cc5518de 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 506 BLAKE2B f0337b2f63a6aaae757f8fbda9b938a76bfe4e8aee44fcbf777099b2a0680921d93766b179aae2bda2c512207808153b2148b8791521ae7de43bca99db714895 SHA512 408a9c056b3e7eb25abbe63379508e13dd3c92862feb7b05d5876a1aa61b4ef2b6b07d76b97e0eb307d0ad21ca347d9d1d59085b6c05441f41c768341af70ebe
-EBUILD tvnamer-2.5.ebuild 508 BLAKE2B abf47f9fd290d1ccd3460eafbc2a964f063b17a7e7bfcd045df57bf1c10c935a9396d491fb95ab51b2a70bcdb8b2bdcc8c9d5f368b3eec12c9e298d1730c2129 SHA512 bb1e3389ee85bb217faa2122fc1b528f17597feeacb1ce3c53cd1343ca4217f30ff2aef4ef00d098f8c6d46defa97d1d2e6abf8cf7842551eb3c363d66532632
+EBUILD tvnamer-2.4.ebuild 502 BLAKE2B ae58c1cffcc8c537b53e4df173cc17854fee032de606edc9516642db3626e6df48961842b4c694743ac86ab340ff06fd535a42eb328479c4c333ff1456299aea SHA512 519a1ada18c5952940e059768d99081231c0ed83db177a702d85fa78c825bedfd646e951e1059d21d94631608fd31aad4fb4abcbbecba70ac10f8f9ed277b7c5
+EBUILD tvnamer-2.5.ebuild 504 BLAKE2B b481e07f3ab5cbc8046fb553e4e49edc49c56b0c3dc3684149bfc8cb82c9f38308cc6562549dcf4e561fe6248b92c4a9aa84ba2724f39a9636b785c14242dc9c SHA512 07f5138412e5fbbb90287242027fd4daa19b2f0c2628a57d1746b0a57270846a9ac51dfa5a957b10de46391e44a6bf021c61c884d970997c5e9f1f96e12fd735
 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 ad38278961b4..f871b3f6214f 100644
--- a/media-tv/tvnamer/tvnamer-2.4.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 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 4c1014a310cf..366b0815ec75 100644
--- a/media-tv/tvnamer/tvnamer-2.5.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"