Merge updates from master

games-arcade/taisei/Manifest

@@ -1,2 +1 @@
-DIST taisei-v1.3.1.tar.xz 70763196 BLAKE2B ca1901ba0205f6771c087ee70222ceaa3c406a1c632a5f46df1fe4fe493c89af8b587e397551777cd956ab73b5104450356303d0ea0cb8d5cd1b6723ceb1d648 SHA512 5e6f364e67717091041a30103bf117bb5d7a6be76d3d9499b13e36fc190be8c2a0e7ceb582e1d106aa0c1acbb6e39b99a4873a0885af1ec2117ff6ff08e14e3c
 DIST taisei-v1.3.2.tar.xz 70481856 BLAKE2B 608b5db6f17e2693539ce0742a1812633e91e901b3935b9e54f91514827642334f6cb6f0217aff713f1ff9dd01d971ae895ac8c98b0360f254b52d3e49bfae61 SHA512 9304c082106dfa1ffcf6c8fb7333e64755b1246ef50b9f49d3e64d167eb15575ac667ca658b1d7e247582e164e703e5817384556dd633f5516670d975817717d

games-arcade/taisei/taisei-1.3.1-r1.ebuild

@@ -1,56 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson python-any-r1 xdg
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/taisei-project/taisei.git"
-else
-	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/${PN}-v${PV}.tar.xz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-DESCRIPTION="Clone of the Touhou series, written in C using SDL/OpenGL/OpenAL."
-HOMEPAGE="https://taisei-project.org/"
-LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain"
-SLOT="0"
-
-IUSE="doc lto zip"
-
-DEPEND="
-	media-libs/freetype:2
-	>=media-libs/libpng-1.5
-	media-libs/libsdl2
-	media-libs/sdl2-mixer[opus]
-	media-libs/libwebp
-	sys-libs/zlib
-	zip? ( dev-libs/libzip )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	${PYTHON_DEPS}
-	doc? ( dev-python/docutils )"
-
-src_prepare() {
-	if use doc; then
-		sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${P}\')/" \
-			meson.build || die "Failed changing doc_path"
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-		$(meson_use lto b_lto)
-		$(meson_use zip enable_zip)
-		-Dstrip=false
-	)
-	meson_src_configure
-}

games-arcade/taisei/taisei-1.3.2-r1.ebuild

@@ -23,18 +23,22 @@ SLOT="0"
 
 IUSE="doc lto zip"
 
-DEPEND="
+RDEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.5
 	media-libs/libsdl2
-	media-libs/sdl2-mixer[opus]
+	media-libs/opusfile
 	media-libs/libwebp
+	app-arch/zstd
 	sys-libs/zlib
 	zip? ( dev-libs/libzip )
 "
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	>=dev-libs/cglm-0.7.8
-	>=dev-util/meson-0.49
+"
+BDEPEND="
+	>=dev-util/meson-0.53
 	${PYTHON_DEPS}
 	doc? ( dev-python/docutils )"
 

games-arcade/taisei/taisei-9999.ebuild

@@ -23,7 +23,7 @@ SLOT="0"
 
 IUSE="doc lto zip"
 
-DEPEND="
+RDEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.5
 	media-libs/libsdl2
@@ -33,8 +33,11 @@ DEPEND="
 	sys-libs/zlib
 	zip? ( dev-libs/libzip )
 "
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	>=dev-libs/cglm-0.7.8
+"
+BDEPEND="
 	>=dev-util/meson-0.53
 	${PYTHON_DEPS}
 	doc? ( dev-python/docutils )"

media-video/jellyfin-desktop/Manifest

