gentoo resync : 17.07.2021

6 files changed, 16 insertions, 95 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 3c55bcc88965..12d29aaeff8a 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 1faba8d5a84b..dccfeb863165 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,15 +1,13 @@
 AUX 80plexmediaserver 191 BLAKE2B 74f870eb772efcee47eab654732cae69b3e3991b66ebbbdd241dc1272cf90d536d2309f10053878d1f904dcf77afea238133be06a66c9a0541e94d18fa669e1b SHA512 55fb0ab1d95ae5af385e9b22f275a8854034db27cadd87e5fe20f6b5580180195715773c08281d42a2aae5466f55c85f8294d9cdd30da9d134e7ad6b08e26bb5
-AUX README.gentoo 603 BLAKE2B 01a0be613587c682077b480dfce7f7f95cb48ed0ee8ca7ea789cf0814f7485b769131a16627bd68ce330810478e52b0d0931e0ee8325c10c369daea3ca47f525 SHA512 fa811d3555c267fc895e783fdb54ccdc13cceb9dccfdd3a69a00871f4cc75ab647aa097fb3a8547f5322c076fd8cde7d8f14e893c8a8968922ce1cd3f883e0a1
+AUX README.gentoo 581 BLAKE2B f11001e1ab9e905701e536cd2d6c9075571948ec8ea9e045cb50b449e2ba15a15598d9e4f0ecd63317af0d0d35a08b72b2cc887c56376256cb6411c485498587 SHA512 a029ea093893585ef0f57e1f1fccebe06eb12494b8f7aa5bf9d1525862ab9fbf7e39e828e8288c28eecfeb0a81c317d385edbd9bd028a1eabb9cd4d35c6fa538
 AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe02a12c3ee986c1078ae0a46d974adc25dce252a49c3fd72e0dfe1ba65c49d575e12036fba44ce9b0390da64ec SHA512 d3d68fa58a1c1064803a9607708123302890571e823e5bc26de741bb15bd51db19234636672ff01757cbbcdb984c60663545689fa915761c78c3cf49e6da0f95
 AUX plex-media-server.init.d 380 BLAKE2B 03d5737128390c13d914a94e8d861cf24abed92b2a5c672e72cd7dad8ed9a71ba7bccc28f06acaf5920be7d0b809746b6a8f4daffef4594830cf8ad5f071a2f5 SHA512 44ddd5a046851f77f550ff9f0bf158a3bce465101b5fdbd31b68ed64dc6c8e823f70c05b833f97101b4608256422ff4aa026114fac17f9e6e3670602ed9ef816
+AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.23.1.4602-280ab6053_amd64.deb 81613502 BLAKE2B 59f3bc54e8436bb35983cc7b77c252c88d5ccc26325203edcbaf7ef2428dbe465e0db8bb0b24472f7f7b07b25b23d23e240903243d8dcd7983edd4cda62906b3 SHA512 e269066a10794d63cf9912df3e66b92874701a8263f2806f42d0abe9484bd347284e2bacb3ba2f6825e1489be164f0b2abe6d23021737b37be918a9b356c1301
-DIST plexmediaserver_1.23.1.4602-280ab6053_i386.deb 75020714 BLAKE2B 12c8057592f734969c9d4a3ea245c2b725fe16433260214c1e18d0b192151b51c61d55bde7b40015727b1775a21fe965960165b8cc6f039a138f521f95f34cb3 SHA512 afd569e0cfd665b81e422b925e623b910d29b99e77dbfe2ff2333497f63fb69adf851562c887a9bd8ff216f37b18397cad673547a41d8fdba611d9a6bd7254e2
-DIST plexmediaserver_1.23.2.4625-a83d2d0f9_amd64.deb 81773538 BLAKE2B 7b22cdd4662f37c4138bd5edc74a5471e7d31c89465ce25a428e7963fc10e5dc07c154812b51c1c17d725175f093c7e22560acde8b00ee3b5d6a724441af2729 SHA512 632497e596542fc11cd2b9ec6dd9d7403800f26473811fbd5c75d73aa1abde08b881005f1c51663afe190ce95b6d02900272f2024bbcce02f6b952efe498430d
-DIST plexmediaserver_1.23.2.4625-a83d2d0f9_i386.deb 75148422 BLAKE2B 1758529c97b3f743df44321074f95f85ce7003fd9d92e4a849776e9f24bf6034de6e90c123db9c36c8732cffbc65089f6db20fba8ffffac1b6bce238b1595b04 SHA512 0e727d96bc147d7c4457f91c8309e1937bbee49a1599ff376959fb25cdc62fa3df1ae09880cc6ada7d8dfa4cbadccce24c35ad3bd41143f086ea1a0861e010f0
 DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_amd64.deb 81474702 BLAKE2B 8e12a9c39bea8f44e6fa4fa495556cafc9865682b27c64b06072470367d7e9a64eca3147197ddef0b277fbd28970f85b388fc812f3532890d45506c49432324e SHA512 c30e19e1895eeaa699effb1d3d282fbf1f3657aff2d41af61f30f398fc501bac12e8d178abc12c818f52c52c0bc1bf803ad74985521e37f5db6baf60ecc959ab
 DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_i386.deb 74842010 BLAKE2B 36967187241afdd7294ac46e03b5f55c1b22f5f7e2ba974ea322a369c41768cd6b7fd44d82ebf0afae1a98f5178161740e1d40d5f2c17faffa5b4ccb1d811eed SHA512 4625ea0b195fad305679656728c98ba8b15b38b86cbc9a95fbc6b617fb45e7e41b24f2c1ef2bc9736207d888c295d4e423a3d00fe654036ca1865782d88790ac
