commit: 7b3bb71592c015fc65d5c1dce813ce8b5c55cb80 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Fri Mar 22 22:03:43 2024 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 18:36:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3bb715
www-apps/jellyfin-bin: move from www-apps/jellyfin Bug: https://bugs.gentoo.org/915346 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> profiles/updates/1Q-2024 | 1 + www-apps/{jellyfin => jellyfin-bin}/Manifest | 0 .../files/jellyfin.confd | 0 .../files/jellyfin.init-r1 | 0 .../files/jellyfin.service | 0 .../jellyfin-bin-10.8.13.ebuild} | 31 ++++++++++++---------- www-apps/{jellyfin => jellyfin-bin}/metadata.xml | 0 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index 1053aa984aa3..420be15dbf42 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -93,3 +93,4 @@ slotmove =dev-ruby/launchy-3.0.0 0 3 move dev-python/DBUtils dev-python/dbutils move dev-python/aiorpcX dev-python/aiorpcx move www-apps/sonarr www-apps/sonarr-bin +move www-apps/jellyfin www-apps/jellyfin-bin diff --git a/www-apps/jellyfin/Manifest b/www-apps/jellyfin-bin/Manifest similarity index 100% rename from www-apps/jellyfin/Manifest rename to www-apps/jellyfin-bin/Manifest diff --git a/www-apps/jellyfin/files/jellyfin.confd b/www-apps/jellyfin-bin/files/jellyfin.confd similarity index 100% rename from www-apps/jellyfin/files/jellyfin.confd rename to www-apps/jellyfin-bin/files/jellyfin.confd diff --git a/www-apps/jellyfin/files/jellyfin.init-r1 b/www-apps/jellyfin-bin/files/jellyfin.init-r1 similarity index 100% rename from www-apps/jellyfin/files/jellyfin.init-r1 rename to www-apps/jellyfin-bin/files/jellyfin.init-r1 diff --git a/www-apps/jellyfin/files/jellyfin.service b/www-apps/jellyfin-bin/files/jellyfin.service similarity index 100% rename from www-apps/jellyfin/files/jellyfin.service rename to www-apps/jellyfin-bin/files/jellyfin.service diff --git a/www-apps/jellyfin/jellyfin-10.8.13.ebuild b/www-apps/jellyfin-bin/jellyfin-bin-10.8.13.ebuild similarity index 72% rename from www-apps/jellyfin/jellyfin-10.8.13.ebuild rename to www-apps/jellyfin-bin/jellyfin-bin-10.8.13.ebuild index 39218e469f00..ab927c16c0e6 100644 --- a/www-apps/jellyfin/jellyfin-10.8.13.ebuild +++ b/www-apps/jellyfin-bin/jellyfin-bin-10.8.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,36 +6,39 @@ EAPI=8 inherit pax-utils systemd tmpfiles DESCRIPTION="Jellyfin puts you in control of managing and streaming your media" -HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/" +HOMEPAGE="https://jellyfin.readthedocs.io/en/latest/ + https://github.com/jellyfin/jellyfin/" SRC_URI=" arm64? ( - https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/${PN}_${PV}_arm64.tar.gz - https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${PN}_${PV}_arm64.tar.gz + https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/jellyfin_${PV}_arm64.tar.gz + https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/jellyfin_${PV}_arm64.tar.gz ) amd64? ( - https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/${PN}_${PV}_amd64.tar.gz - https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/${PN}_${PV}_amd64.tar.gz + https://repo.jellyfin.org/releases/server/linux/versions/stable/combined/${PV}/jellyfin_${PV}_amd64.tar.gz + https://repo.jellyfin.org/archive/linux/stable/${PV}/combined/jellyfin_${PV}_amd64.tar.gz )" -RESTRICT="mirror test" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~arm64" +RESTRICT="mirror test" +REQUIRED_USE="elibc_glibc" + DEPEND="acct-user/jellyfin media-libs/fontconfig sys-libs/zlib" RDEPEND="${DEPEND} dev-libs/icu - media-video/ffmpeg[vpx,x264] - sys-libs/glibc" + media-video/ffmpeg[vpx,x264]" BDEPEND="acct-user/jellyfin" -INST_DIR="/opt/${PN}" + +INST_DIR="/opt/jellyfin" QA_PREBUILT="${INST_DIR#/}/*.so ${INST_DIR#/}/jellyfin ${INST_DIR#/}/createdump" src_unpack() { unpack ${A} - mv ${PN}_${PV} ${P} || die + mv jellyfin_${PV} ${P} || die } src_prepare() { @@ -56,9 +59,9 @@ src_install() { doins -r "${S}"/* newtmpfiles - jellyfin.conf <<<"d /var/cache/jellyfin 0775 jellyfin jellyfin -" chmod 755 "${D}${INST_DIR}/jellyfin" - newinitd "${FILESDIR}/${PN}.init-r1" "${PN}" - newconfd "${FILESDIR}"/${PN}.confd "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}/jellyfin.init-r1" "jellyfin" + newconfd "${FILESDIR}"/jellyfin.confd "jellyfin" + systemd_dounit "${FILESDIR}/jellyfin.service" pax-mark -m "${ED}${INST_DIR}/jellyfin" } diff --git a/www-apps/jellyfin/metadata.xml b/www-apps/jellyfin-bin/metadata.xml similarity index 100% rename from www-apps/jellyfin/metadata.xml rename to www-apps/jellyfin-bin/metadata.xml