gentoo resync : 24.07.2021

3 files changed, 10 insertions, 17 deletions

diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index dccfeb863165..680c72b79c94 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -4,10 +4,10 @@ AUX plex-media-server.conf.d 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe
 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.3.4707-ebb5fe9f3_amd64.deb 81474702 BLAKE2B 8e12a9c39bea8f44e6fa4fa495556cafc9865682b27c64b06072470367d7e9a64eca3147197ddef0b277fbd28970f85b388fc812f3532890d45506c49432324e SHA512 c30e19e1895eeaa699effb1d3d282fbf1f3657aff2d41af61f30f398fc501bac12e8d178abc12c818f52c52c0bc1bf803ad74985521e37f5db6baf60ecc959ab
-DIST plexmediaserver_1.23.3.4707-ebb5fe9f3_i386.deb 74842010 BLAKE2B 36967187241afdd7294ac46e03b5f55c1b22f5f7e2ba974ea322a369c41768cd6b7fd44d82ebf0afae1a98f5178161740e1d40d5f2c17faffa5b4ccb1d811eed SHA512 4625ea0b195fad305679656728c98ba8b15b38b86cbc9a95fbc6b617fb45e7e41b24f2c1ef2bc9736207d888c295d4e423a3d00fe654036ca1865782d88790ac
 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
+DIST plexmediaserver_1.23.5.4841-549599676_amd64.deb 81750100 BLAKE2B 2b8e110c6e4728607b9cdb033da97e71a124e19a0e05a14ef5053195a23d621efb4a7774a332899aaef471fd7bdc5ee88e958affdc11e268c907cfc0d845d830 SHA512 3c3ef651e512405f57ec8c794955937a9b571d5251efe66024dbccd982eeacf5417562037d9b970fdb9ac9f68fc3963b525537b9d42dc3d673b109a6ef18e370
+DIST plexmediaserver_1.23.5.4841-549599676_i386.deb 75095044 BLAKE2B 724a8f0c9d29c591759de8b2208ddcf1f6ec81aee0535939f95a11b2927c1c47545eb85de26ee41dd0e9ca021eeda00bde45fb6efe8bfc6c11e021f2fdd86eff SHA512 29ce137e93223b83960ac439314aec1f4c4ad78d392f48376faa3912023f4fd866005b14380b91eeacb1a3673f8b8ea464cd9ceff3ece2592190c32d24c9c8e8
 EBUILD plex-media-server-1.23.4.4805.ebuild 1897 BLAKE2B 63ce0a48bf86ba1d5f4872ec3185d16eaa99253947e658fc82d9124eae6622592330409e8efc1a447088ce8e1b3d527022e4dca59f66e6348fc69c1912039553 SHA512 af3741ea319bf7f2cf2e661f1c8f435ae667dcd09a5f2967bd28b2a46c1d29cf73d05ccf4c66a6180379889572fcb2bba3e66a1b868f788f8ee44b3a392c41ac
-MISC metadata.xml 746 BLAKE2B 32ddcdfc95a50cd336dec02a232ed50eeeca7d74d410cd327068da50fa55ac2090338854cff3fbc1da5c5c7027f0114db9c007cdb4ffc4426bf69ee8a5bdba59 SHA512 0f95894ecb5a28aaa0254435ad9b29552623e33340a23358ed3287c8e23d6a98e3cde838916f279970990ccc0113bd662a0c9d32259be3a50fec70fcd1ae2530
+EBUILD plex-media-server-1.23.5.4841.ebuild 1897 BLAKE2B 7b06fd697dde210dee0e11d41517e05eb93ebd540a90b058e35105586c2b643d68e1b9b20fc7a38b6601493c8f056298e0d70c31a85fff110ae4237782ee74bd SHA512 b0c71fc246653aa7ad99ced412cb8a6683b00bb9e00f3ad8ce8999680048bc3c2b8834561443433f785fe332c5e71152627d6d626493829666a855fccd4f942b
+MISC metadata.xml 597 BLAKE2B ccb49cc2f1115157ace237440b8c59e4466eb96a4f3c274c13e275fa6564b5bb0506bc3e3d9bdee4d2385d151e1f1bf9e3e3b70c7e0400d884aa1fcb3f0a1522 SHA512 d33bfd6ff84128622666b9452b975879840b3b6d24e555536cb8daf98f41411000ea26754df7fb31a639749c9f9b4aca64ed7524fb48d918a74d30a003a19d04
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 39729e116b91..66e76ce6294a 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -13,7 +13,4 @@
 		<changelog>http://forums.plex.tv/discussion/62832/plex-media-server#latest</changelog>
 		<doc>https://support.plex.tv/hc/en-us/categories/200007268-Getting-Started</doc>
 	</upstream>
-	<use>
-		<flag name="system-openssl">Use system copy of <pkg>dev-libs/openssl</pkg> instead of the bundled one. Unsupported upstream.</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-tv/plex-media-server/plex-media-server-1.23.3.4707.ebuild b/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild
index 0ca85f3300a0..d4e54c130d2c 100644
--- a/media-tv/plex-media-server/plex-media-server-1.23.3.4707.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.23.5.4841.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit readme.gentoo-r1 systemd unpacker
 
-MY_PV="${PV}-ebb5fe9f3"
+MY_PV="${PV}-549599676"
 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