From 26fcba1f4ce7f1f9d1ec6596931fa6d002e935a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sun, 3 Jan 2021 13:09:06 +0100 Subject: [PATCH] www-servers/jellyfin-bin: re-add conditional SRC_URI with a fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Maciej Barć --- .../jellyfin-bin/jellyfin-bin-10.6.4.ebuild | 20 ++++++++++--------- .../jellyfin-bin-10.7.0_rc2.ebuild | 20 ++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild index fd90fa1..15c9ff2 100644 --- a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild +++ b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild @@ -9,15 +9,13 @@ MY_PN="${PN/-bin}" if [[ "${PV}" == *_rc* ]]; then # _rc -> ~rc MY_PV="${PV/_rc/~rc}" - ARM64_DEB="${MY_PN}-server_${MY_PV}_arm64.deb" - AMD64_DEB="${MY_PN}-server_${MY_PV}_amd64.deb" - WEB_DEB="${MY_PN}-web_${MY_PV}_all.deb" + SRV_SRC="${MY_PN}-server_${MY_PV}" + WEB_SRC="${MY_PN}-web_${MY_PV}" else # Add "-1" MY_PV="${PV}" - ARM64_DEB="${MY_PN}-server_${MY_PV}-1_arm64.deb" - AMD64_DEB="${MY_PN}-server_${MY_PV}-1_amd64.deb" - WEB_DEB="${MY_PN}-web_${MY_PV}-1_all.deb" + SRV_SRC="${MY_PN}-server_${MY_PV}-1" + WEB_SRC="${MY_PN}-web_${MY_PV}-1" fi inherit unpacker systemd wrapper @@ -25,9 +23,13 @@ inherit unpacker systemd wrapper DESCRIPTION="The Free Software Media System" HOMEPAGE="https://jellyfin.org" SRC_URI=" - ${BASE_URI}/server/${MY_PV}/${ARM64_DEB} -> ${P}-server-arm64.deb - ${BASE_URI}/server/${MY_PV}/${AMD64_DEB} -> ${P}-server-amd64.deb - ${BASE_URI}/web/${MY_PV}/${WEB_DEB} -> ${P}-web.deb + amd64? ( + ${BASE_URI}/server/${MY_PV}/${SRV_SRC}_amd64.deb -> ${P}-server-amd64.deb + ) + arm64? ( + ${BASE_URI}/server/${MY_PV}/${SRV_SRC}_arm64.deb -> ${P}-server-arm64.deb + ) + ${BASE_URI}/web/${MY_PV}/${WEB_SRC}_all.deb -> ${P}-web.deb " RESTRICT="mirror" diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild index fd90fa1..15c9ff2 100644 --- a/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild +++ b/www-servers/jellyfin-bin/jellyfin-bin-10.7.0_rc2.ebuild @@ -9,15 +9,13 @@ MY_PN="${PN/-bin}" if [[ "${PV}" == *_rc* ]]; then # _rc -> ~rc MY_PV="${PV/_rc/~rc}" - ARM64_DEB="${MY_PN}-server_${MY_PV}_arm64.deb" - AMD64_DEB="${MY_PN}-server_${MY_PV}_amd64.deb" - WEB_DEB="${MY_PN}-web_${MY_PV}_all.deb" + SRV_SRC="${MY_PN}-server_${MY_PV}" + WEB_SRC="${MY_PN}-web_${MY_PV}" else # Add "-1" MY_PV="${PV}" - ARM64_DEB="${MY_PN}-server_${MY_PV}-1_arm64.deb" - AMD64_DEB="${MY_PN}-server_${MY_PV}-1_amd64.deb" - WEB_DEB="${MY_PN}-web_${MY_PV}-1_all.deb" + SRV_SRC="${MY_PN}-server_${MY_PV}-1" + WEB_SRC="${MY_PN}-web_${MY_PV}-1" fi inherit unpacker systemd wrapper @@ -25,9 +23,13 @@ inherit unpacker systemd wrapper DESCRIPTION="The Free Software Media System" HOMEPAGE="https://jellyfin.org" SRC_URI=" - ${BASE_URI}/server/${MY_PV}/${ARM64_DEB} -> ${P}-server-arm64.deb - ${BASE_URI}/server/${MY_PV}/${AMD64_DEB} -> ${P}-server-amd64.deb - ${BASE_URI}/web/${MY_PV}/${WEB_DEB} -> ${P}-web.deb + amd64? ( + ${BASE_URI}/server/${MY_PV}/${SRV_SRC}_amd64.deb -> ${P}-server-amd64.deb + ) + arm64? ( + ${BASE_URI}/server/${MY_PV}/${SRV_SRC}_arm64.deb -> ${P}-server-arm64.deb + ) + ${BASE_URI}/web/${MY_PV}/${WEB_SRC}_all.deb -> ${P}-web.deb " RESTRICT="mirror"