Merge branch 'edge' into next

17 files changed, 405 insertions, 403 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index e38aa3304658..85d32f6c9713 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
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
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 2d4e9688769e..c8dbf8d9400e 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -4,11 +4,12 @@ AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc6452807
 AUX tvheadend-4.2.7-python3.patch 2952 BLAKE2B c6eee8aea74abd9a6eaacd3206a4b0191a45ce63e9e18bb213f1f6c85702a3836c44c55dd7131df4d739fb1f689c8bd97e24f4924e113649b7b0c9d349d471c7 SHA512 f031a06e5d4db4ea265a3e99bb07bee983ab40e5b028d9e69457971090e538b2057d49258cadda75db7816c2e4e9609819e59ab8a30d3ce848444774bfa1a02f
 AUX tvheadend-4.2.8-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834
 AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa
+AUX tvheadend-4.2.8-no-dvb-fix.patch 817 BLAKE2B d07b38662175f64c29c166c16aa0fc76240aa86d325a1b715dee3de4733287a615566d9cb53fce9da37cc69ff66992eb228c45e8b7dce77cc125a8dfc303ece8 SHA512 37fe828b3a878913468bd06e115dfd9eec29df840455872019414187bb4a904c50d2476fc0508c465a92029f28068a6e6da54d9089ca2c5957f34a94835dc04a
 AUX tvheadend-4.3-hdhomerun.patch 1435 BLAKE2B 3250c5d1ce2a757a2fdee646cb64136661e171c5ae5b30199560e2e74fbfbfefb6d8284e5c2cb92d179751f5fa814148240e08e132761d4d3e2b66844ccd53b9 SHA512 a013ecb61cf05ff5d976f88be58a4ba5471034ab02d34778a8c472746355f2630a88b90951ba98513c787e616119183087d7560be6a9c89c5ea9c26285fe2d5d
-AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa7429977104c9db1e6ef54901750d14dc0f43a20c89ddf504a9fc28a10a88d68105e5a5f07820696d50 SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b
+AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060e102b801337fd5a1e3f1376f4e5de59a8da0ae5bfb9a2335c1205504d28a3582ac6f7c095b0623d0 SHA512 11448507059ed12bef972dfd898771ab2a63078927e55a356b44be04c738e461535ba2a621a9aba4b621cb316dfd66e74b3c25c22c45ccf73a28f6dd0ad3cb23
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
-AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4
+AUX tvheadend.service 575 BLAKE2B cc332347736f9dccc34ece966311899307d03e3bf852fa8052dd86f4bfe02e0b927da7b3b8b9d78c6fcb85d77ca889ac22c8106636cac825b8550e7bd5e38176 SHA512 c9c0f52dda9f325189f99fd275cd806f6b818761ab1bc00a36ddb934418d5cff4b9dcf594aaa446ec47f3b0004ab8fc75b221a4fb76ac8730c365f751056c522
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8.ebuild 3059 BLAKE2B 2d2bde0369e364f58f81b93966c14c4e38cb9cbe0ae76f13ceb45ebb3ce557b5324940be0e4617f6d7884178e2143351666d674e4ed181635ab78b4938a7133b SHA512 0fe731a22d0a9ce7061afce2aacae45e9e8cea09c4159151207bfacce6cc15ad6e7a5d2ec6a96a09afac0f436397b7b8c1fc7dcf275931feca5b4aeceae6d318
-EBUILD tvheadend-9999.ebuild 3756 BLAKE2B c3d62f8de1ab35dd91087e624d121fa5c31867b258b4e9eda2e7856e7cdccdbad1ef6982d0e6894ff99f0ec409127a7d5d8067f766338a88d9e868a5bbddea11 SHA512 4457b26c465992f6d57ac29cdc12a223df49d4cafbe8c3864c529b23ae7e2ed240d316e34eb49ff2e6c7f0cb89c3b0e761149a957cf55f63f08ff028cb410602
+EBUILD tvheadend-4.2.8-r1.ebuild 3448 BLAKE2B 9aaefa31ffcec4762a6cdee5e7b77d17ea1d5b22ddd7a8f9b73746e2eb889b95226b2210bbd4f1c3c6e454752ed1da50fda9ba24c9def282619d1181b534ab71 SHA512 c19ae734fa3942876023e98a7a83f9cf651d60feb8f5cbf2eae92cc4ca42e6006fefdd262333d797824b276c1198765a30245e8b937aba1b3a395e7fd65bd093
+EBUILD tvheadend-9999.ebuild 4145 BLAKE2B d9c98a52acb88fef1bc66bfec2ba740006b73c8154dbf2b3a050c3ad766ba5094ff8e441e36e320ca5b0190d1c0240564e12822220069c74d65df24063bd90db SHA512 29fc9ff9763c24444ced296365b0ae9eab9eb9e010865942772469a94867094adba31588969408969eb55bd66f55fd4ff5efffeb534e48c2688e7999e3d5de49
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
new file mode 100644
index 000000000000..b398064292e5
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch
@@ -0,0 +1,28 @@
+From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 10 May 2020 23:02:14 +0100
+Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all
+
+---
+ src/input/mpegts/dvb_psi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
+index 15203d98c..96b1689fb 100644
+--- a/src/input/mpegts/dvb_psi.c
++++ b/src/input/mpegts/dvb_psi.c
+@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
+     psi_tables_atsc_t(mm);
+     break;
+   case DVB_SYS_DVBC_ANNEX_B:
++#if ENABLE_MPEGTS_DVB
+     if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class))
+       psi_tables_dvb(mm);
+     else
++#endif
+       psi_tables_atsc_c(mm);
+     break;
+   case DVB_SYS_NONE:
+-- 
+2.26.2
+
diff --git a/media-tv/tvheadend/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd
index 8be4a5dadce9..bac19ece3ac1 100644
--- a/media-tv/tvheadend/files/tvheadend.confd
+++ b/media-tv/tvheadend/files/tvheadend.confd
@@ -8,7 +8,7 @@ TVHEADEND_USER="tvheadend"
 TVHEADEND_GROUP="video"
 
 # Path to Tvheadend config.
-TVHEADEND_CONFIG="/etc/tvheadend"
+TVHEADEND_CONFIG="/var/lib/tvheadend"
 
 # Other options you want to pass to Tvheadend.
 TVHEADEND_OPTIONS=""
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index 6d1e27445b73..cd5c5e7f9115 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -9,7 +9,7 @@ Group=video
 RuntimeDirectory=tvheadend
 PIDFile=/run/tvheadend/tvheadend.pid
 EnvironmentFile=/etc/conf.d/tvheadend
-ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c "${TVHEADEND_CONFIG}" ${TVHEADEND_OPTIONS}
+ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c ${TVHEADEND_CONFIG} ${TVHEADEND_OPTIONS}
 TimeoutStartSec=1m
 TimeoutStopSec=20s
 Restart=always
diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index a20bac30f228..7886d755c7d5 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.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
 
-inherit linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/"
@@ -20,6 +20,7 @@ BDEPEND="
 	virtual/pkgconfig"
 
 RDEPEND="
+	acct-user/tvheadend
 	virtual/libiconv
 	dbus? ( sys-apps/dbus )
 	dvbcsa? ( media-libs/libdvbcsa )
@@ -51,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 	"${FILESDIR}"/${PN}-4.2.7-python3.patch
 	"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