-EBUILD plex-media-server-1.23.1.4602.ebuild 1963 BLAKE2B d6848a06ff1b0ae8b549612c4134de017945171bca8d0095e88c9e4290163f2bbbe75dc3519ff03020b9aaa5006264f89b6b0af356ef343791c2526a11f81a2d SHA512 e182f5a1da3ea94d2733e018f96bf4dd67382360e165ce389e0d81404e3666296f211a4f9f4cad803d1abdbef3573e170cb8f7bef07ed0859ee931d800f62942
-EBUILD plex-media-server-1.23.2.4625.ebuild 1963 BLAKE2B 89de95b39c64d16d67c2b897bf929dfddcff233c737536025c8c5002686d5ba85c7ed2d84ce3978d0bd7a752480d014013e5569af9413199c6573bf5710f37ea SHA512 859a487b1155caec0fd022b358cea338ec18c5b9e44c69dfa6fe82802c9362acfb6023203dac3912d936f2ea3702a27e45ff2273d66e3fceaa5b5eca06d85ba7
+DIST plexmediaserver_1.23.4.4805-186bae04e_amd64.deb 81419308 BLAKE2B df205474d640a6e6403e8c33f507a52bf2b1f5fd5352285e71357e0640a3e1ab644b0ed8e7ce2d01c30a4a657fab9601e4bf169bb520567550b0b182b988a1f3 SHA512 6e8febdfe7d3dbd7d00c76b5f8e10a72ec6fe5744602101adca4ea127147b6a0681f5207f1805b621bd9107ae0b15f8286b2e9e0ed96838378f29d888af52fd8
+DIST plexmediaserver_1.23.4.4805-186bae04e_i386.deb 74764294 BLAKE2B c4f1b978acd84d30d1685065e7eab7a87dec5c03d448c9d2ef378c57ed4f2dc9067379279cd97815e58a86690406fc8646be2f9bbdd552288782c14750ee1799 SHA512 55ed319e0a5e2290157cc800967ae26f80dcfa3c8476c0fb770a13069096ef8d88d9dd24cd8b7619828e5f2f17ac2ab2ca4ac0c748843e9af61866d4c60a45fd
 EBUILD plex-media-server-1.23.3.4707.ebuild 1963 BLAKE2B b439267e8fb2d96f4079be0b4c20906fda429f2397e230d0f84ccce9e03e8c6af19727641d4be68dae9f42462b7c76a32630ec27915648591e333f87bcbbb98d SHA512 50d7f39404a164399bf6514fd311c6aeff66ba4d5a181abf1bb61cd770fe1bac97f89746ae614e2f3a85a735b7fb6ba8c1c39c2a7d553ae2477240837555948e
+EBUILD plex-media-server-1.23.4.4805.ebuild 1897 BLAKE2B 63ce0a48bf86ba1d5f4872ec3185d16eaa99253947e658fc82d9124eae6622592330409e8efc1a447088ce8e1b3d527022e4dca59f66e6348fc69c1912039553 SHA512 af3741ea319bf7f2cf2e661f1c8f435ae667dcd09a5f2967bd28b2a46c1d29cf73d05ccf4c66a6180379889572fcb2bba3e66a1b868f788f8ee44b3a392c41ac
 MISC metadata.xml 746 BLAKE2B 32ddcdfc95a50cd336dec02a232ed50eeeca7d74d410cd327068da50fa55ac2090338854cff3fbc1da5c5c7027f0114db9c007cdb4ffc4426bf69ee8a5bdba59 SHA512 0f95894ecb5a28aaa0254435ad9b29552623e33340a23358ed3287c8e23d6a98e3cde838916f279970990ccc0113bd662a0c9d32259be3a50fec70fcd1ae2530
