gentoo auto-resync : 16:04:2023 - 11:50:23

2 files changed, 31 insertions, 19 deletions

diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 679979134801..c7ee457fe7cd 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -5,16 +5,16 @@ AUX plex-media-server.init.d 382 BLAKE2B 7b72d3397a988ad589944e87dc76c0f7138e5f2
 AUX plex-media-server.service.patch 749 BLAKE2B 64db57eb56c9ee8cc20d230aaa59afb420d7d1264313c74754e18e8b4c3b609116c9bd3d644dcf13519f9c700c7f04c9c2b59ad2da4ff752c83fbf0f96b263a9 SHA512 d9839189319cd084b5059bd515f4ace24e9a6c3008e23e4f511b1bbb199860ae89fb5be37f143a9ef72149baae03184069cf87c5532967630f0ecf409022354a
 AUX plexmediaserver 89 BLAKE2B c7866fce849e6ce2a15ec5a1550146072aa62d278ee47bf2ca70327babf5877750c0749d879e51bacc05ddd242d8a46c808665b9f299cee999dfa2d243ced073 SHA512 798a1736133339865aa1ffc6074720e84b28f3e3298c044019ec4959ba724f7a96dcbfcac29f1f39252cadb2a863a500423027970e5f2699e806bc4d532d9974
 AUX start_pms 1768 BLAKE2B c111f268535f03f1763c9a2f16ccc4a317f9540721a1c89e33306d6ad6d6ee34673d6a13326923c2fa399d1a3f7ad3e26c89d097de8f977a9ad7973c99dff811 SHA512 8c672a9de6f20c968869fb2bd643bdfe6d3e7ca6d89dfddfd5d7a4bc425a34e1b30ba711a0f0afd79df428df4151a59f18880cff7e0ef12df146421f299858c5
-DIST plexmediaserver_1.30.2.6563-3d4dc0cce_amd64.deb 85250976 BLAKE2B e7637733dc0e3c966e9609abfdefeb06b9985956fc8cffa58e5022a3e9e3924d186cf642c5b68a38340a99dcc0fa1619c91e564d69a4e7a7b5ae8633d6408d42 SHA512 c852ff8de3efbc06fcba6d5af3f7e68406cda8fe1e72b3954b3909dd83dfa39f973c2bc62e7e3a9a9b5b6169263af938c3564fe2d237c722eb3716cf5f01af52
-DIST plexmediaserver_1.30.2.6563-3d4dc0cce_arm64.deb 74318740 BLAKE2B cc8b42b75aac0de511902ba22b6dcbe649ba3e8c919c9d2fa6baa876ed0e1279c19abed3172a6aec5713967324c3534feebd67e60489c85b8d13aaad7d89f818 SHA512 ce900b6442e77ecbfcd2bb88a89f900423bbb408e8f0600455cce78d28c07462431270e4b2f2f19763a75ef07ab11cfabd2c99bf3931bfaf60e112f3bb133532
-DIST plexmediaserver_1.30.2.6563-3d4dc0cce_i386.deb 77862086 BLAKE2B dffabe49b1e556514272eb2be0b5eab4ba47277e08ffac8037904d77c564fb5dba477e21663b92b15013631a8ed319bf33396e70b075026cdbaa45bcde65c817 SHA512 7293d33ba658791307f5aa45a19d5f9a5d4288ce2b3509322b5ecb496f8b2e6436850ce3c23b722d7af775fc7732760b5db853c9429d3abc60050e5e590a780b
 DIST plexmediaserver_1.31.1.6733-bc0674160_amd64.deb 83355492 BLAKE2B c1892bd1a27a65c6948f6a5fa44ee21996691ad2eaddd1b977dbead7ff957fba11166ecc9e9be1bcdfd29568136353d01784c26328663b1ac0f7a1cba6874773 SHA512 7740f42d114bccc39c464b52fdfda85a486480decdb6c1e2bca15616ef417a85a23a659ca29734cf85f459254df6993726106e72f5bd3a5f78c9bff6021b56bb
 DIST plexmediaserver_1.31.1.6733-bc0674160_arm64.deb 71934476 BLAKE2B b78400100e12506f28055c2aa5ea5816d3f2c89ddcc32a842595799c481cbf314cd159beb30629f892907018e94d93884a728bded0dee461910992b1be3beefd SHA512 e7a4a5d2a5bc6a518d955d44de5076213935717fd738efab43645c95383bee0696b608c7651d6c577ae9a53db0e18327475780b0884e8371dd5ddd649db054fa
 DIST plexmediaserver_1.31.1.6733-bc0674160_i386.deb 75390872 BLAKE2B f4f6cf7686f441f547b37bb2bc3211d8410b6441ec896955b024d7a9a52c953f3aa01d5abc311e83026a1ce268047cc7423ac02f6cfa32548c28b13ccb1fa923 SHA512 f34f85076119fa31333fa294a10b81dd3078370c9a42d36506c57bd576cf32f0191b01eb603f26bf81c5b059165db3eb9c15492e1d9d89e7f77a554e17671aed
 DIST plexmediaserver_1.31.3.6868-28fc46b27_amd64.deb 81021076 BLAKE2B 464c12add025a33806bd6389887e5c92429bc8be6fa1b1f1440dc0ff80212595524e2a15bf225ec3dd387ce25afe7166aef913c8a384f94a518ecbfecf95fdc4 SHA512 9f3f63843dd95f28f5ee613a9df7fbc4f4a7bee6fa52525312bd046cd231f50802f2118a4d072b0feaa9fbdecfe6cef0c8c3d1f495fc462922bae458cfd40e29
 DIST plexmediaserver_1.31.3.6868-28fc46b27_arm64.deb 69941782 BLAKE2B ed1a18472a167dee99b1d2e7e7475575672d0ac349beee367e9d5acd5db8b32bf5c0263ff1104d1779ea5464e0c12b278f5c8dfff031fe0ba1356ef2f7c1559f SHA512 21d809df5056d9fa97b094af17afbf71347ecb266fd5a504c60a5a1104f7d39a1a0fcf477e4e8be2fffb1f40fd1a8c6648160a29df6ccdc7b874674f4d95de79
 DIST plexmediaserver_1.31.3.6868-28fc46b27_i386.deb 73289950 BLAKE2B 963a2c8bbaf049e362754f8dd428095afc6c552847f47cd6300b73cbf4ac9030c16bb19fb835cd4baa6a430be17a42c7bfc3260c4bf9e4c81e9fe22e5c9b570c SHA512 92f1a17a9d2ed53829d8fbb7b0f42cb70b3a8871915eaf5c7c7581adf0739c10ec58226e435be1893341853e4f9121985e6a05847510b10613f3c64a8ebd069e
