gentoo resync : 14.05.2020

5 files changed, 34 insertions, 373 deletions

diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 287d3c5d593d..ed78ffe712e4 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -6,21 +6,17 @@ AUX plexmediamanager.desktop.new.patch 350 BLAKE2B f52186623be0ee3e4e1414639c69a
 AUX plexmediaserver.service.patch 818 BLAKE2B aa86ab75f500fbfc50cf607f75511664675e3180ef23c78690f982e9a284c2ae21420e95e91befd74c12d81eee6c65994323c59def3f56672bc42e1a5cb503d9 SHA512 18930ad1f610c63ede0df0c53beb39d21d762a09e6427493aa47293c595b96660ace9c780891ce1f49fcbece2324ddec6b0b431c4f82ac32be85fae8e7cd1600
 AUX start_pms 1742 BLAKE2B 82e5929186fecef32c653127524cff316c6576607649aa5ad7d973879b2f084140a75e41b35f5aa39f6599b7181a0cf5880be9d084494847566ead259828cea3 SHA512 c21739f8904f2ca82427f0c62a7305ab079f697205ad44ea4071e97d82fd56924abaaec0b4b056fbdf1c047491b7b46c1a711e4339c6bf0d482829185996367d
 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.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
 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
 DIST plexmediaserver_1.19.1.2645-ccb6eb67e_amd64.deb 90963992 BLAKE2B 470e0217bf42ce835b35fe08c7589f3b45ba90bc4281f549486e716b948dec88cade474ec969acc360358e778debd863fec7eef2bd5a1c53c2f2d723bceef4e2 SHA512 4bfff09efb8c0fc3832a50755b11a4be96fe642c50beaaf833bfb4689c8645428769ebb5c68f92bed82b89c61332f179cd2ca0c5b83424615a2738083da5843c
 DIST plexmediaserver_1.19.1.2645-ccb6eb67e_i386.deb 74806258 BLAKE2B 092ec3020c6d895f08804c9938508ae0f3009cf195263b0b2ee977044a194a93823b61ff58581b3e5c0312edf829fb8e88e13ea7345fb9a6afde7e7dfb77fb68 SHA512 5ec858a79e6211931459d116efcc7b6d372404713b74d68366fc03f4ae9bc30566d28190d32ef9c444ae994f67f5f86930967508611b335085854071f91e4c48
-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
+DIST plexmediaserver_1.19.2.2737-b69929dab_amd64.deb 91102918 BLAKE2B 44deeac4ba1922dbb8d1b3504447681db1ca6e56e1545e3dcc0f3a15812f9316d40456f0d95ad52e18d680dba7318f44fef20fb4f77e85e8a74de6645477fedc SHA512 4fb5fb617b56612cc00c181bc9cdf757c9df5c725975345d20adb3f656152b556c0120a48e7223c7a042663cbbd1b9da7e3ccf32cf2dfea4cc76ea5bc1b9893c
+DIST plexmediaserver_1.19.2.2737-b69929dab_i386.deb 74970900 BLAKE2B a29b6db4d21615458c4693f0bc560f552ad5e930a4b65c0b7c48055da3c092fdb3a65862a14fc82f92f117d5c03eecce9a74750704ce3dd976e4b1632490e226 SHA512 c48364f683d8a98c6fa70f1a7f16eb0a67313439670f981d54d107983c3ccc4358ddc2c45bc0e1bcdb70cd095f53c53df4625886dee3e050b0d7cccc96d6b8ca
 EBUILD plex-media-server-1.18.3.ebuild 4471 BLAKE2B eccc5c50e3776b2a75f3b9e5e39fbf173b9810296bb1ab9a3d8ebbf55de1352a93f625f1db8b7af6fcca5e266d07e8eae551388546823cd9c26fdedcb16a485e SHA512 2e250e2a7679bb20dabe8aa25ddd8c864f0de3878b97303901e400824250d64b8c26deab08c4ae9b811951efff600d7af463fa570cf70c9f785f5caf59b30605
 EBUILD plex-media-server-1.18.4-r1.ebuild 4445 BLAKE2B 7f5e55277cf0703b563a9d50badd9cb6471e0149c4d28d777eb6b8d44cc8a1ad7e46a3a78b3397dc57ef00ed0605561b7b5c67056f64cde88b5df668351c033d SHA512 81a87902ac81041faa53a4ce280cb1b035c8a8d32d26bcf3b3d21292c460b39f6cbe40693845f61c3c25ef4fbc424b7d8f9c1d8ed78f9bb71ab11057e1015314
 EBUILD plex-media-server-1.19.1.ebuild 4341 BLAKE2B be66c3be68a0a033594417527c39f3a468c48efde72e5791d1bb596838829f8e32613256192ba6ba370676b4b578cd3e21e4c59022a54d7aaa08476c49c8317a SHA512 dc9d311b9082169167eb4f46bf941efeb943371516d78db1ad71766f235c1489747fba4073eb6fe6e94fb584ccafa95fda026018d5252fa76f90639ea10de320