diff --git a/media-tv/plex-media-server/files/README.gentoo b/media-tv/plex-media-server/files/README.gentoo
index ec4445ac397d..db988e30fe06 100644
--- a/media-tv/plex-media-server/files/README.gentoo
+++ b/media-tv/plex-media-server/files/README.gentoo
@@ -1,7 +1,8 @@
 Plex Media Server is now installed. Please check the configuration file.
 It can be found in /etc/plex/plexmediaserver to verify the default settings.
-Adjust thread counts and memory usage limits in /usr/sbin/start_pms for best
-performance. To start the Plex Server, run 'rc-config start plex-media-server'
+Adjust thread counts and memory usage limits for best performance.
+
+To start the Plex Server, run 'rc-config start plex-media-server'
 You will then be able to access your library at http://localhost:32400/manage
 
 If installing on a remote host you will need to use a ssh tunnel eg,
diff --git a/media-tv/plex-media-server/files/plexmediaserver b/media-tv/plex-media-server/files/plexmediaserver
new file mode 100644
index 000000000000..d1981dc1c6f4
--- /dev/null
+++ b/media-tv/plex-media-server/files/plexmediaserver
@@ -0,0 +1,2 @@
+export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=4
+export PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild
deleted file mode 100644
index 92b87a68f4e0..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.23.2.4625.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd unpacker
-
-MY_PV="${PV}-a83d2d0f9"
-MY_URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="Free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
-S="${WORKDIR}"
-
-LICENSE="Plex"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="system-openssl"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	acct-group/plex
-	acct-user/plex"
-RDEPEND="
-	${DEPEND}
-	system-openssl? ( dev-libs/openssl:0/1.1 )"
-
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/plexmediaserver/lib/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/.*"
-	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
-)
-
-src_install() {
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Remove shipped openssl library
-	if use system-openssl; then
-		rm usr/lib/plexmediaserver/lib/libssl.so.1.1 || die
-	fi
-
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# 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
-	keepdir /var/log/pms
-	fowners plex:plex /var/log/pms
-
-	keepdir /var/lib/plexmediaserver
-	fowners plex:plex /var/lib/plexmediaserver
-
-	newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-
-	systemd_dounit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service
-	keepdir /var/lib/plexmediaserver
-
-	# 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.
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/80plexmediaserver
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.1.4602.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild
index 3c08b6b51bf1..6a97c242b504 100644
--- a/media-tv/plex-media-server/plex-media-server-1.23.1.4602.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.23.4.4805.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit readme.gentoo-r1 systemd unpacker
 
-MY_PV="${PV}-280ab6053"
+MY_PV="${PV}-186bae04e"
 MY_URI="https://downloads.plex.tv/plex-media-server-new"
 
 DESCRIPTION="Free media library that is intended for use with a plex client"
@@ -18,15 +18,12 @@ S="${WORKDIR}"
 LICENSE="Plex"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="system-openssl"
 RESTRICT="mirror bindist"
 
 DEPEND="
 	acct-group/plex
 	acct-user/plex"
-RDEPEND="
-	${DEPEND}
-	system-openssl? ( dev-libs/openssl:0/1.1 )"
+RDEPEND="${DEPEND}"
 
 QA_PREBUILT="*"
 QA_MULTILIB_PATHS=(
@@ -39,14 +36,13 @@ src_install() {
 	# Remove Debian specific files
 	rm -r "usr/share/doc" || die
 
-	# Remove shipped openssl library
-	if use system-openssl; then
-		rm usr/lib/plexmediaserver/lib/libssl.so.1.1 || die
-	fi
-
 	# Add startup wrapper
 	dosbin "${FILESDIR}/start_pms"
 
+	# Add user config file
+	mkdir -p "${ED}/etc/default" || die
+	cp "${FILESDIR}/plexmediaserver" "${ED}/etc/default/" || die
+
 	# Copy main files over to image and preserve permissions so it is portable
 	cp -rp usr/ "${ED}" || die