+	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )
@@ -58,8 +60,6 @@ DOCS=( README.md )
 pkg_setup() {
 	use inotify &&
 		CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-	enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
 src_configure() {
@@ -106,10 +106,6 @@ src_install() {
 
 	use systemd &&
 		systemd_dounit "${FILESDIR}"/tvheadend.service
-
-	dodir /etc/tvheadend
-	fperms 0700 /etc/tvheadend
-	fowners tvheadend:video /etc/tvheadend
 }
 
 pkg_postinst() {
@@ -119,4 +115,15 @@ pkg_postinst() {
 	elog "Make sure that you change the default username"
 	elog "and password via the Configuration / Access control"
 	elog "tab in the web interface."
+
+	. "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
+
+	if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
+		echo
+		ewarn "The HOME directory for the tvheadend user has changed from"
+		ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
+		ewarn "to use the old location until you update TVHEADEND_CONFIG in"
+		ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
+		ewarn "before you do so."
+	fi
 }
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 692d4ec897c3..e8e5c2814ed8 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.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
 
-inherit git-r3 linux-info systemd toolchain-funcs user
+inherit git-r3 linux-info systemd toolchain-funcs
 
 DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
 HOMEPAGE="https://tvheadend.org/"
@@ -20,6 +20,7 @@ BDEPEND="
 	virtual/pkgconfig"
 
 RDEPEND="
+	acct-user/tvheadend
 	virtual/libiconv
 	dbus? ( sys-apps/dbus )
 	dvbcsa? ( media-libs/libdvbcsa )
@@ -60,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
 	"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
 	"${FILESDIR}"/${PN}-4.2.7-python3.patch
+	"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )
@@ -67,8 +69,6 @@ DOCS=( README.md )
 pkg_setup() {
 	use inotify &&
 		CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
-	enewuser tvheadend -1 -1 /etc/tvheadend video
 }
 
 # We unconditionally enable codecs that do not require additional
@@ -130,10 +130,6 @@ src_install() {
 
 	use systemd &&
 		systemd_dounit "${FILESDIR}"/tvheadend.service
-
-	dodir /etc/tvheadend
-	fperms 0700 /etc/tvheadend
-	fowners tvheadend:video /etc/tvheadend
 }
 
 pkg_postinst() {
@@ -143,4 +139,15 @@ pkg_postinst() {
 	elog "Make sure that you change the default username"
 	elog "and password via the Configuration / Access control"
 	elog "tab in the web interface."
+
+	. "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
+
+	if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
+		echo
+		ewarn "The HOME directory for the tvheadend user has changed from"
+		ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
+		ewarn "to use the old location until you update TVHEADEND_CONFIG in"
+		ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
+		ewarn "before you do so."
+	fi
 }
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index ba4509f02383..78a24876e70b 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 492 BLAKE2B 1f9ffa330d3c1d13615a8d97538b087e4948690b6f427b4e72281c987fd24c27ba19ae6f041737dc33a15549b348648e91ce0f92d0fcebdd1384e6ec41ec6040 SHA512 5ebff75ac001625b6d8a7e9c2b805771bb808ee7358f6d280b4dd9ca08c2c3da1413272a13ab6d971dd8d484cfb1096225501332973575f8896076f0803a5380
-EBUILD tvnamer-2.5.ebuild 494 BLAKE2B b1db24b3ab41583c8b0c5f7598577d5d1e671a600eb5c6f1308182bf144e1f6132e42c7eab4298259f84211b735e4f2767c6e0ebca1158d9fc24ec4c0b6382a8 SHA512 f8abe622dfd872f61be4161806f6396881710a4e61348ba0af350972e41fee8231c2c7346f21e4046e75feb281bfbcab06349468793824f9d643a9171420e7e4
+EBUILD tvnamer-2.5.ebuild 500 BLAKE2B 08fe0fee272113633f2d56d5900c51721a5d3b7d61a3bfa4720dcc0cedfc77a58f8e5d9ef7faa152433ecbbf0840932d0d2827b45883ddbd00eec3c4f75ce18a SHA512 581db8e9e5b49cc13de4f505bc68071a030f3be34e6b7449adea00c218932bc57205310afbc1e15b08440a1ec6a7a063ce0d3642b9ee51fc9b30b26219ff4d86
 MISC metadata.xml 379 BLAKE2B 79d429f9497154662e75f4693ab95c5251d65ed6ea06d3870e1f2a639cd470a9207d02ade929f10f9d0d7b0e91ad9629a899546ea02f40b6a4e5aeb5f846716e SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6
diff --git a/media-tv/tvnamer/tvnamer-2.5.ebuild b/media-tv/tvnamer/tvnamer-2.5.ebuild
index 7e3ec1affa5f..ab7b93611eb4 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=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index f92b2a7d1186..1488aac947e8 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,3 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
+DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B 46bed06ca83a46fbd2833eadfc549411578b390258fbeb1a10438e6de47cc7a2475c996c23aa9ffea7a04ea48948067546024bc52a183bc91ad0e2383cde85b6 SHA512 c0a326722ffe4b180a5c81627556a80213fbf3c8da80083145089f464c10983fe8f22db0e6f2632f2284b1763e1a05dbdfec07acbe137b559ea7d593dd0a657e
-MISC metadata.xml 2086 BLAKE2B fa818d29c7e94a4e7a7cf7c3ea14dfcb9276ba3f904f942ac4bdcf862dfbf9f079c848ba5079bf5b2aeaf45a16601ca4aaa13a3cab92b9c93989b64fe0c8d54b SHA512 4b8631c51d9f9bf42ca77abcef7a9ef78b0794f2d893f722b50c37efd415a953e3310d270536407bf61708f9a699d7ad02ac0377971b2faabcd23d5b7d0d958d
+EBUILD xmltv-0.6.1.ebuild 5914 BLAKE2B 268088ad3b0a742cbc6b5d4780261cc77c8fb41c7065d4798a6e68eea921037ba25076cffa01820149327b77e61acc0f9c36f163f668ae32eb9babd0d648a08a SHA512 24a3c4a4a6572b6931945df82efc2a582c5cba6dab84019e94f9d7924452a6aea05f32253515f65e9ce9b08042abd5e4d73e3d091face583074a691d79a16d65
+MISC metadata.xml 2676 BLAKE2B d7e8c1166118a7622f365c05b7408c8ac8725c5f98b26d792bf89e430dcb6f671e397f6f6f92f7d55a2f4a0756f6ce2e62ea08a8e7f74182ac23b806788aaedf SHA512 52b5419e2c2737c94dd99cad4d412666db10c217dd68e65f9422532d57bcf5c836fa7e94938eb8876739add027477bde8b3a5f269dbc69493c930ae5aaf69a41
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index c1cc93bee800..92e9a4fd8f98 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>thebitpit@earthlink.net</email>
+		<name>Wilson Michaels</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ar">Argentina tv listing grabber</flag>
 		<flag name="ch-search">Grabber for Switzerland</flag>
@@ -10,20 +17,23 @@
 		<flag name="es-laguiatv">Spain alternative grabber</flag>
 		<flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
 		<flag name="eu-epg">EPG grabber for some European countries.</flag>
-		<flag name="fi">Finland tv listing grabber</flag>
+		<flag name="eu-epgdata">include fanart URLs for some European countries.</flag>
+		<flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag>
+		<flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag>
 		<flag name="fi-sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
 		<flag name="fr-kazer">France (Kazer) tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
 		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
-		<flag name="it">Italy tv listing grabber</flag>
+		<flag name="it">Italy tv listing grabber (RUV)</flag>
 		<flag name="na-dd">North America tv listing grabber</flag>
 		<flag name="na-dtv">North America Direct TV grabber</flag>
 		<flag name="na-tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="nl">Netherlands tv listing grabber</flag>
+		<flag name="nl">Netherlands tv listing grabber [REMOVED 0.6.1]</flag>
 		<flag name="no-gf">Norway Gfeed tv listing grabber</flag>
 		<flag name="pt-meo">Grabber for Portugal (MEO)</flag>
+		<flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag>
 		<flag name="se-swedb">Sweden tv listing grabber</flag>
 		<flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag>
 		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
@@ -33,9 +43,10 @@
 		<flag name="uk-bleb">Britain tv listing grabber</flag>
 		<flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
 		<flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
+		<flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">xmltv</remote-id>
+		<remote-id type="github">XMLTV/xmltv</remote-id>
 	</upstream>
 </pkgmetadata>
 
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
new file mode 100644
index 000000000000..e7906a788a68
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv"
+SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
+huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
+tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Date-Manip
+	dev-perl/File-Slurp
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Lingua-Preferred
+	dev-perl/PerlIO-gzip
+	dev-perl/Term-ProgressBar
+	dev-perl/TermReadKey
+	dev-perl/XML-Parser
+	dev-perl/XML-TreePP
+	dev-perl/XML-Twig
+	dev-perl/XML-Writer
+	dev-perl/Unicode-String
+	virtual/perl-Memoize
+	virtual/perl-Storable
+	virtual/perl-IO-Compress
+	ar? (
+		dev-perl/DateTime
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+		dev-perl/HTTP-Cookies
+	)
+	ch-search? (
+		dev-perl/HTML-Tree
+		dev-perl/HTML-Parser
+		dev-perl/HTTP-Cookies
+		dev-perl/URI
+	)
+	dk? (
+		dev-perl/DateTime
+		dev-perl/IO-stringy
+	)
+	dtvla? (
+		dev-perl/DateTime
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+		dev-perl/HTTP-Cookies
+	)
+	eu-dotmedia? (
+		dev-perl/HTTP-Cache-Transparent
+		dev-perl/IO-stringy
+	)
+	eu-epgdata? (
+		dev-perl/Archive-Zip
+		dev-perl/DateTime
+		dev-perl/DateTime-Format-Strptime
+		dev-perl/HTML-Parser
+		dev-perl/HTTP-Message
+	)
+	eu-xmltvse? (
+		dev-perl/HTTP-Cache-Transparent
+		dev-perl/IO-stringy
+	)
+	fi? (
+		dev-perl/HTML-Tree
+		dev-perl/LWP-Protocol-https
+		dev-perl/URI
+	)
+	fi-sv? (
+		dev-perl/DateTime
+		dev-perl/HTML-Tree
+		dev-perl/IO-stringy
+	)
+	fr? (
+		dev-perl/DateTime
+		dev-perl/DateTime-TimeZone
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+	)
+	huro? (
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+	)
+	il? ( dev-perl/DateTime )
+	is? (
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+		dev-perl/URI
+		dev-perl/XML-DOM
+		dev-perl/XML-LibXSLT
+	)
+	it? (
+		dev-perl/HTML-Parser
+		dev-perl/HTML-Tree
+		dev-perl/URI
+	)
+	na-dd? ( dev-perl/SOAP-Lite )
+	na-dtv? (
+		dev-perl/DateTime
+		dev-perl/HTTP-Cookies
+		dev-perl/URI
+	 )
+	na-tvmedia? ( dev-perl/XML-LibXML )
+	pt-meo? (
+		dev-perl/DateTime
+		dev-perl/XML-LibXML
+	)
+	pt-vodafone? (
+		dev-perl/DateTime
+		dev-perl/URI
+		dev-perl/XML-LibXML
+	)
+	se-swedb? (
+		dev-perl/HTTP-Cache-Transparent
+		dev-perl/IO-stringy
+		dev-perl/XML-LibXML
+	)
+	se-tvzon? (
+		dev-perl/XML-LibXML
+		dev-perl/IO-stringy
+		dev-perl/HTTP-Cache-Transparent
+	)
+	tr? (
+		dev-perl/DateTime
+		dev-perl/HTTP-Cache-Transparent
+		dev-perl/HTTP-Cookies
+		dev-perl/URI
+	)
+	uk-bleb? (
+		dev-perl/Archive-Zip
+		dev-perl/IO-stringy
+	)
+	uk-tvguide? (
+		dev-perl/DateTime
+		dev-perl/HTML-Tree
+		dev-perl/HTTP-Cache-Transparent
+		dev-perl/HTTP-Cookies
+		dev-perl/URI
+	)
+	zz-sdjson? (
+		dev-lang/perl
+		dev-perl/DateTime
+		virtual/perl-Digest-SHA
+		dev-perl/HTTP-Message
+		dev-perl/LWP-Protocol-https
+		dev-perl/Try-Tiny
+	)
+	zz-sdjson-sqlite? (
+		dev-lang/perl
+		dev-perl/DateTime
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/DateTime-Format-SQLite
+		dev-perl/DateTime-TimeZone
+		dev-perl/DBD-SQLite
+		dev-perl/DBI
+		virtual/perl-Digest-SHA
+		dev-perl/File-HomeDir
+		dev-perl/File-Which
+		dev-perl/List-MoreUtils
+		dev-perl/LWP-UserAgent-Determined
+	)
+	tv-check? (
+		dev-perl/Tk
+		dev-perl/Tk-TableMatrix
+	)
+	tv-combiner? ( dev-perl/XML-LibXML )
+	tv-pick-cgi? ( dev-perl/CGI )
+"
+
+PREFIX="/usr"
+
+pkg_setup() {
+	# Uses Data::Manip in various places which can fail
+	# if TZ is still set to Factory as it is in stock gentoo
+	# install media
+	export TZ=UTC
+}
+
+src_prepare() {
+	default
+	# Add revision number to version info.
+	# Remove the doc/COPYING file from documentation.
+	sed -i \
+		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+		-e "/^@docs/s:doc/COPYING ::" \
+		Makefile.PL || die
+}
+
+src_configure() {
+	# Must match the order of elements in @opt_components in Makefile.PL
+	make_config() {
+		# Never except default configuration
+		echo "no"
+
+		# Enable Agentina
+		usex ar
+		# Enable Switzerland Search
+		usex ch-search
+		# Enable Denmark
+		usex dk
+		# Enable Latin America
+		usex dtvla
+		# Enable Europe (DEPRECATED, xmltv.se / dotmedia)
+		usex eu-dotmedia
+		# Enable EU epgdata.com including fanart
+		usex eu-epgdata
+		# Enable Europe (xmltv.se / xmltvse)
+		usex eu-xmltvse
+		# Enable Finland
+		usex fi
+		# Enable Swedish listings in Finland
+		usex fi-sv
+		# Enable France
+		usex fr
+		# Enable Hungary and Romania
+		usex huro
+		# Enable Israel
+		usex il
+		# Enable Iceland
+		usex is
+		# Enable Italy
+		usex it
+		# Enable Italy from DVB-S stream
+		echo "no" # missing Linux::DVB
+		# Enable North America using DataDirect
+		usex na-dd
+		# Enable North America from directv.com
+		usex na-dtv
+		# Enable North America XMLTVListings.com
+		usex na-tvmedia
+		# Enable Portugal EPG from sappo.pt
+		usex pt-meo
+		# Enable Portugal EPG from Vodafone
+		usex pt-vodafone
+		# Enable Sweden
+		usex se-swedb
+		# Enable Sweeden Alternative (Repace with eu_xmltvse)
+		usex se-tvzon
+		# Enable Turkey
+		usex tr
+		# Enable UK fast alternative grabber
+		usex uk-bleb
+		# Enable UK/Ireland TV Guide
+		usex uk-tvguide
+		# Enable Schedules Direct JSON
+		usex zz-sdjson
+		# Enable Schedules Direct JSON (SQLite version)
+		usex zz-sdjson-sqlite
+		# rules to improve episode numbering
+		usex tv-check
+		# Enable combiner
+		usex tv-combiner
+		# Enable CGI support
+		usex tv-pick-cgi
+	}
+
+	pm_echovar=`make_config`
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	if use tv-pick-cgi; then
+		dobin choose/tv_pick/tv_pick_cgi
+	fi
+}
+
+pkg_postinst() {
+	if use tv-pick-cgi; then
+		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+		elog "to where the ScriptAlias directive is configured."
+	fi
+}