+EBUILD plex-media-server-1.19.2.ebuild 4341 BLAKE2B 04e5d06ebea929a20f8fe2b9ffe1319c8ff185451f571e90899fbcc6d11e189df80eddf3ede2b6ea919c537994dd0f28c2f911dddde53f116c18f9a55a72f248 SHA512 40b3936233ad9827de5bb71197a6c9f9852319293261f8866c88c24bd7d0b1dbe8f8d8758a43489d851a8dccf9b4340b1e9f2384d8a007347045654fe5243910
 MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
diff --git a/media-tv/plex-media-server/files/virtualenv_start_pms.patch b/media-tv/plex-media-server/files/virtualenv_start_pms.patch
deleted file mode 100644
index bb4d575240b3..000000000000
--- a/media-tv/plex-media-server/files/virtualenv_start_pms.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/usr/sbin/start_pms	2017-03-01 13:35:28.340489280 -0500
-+++ b/usr/sbin/start_pms	2017-03-01 13:36:05.574540305 -0500
-@@ -8,16 +8,20 @@
- export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support"
- if [ -f /etc/default/locale ]; then
-   export LANG="`cat /etc/default/locale|awk -F '=' '/LANG=/{print $2}'|sed 's/"//g'`"
-   export LC_ALL="$LANG"
- fi
- 
- test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver
- 
-+# Activate python virtualenv
-+. "${PLEX_MEDIA_SERVER_HOME}"/Resources/Python/bin/activate
-+
-+
- if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]
- then
-   mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR"
-   if [ ! $? -eq 0 ]
-   then
-     echo "WARNING COULDN'T CREATE $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR, MAKE SURE I HAVE PERMISSON TO DO THAT!"
-     exit 1
-   fi
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
deleted file mode 100644
index 3633cd824ba6..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="5154-fd05be322"
-
-_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
-	$(python_gen_cond_dep '
-		dev-python/virtualenv[${PYTHON_MULTI_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}"
-	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/
-
-	# 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
-}
-
-# 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.14.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
deleted file mode 100644
index 57039153cea1..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils user systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="5488-cc260c476"
-
-_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
-	$(python_gen_cond_dep '
-		dev-python/virtualenv[${PYTHON_MULTI_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/
-
-	# 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
-}
-
-# 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.16.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.19.2.ebuild
index b939c7a780c1..5c818884733e 100644
--- a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.19.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit eutils systemd unpacker pax-utils python-single-r1
 
-MINOR_VERSION="1469-6d5612c2f"
+MINOR_VERSION="2737-b69929dab"
 
 _APPNAME="plexmediaserver"
 _USERNAME="plex"
@@ -17,55 +17,61 @@ 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 )"
+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"
+KEYWORDS="-* ~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
 	')"
+BDEPEND="dev-util/patchelf"
 
 RDEPEND="
-	net-dns/avahi
-	acct-user/plex
 	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" )
+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" )
+PATCHES=(
+	"${FILESDIR}/plexmediamanager.desktop.new.patch"
+	"${FILESDIR}/plexmediaserver.service.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
+	# Install base config file
+	insinto "/etc/plex/"
+	newins "${FILESDIR}/etc-plexmediaserver" "plexmediaserver"
+
+	# Remove Debian apt repo files
+	rm -r "etc/apt" || die
 
 	# Remove Debian specific files
 	rm -r "usr/share/doc" || die
 
-	# Fix QA warning about .desktop file.
-	sed -i 's|Audio;Music;Video;Player;Media;|AudioVideo;Music;Player;|g' \
-		usr/share/applications/plexmediaserver.desktop || die
-
 	# Copy main files over to image and preserve permissions so it is portable
 	cp -rp usr/ "${ED}"/ || die
 
@@ -89,6 +95,9 @@ src_install() {
 	# 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"
 
@@ -97,6 +106,10 @@ src_install() {
 		pax-mark m "${f}"
 	done
 
+	# Install start_pms script
+	into /usr
+	dosbin "${FILESDIR}/start_pms"
+
 	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