From fec152b4f4232a44930d464b52cdfb0e3e662e0d Mon Sep 17 00:00:00 2001 From: Michal Vu Date: Wed, 11 Sep 2024 13:36:02 +0200 Subject: [PATCH 01/17] sys-power/auto-cpufreq: add 2.4.0 ebuild Signed-off-by: Michal Vu --- sys-power/auto-cpufreq/Manifest | 1 + .../auto-cpufreq/auto-cpufreq-2.4.0.ebuild | 147 ++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild diff --git a/sys-power/auto-cpufreq/Manifest b/sys-power/auto-cpufreq/Manifest index 2f7b7ca3d3..4f2fc08b0c 100644 --- a/sys-power/auto-cpufreq/Manifest +++ b/sys-power/auto-cpufreq/Manifest @@ -1,3 +1,4 @@ DIST auto-cpufreq-2.1.0.tar.gz 211221 BLAKE2B ee376e44b31cd93ae37c3a800fd1b7e89af3b696e1d128d2bc8d335b1240d2e2b0d5aa0e90cd1465185bfff9cee02069ee1d46120be014b1dc61ce056308d4a1 SHA512 e01e6f03e7fcd3e0640ebd829234a07043c8d88bd1feabbcc6df463007b2e93410935394257bc28ed1297b294292425adfe4079a3dff0ec5636c23c3cbdd9ee0 DIST auto-cpufreq-2.2.0.tar.gz 213108 BLAKE2B 78d61df3120153fddc50a6cea1c209d14da4aa1072fa10ba4a40c7e4268cf4b2d203a932950087716b08b0551c939bf694d7501c4df4f27d266c2711118afa58 SHA512 9a41f9e7b6e27f0bf7c58da28f84db4db442dee1ab77ee0a849190127b148cb15f5c1a1886f8d2950ef861e6250432383f78b01851f8cdc6ebb9c95b1113acf4 DIST auto-cpufreq-2.3.0.tar.gz 216356 BLAKE2B ac4c0f293575d7e0deb7b31437674f06e614930eeff35cc7e57cca0088e8cf928b9401fcda72d48de12ccf158181cb9290a57dd49047fe3ae9ee182507dfab12 SHA512 46438401cfc662c8b26350e8e6d8ff147d87b49b65162dbdcced5c6e2d7a4762e8d732823c92ae6da80e2b4298999a3131ff574a3ec4293bd8b65979de36e688 +DIST auto-cpufreq-2.4.0.tar.gz 217070 BLAKE2B c572f6665feb55d2fc62d7cb0ec1ec5a8fd382e6745a422ab276deacd1936a6fbd4af8191725877c07958c1b89cb2daaff8cfb9c8ecdbd7cd4047e7986ce82ec SHA512 42fbf2d1a0b97b76343546d1f67c6da25e912001b521a94b7d4e4170b0b5e8e5450a08535a9f22e289ffaccffcd8c8377b22b7bb07d3e139b602f1cb924bd301 diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild new file mode 100644 index 0000000000..206741c8d9 --- /dev/null +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 systemd xdg-utils desktop + +DESCRIPTION="Automatic CPU speed & power optimizer for Linux" +HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" +SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/poetry-core[${PYTHON_USEDEP}] +" + +DOCS=( README.md ) + +src_prepare() { + default + # Update pyproject.toml to avoid dynamic_versioning in poetry + sed -i 's/poetry_dynamic_versioning.backend/poetry.core.masonry.api/' pyproject.toml || die + # Replace /usr/local/ paths with /usr/ in the source code to adhere to Gentoo standards + sed -i 's|/usr/local/share|/usr/share|g' scripts/auto-cpufreq-install.sh || die + sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/core.py || die + sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/gui/app.py || die + # Modify the service file to launch auto-cpufreq natively without the need for virtual environment + sed -i 's|WorkingDirectory=/opt/auto-cpufreq/venv||g' scripts/auto-cpufreq.service || die + sed -i 's|Environment=PYTHONPATH=/opt/auto-cpufreq||g' scripts/auto-cpufreq.service || die + sed -i 's|ExecStart=/opt/auto-cpufreq/venv/bin/python /opt/auto-cpufreq/venv/bin/auto-cpufreq --daemon|ExecStart=/usr/bin/auto-cpufreq --daemon|g' scripts/auto-cpufreq.service || die + # Change the path in core.py + sed -i 's|/opt/auto-cpufreq/override.pickle|/var/lib/auto-cpufreq/override.pickle|g' auto_cpufreq/core.py || die + distutils-r1_src_prepare +} + +python_install() { + distutils-r1_python_install + + # Create the scripts directory if it doesn't exist + dodir "/usr/share/${PN}/scripts" + + # Create the directory for override.pickle + dodir /var/lib/auto-cpufreq + keepdir /var/lib/auto-cpufreq + fowners root:root /var/lib/auto-cpufreq + fperms 0755 /var/lib/auto-cpufreq + + # Copy all scripts from the 'scripts' directory + for script in scripts/*; do + if [[ -f "$script" ]]; then + case "${script##*/}" in + *.sh|*.py|auto-cpufreq-*|cpufreqctl.sh) + exeinto "/usr/share/${PN}/scripts" + doexe "$script" + ;; + *) + insinto "/usr/share/${PN}/scripts" + doins "$script" + ;; + esac + fi + done + + # Copy images + insinto "/usr/share/${PN}/images" + doins images/* + + # Install icon + doicon -s 128 images/icon.png + + # Install polkit policy + insinto /usr/share/polkit-1/actions + doins scripts/org.auto-cpufreq.pkexec.policy + + # Install desktop file + domenu scripts/auto-cpufreq-gtk.desktop + + # Install systemd service file + systemd_dounit "scripts/${PN}.service" + + # Install OpenRC init script + newinitd "scripts/${PN}-openrc" "${PN}" +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + + elog "Updating XDG database" + + elog "The auto-cpufreq override file will be stored in /var/lib/auto-cpufreq/override.pickle" + + # Create log file + touch /var/log/auto-cpufreq.log + elog "" + elog "Enable auto-cpufreq daemon service at boot:" + elog "systemd: systemctl enable --now auto-cpufreq" + elog "openrc: rc-update add auto-cpufreq default" + elog "" + elog "To view live log, run:" + elog "auto-cpufreq --stats" +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + + # Remove the override.pickle file and directory + if [[ -d "${EROOT}/var/lib/auto-cpufreq" ]]; then + rm -rf "${EROOT}"/var/lib/auto-cpufreq || die + fi + + # Remove auto-cpufreq log file + if [ -f "${EROOT}/var/log/auto-cpufreq.log" ]; then + rm "${EROOT}"/var/log/auto-cpufreq.log || die + fi + + # Remove auto-cpufreq-install script + if [ -f "${EROOT}/usr/bin/auto-cpufreq-install" ]; then + rm "${EROOT}"/usr/bin/auto-cpufreq-install || die + fi + + # Restore original cpufreqctl binary if backup was made + if [ -f "${EROOT}/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then + mv "${EROOT}"/usr/bin/cpufreqctl.auto-cpufreq{.bak,} || die + fi + # Remove auto-cpufreq's cpufreqctl binary + # it overwrites cpufreqctl.sh + if [ -f "${EROOT}/usr/bin/cpufreqctl" ]; then + rm "${EROOT}"/usr/bin/cpufreqctl || die + fi +} From 90a7c2f4ffef67f4e3bb00d8473557e19cd303bc Mon Sep 17 00:00:00 2001 From: Ivan Lloro Date: Wed, 11 Sep 2024 11:40:56 +0200 Subject: [PATCH 02/17] dev-python/jpype: Remove obsolete workaround to distutils-r1.eclass former blocking QA check Bug: https://bugs.gentoo.org/937642 Signed-off-by: Ivan Lloro --- dev-python/jpype/jpype-1.5.0.ebuild | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dev-python/jpype/jpype-1.5.0.ebuild b/dev-python/jpype/jpype-1.5.0.ebuild index a7ecaa06af..2f6768ca81 100644 --- a/dev-python/jpype/jpype-1.5.0.ebuild +++ b/dev-python/jpype/jpype-1.5.0.ebuild @@ -19,13 +19,6 @@ KEYWORDS="~amd64" RDEPEND="virtual/jdk" -# WORKAROUND: Overload function to nullify blocking QA check. -# To be deleted after resolution of -# https://bugs.gentoo.org/937642 -_distutils-r1_post_python_install() { - local keep -} - src_prepare() { sed -i "s/'-g0', //g;s/, '-O2'//g" "${S}"/setupext/platform.py || die default From d2439b03333ee190fb425a97dc072498d570d5c2 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 22:30:35 +0900 Subject: [PATCH 03/17] sys-apps/dnf5: add 5.2.6.0 Signed-off-by: Takuya Wakazono --- sys-apps/dnf5/Manifest | 1 + sys-apps/dnf5/dnf5-5.2.6.0.ebuild | 78 +++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 sys-apps/dnf5/dnf5-5.2.6.0.ebuild diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest index df918dcba4..03631e6218 100644 --- a/sys-apps/dnf5/Manifest +++ b/sys-apps/dnf5/Manifest @@ -3,3 +3,4 @@ DIST dnf5-5.2.5.0-toml11-2.patch 1245 BLAKE2B 8396ff3028462f91ea97174d43d511ebfe DIST dnf5-5.2.5.0-toml11-3.patch 4223 BLAKE2B 2b1afd2188e7ca4a72208227d3f081041eef651299ea7242dff9273a23df7e0592777c3007af3ba3c581dc6737150d28212b94370d40d16567bfefa33bf5df96 SHA512 8f9abf420845c0240da4c2d776c933722af3858bfe638206390c62dbf3748ad5d4c6bf8482b864e2b43c74ba3b49bab5b2ac15d90a8d815a6e7f42069bd09ec4 DIST dnf5-5.2.5.0-toml11-4.patch 11747 BLAKE2B 83a6cd0f54bcb471b0009e204d10d2eeafc9bf1ad7af1e0a07c0294cb76ebcd728ce43403be8ae5428313adcfd0839886681273f75caefe915496f5e166d7468 SHA512 eb67693605cf6d401393fb11e5d8508f374bc92d10815a881890cbf73c70e057d3d0cfa9e48f888edbde07f24f7741f50162a60c7adbb6e94e84876be6061215 DIST dnf5-5.2.5.0.tar.gz 1303914 BLAKE2B c9fd30aaa74e7e063b1ffbce645a839ba1b82aad92bae70299254a6a62e087246d006af58205f46720f57c1f1eb193eaabe323b6b8d67b31b4ce763b98e573f5 SHA512 9339bdb39a2b55006941909bd9c5e2ebba01258a15952952c346d88bb270cf51b2db91d1938b2bb8ace3c20c58dab3ec11b25454394d270de76580ea6ee49980 +DIST dnf5-5.2.6.0.tar.gz 1345711 BLAKE2B 5f5eb39379ec8f50c5a2ba5a92eaf4adeb2eefd1ad4cfa1a73bd1a1dd0e91f2882967864524f520c512f03eb7d04f58515e5356513a3cb490d06e733051ca2d7 SHA512 4c1ccf77e0f34415df2cd1530672053d9acb53c10ca0880c1f7c4ad0fcbebf13ffa31a075d0ccd740969b48f0634b80d8c014ecd0eaa36bbce40d49f420a3216 diff --git a/sys-apps/dnf5/dnf5-5.2.6.0.ebuild b/sys-apps/dnf5/dnf5-5.2.6.0.ebuild new file mode 100644 index 0000000000..d5b62426e7 --- /dev/null +++ b/sys-apps/dnf5/dnf5-5.2.6.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Command-line package manager" +HOMEPAGE="https://github.com/rpm-software-management/dnf5" +SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="nls systemd test" +PROPERTIES="test_network" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/rpm-4.17.0 + dev-cpp/sdbus-c++:= + dev-cpp/toml11 + >=dev-db/sqlite-3.35.0:3 + >=dev-libs/glib-2.46.0:2 + dev-libs/json-c:= + dev-libs/libfmt:= + >=dev-libs/librepo-1.17.1 + >=dev-libs/libsolv-0.7.25 + dev-libs/libxml2 + sys-apps/util-linux + >=sys-libs/libmodulemd-2.11.2 + systemd? ( sys-apps/systemd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-python/breathe + dev-python/sphinx + virtual/pkgconfig + test? ( + app-arch/rpm + app-arch/createrepo_c + dev-util/cppunit + ) +" + +PATCHES=( + # Prevent empty cache directory from being created. + "${FILESDIR}/${PN}-5.2.5.0-remove-empty-dir.patch" + # Prevent test suite from writing to system files. + "${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch" +) + +src_prepare() { + cmake_src_prepare + # Replace hardcoded TMPDIR. + sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die + # remove -Werror{,=unused-result}; bug 936870 + sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DWITH_HTML=OFF + -DWITH_PERL5=OFF + -DWITH_PYTHON3=OFF + -DWITH_RUBY=OFF + -DWITH_ZCHUNK=OFF + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TESTS=$(usex test) + -DWITH_TRANSLATIONS=$(usex nls) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + cmake_src_compile doc-man +} From 91d35c8ddad04910fa61e50e990c7cd161036b59 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 22:30:35 +0900 Subject: [PATCH 04/17] sys-apps/dnf5: drop 5.2.5.0-r2 Signed-off-by: Takuya Wakazono --- sys-apps/dnf5/Manifest | 5 -- sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild | 93 ---------------------------- 2 files changed, 98 deletions(-) delete mode 100644 sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest index 03631e6218..d8e2a8608f 100644 --- a/sys-apps/dnf5/Manifest +++ b/sys-apps/dnf5/Manifest @@ -1,6 +1 @@ -DIST dnf5-5.2.5.0-toml11-1.patch 19355 BLAKE2B 6de22ffcee99ab9eff5926b3d255af0f5be59524b4804048be900905a4750a740736454f56b0162af1f43a536495f1e1f644642c7902593c114ee4bbea859eb5 SHA512 f94103259e6b47ed41b97090a47c7a9978c82711c34c984285cbf704344147947c62f6f506c70bdfe9f678feda564da88fbbc8da2dfdb08a3e7abbf2fdce4bbf -DIST dnf5-5.2.5.0-toml11-2.patch 1245 BLAKE2B 8396ff3028462f91ea97174d43d511ebfe6b13fda0c8f419f590961a4207e62a2b0301ad8bab8d1a02050fd8124561ba1f29c880d04833ff96283d8d5c7b61a9 SHA512 2a56125d84024236d789797f6ede473f29367b4ca0a6fa64c2fa6f93909dbda7bae7fe8de34ab791bed148995cb44a99c6f8cd767186b086b0d15fb29d19d28a -DIST dnf5-5.2.5.0-toml11-3.patch 4223 BLAKE2B 2b1afd2188e7ca4a72208227d3f081041eef651299ea7242dff9273a23df7e0592777c3007af3ba3c581dc6737150d28212b94370d40d16567bfefa33bf5df96 SHA512 8f9abf420845c0240da4c2d776c933722af3858bfe638206390c62dbf3748ad5d4c6bf8482b864e2b43c74ba3b49bab5b2ac15d90a8d815a6e7f42069bd09ec4 -DIST dnf5-5.2.5.0-toml11-4.patch 11747 BLAKE2B 83a6cd0f54bcb471b0009e204d10d2eeafc9bf1ad7af1e0a07c0294cb76ebcd728ce43403be8ae5428313adcfd0839886681273f75caefe915496f5e166d7468 SHA512 eb67693605cf6d401393fb11e5d8508f374bc92d10815a881890cbf73c70e057d3d0cfa9e48f888edbde07f24f7741f50162a60c7adbb6e94e84876be6061215 -DIST dnf5-5.2.5.0.tar.gz 1303914 BLAKE2B c9fd30aaa74e7e063b1ffbce645a839ba1b82aad92bae70299254a6a62e087246d006af58205f46720f57c1f1eb193eaabe323b6b8d67b31b4ce763b98e573f5 SHA512 9339bdb39a2b55006941909bd9c5e2ebba01258a15952952c346d88bb270cf51b2db91d1938b2bb8ace3c20c58dab3ec11b25454394d270de76580ea6ee49980 DIST dnf5-5.2.6.0.tar.gz 1345711 BLAKE2B 5f5eb39379ec8f50c5a2ba5a92eaf4adeb2eefd1ad4cfa1a73bd1a1dd0e91f2882967864524f520c512f03eb7d04f58515e5356513a3cb490d06e733051ca2d7 SHA512 4c1ccf77e0f34415df2cd1530672053d9acb53c10ca0880c1f7c4ad0fcbebf13ffa31a075d0ccd740969b48f0634b80d8c014ecd0eaa36bbce40d49f420a3216 diff --git a/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild b/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild deleted file mode 100644 index 9d1230127f..0000000000 --- a/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Command-line package manager" -HOMEPAGE="https://github.com/rpm-software-management/dnf5" -SRC_URI=" - https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/rpm-software-management/dnf5/commit/f2f730229d10431272ee8991b600a17607c40f36.patch - -> ${P}-toml11-1.patch - https://github.com/rpm-software-management/dnf5/commit/87b11dc2fd152bc662bc97ff2340a6e4d10b0dc8.patch - -> ${P}-toml11-2.patch - https://github.com/rpm-software-management/dnf5/commit/7b2a6e58b103e1100bcff06e097bb94b34bde22e.patch - -> ${P}-toml11-3.patch - https://github.com/rpm-software-management/dnf5/commit/1746eabb865bc3882956128adef5f228323855a0.patch - -> ${P}-toml11-4.patch -" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="nls systemd test" -PROPERTIES="test_network" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/rpm-4.17.0 - dev-cpp/sdbus-c++:= - dev-cpp/toml11 - >=dev-db/sqlite-3.35.0:3 - >=dev-libs/glib-2.46.0:2 - dev-libs/json-c:= - dev-libs/libfmt:= - >=dev-libs/librepo-1.17.1 - >=dev-libs/libsolv-0.7.25 - dev-libs/libxml2 - sys-apps/util-linux - >=sys-libs/libmodulemd-2.11.2 - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-python/breathe - dev-python/sphinx - virtual/pkgconfig - test? ( - app-arch/rpm - app-arch/createrepo_c - dev-util/cppunit - ) -" - -PATCHES=( - # Prevent empty cache directory from being created. - "${FILESDIR}/${P}-remove-empty-dir.patch" - # Prevent test suite from writing to system files. - "${FILESDIR}/${P}-sandbox-test.patch" - # toml11-4 support - "${DISTDIR}/${P}-toml11-1.patch" - "${DISTDIR}/${P}-toml11-2.patch" - "${DISTDIR}/${P}-toml11-3.patch" - "${DISTDIR}/${P}-toml11-4.patch" -) - -src_prepare() { - cmake_src_prepare - # Replace hardcoded TMPDIR. - sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die - # remove -Werror{,=unused-result}; bug 936870 - sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DWITH_HTML=OFF - -DWITH_PERL5=OFF - -DWITH_PYTHON3=OFF - -DWITH_RUBY=OFF - -DWITH_ZCHUNK=OFF - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_TRANSLATIONS=$(usex nls) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - cmake_src_compile doc-man -} From c0bff00760c7c6b97d095d6b08cae78f6aad76e7 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 22:30:36 +0900 Subject: [PATCH 05/17] media-video/kikoplay: fix RDEPEND Closes: https://bugs.gentoo.org/911382 Signed-off-by: Takuya Wakazono --- media-video/kikoplay/kikoplay-0.9.3.ebuild | 7 ++++--- media-video/kikoplay/kikoplay-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/media-video/kikoplay/kikoplay-0.9.3.ebuild b/media-video/kikoplay/kikoplay-0.9.3.ebuild index d8e86af6dd..e004828310 100644 --- a/media-video/kikoplay/kikoplay-0.9.3.ebuild +++ b/media-video/kikoplay/kikoplay-0.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -37,15 +37,16 @@ LICENSE="GPL-3" SLOT="0" RDEPEND=" - dev-libs/qhttpengine:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - media-video/mpv[libmpv] + media-video/mpv:=[libmpv] net-misc/aria2 + sys-libs/zlib " DEPEND=" diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild index d8e86af6dd..e004828310 100644 --- a/media-video/kikoplay/kikoplay-9999.ebuild +++ b/media-video/kikoplay/kikoplay-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -37,15 +37,16 @@ LICENSE="GPL-3" SLOT="0" RDEPEND=" - dev-libs/qhttpengine:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - media-video/mpv[libmpv] + media-video/mpv:=[libmpv] net-misc/aria2 + sys-libs/zlib " DEPEND=" From a827e65f9adeb15c4ae47b09ab168ba10fac1e3d Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 22:30:36 +0900 Subject: [PATCH 06/17] media-video/kikoplay: unkeyword 0.9.3 for ~mips Signed-off-by: Takuya Wakazono --- media-video/kikoplay/kikoplay-0.9.3.ebuild | 2 +- media-video/kikoplay/kikoplay-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/kikoplay/kikoplay-0.9.3.ebuild b/media-video/kikoplay/kikoplay-0.9.3.ebuild index e004828310..63408fec2b 100644 --- a/media-video/kikoplay/kikoplay-0.9.3.ebuild +++ b/media-video/kikoplay/kikoplay-0.9.3.ebuild @@ -28,7 +28,7 @@ else https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}/archive/${GIT_SCRIPT_PV}.tar.gz \ -> kikoplayscript-${GIT_SCRIPT_PV}.tar.gz " - KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~m68k ~ppc ~ppc64 ~x86" S="${WORKDIR}/${GIT_PN}-${PV}" S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}-${GIT_SCRIPT_PV}" fi diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild index e004828310..63408fec2b 100644 --- a/media-video/kikoplay/kikoplay-9999.ebuild +++ b/media-video/kikoplay/kikoplay-9999.ebuild @@ -28,7 +28,7 @@ else https://github.com/KikoPlayProject/${GIT_SCRIPT_PN}/archive/${GIT_SCRIPT_PV}.tar.gz \ -> kikoplayscript-${GIT_SCRIPT_PV}.tar.gz " - KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~m68k ~ppc ~ppc64 ~x86" S="${WORKDIR}/${GIT_PN}-${PV}" S_SCRIPT="${WORKDIR}/${GIT_SCRIPT_PN}-${GIT_SCRIPT_PV}" fi From 61d1aa88c70209ce5b7c239e5e6b8d2afa6dc7fd Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 22:30:36 +0900 Subject: [PATCH 07/17] profiles: last-rite dev-libs/qhttpengine for removal Signed-off-by: Takuya Wakazono --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 5afc856b57..50d3c8a4a1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,11 @@ # New entries go on top. +# Takuya Wakazono (2024-09-11) +# Dead upstream and no revdeps left. +# Removal on 2024-10-11. +dev-libs/qhttpengine + # Takuya Wakazono (2024-09-07) # gevent never has been built successfully. # Removing reverse dependency and its dependencies as well. From 99a7d53bea4e5b97dce9dfa7848494cc11193a71 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 23:32:21 +0900 Subject: [PATCH 08/17] sys-power/auto-cpufreq: drop 2.1.0-r1, 2.2.0 Signed-off-by: Takuya Wakazono --- sys-power/auto-cpufreq/Manifest | 2 - .../auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild | 83 ---------- .../auto-cpufreq/auto-cpufreq-2.2.0.ebuild | 142 ------------------ 3 files changed, 227 deletions(-) delete mode 100644 sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild delete mode 100644 sys-power/auto-cpufreq/auto-cpufreq-2.2.0.ebuild diff --git a/sys-power/auto-cpufreq/Manifest b/sys-power/auto-cpufreq/Manifest index 4f2fc08b0c..762963ff6b 100644 --- a/sys-power/auto-cpufreq/Manifest +++ b/sys-power/auto-cpufreq/Manifest @@ -1,4 +1,2 @@ -DIST auto-cpufreq-2.1.0.tar.gz 211221 BLAKE2B ee376e44b31cd93ae37c3a800fd1b7e89af3b696e1d128d2bc8d335b1240d2e2b0d5aa0e90cd1465185bfff9cee02069ee1d46120be014b1dc61ce056308d4a1 SHA512 e01e6f03e7fcd3e0640ebd829234a07043c8d88bd1feabbcc6df463007b2e93410935394257bc28ed1297b294292425adfe4079a3dff0ec5636c23c3cbdd9ee0 -DIST auto-cpufreq-2.2.0.tar.gz 213108 BLAKE2B 78d61df3120153fddc50a6cea1c209d14da4aa1072fa10ba4a40c7e4268cf4b2d203a932950087716b08b0551c939bf694d7501c4df4f27d266c2711118afa58 SHA512 9a41f9e7b6e27f0bf7c58da28f84db4db442dee1ab77ee0a849190127b148cb15f5c1a1886f8d2950ef861e6250432383f78b01851f8cdc6ebb9c95b1113acf4 DIST auto-cpufreq-2.3.0.tar.gz 216356 BLAKE2B ac4c0f293575d7e0deb7b31437674f06e614930eeff35cc7e57cca0088e8cf928b9401fcda72d48de12ccf158181cb9290a57dd49047fe3ae9ee182507dfab12 SHA512 46438401cfc662c8b26350e8e6d8ff147d87b49b65162dbdcced5c6e2d7a4762e8d732823c92ae6da80e2b4298999a3131ff574a3ec4293bd8b65979de36e688 DIST auto-cpufreq-2.4.0.tar.gz 217070 BLAKE2B c572f6665feb55d2fc62d7cb0ec1ec5a8fd382e6745a422ab276deacd1936a6fbd4af8191725877c07958c1b89cb2daaff8cfb9c8ecdbd7cd4047e7986ce82ec SHA512 42fbf2d1a0b97b76343546d1f67c6da25e912001b521a94b7d4e4170b0b5e8e5450a08535a9f22e289ffaccffcd8c8377b22b7bb07d3e139b602f1cb924bd301 diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild deleted file mode 100644 index 4ee9f6f698..0000000000 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -DISTUTILS_USE_PEP517=poetry - -inherit distutils-r1 systemd - -DESCRIPTION="Automatic CPU speed & power optimizer for Linux" -HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" -SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -DEPEND="${RDEPEND}" - -DOCS=( README.md ) -PATCHES=( "${FILESDIR}/${PN}-remove-poetry_versioning.patch" ) - -src_prepare() { - sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/core.py || die - sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/gui/app.py || die - distutils-r1_src_prepare -} - -python_install() { - distutils-r1_python_install - - exeinto "/usr/share/${PN}/scripts" - doexe scripts/cpufreqctl.sh - - insinto "/usr/share/${PN}/scripts" - doins scripts/style.css - - insinto "/usr/share/${PN}/images" - doins images/* - - systemd_douserunit "${FILESDIR}/${PN}.service" - newinitd "scripts/${PN}-openrc" "${PN}" -} - -pkg_postinst() { - touch /var/log/auto-cpufreq.log - - elog "" - elog "Enable auto-cpufreq daemon service at boot:" - elog "systemd: systemctl enable --now auto-cpufreq" - elog "openrc: rc-update add auto-cpufreq default" - elog "" - elog "To view live log, run:" - elog "auto-cpufreq --stats" -} - -pkg_postrm() { - # Remove auto-cpufreq log file - if [ -f "${EROOT}/var/log/auto-cpufreq.log" ]; then - rm "${EROOT}"/var/log/auto-cpufreq.log || die - fi - - # Restore original cpufreqctl binary if backup was made - if [ -f "${EROOT}/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then - mv "${EROOT}"/usr/bin/cpufreqctl.auto-cpufreq{.bak,} || die - fi - - # Remove auto-cpufreq's cpufreqctl binary - # it overwrites cpufreqctl.sh - if [ -f "${EROOT}/usr/bin/cpufreqctl" ]; then - rm "${EROOT}"/usr/bin/cpufreqctl || die - fi -} diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.2.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.2.0.ebuild deleted file mode 100644 index da618f3c94..0000000000 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.2.0.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -DISTUTILS_USE_PEP517=poetry - -inherit distutils-r1 systemd xdg-utils desktop - -DESCRIPTION="Automatic CPU speed & power optimizer for Linux" -HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" -SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-python/poetry-core[${PYTHON_USEDEP}] -" - -DOCS=( README.md ) - -src_prepare() { - default - # Update pyproject.toml to avoid dynamic_versioning in poetry - sed -i 's/poetry_dynamic_versioning.backend/poetry.core.masonry.api/' pyproject.toml || die - # Replace /usr/local/ paths with /usr/ in the source code to adhere to Gentoo standards - sed -i 's|/usr/local/share|/usr/share|g' scripts/auto-cpufreq-install.sh || die - sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/core.py || die - sed -i 's|usr/local|usr|g' "scripts/${PN}.service" "scripts/${PN}-openrc" auto_cpufreq/gui/app.py || die - # Modify the service file to launch auto-cpufreq natively without the need for virtual environment - sed -i 's|WorkingDirectory=/opt/auto-cpufreq/venv||g' scripts/auto-cpufreq.service || die - sed -i 's|Environment=PYTHONPATH=/opt/auto-cpufreq||g' scripts/auto-cpufreq.service || die - sed -i 's|ExecStart=/opt/auto-cpufreq/venv/bin/python /opt/auto-cpufreq/venv/bin/auto-cpufreq --daemon|ExecStart=/usr/bin/auto-cpufreq --daemon|g' scripts/auto-cpufreq.service || die - # Change the path in core.py - sed -i 's|/opt/auto-cpufreq/override.pickle|/var/lib/auto-cpufreq/override.pickle|g' auto_cpufreq/core.py || die - distutils-r1_src_prepare -} - -python_install() { - distutils-r1_python_install - - # Create the scripts directory if it doesn't exist - dodir "/usr/share/${PN}/scripts" - - # Create the directory for override.pickle - dodir /var/lib/auto-cpufreq - keepdir /var/lib/auto-cpufreq - fowners root:root /var/lib/auto-cpufreq - fperms 0755 /var/lib/auto-cpufreq - - # Copy all scripts from the 'scripts' directory - for script in scripts/*; do - if [[ -f "$script" ]]; then - case "${script##*/}" in - *.sh|*.py|auto-cpufreq-*|cpufreqctl.sh) - exeinto "/usr/share/${PN}/scripts" - doexe "$script" - ;; - *) - insinto "/usr/share/${PN}/scripts" - doins "$script" - ;; - esac - fi - done - - # Copy images - insinto "/usr/share/${PN}/images" - doins images/* - - # Install icon - doicon -s 128 images/icon.png - - # Install polkit policy - insinto /usr/share/polkit-1/actions - doins scripts/org.auto-cpufreq.pkexec.policy - - # Install desktop file - domenu scripts/auto-cpufreq-gtk.desktop - - # Install systemd service file - systemd_dounit "scripts/${PN}.service" - - # Install OpenRC init script - newinitd "scripts/${PN}-openrc" "${PN}" -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - elog "Updating XDG database" - - elog "The auto-cpufreq override file will be stored in /var/lib/auto-cpufreq/override.pickle" - - # Create log file - touch /var/log/auto-cpufreq.log - elog "" - elog "Enable auto-cpufreq daemon service at boot:" - elog "systemd: systemctl enable --now auto-cpufreq" - elog "openrc: rc-update add auto-cpufreq default" - elog "" - elog "To view live log, run:" - elog "auto-cpufreq --stats" -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - - # Remove the override.pickle file and directory - if [[ -d "${EROOT}/var/lib/auto-cpufreq" ]]; then - rm -rf "${EROOT}"/var/lib/auto-cpufreq || die - fi - - # Remove auto-cpufreq log file - if [ -f "${EROOT}/var/log/auto-cpufreq.log" ]; then - rm "${EROOT}"/var/log/auto-cpufreq.log || die - fi - - # Restore original cpufreqctl binary if backup was made - if [ -f "${EROOT}/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then - mv "${EROOT}"/usr/bin/cpufreqctl.auto-cpufreq{.bak,} || die - fi - # Remove auto-cpufreq's cpufreqctl binary - # it overwrites cpufreqctl.sh - if [ -f "${EROOT}/usr/bin/cpufreqctl" ]; then - rm "${EROOT}"/usr/bin/cpufreqctl || die - fi -} From 398bb8349a658cf16d78682a1856ec6ed008114c Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Wed, 11 Sep 2024 23:33:54 +0900 Subject: [PATCH 09/17] sys-power/auto-cpufreq: update LICENSE There are places where '-or-later' is not present, but most distributions consider it as LGPL3+. https://github.com/AdnanHodzic/auto-cpufreq/blob/master/LICENSE https://github.com/AdnanHodzic/auto-cpufreq/blob/3e528420223b40611ec2664e5e3738dc4800afbb/nix/default.nix#L77 Signed-off-by: Takuya Wakazono --- sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild | 2 +- sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild index da618f3c94..5694dc67a8 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Automatic CPU speed & power optimizer for Linux" HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="LGPL-3+" SLOT="0" KEYWORDS="~amd64" diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild index 206741c8d9..19c577dd3e 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.4.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Automatic CPU speed & power optimizer for Linux" HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="LGPL-3+" SLOT="0" KEYWORDS="~amd64" From 98c4eef2bdb0e6b38e3f6ffb766bdb056f7cb6c7 Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Wed, 11 Sep 2024 17:50:01 +0300 Subject: [PATCH 10/17] media-sound/tidal-hifi-bin: add .desktop file and USE=wayland Signed-off-by: Kostadin Shishmanov --- .../tidal-hifi-bin/files/tidal-hifi.desktop | 10 ++ .../tidal-hifi-bin-5.16.0-r1.ebuild | 109 ++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 media-sound/tidal-hifi-bin/files/tidal-hifi.desktop create mode 100644 media-sound/tidal-hifi-bin/tidal-hifi-bin-5.16.0-r1.ebuild diff --git a/media-sound/tidal-hifi-bin/files/tidal-hifi.desktop b/media-sound/tidal-hifi-bin/files/tidal-hifi.desktop new file mode 100644 index 0000000000..56e22e8e6b --- /dev/null +++ b/media-sound/tidal-hifi-bin/files/tidal-hifi.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=TIDAL Hi-Fi +Type=Application +Comment=Web version of Tidal running in electron with Hi-Fi support thanks to Widevine. +Exec=/usr/bin/tidal-hifi @exec_extra_flags@ +Icon=tidal-hifi +Categories=Network;AudioVideo;Audio;Video; +StartupWMClass=tidal-hifi +X-PulseAudio-Properties=media.role=music +MimeType=x-scheme-handler/tidal; diff --git a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.16.0-r1.ebuild b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.16.0-r1.ebuild new file mode 100644 index 0000000000..68df90d38b --- /dev/null +++ b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.16.0-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN/-bin/}" + +CHROMIUM_LANGS=" + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv + sw ta te th tr uk ur vi zh-CN zh-TW +" + +inherit chromium-2 desktop linux-info unpacker xdg + +DESCRIPTION="Web version of Tidal running in electron with Hi-Fi support thanks to Widevine." +HOMEPAGE="https://github.com/Mastermindzh/tidal-hifi" +SRC_URI="https://github.com/Mastermindzh/tidal-hifi/releases/download/${PV}/tidal-hifi-${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="wayland" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/libgcrypt + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/mesa[gbm(+)] + net-print/cups + sys-apps/dbus + sys-apps/util-linux + sys-libs/glibc + x11-libs/cairo + x11-libs/libdrm + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/libxshmfence + x11-libs/pango +" + +DESTDIR="/opt/${PN}" + +QA_PREBUILT="*" + +CONFIG_CHECK="~USER_NS" + +src_configure() { + default + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + # cleanup languages + pushd "locales/" >/dev/null || die "location change for language cleanup failed" + chromium_remove_language_paks + popd >/dev/null || die "location reset for language cleanup failed" + rm -rf "${S}"/resources/app.asar.unpacked/node_modules/{abstract-socket,register-scheme}/build/node_gyp_bins || die +} + +src_install() { + doicon -s 256 "${FILESDIR}/${MY_PN}.png" + + local EXEC_EXTRA_FLAGS=() + if use wayland; then + EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" ) + fi + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/tidal-hifi.desktop" \ + > "${T}/tidal-hifi.desktop" || die + + domenu "${T}/tidal-hifi.desktop" + + exeinto "${DESTDIR}" + + doexe "${MY_PN}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so + + insinto "${DESTDIR}" + doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin + insopts -m0755 + doins -r locales resources + + # Chrome-sandbox requires the setuid bit to be specifically set. + # see https://github.com/electron/electron/issues/17972 + fowners root "${DESTDIR}/chrome-sandbox" + fperms 4711 "${DESTDIR}/chrome-sandbox" + + [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + + dosym -r "${DESTDIR}/${MY_PN}" "/usr/bin/${MY_PN}" +} From 4a52a96ca8b6fb10b11d0510ac884284c09c8eff Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Wed, 11 Sep 2024 17:50:49 +0300 Subject: [PATCH 11/17] media-sound/tidal-hifi-bin: drop 5.15.0 Signed-off-by: Kostadin Shishmanov --- media-sound/tidal-hifi-bin/Manifest | 1 - .../tidal-hifi-bin-5.15.0.ebuild | 99 ------------------- 2 files changed, 100 deletions(-) delete mode 100644 media-sound/tidal-hifi-bin/tidal-hifi-bin-5.15.0.ebuild diff --git a/media-sound/tidal-hifi-bin/Manifest b/media-sound/tidal-hifi-bin/Manifest index 41daa01a57..d2a4b472bd 100644 --- a/media-sound/tidal-hifi-bin/Manifest +++ b/media-sound/tidal-hifi-bin/Manifest @@ -1,2 +1 @@ -DIST tidal-hifi-bin-5.15.0.tar.gz 113447478 BLAKE2B 2f1b7ee95ca1b7faed391634c8849d90c2c7c7307e828e762023281f478aa52b468c96b1df3dafdef79ae5706e8069ba1e65f38863646563d3e7b47a15a30c84 SHA512 b76a4c9ffa26645665c815b96ceb5dde33d73bb6e0e6b2a524738dcbdf0a00f9c7fdd2e72debb91e54175392c902a2bc71606e6fcdb9d96d356edc2a3edbd2e2 DIST tidal-hifi-bin-5.16.0.tar.gz 113448747 BLAKE2B 5c0721de2d6997c158e2f850d01129eea4c7b5ef3e3ea48c216dc68fec5f05565f0d9bcf6b70744c106b2408999e91bf19da5b11ec1773b80a123972095c9d49 SHA512 edde0e60330ed9071be28d0a255c801c32382e5f7b5c3eefe802d16474f27af2e8a55790e9a71bf049c1cd3ea6ef05c5fc1f9e1390c3a3d58e53f83d76430427 diff --git a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.15.0.ebuild b/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.15.0.ebuild deleted file mode 100644 index fa242c2f3c..0000000000 --- a/media-sound/tidal-hifi-bin/tidal-hifi-bin-5.15.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN/-bin/}" - -CHROMIUM_LANGS=" - af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk ur vi zh-CN zh-TW -" - -inherit chromium-2 desktop linux-info unpacker xdg - -DESCRIPTION="Web version of Tidal running in electron with Hi-Fi support thanks to Widevine." -HOMEPAGE="https://github.com/Mastermindzh/tidal-hifi" -SRC_URI="https://github.com/Mastermindzh/tidal-hifi/releases/download/${PV}/tidal-hifi-${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - dev-libs/expat - dev-libs/glib:2 - dev-libs/libgcrypt - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/libdrm - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/libxshmfence - x11-libs/pango -" - -DESTDIR="/opt/${PN}" - -QA_PREBUILT="*" - -CONFIG_CHECK="~USER_NS" - -src_configure() { - default - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - default - # cleanup languages - pushd "locales/" >/dev/null || die "location change for language cleanup failed" - chromium_remove_language_paks - popd >/dev/null || die "location reset for language cleanup failed" - rm -rf "${S}"/resources/app.asar.unpacked/node_modules/{abstract-socket,register-scheme}/build/node_gyp_bins || die -} - -src_install() { - doicon -s 256 "${FILESDIR}/${MY_PN}.png" - - make_desktop_entry "/usr/bin/tidal-hifi" "TIDAL Hi-Fi" ${MY_PN} "Network;AudioVideo;Audio;Video" - - exeinto "${DESTDIR}" - - doexe "${MY_PN}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so - - insinto "${DESTDIR}" - doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin - insopts -m0755 - doins -r locales resources - - # Chrome-sandbox requires the setuid bit to be specifically set. - # see https://github.com/electron/electron/issues/17972 - fowners root "${DESTDIR}/chrome-sandbox" - fperms 4711 "${DESTDIR}/chrome-sandbox" - - [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler - - dosym -r "${DESTDIR}/${MY_PN}" "/usr/bin/${MY_PN}" -} From a5450f7faa7aae789816e555b95b1f2e8c4e1e69 Mon Sep 17 00:00:00 2001 From: Michal Vu Date: Wed, 11 Sep 2024 20:46:44 +0200 Subject: [PATCH 12/17] sys-power/auto-cpufreq: remove redundant patch files due to recent drops of 2.1.0-r1 and 2.2.0 Signed-off-by: Michal Vu --- .../auto-cpufreq/auto-cpufreq-2.3.0.ebuild | 5 +++++ ...uto-cpufreq-remove-poetry_versioning.patch | 13 ------------- ...req-remove-setuptools_git_versioning.patch | 19 ------------------- .../auto-cpufreq/files/auto-cpufreq.service | 12 ------------ 4 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch delete mode 100644 sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch delete mode 100644 sys-power/auto-cpufreq/files/auto-cpufreq.service diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild index 5694dc67a8..19c577dd3e 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild @@ -130,6 +130,11 @@ pkg_postrm() { rm "${EROOT}"/var/log/auto-cpufreq.log || die fi + # Remove auto-cpufreq-install script + if [ -f "${EROOT}/usr/bin/auto-cpufreq-install" ]; then + rm "${EROOT}"/usr/bin/auto-cpufreq-install || die + fi + # Restore original cpufreqctl binary if backup was made if [ -f "${EROOT}/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then mv "${EROOT}"/usr/bin/cpufreqctl.auto-cpufreq{.bak,} || die diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch b/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch deleted file mode 100644 index c48110495a..0000000000 --- a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index c555726..f3ea0ab 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -33,7 +33,7 @@ poetry = "^1.6.1" - - [build-system] - requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"] --build-backend = "poetry_dynamic_versioning.backend" -+build-backend = "poetry.core.masonry.api" - - [tool.poetry.scripts] - auto-cpufreq = "auto_cpufreq.bin.auto_cpufreq:main" diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch b/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch deleted file mode 100644 index c5d9460521..0000000000 --- a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove the automatic setuptools_git_versioning because distutils can not handle that. - ---- a/setup.py -+++ b/setup.py -@@ -17,13 +17,7 @@ VERSION = "1.9.5" - - setup( - name="auto-cpufreq", -- setuptools_git_versioning={ -- "starting_version": VERSION, -- "template": "{tag}+{sha}", -- "dev_template": "{tag}+{sha}", -- "dirty_template": "{tag}+{sha}.post{ccount}.dirty" -- }, -- setup_requires=["setuptools-git-versioning"], -+ version=VERSION, - description="Automatic CPU speed & power optimizer for Linux", - long_description=readme, - author="Adnan Hodzic", diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq.service b/sys-power/auto-cpufreq/files/auto-cpufreq.service deleted file mode 100644 index 494942d835..0000000000 --- a/sys-power/auto-cpufreq/files/auto-cpufreq.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=auto-cpufreq - Automatic CPU speed & power optimizer for Linux -After=network.target network-online.target - -[Service] -Type=simple -User=root -ExecStart=auto-cpufreq --daemon -Restart=on-failure - -[Install] -WantedBy=multi-user.target From cba9edadcede7fe52c669409dcfeffacc4041e16 Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Wed, 11 Sep 2024 20:57:45 +0200 Subject: [PATCH 13/17] gui-apps/fuzzel: add 1.11.0 Signed-off-by: Jonas Frei --- gui-apps/fuzzel/Manifest | 1 + gui-apps/fuzzel/fuzzel-1.11.0.ebuild | 57 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 gui-apps/fuzzel/fuzzel-1.11.0.ebuild diff --git a/gui-apps/fuzzel/Manifest b/gui-apps/fuzzel/Manifest index 2bba26ea1c..f08e976da4 100644 --- a/gui-apps/fuzzel/Manifest +++ b/gui-apps/fuzzel/Manifest @@ -1,2 +1,3 @@ DIST fuzzel-1.10.2.tar.gz 440973 BLAKE2B 201d5ac43629ead9f2dcbc55f97e6847ec9c39fc6b8d4c48ad286a0a45c89a685464ea113f04179378d775ffe93ee1dfe4a99cd13b0797df374e6d3948772c0f SHA512 bc2a3780838ae4a68f23cd9c5e240576cb79c8c29fe5a2069628f3763670139d9c19695b55fbc10cf16affcf8527bedcef0524e374d406e698be8c4afb7a2579 +DIST fuzzel-1.11.0.tar.gz 473635 BLAKE2B 046eef81998ab89b710c225f5df79a64d7f5d38d247f9bc2c3efcd569106562d2b66574f1c0f3348b38ff92655f714e07495dc4870dfb8eb97158dd5442452fd SHA512 d52bb149f786a652576bf47f2167dde38d273825a6c59d362fa1f50b29b06da4eb6ca0605df481271e0016eff09aafb40ab61228e51ac93fb7bbe98428bd0c3f DIST fuzzel-1.9.2.tar.gz 433292 BLAKE2B 7b0533f7bb705b330e9c5c0fb89831283cc5e349891408d398d26f20c7c78c599ae28c18e92379df8888a8099ec4b7736ea356b6342ff3b1c3fde57085580f23 SHA512 a92f0b6eb9470aa099651c2f5d095986347565bbd7366bffe0719801dbb1ae4f7e413460c59872d40e910bb1d3bc8195e9d9038a73c2de835bcda77f9372b393 diff --git a/gui-apps/fuzzel/fuzzel-1.11.0.ebuild b/gui-apps/fuzzel/fuzzel-1.11.0.ebuild new file mode 100644 index 0000000000..3a65daea02 --- /dev/null +++ b/gui-apps/fuzzel/fuzzel-1.11.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson optfeature + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/fuzzel.git" +else + SRC_URI="https://codeberg.org/dnkl/fuzzel/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +fi + +DESCRIPTION="Application launcher for wlroots based Wayland compositors." +HOMEPAGE="https://codeberg.org/dnkl/fuzzel" +LICENSE="MIT" +SLOT="0" +IUSE="png svg" + +DEPEND=" + dev-libs/wayland + =media-libs/fcft-3.0.0 + media-libs/fontconfig + x11-libs/libxkbcommon + x11-libs/pixman + png? ( media-libs/libpng ) + svg? ( media-libs/nanosvg ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + app-text/scdoc + >=dev-libs/tllist-1.0.1 + >=dev-libs/wayland-protocols-1.32 + dev-util/wayland-scanner +" + +src_configure() { + local emesonargs=( + -Dpng-backend=$(usex png libpng none) + -Dsvg-backend=$(usex svg nanosvg none) + $(meson_feature svg system-nanosvg) + ) + meson_src_configure +} + +src_install() { + meson_src_install + rm -rf "${ED}/usr/share/doc/fuzzel" || die +} + +pkg_postinst() { + optfeature "For rounded corner support" x11-libs/cairo +} From fbe36a9dccf74a07867e67b45dc4426415939965 Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Wed, 11 Sep 2024 20:57:57 +0200 Subject: [PATCH 14/17] gui-apps/fuzzel: drop 1.9.2, 9999 Signed-off-by: Jonas Frei --- gui-apps/fuzzel/Manifest | 1 - gui-apps/fuzzel/fuzzel-1.9.2.ebuild | 53 ----------------------------- gui-apps/fuzzel/fuzzel-9999.ebuild | 53 ----------------------------- 3 files changed, 107 deletions(-) delete mode 100644 gui-apps/fuzzel/fuzzel-1.9.2.ebuild delete mode 100644 gui-apps/fuzzel/fuzzel-9999.ebuild diff --git a/gui-apps/fuzzel/Manifest b/gui-apps/fuzzel/Manifest index f08e976da4..a64ff05dcb 100644 --- a/gui-apps/fuzzel/Manifest +++ b/gui-apps/fuzzel/Manifest @@ -1,3 +1,2 @@ DIST fuzzel-1.10.2.tar.gz 440973 BLAKE2B 201d5ac43629ead9f2dcbc55f97e6847ec9c39fc6b8d4c48ad286a0a45c89a685464ea113f04179378d775ffe93ee1dfe4a99cd13b0797df374e6d3948772c0f SHA512 bc2a3780838ae4a68f23cd9c5e240576cb79c8c29fe5a2069628f3763670139d9c19695b55fbc10cf16affcf8527bedcef0524e374d406e698be8c4afb7a2579 DIST fuzzel-1.11.0.tar.gz 473635 BLAKE2B 046eef81998ab89b710c225f5df79a64d7f5d38d247f9bc2c3efcd569106562d2b66574f1c0f3348b38ff92655f714e07495dc4870dfb8eb97158dd5442452fd SHA512 d52bb149f786a652576bf47f2167dde38d273825a6c59d362fa1f50b29b06da4eb6ca0605df481271e0016eff09aafb40ab61228e51ac93fb7bbe98428bd0c3f -DIST fuzzel-1.9.2.tar.gz 433292 BLAKE2B 7b0533f7bb705b330e9c5c0fb89831283cc5e349891408d398d26f20c7c78c599ae28c18e92379df8888a8099ec4b7736ea356b6342ff3b1c3fde57085580f23 SHA512 a92f0b6eb9470aa099651c2f5d095986347565bbd7366bffe0719801dbb1ae4f7e413460c59872d40e910bb1d3bc8195e9d9038a73c2de835bcda77f9372b393 diff --git a/gui-apps/fuzzel/fuzzel-1.9.2.ebuild b/gui-apps/fuzzel/fuzzel-1.9.2.ebuild deleted file mode 100644 index 3e66166046..0000000000 --- a/gui-apps/fuzzel/fuzzel-1.9.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://codeberg.org/dnkl/fuzzel.git" -else - SRC_URI="https://codeberg.org/dnkl/fuzzel/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}" -fi - -DESCRIPTION="Application launcher for wlroots based Wayland compositors." -HOMEPAGE="https://codeberg.org/dnkl/fuzzel" -LICENSE="MIT" -SLOT="0" -IUSE="cairo png svg" - -DEPEND=" - dev-libs/wayland - =media-libs/fcft-3.0.0 - x11-libs/libxkbcommon - x11-libs/pixman - cairo? ( x11-libs/cairo ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - app-text/scdoc - >=dev-libs/tllist-1.0.1 - dev-libs/wayland-protocols - dev-util/wayland-scanner -" - -src_configure() { - local emesonargs=( - -Dpng-backend=$(usex png libpng none) - -Dsvg-backend=$(usex svg librsvg none) - $(meson_feature cairo enable-cairo) - ) - meson_src_configure -} - -src_install() { - meson_src_install - rm -rf "${ED}/usr/share/doc/fuzzel" || die -} diff --git a/gui-apps/fuzzel/fuzzel-9999.ebuild b/gui-apps/fuzzel/fuzzel-9999.ebuild deleted file mode 100644 index 3e66166046..0000000000 --- a/gui-apps/fuzzel/fuzzel-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://codeberg.org/dnkl/fuzzel.git" -else - SRC_URI="https://codeberg.org/dnkl/fuzzel/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}" -fi - -DESCRIPTION="Application launcher for wlroots based Wayland compositors." -HOMEPAGE="https://codeberg.org/dnkl/fuzzel" -LICENSE="MIT" -SLOT="0" -IUSE="cairo png svg" - -DEPEND=" - dev-libs/wayland - =media-libs/fcft-3.0.0 - x11-libs/libxkbcommon - x11-libs/pixman - cairo? ( x11-libs/cairo ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - app-text/scdoc - >=dev-libs/tllist-1.0.1 - dev-libs/wayland-protocols - dev-util/wayland-scanner -" - -src_configure() { - local emesonargs=( - -Dpng-backend=$(usex png libpng none) - -Dsvg-backend=$(usex svg librsvg none) - $(meson_feature cairo enable-cairo) - ) - meson_src_configure -} - -src_install() { - meson_src_install - rm -rf "${ED}/usr/share/doc/fuzzel" || die -} From 6eeba78b405e231e01096adcead8137c9810bab5 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Wed, 11 Sep 2024 21:13:06 +0200 Subject: [PATCH 15/17] x11-misc/gromit-mpx: add missing dep on app-arch/lz4 Closes: https://bugs.gentoo.org/939473 Signed-off-by: Oliver Freyermuth --- x11-misc/gromit-mpx/gromit-mpx-1.7.0.ebuild | 1 + x11-misc/gromit-mpx/gromit-mpx-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.7.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.7.0.ebuild index af92ebca0e..abaae1384a 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.7.0.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.7.0.ebuild @@ -20,6 +20,7 @@ LICENSE="GPL-2" SLOT="0" RDEPEND=" + app-arch/lz4 dev-libs/glib dev-libs/libayatana-appindicator x11-libs/cairo diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild index af92ebca0e..abaae1384a 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -20,6 +20,7 @@ LICENSE="GPL-2" SLOT="0" RDEPEND=" + app-arch/lz4 dev-libs/glib dev-libs/libayatana-appindicator x11-libs/cairo From c6b654765f570763ed7d946e91a53c87afb05814 Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Thu, 12 Sep 2024 10:43:20 +0200 Subject: [PATCH 16/17] dev-vcs/jj: require exactly libgit2:0/1.8 Closes: https://bugs.gentoo.org/938497 Signed-off-by: Steffen Winter --- dev-vcs/jj/jj-0.21.0.ebuild | 2 +- dev-vcs/jj/jj-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-vcs/jj/jj-0.21.0.ebuild b/dev-vcs/jj/jj-0.21.0.ebuild index 8025637ed4..954bf04cc8 100644 --- a/dev-vcs/jj/jj-0.21.0.ebuild +++ b/dev-vcs/jj/jj-0.21.0.ebuild @@ -407,7 +407,7 @@ SLOT="0" BDEPEND="virtual/pkgconfig" DEPEND=" >=app-arch/zstd-1.5.5:= - dev-libs/libgit2:0/1.7 + =dev-libs/libgit2-1.8*:0/1.8 dev-libs/openssl net-libs/libssh2:= sys-libs/zlib diff --git a/dev-vcs/jj/jj-9999.ebuild b/dev-vcs/jj/jj-9999.ebuild index 4895d0b656..69aa701083 100644 --- a/dev-vcs/jj/jj-9999.ebuild +++ b/dev-vcs/jj/jj-9999.ebuild @@ -27,7 +27,7 @@ SLOT="0" BDEPEND="virtual/pkgconfig" DEPEND=" >=app-arch/zstd-1.5.5:= - >=dev-libs/libgit2-1.7.2:= + =dev-libs/libgit2-1.8*:0/1.8 dev-libs/openssl net-libs/libssh2:= sys-libs/zlib From baf9e23de8191090192dbdb35e1e77f05db93fa0 Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Thu, 12 Sep 2024 10:49:33 +0200 Subject: [PATCH 17/17] dev-vcs/jj: require libgit2-1.8.1 or better Signed-off-by: Steffen Winter --- dev-vcs/jj/jj-0.21.0.ebuild | 2 +- dev-vcs/jj/jj-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-vcs/jj/jj-0.21.0.ebuild b/dev-vcs/jj/jj-0.21.0.ebuild index 954bf04cc8..056676c2aa 100644 --- a/dev-vcs/jj/jj-0.21.0.ebuild +++ b/dev-vcs/jj/jj-0.21.0.ebuild @@ -407,7 +407,7 @@ SLOT="0" BDEPEND="virtual/pkgconfig" DEPEND=" >=app-arch/zstd-1.5.5:= - =dev-libs/libgit2-1.8*:0/1.8 + >=dev-libs/libgit2-1.8.1:0/1.8 dev-libs/openssl net-libs/libssh2:= sys-libs/zlib diff --git a/dev-vcs/jj/jj-9999.ebuild b/dev-vcs/jj/jj-9999.ebuild index 69aa701083..298db66e80 100644 --- a/dev-vcs/jj/jj-9999.ebuild +++ b/dev-vcs/jj/jj-9999.ebuild @@ -27,7 +27,7 @@ SLOT="0" BDEPEND="virtual/pkgconfig" DEPEND=" >=app-arch/zstd-1.5.5:= - =dev-libs/libgit2-1.8*:0/1.8 + >=dev-libs/libgit2-1.8.1:0/1.8 dev-libs/openssl net-libs/libssh2:= sys-libs/zlib