-EBUILD plex-media-server-1.30.2.6563.ebuild 1994 BLAKE2B d94abb05f42951b27c93098eca409473f11b131044662c38c330e49c1e0c762a794b2e49aa8cbfcba96209b53048ed67e880c331a8ec611d75b05c9910b7fbd7 SHA512 c64098f8c6f0d01cbe5c66f0087396fa0d5be82b4423a03897ec8ba60773fb6f4b5051f76a46deda7c12dd4b96e489d85900f2978a180853e0cbba1d08402212
+DIST plexmediaserver_1.32.0.6918-6f393eda1_amd64.deb 81102136 BLAKE2B 309f553877e3e24b8cc0ac62cc50e9c1aee594d31019b7484c10bd3a323c0c0711fb4bcebcacf16f92dabf25b40acd2aa12c9cb830316a6354dcc4f523504980 SHA512 8a4ef0534bad5c73a5044d23cf389a05d73a070b65751090c29ec454649b128b397cec12f2b03b92cdf4d93b0bd0aaa7e308b83bb77e70a2718c3fd6f970592f
+DIST plexmediaserver_1.32.0.6918-6f393eda1_arm64.deb 69869182 BLAKE2B a22f62b36e5909e674b5056147c527a6245315d437949505f78461492a78c23e0e8d002ad73478398fdb8516fff446bef9c5c359eb6e1137f60c9ad2b327cfdd SHA512 8bf991dc9698ba0abdc96a914e8a5570f01339b0e28c38dc6070fcc258a0c35105aabdf4696e7c881dea474bc1a734e9776b04b992a3ec2346e1773b564a55c9
+DIST plexmediaserver_1.32.0.6918-6f393eda1_i386.deb 73536996 BLAKE2B 285b0f4e5b236b9e471d48e56f40d91b32fe017a77832b4ea52eb118d564c25fe32b387ee2ce9b821c87586a0e7728409d32bd0ac9382a50ffdee98f348d9eda SHA512 d09ef035fa68488749312cb03173bbfb9440a3a6a3bc1bc414e470734579cdc3b73aa27a85d8f98c97fc8aaf04ed0ad0462015adf4858543aeeca848d16038f3
 EBUILD plex-media-server-1.31.1.6733.ebuild 2239 BLAKE2B 6a2ce79a2ef768d21a356d5d7ade62f9dc84ad6a6bde834fc190e2584f0392197ced5195188a3d3425800ea6ede997941f1b5360fc7720b01ad4b770b75504d3 SHA512 95bc068c4c559e0ebe52079a1dc9fbc5bc57c24eb1e56b384abb54e050ba4e553bc2c44ad2f12420af5fea0e3abb7b4745b100f776b72fd77bbcb902f58bb98f
 EBUILD plex-media-server-1.31.3.6868.ebuild 2240 BLAKE2B 4a1fb2244918b07ef55c4b12d29566f4e87eec143576290b0a0a1aa718678c13c6fb34e925f6e9d44acbaa45d28c37c33f008c755471b11b919cd9df07591fcb SHA512 eb209f265548cb51b144c7b4e6b15d581ecee0ca63dc107b746fce88974bdc49c33a3163e814e9d04ca54c8e5c4d147873be9bbe032f185f707f9791ddfe664a
