From f69d5731668fddde4706df130b1419afe9c52868 Mon Sep 17 00:00:00 2001 From: Norbert Norbiros Date: Mon, 20 Jan 2025 15:57:40 +0100 Subject: [PATCH 1/6] games-util/modrinth-app-bin: new package, add 0.9.2 Signed-off-by: Norbert Norbiros --- games-util/modrinth-app-bin/Manifest | 1 + .../files/modrinth-app-bin-desktop.patch | 15 ++++ games-util/modrinth-app-bin/metadata.xml | 11 +++ .../modrinth-app-bin-0.9.2.ebuild | 78 +++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 games-util/modrinth-app-bin/Manifest create mode 100644 games-util/modrinth-app-bin/files/modrinth-app-bin-desktop.patch create mode 100644 games-util/modrinth-app-bin/metadata.xml create mode 100644 games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild diff --git a/games-util/modrinth-app-bin/Manifest b/games-util/modrinth-app-bin/Manifest new file mode 100644 index 0000000000..890269755c --- /dev/null +++ b/games-util/modrinth-app-bin/Manifest @@ -0,0 +1 @@ +DIST Modrinth%20App_0.9.2_amd64.deb 8162736 BLAKE2B 0e5bc56252e2598d5f57e601e7e90cb36d11232d6e78d1271184e0440029241b3ab4945ec83091e64bc31531bd2aedeb096d912cd3c4303e7d58374ec9917c80 SHA512 40445540e071675af23384e55892b659f66da3d9400d8f7d624de2cf9424227dea4ce821a2b843a23d37238908d864ba005668d5a00175a11f30409b384995c2 diff --git a/games-util/modrinth-app-bin/files/modrinth-app-bin-desktop.patch b/games-util/modrinth-app-bin/files/modrinth-app-bin-desktop.patch new file mode 100644 index 0000000000..ebae65bdda --- /dev/null +++ b/games-util/modrinth-app-bin/files/modrinth-app-bin-desktop.patch @@ -0,0 +1,15 @@ +diff --git a/usr/share/applications/modrinth-app-bin.desktop b/usr/share/applications/modrinth-app-bi.desktop +index 802f685..898b247 100644 +--- a/usr/share/applications/modrinth-app-bin.desktop ++++ b/usr/share/applications/modrinth-app-bin.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] + Categories=Game; +-Exec=ModrinthApp ++Exec="/opt/modrinth-app-bin/modrinth-app-bin" %U + Icon=ModrinthApp + Name=Modrinth App + Terminal=false + Type=Application + MimeType=application/zip+mrpack;x-scheme-handler/modrinth + diff --git a/games-util/modrinth-app-bin/metadata.xml b/games-util/modrinth-app-bin/metadata.xml new file mode 100644 index 0000000000..55e587cb3c --- /dev/null +++ b/games-util/modrinth-app-bin/metadata.xml @@ -0,0 +1,11 @@ + + + + + norbiros@protonmail.com + Norbiros + + + Modrinth/code + + diff --git a/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild b/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild new file mode 100644 index 0000000000..a7499983c6 --- /dev/null +++ b/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker desktop xdg-utils + +DESCRIPTION="A unique, open source launcher that allows you to play your favorite Minecraft mods, and keep them up to date, all in one neat little package." +HOMEPAGE="https://modrinth.com/app" +SRC_URI="https://launcher-files.modrinth.com/versions/${PV}/linux/Modrinth%20App_${PV}_amd64.deb" + +S="${WORKDIR}" + +LICENSE="GPL-3.0-only" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +# Tauri deps +RDEPEND=" + sys-apps/dbus + net-libs/webkit-gtk:4.1 + dev-libs/libappindicator + x11-libs/gtk+:3 + net-libs/libsoup + gnome-base/librsvg +" +# Minecraft deps +RDEPEND+=" + x11-libs/libX11 + media-libs/libpulse + x11-libs/libXxf86vm +" +BDEPEND="app-arch/unzip" + +QA_PREBUILT=".*" + +PATCHES=( + "${FILESDIR}/${PN}-desktop.patch" +) + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + mv "${S}/usr/share/applications/Modrinth App.desktop"\ + "${S}/usr/share/applications/${PN}.desktop" + + default + + mv "${S}/usr/bin/ModrinthApp" "${S}/usr/bin/${PN}" || die +} + +src_install() { + ICONDIR="usr/share/icons/hicolor" + DESTDIR="/opt/${PN}" + + doicon -s 128 "${ICONDIR}/128x128/apps/ModrinthApp.png" + doicon -s 256 "${ICONDIR}/256x256@2/apps/ModrinthApp.png" + + domenu "${S}/usr/share/applications/${PN}.desktop" + + dodir /opt/${PN} + + exeinto "${DESTDIR}" + doexe "${S}/usr/bin/${PN}" +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} From cef9532fdf0212dded5c418eeef1a36777739805 Mon Sep 17 00:00:00 2001 From: Norbert Norbiros Date: Mon, 20 Jan 2025 16:21:40 +0100 Subject: [PATCH 2/6] games-util/modrinth-app-bin: update LICENSE Signed-off-by: Norbert Norbiros --- .../modrinth-app-bin-0.9.2.ebuild | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild b/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild index a7499983c6..f592b6b99f 100644 --- a/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild +++ b/games-util/modrinth-app-bin/modrinth-app-bin-0.9.2.ebuild @@ -11,25 +11,23 @@ SRC_URI="https://launcher-files.modrinth.com/versions/${PV}/linux/Modrinth%20App S="${WORKDIR}" -LICENSE="GPL-3.0-only" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" # Tauri deps RDEPEND=" - sys-apps/dbus - net-libs/webkit-gtk:4.1 - dev-libs/libappindicator - x11-libs/gtk+:3 - net-libs/libsoup - gnome-base/librsvg + sys-apps/dbus + net-libs/webkit-gtk:4.1 + x11-libs/gtk+:3 + net-libs/libsoup + gnome-base/librsvg " # Minecraft deps RDEPEND+=" - x11-libs/libX11 - media-libs/libpulse - x11-libs/libXxf86vm + x11-libs/libX11 + media-libs/libpulse + x11-libs/libXxf86vm " BDEPEND="app-arch/unzip" @@ -40,11 +38,11 @@ PATCHES=( ) src_unpack() { - unpack_deb ${A} + unpack_deb ${A} } src_prepare() { - mv "${S}/usr/share/applications/Modrinth App.desktop"\ + mv "${S}/usr/share/applications/Modrinth App.desktop"\ "${S}/usr/share/applications/${PN}.desktop" default @@ -53,18 +51,18 @@ src_prepare() { } src_install() { - ICONDIR="usr/share/icons/hicolor" + ICONDIR="usr/share/icons/hicolor" DESTDIR="/opt/${PN}" - doicon -s 128 "${ICONDIR}/128x128/apps/ModrinthApp.png" + doicon -s 128 "${ICONDIR}/128x128/apps/ModrinthApp.png" doicon -s 256 "${ICONDIR}/256x256@2/apps/ModrinthApp.png" - domenu "${S}/usr/share/applications/${PN}.desktop" + domenu "${S}/usr/share/applications/${PN}.desktop" - dodir /opt/${PN} + dodir /opt/${PN} - exeinto "${DESTDIR}" - doexe "${S}/usr/bin/${PN}" + exeinto "${DESTDIR}" + doexe "${S}/usr/bin/${PN}" } pkg_postinst() { From 390ea3b93af0350ba8d077b55aac0336de918d25 Mon Sep 17 00:00:00 2001 From: Henri Gasc Date: Mon, 20 Jan 2025 16:59:06 +0100 Subject: [PATCH 3/6] dev-python/pyrr: treeclean Signed-off-by: Henri Gasc --- dev-python/pyrr/Manifest | 1 - dev-python/pyrr/metadata.xml | 12 --------- dev-python/pyrr/pyrr-0.10.3-r1.ebuild | 35 --------------------------- profiles/package.mask | 5 ---- 4 files changed, 53 deletions(-) delete mode 100644 dev-python/pyrr/Manifest delete mode 100644 dev-python/pyrr/metadata.xml delete mode 100644 dev-python/pyrr/pyrr-0.10.3-r1.ebuild diff --git a/dev-python/pyrr/Manifest b/dev-python/pyrr/Manifest deleted file mode 100644 index 383fae89a4..0000000000 --- a/dev-python/pyrr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST v0.10.3.gh.tar.gz 66011 BLAKE2B 843cb7199daae203e93567ad90a8f4456d9e940830d8a88bbe3b316900ccd38df996016b40435b55e857364312c5bca55d078f416a24f9badbe9867039fbe662 SHA512 f3f045604e28f4a944ea0528363c233a75413a6039bd11b90eeeafadcaaf0ef44bc1303581f2e78adcfb9a365f719be64a24adf1cec8c5ef1abf5642dea58df4 diff --git a/dev-python/pyrr/metadata.xml b/dev-python/pyrr/metadata.xml deleted file mode 100644 index 16493659ec..0000000000 --- a/dev-python/pyrr/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - gasc@eurecom.fr - Gasc Henri - - - pyrr - adamlwgriffiths/pyrr - - diff --git a/dev-python/pyrr/pyrr-0.10.3-r1.ebuild b/dev-python/pyrr/pyrr-0.10.3-r1.ebuild deleted file mode 100644 index 81ac354d57..0000000000 --- a/dev-python/pyrr/pyrr-0.10.3-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="A cross platform utility library for ModernGL" -HOMEPAGE="https://github.com/adamlwgriffiths/pyrr https://pypi.org/project/pyrr/" -SRC_URI="https://github.com/adamlwgriffiths/pyrr/archive/refs/tags/${PV}.tar.gz -> v${PV}.gh.tar.gz" -S="${WORKDIR}/Pyrr-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/multipledispatch[${PYTHON_USEDEP}] - (2024-12-05) -# Last release was in 2017, 2 commits in the last 3 years -# Removal on 2025-01-05 -dev-python/pyrr - # Julien Roy (2024-11-25) # Depends on Date: Mon, 20 Jan 2025 23:57:39 -0600 Subject: [PATCH 4/6] dev-python/cloudflare: drop 3.1.0-r3 Signed-off-by: Kyle Elbert --- dev-python/cloudflare/Manifest | 2 - .../cloudflare/cloudflare-3.1.0-r3.ebuild | 101 ------------------ 2 files changed, 103 deletions(-) delete mode 100644 dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild diff --git a/dev-python/cloudflare/Manifest b/dev-python/cloudflare/Manifest index 6d6b442851..2a7fa27880 100644 --- a/dev-python/cloudflare/Manifest +++ b/dev-python/cloudflare/Manifest @@ -1,3 +1 @@ DIST cloudflare-2.19.4.gh.tar.gz 151397 BLAKE2B c91c95f52314c5177d823ef8f827ea2f76f6cc703260449aea12d54c1b77d061feca15d4bb845f84cfb4fd80789e5064e54d7530daf546d54d17054b9e0b4fda SHA512 8ae11e73760c57b610abfe5e2c8fdc83c2e0b9e07340884925ec9ac3bf5b40b4edf39b2b8ce7330538369d7573146a2ddac195efb0efb4ff657f75fdacb31aed -DIST cloudflare-3.1.0.gh.tar.gz 1436993 BLAKE2B 136ed341bd16bd04165d94c10d82b2ad617a434728b290aff1dfc9bf11193786011224feeef567455df451efc7921c41c9835e80413738f80db60b3213396df8 SHA512 72f42012e8b4a4497523d159139ebbcef99b75f58a55a429ecb3dcdcfdad3ce3b3694cccb06bc6ec72c6148b1e1516083bda0fb43babdeb8933561e5821fbb1d -DIST cloudflare-python-3.1.0-prism.tar.gz 10537403 BLAKE2B 67caa6b98f452890ea9613e875d534ddb14c8d3720af5c57bceb04e2e3518702ecafe1bf37f02e53818f8cbc5c6bd8c799c18342879b07d39ba64831168f5495 SHA512 718f968755c62aa4b66bbf3659437751734c3183d6c5d48b025b72355d59414578bb0748f01fa38d46c33736af10d52742723a4eda47d9868d86ec2b499ece27 diff --git a/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild b/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild deleted file mode 100644 index 1a309e4b39..0000000000 --- a/dev-python/cloudflare/cloudflare-3.1.0-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..12} ) -DISTUTILS_USE_PEP517="hatchling" -inherit distutils-r1 -DESCRIPTION="Python wrapper for the Cloudflare v4 API" -HOMEPAGE="https://pypi.org/project/cloudflare/" -if [ "${PV}" == 9999 ]; then - EGIT_REPO_URI="https://github.com/cloudflare/cloudflare-python" - inherit git-r3 -else - MYPV=$(ver_rs 3 -) - MYPV=${MYPV/beta/beta.} - MYPN="cloudflare-python" - SRC_URI="https://github.com/cloudflare/cloudflare-python/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.gh.tar.gz - test? ( https://github.com/Phoenix591/${MYPN}/releases/download/${PV}/${MYPN}-${PV}-prism.tar.gz )" - #Prism archive generated by workflow - # https://github.com/Phoenix591/cloudflare-python/blob/master/.github/workflows/test-tar.yml - S="${WORKDIR}/${MYPN}-${MYPV}" - KEYWORDS="~amd64 ~arm64" -fi -LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )" -# nodejs module and deps used to test -SLOT="3" -RDEPEND=" ${DEPEND} - >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] - =dev-python/pydantic-2.9*[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] - >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] - >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] - prism.log || die "Failed starting prism" & - echo $! >"${T}/mock.pid" || die - # Wait for server to come online - echo -n "Waiting for mockserver" - while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do - echo -n "." || die - sleep 0.5 - done - if grep -q "✖ fatal" prism.log; then - die "Prism mock server failed" - fi -} -stop_mock() { - kill $(cat "${T}/mock.pid") || die -} From 2077e2c064490dba238b74cf6777c616d44a648d Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Mon, 20 Jan 2025 23:58:17 -0600 Subject: [PATCH 5/6] profiles: remove mask for dev-python/cloudflare and certbot-dns-cloudflare Only 3.x of cloudflare is tied to --- profiles/package.mask | 8 -------- 1 file changed, 8 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 1ddcccb549..d3ce569ae4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,14 +18,6 @@ # New entries go on top. -# Julien Roy -# Depends on # Depends on dev-python/zenlib-3.1.2 which isn't yet in tree # https://github.com/gentoo/gentoo/pull/39922 From cc7b80402e92be374d1d44deb70f3b719b461059 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Tue, 21 Jan 2025 00:02:45 -0600 Subject: [PATCH 6/6] dev-python/cloudflare: add 4.0.0 Bug: https://bugs.gentoo.org/948477 Signed-off-by: Kyle Elbert --- dev-python/cloudflare/Manifest | 2 + dev-python/cloudflare/cloudflare-4.0.0.ebuild | 100 ++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 dev-python/cloudflare/cloudflare-4.0.0.ebuild diff --git a/dev-python/cloudflare/Manifest b/dev-python/cloudflare/Manifest index 2a7fa27880..f6b85cb492 100644 --- a/dev-python/cloudflare/Manifest +++ b/dev-python/cloudflare/Manifest @@ -1 +1,3 @@ DIST cloudflare-2.19.4.gh.tar.gz 151397 BLAKE2B c91c95f52314c5177d823ef8f827ea2f76f6cc703260449aea12d54c1b77d061feca15d4bb845f84cfb4fd80789e5064e54d7530daf546d54d17054b9e0b4fda SHA512 8ae11e73760c57b610abfe5e2c8fdc83c2e0b9e07340884925ec9ac3bf5b40b4edf39b2b8ce7330538369d7573146a2ddac195efb0efb4ff657f75fdacb31aed +DIST cloudflare-4.0.0.gh.tar.gz 1715334 BLAKE2B 3ec5ace00c173caec36e75001a7f0fb08e3747902cfbd45a29958c7d4a124b93b24c431ed0967d2100056de7b3063625379723512aee4be7a03dfeb2c4bdbc5a SHA512 ac156af42cadfd1c63568df485c816de0b3720af18ec12b25cb88e06476e817707a29de91bfce8da3b7f7b4e690b6c33aa6c38bc2b485901e81e032dae0d0109 +DIST cloudflare-python-4.0.0-prism.tar.gz 10687934 BLAKE2B d8696ec3f20d56e8ed5578d96ff41e4b90faf8d440b734b76d7217b8127f1c428e523f75f266cd9a677a3501b961844107afb03b2ec06f9940aadbf369a3567e SHA512 0d622922f26f9a6749858f226ff8ac5baee613a771e9cbe16787932304b5c1654c1a6d928ce7fe4734bc0710f3357160dcbe441f9238ae8c33cde02435e169e8 diff --git a/dev-python/cloudflare/cloudflare-4.0.0.ebuild b/dev-python/cloudflare/cloudflare-4.0.0.ebuild new file mode 100644 index 0000000000..013ddf060c --- /dev/null +++ b/dev-python/cloudflare/cloudflare-4.0.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517="hatchling" +inherit distutils-r1 +DESCRIPTION="Python wrapper for the Cloudflare v4 API" +HOMEPAGE="https://pypi.org/project/cloudflare/" +if [ "${PV}" == 9999 ]; then + EGIT_REPO_URI="https://github.com/cloudflare/cloudflare-python" + inherit git-r3 +else + MYPV=$(ver_rs 3 -) + MYPV=${MYPV/beta/beta.} + MYPN="cloudflare-python" + SRC_URI="https://github.com/cloudflare/cloudflare-python/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.gh.tar.gz + test? ( https://github.com/Phoenix591/${MYPN}/releases/download/${PV}/${MYPN}-${PV}-prism.tar.gz )" + #Prism archive generated by workflow + # https://github.com/Phoenix591/cloudflare-python/blob/master/.github/workflows/test-tar.yml + S="${WORKDIR}/${MYPN}-${MYPV}" + KEYWORDS="~amd64 ~arm64" +fi +LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )" +# nodejs module and deps used to test +SLOT="0" +RDEPEND=" ${DEPEND} + >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] + >=dev-python/pydantic-2.9.2[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] + >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] + " + +BDEPEND="test? ( + >=net-libs/nodejs-18.20.1 + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/time-machine[${PYTHON_USEDEP}] + dev-python/dirty-equals[${PYTHON_USEDEP}] + dev-python/respx[${PYTHON_USEDEP}] + ${RDEPEND} +)" + +distutils_enable_tests pytest +RESTRICT+=" !test? ( test )" + +src_unpack() { + unpack "${P}.gh.tar.gz" + use test && cd "${S}" && unpack "cloudflare-python-${PV}-prism.tar.gz" +} + +#python_prepare_all() { +# # don't install tests or examples +# sed -i -e "s/'cli4', 'examples'/'cli4'/" \ +# -e "s#'CloudFlare/tests',##" \ +# setup.py || die +# sed -i -e "/def test_ips7_should_fail():/i@pytest.mark.xfail(reason='Now fails upstream')" \ +# -e "2s/^/import pytest/" \ +# CloudFlare/tests/test_cloudflare_calls.py || die +# distutils-r1_python_prepare_all +#} + +python_test() { + # these 2 tests fail in an ebuild environment for some reason + # help appreciated + local EPYTEST_DESELECT=( + tests/test_client.py::TestCloudflare::test_validate_headers + tests/test_client.py::TestAsyncCloudflare::test_validate_headers ) + #intermittently fail for unknown reasons, passed along to upstream + EPYTEST_DESELECT+=( + tests/test_client.py::TestAsyncCloudflare::test_copy_build_request + tests/test_client.py::TestCloudflare::test_copy_build_request ) + epytest +} + +src_test() { + start_mock + distutils-r1_src_test + stop_mock +} +start_mock() { +# Run prism mock api server, this is what needs nodejs + node --no-warnings node_modules/@stainless-api/prism-cli/dist/index.js mock \ + "cloudflare-spec.yml" >prism.log || die "Failed starting prism" & + echo $! >"${T}/mock.pid" || die + # Wait for server to come online + echo -n "Waiting for mockserver" + while ! grep -q "✖ fatal\|Prism is listening" "prism.log" ; do + echo -n "." || die + sleep 0.5 + done + if grep -q "✖ fatal" prism.log; then + die "Prism mock server failed" + fi +} +stop_mock() { + kill $(cat "${T}/mock.pid") || die +}