@@ -1,3 +1 @@
-DIST jellyfin-desktop-1.10.2.tar.gz 462456 BLAKE2B b2a97937e016e8e998f48a5baf6fb20d2feaeefaeda0db484c6004752cae81f70846630a4baff29b49aa4d40e72d46642cca77a658784d5f089e6adffa30afca SHA512 fff04450a7f948bc234797a11af143b75da7c8fcd116c1777e4d004998803ce18cb235e81e84ec0028a3f4e29e3bfc510cb6b3be1f0b131e963b03771da6010a
-DIST jellyfin-mpv-shim-shader-pack-1.1.0.tar.gz 1326518 BLAKE2B ef1d1c699698cc62163b903e20e4a9cbad14169f2aca1058e58da5102e72be4291504cbad5bb877820fb7d4ed6749b04319bca7d210bfcf103693be9a0cc4e69 SHA512 26cacd859c0d0fef06fbd598007f291a652fd52d617af2df71104f705156ae78665dee2ae963f3e7bdb01e91d3fa41f555824a47f9d621d1627a06b2b5f9ba75
-DIST jellyfin-web-1.7.0.zip 34771390 BLAKE2B cab30609bda5936b5a9d3f9a0a9d59ceec88abf8e80e9ddc3e00b2d3a5f20e5cef28318b13b9c529cd1a175ebc87376348471b19d0de2ef92f4e584ee45c672a SHA512 ab674911f20172b56baf06ea0cccb9b89083266661f1b9aecc2e620735de901d355a7f0f93e1b9e109e00b1e8097bd5aa1b185f3e4670ee9f22e38bbaa84f5d2
+DIST jellyfin-mpv-shim-2.0.1.tar.gz 1493065 BLAKE2B 69f5bdef06b0e4cf075c209c0177aa886e00416e3d2504e876893b1e71683d2ec674a325105202fcd3d8f245b8f1998a45fc8d6d535dff16c9ad2d034fb81c0b SHA512 ff4398c590fa7fb7fbf09a1079872ab9e0a9603d451f5e6eb527ea975367f19cc2e446fef7ffc03d2f95e7b0b1ec3289fd5d3914c2b1c4032655efd1459030c0

media-video/jellyfin-desktop/jellyfin-desktop-2.0.1.ebuild

@@ -8,18 +8,14 @@ PYTHON_REQ_USE="tk"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1
+MY_PN="jellyfin-mpv-shim"
+MY_P="${MY_PN}-${PV}"
 
-SHADER_PV="1.1.0"
-WEB_PV="1.7.0"
+inherit distutils-r1
 
 DESCRIPTION="MPV-based desktop and cast client for Jellyfin"
 HOMEPAGE="https://github.com/jellyfin/jellyfin-desktop"
-SRC_URI="
-	https://github.com/jellyfin/jellyfin-desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/iwalton3/default-shader-pack/archive/v${SHADER_PV}.tar.gz -> jellyfin-mpv-shim-shader-pack-${SHADER_PV}.tar.gz
-	https://github.com/iwalton3/jellyfin-web/releases/download/v${WEB_PV}-4/dist.zip -> jellyfin-web-${WEB_PV}.zip
-"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT Unlicense"
 SLOT="0"
@@ -29,9 +25,8 @@ DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/python-mpv[${PYTHON_USEDEP}]
 		>=dev-python/jellyfin-apiclient-python-1.7.2[${PYTHON_USEDEP}]
-		dev-python/python-mpv-jsonipc[${PYTHON_USEDEP}]
+		>=dev-python/python-mpv-jsonipc-1.1.9[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="
@@ -46,12 +41,5 @@ RDEPEND="
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 	')
 "
-BDEPEND="app-arch/unzip"
 
-src_install() {
-	distutils-r1_src_install
-	python_moduleinto "jellyfin_mpv_shim/webclient_view/webclient" # jellyfin-web dist
-	python_domodule -r "${WORKDIR}"/dist/*
-	python_moduleinto "jellyfin_mpv_shim/default_shader_pack" # mpv shaders
-	python_domodule -r "${WORKDIR}"/default-shader-pack-${SHADER_PV}/*
-}
+S="${WORKDIR}/${MY_P}"