+EBUILD plex-media-server-1.32.0.6918.ebuild 2240 BLAKE2B 318e17639f8da14c030a8b575397d421bdf4a83b3de8dcd78a0b636685c6007efa24b77828e423a12a066351bfe00fd60b94d97eacd0aed690c426e820d1af6e SHA512 5df6cbd6d2370feaa76d6d300f00a8f5c6294d5ed4c67e8b44da358ef4acd39b19431ffe65a3137d6d0901bb2202520ca3d263fef0fb8f2356e9c533f5ae8e85
 MISC metadata.xml 572 BLAKE2B 43e637c63f2745de898d7312c317a9faf5013832c04d266da364b70fa7b8fd4e18c1a4e8cda0ee3a8ea1a5970214a4444cef31e010db6a7bf7703d919ab70c22 SHA512 eabead0de1cec6174dad9fee3094f928373d0a69ab59bf81fd4fd205f6e49d2767bede834e43ef3a12dbd2c25c993019f4f6bb6ab82da900ade3eb182d260b79
diff --git a/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild b/media-tv/plex-media-server/plex-media-server-1.32.0.6918.ebuild
index efa23d2e7a1f..629bdf22fa27 100644
--- a/media-tv/plex-media-server/plex-media-server-1.30.2.6563.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.32.0.6918.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-inherit readme.gentoo-r1 systemd unpacker
+inherit readme.gentoo-r1 systemd unpacker pax-utils
 
-MY_PV="${PV}-3d4dc0cce"
+MY_PV="${PV}-6f393eda1"
 MY_URI="https://downloads.plex.tv/plex-media-server-new"
 
 DESCRIPTION="Free media library that is intended for use with a plex client"
@@ -13,19 +13,25 @@ HOMEPAGE="https://www.plex.tv/"
 SRC_URI="
 	amd64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_amd64.deb )
 	arm64? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_arm64.deb )
-	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )"
+	x86? ( ${MY_URI}/${MY_PV}/debian/plexmediaserver_${MY_PV}_i386.deb )
+"
 S="${WORKDIR}"
 
 LICENSE="Plex"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm64 ~x86"
-RESTRICT="mirror bindist"
+KEYWORDS="-* ~amd64 ~arm64 ~x86"
+RESTRICT="bindist"
 
 DEPEND="
 	acct-group/plex
 	acct-user/plex"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}.service.patch"
+)
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
 QA_PREBUILT="*"
 QA_MULTILIB_PATHS=(
 	"usr/lib/plexmediaserver/lib/.*"
@@ -33,17 +39,15 @@ QA_MULTILIB_PATHS=(
 	"usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_hashlib.so"
 )
 
+BINS_TO_PAX_MARK=(
+	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+)
+
 src_install() {
 	# Remove Debian specific files
 	rm -r "usr/share/doc" || die
 
-	# Add startup wrapper
-	dosbin "${FILESDIR}/start_pms"
-
-	# Add user config file
-	mkdir -p "${ED}/etc/default" || die
-	cp usr/lib/plexmediaserver/lib/plexmediaserver.default "${ED}"/etc/default/plexmediaserver || die
-
 	# Copy main files over to image and preserve permissions so it is portable
 	cp -rp usr/ "${ED}" || die
 
@@ -54,10 +58,18 @@ src_install() {
 	keepdir /var/lib/plexmediaserver
 	fowners plex:plex /var/lib/plexmediaserver
 
-	newinitd usr/lib/plexmediaserver/lib/plexmediaserver.init "${PN}"
+	# Install the OpenRC init/conf files
+	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
+	# Install systemd service file
+	systemd_newunit "${ED}"/usr/lib/plexmediaserver/lib/plexmediaserver.service "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	local f
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
 
 	# 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.