From 0315a8c0c39cf3fcfd73f5051b8a54f36c19f4a5 Mon Sep 17 00:00:00 2001 From: Dale Showers Date: Tue, 4 Jun 2024 12:07:00 -0400 Subject: [PATCH 1/7] net-voip/baresip: add 3.12.1 Remove automagic dependenies and enable several new use flags. Signed-off-by: Dale Showers --- net-voip/baresip/Manifest | 1 + net-voip/baresip/baresip-3.12.1.ebuild | 109 +++++++++++++++++++++++++ net-voip/baresip/metadata.xml | 24 +++++- 3 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 net-voip/baresip/baresip-3.12.1.ebuild diff --git a/net-voip/baresip/Manifest b/net-voip/baresip/Manifest index 170e8a3f53..67239105b1 100644 --- a/net-voip/baresip/Manifest +++ b/net-voip/baresip/Manifest @@ -1,6 +1,7 @@ DIST baresip-3.10.0.tar.gz 1167280 BLAKE2B b75558f75c1842361a795645ed67fbf1f121bf76a98f9590984da754bc3171a6e8c5feaee1b45afd90960e8444f2ff5b5fbbb314ee2fa268239bccd481c79236 SHA512 62c977e4af72a401fc8d52a52afc7f3750070f539af8b41098c92dd5e1b6ed1e654bd7d35dda8704c255fbc13a5b2c75bb441818b86f4cf8ff95c1ffd87a0a8a DIST baresip-3.10.1.tar.gz 1166742 BLAKE2B 01ff2fef17b805b79ab4cd85b90ea092384c467191b152dd8edbfb8f2c82f2334b1a8afbc812e9e724b8f863caa85d6cf86de303b2ce303165c88ecda3e4effb SHA512 71853ab11895b9ce85a6f57400e570b353d594f8a0e6697368088cc393b14970401165b89cf3bc2d0392199cef76eca246a0c934014a726c5261dce65243bae4 DIST baresip-3.11.0.tar.gz 1168323 BLAKE2B f09d4b0f9edf1a18df21f4835e695e8b90aad6a6477b8c11716f1a3a2829303fc63193294f107cc99428758df8466dd31a0a2756cb444a6b8b64d8337ce3a9ed SHA512 9a538695fc9d9fc57eece0db8c49e574a224f158c1089d0e5a4d6501a1cba0fa49aeb3e2eaf0dc663e0d1d62154cd05ae549a971158747eaa40f0a7b20806cf1 +DIST baresip-3.12.1.tar.gz 1156255 BLAKE2B 29535f6909143c6d4e20a540a6396acf0ac2404b9226b25dcfb2f69eca60fab7f1ea3c402466e12242c6058916a07036dfbb80f70b4b112a7a821ac7a5d5b4ef SHA512 0d5f5df4664cbca785606d531ab809e555013937e2f1f0585b550edc36b49f0012d63450ee0817e3657dfbb460bd0dd410326cdf81da1b197dcd15cd0ce11aa2 DIST baresip-3.7.0.tar.gz 1156270 BLAKE2B 48d9f2762739f023dfe8597921de1bfcd355ce4d6e403a77c6fd2f95a88970538208e5aae5f2cd2ed98767f5b1c17e0740f3298faaf7056cd7e89906e22d67b8 SHA512 f3497a903fa67c8ecfb90cd63f9f2bdc376d98ea28a71ea64b042b3641628126fac5ff8afe8539f98f51a54aa4ef1304d22c0b83edc3e91767f8bf35310621c3 DIST baresip-3.8.0.tar.gz 1158645 BLAKE2B e7badad42dde5e0cbd0fa090654b6559f7cf2f6c1dcc458290a43c72b26b0aa2fe40c92f4335ed72c4a2f85ec20d9bfb45f8059bc179cbd47b26867bf7612ccf SHA512 12ff9aaedcc3bc19a38235f5abc955aa1a64db47827895b95ca55329cb29acef353ee0871e888f12f0a9ea5a2ac0b3a34c278115c05e9f55d055638b5e13f852 DIST baresip-3.9.0.tar.gz 1163327 BLAKE2B c994a6ca16610936887f9bfbfb776e155ad9418fb46387af899044e8237e1e7662e62b697408c7c0a47849bbc8ce078122b9290afd868aa9974ad50c9a7b68dd SHA512 7e6bf2c68ae4dec60da7692527d511b7acf373e14c67c96591b7a5e02af7275ff7adde8a8c07af6ed98474b87357b734aae17fb337d4fad8353c253de56dc534 diff --git a/net-voip/baresip/baresip-3.12.1.ebuild b/net-voip/baresip/baresip-3.12.1.ebuild new file mode 100644 index 0000000000..4d98800aee --- /dev/null +++ b/net-voip/baresip/baresip-3.12.1.ebuild @@ -0,0 +1,109 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Baresip is a portable and modular SIP User-Agent" +HOMEPAGE="https://github.com/baresip/baresip" +SRC_URI="https://github.com/baresip/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="aac acip alsa amr aptx aom codec2 console dbus echo evdev ffmpeg gstreamer + gtk3 jack httpd httpreq mpa mqtt opus pipewire portaudio pulseaudio sdl + serreg snapshot sndfile spandsp static-libs syslog tcpcontrol v4l video vpx webrtc X" + +RE_PVF="$(ver_cut 1-2)*" + +DEPEND=" + dev-libs/openssl:0= + =net-voip/re-${RE_PVF} + sys-libs/zlib + aac? ( media-libs/fdk-aac ) + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + aom? ( media-libs/libaom ) + aptx? ( media-libs/libopenaptx ) + codec2? ( media-libs/codec2 ) + dbus? ( + dev-util/gdbus-codegen + sys-apps/dbus + ) + ffmpeg? ( media-video/ffmpeg ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + ) + gtk3? ( x11-libs/gtk+:3 ) + jack? ( virtual/jack ) + mpa? ( + media-sound/twolame + media-sound/mpg123 + media-libs/speexdsp + ) + mqtt? ( app-misc/mosquitto ) + opus? ( media-libs/opus ) + pipewire? ( media-video/pipewire ) + snapshot? ( media-libs/libpng ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( media-libs/libsdl2 ) + sndfile? ( media-libs/libsndfile ) + spandsp? ( media-libs/spandsp ) + v4l? ( media-libs/libv4l ) + vpx? ( media-libs/libvpx ) + webrtc? ( media-plugins/gst-plugins-webrtc ) + X? ( x11-libs/libX11 ) + " + +RDEPEND="${DEPEND}" + +src_configure() { + use aac && MODULES+="aac;" + use acip && MODULES+="ebuacip;" + use alsa && MODULES+="alsa;" + use amr && MODULES+="amr;" + use aom && MODULES+="av1;" + use aptx && MODULES+="aptx;" + use codec2 && MODULES+="codec2;" + use console && MODULES+="cons;" + use dbus && MODULES+="ctrl_dbus;" + use evdev && MODULES+="evdev;" + use echo && MODULES+="echo;" + use gtk3 && MODULES+="gtk;" + use gstreamer && MODULES+="gst;" + use httpd && MODULES+="httpd;" + use httpreq && MODULES+="httpreq;" + use ffmpeg && MODULES+="avcodec;avfilter;avformat;selfview;swscale;" + use jack && MODULES+="jack;" + use mpa && MODULES+="mpa;" + use mqtt && MODULES+="mqtt;" + use opus && MODULES+="opus;opus_multistream;" + use pipewire && MODULES+="pipewire;" + use pulseaudio && MODULES+="pulse;" + use portaudio && MODULES+="portaudio;" + use serreg && MODULES+="serreg;" + use snapshot && MODULES+="snapshot;" + use sdl && MODULES+="sdl;" + use sndfile && MODULES+="sndfile;" + use spandsp && MODULES+="g722;g726;plc;" + use syslog && MODULES+="syslog;" + use tcpcontrol && MODULES+="ctrl_tcp;" + use v4l && MODULES+="v4l2;" + use video && MODULES+="vidbridge;vidinfo;" + use vpx && MODULES+="vp8;vp9;" + use webrtc && MODULES+="webrtc_aec;" + use X && MODULES+="x11;" + MODULES+="account;aubridge;auconv;aufile;auresamp;ausine;contact;debug_cmd;dtls_srtp;g711;ice;menu;mixausrc;mixminus;mwi;natpmp;netroam;pcp;presence;turn;rtcpsummary;srtp;stdio;stun;uuid;vumeter" + + local mycmakeargs=( + -DMODULES="$MODULES" + -DLIBRE_BUILD_STATIC=$(usex static-libs ON OFF) + ) + cmake_src_configure +} diff --git a/net-voip/baresip/metadata.xml b/net-voip/baresip/metadata.xml index 8dfef061aa..5ea2afbea2 100644 --- a/net-voip/baresip/metadata.xml +++ b/net-voip/baresip/metadata.xml @@ -6,16 +6,32 @@ Dale Showers + Audio Contribution over IP compatibility module Enables Adaptive Multi-Rate Audio support Audio Processing Technology codec (aptX) av1 module CODEC2 low-bitrate speech audio codec - Support for video (media-libs/gstreamer) - gtk+ user interface + UDP/TCP console UI driver + Control interface using DBUS. ctrl_dbus module + Echo server module + Input event device UI module + GTK+ 3 menu-based UI + Add support for media-libs/gstreamer (Streaming media) + HTTP webserver UI-module + HTTP request module Enable mqtt support via app-misc/mosquitto MPA Speech and Audio Codec - Enable pipewire audio support - Use media-libs/spandsp for for G.722 and G.726 codec support + Pipewire audio driver + Pulseaudio driver + Video ouptput driver via media-libs/libsdl2 + Serial registration module + G.722 and G.726 audio codecs via media-libs/spandsp + Audio dumper using libsndfile + Save video-stream as PNG images + TCP control interface using JSON payload + Build vidbridge and vidinfo modules. + Use media-plugins/gst-plugins-webrtc for webrtc support + Video4Linux2 video source Enables VP8 and VP9 codec support using libvpx From 23733148e1eb23e54bf9210be1cdf033ab46a652 Mon Sep 17 00:00:00 2001 From: Violet Date: Tue, 4 Jun 2024 08:35:46 -0400 Subject: [PATCH 2/7] some consmetic changes to the DEPENDS= section of the ebuild,and removed description section in metadata.xml as it was uneeded,and made sure the SRC_URI=pointed to the tarball +3 Signed-off-by: Violet --- media-sound/kew/Manifest | 1 + media-sound/kew/kew-2.4.4.ebuild | 27 +++++++++++++++++++++++++++ media-sound/kew/metadata.xml | 11 +++++++++++ 3 files changed, 39 insertions(+) create mode 100644 media-sound/kew/Manifest create mode 100644 media-sound/kew/kew-2.4.4.ebuild create mode 100644 media-sound/kew/metadata.xml diff --git a/media-sound/kew/Manifest b/media-sound/kew/Manifest new file mode 100644 index 0000000000..a5443e785d --- /dev/null +++ b/media-sound/kew/Manifest @@ -0,0 +1 @@ +DIST v2.4.4.tar.gz 1156275 BLAKE2B ab4e584ad0d0ea5243edaa49ed17fb45dd9e146f2f94ccd151e5bd0bcee5553ac1817e779b099ad59b3d627fc59bd07f2f855c3b89d5bfe96d168a7bcf93f4bc SHA512 cc0c312752dfd05e9b81a6ac562f856f6c8328e0f872f0dafb820ccc993e67775825ef32983edb37c465199461dc3258e7a7d09a26458a8a7368c5f47faefaa3 diff --git a/media-sound/kew/kew-2.4.4.ebuild b/media-sound/kew/kew-2.4.4.ebuild new file mode 100644 index 0000000000..5623748e83 --- /dev/null +++ b/media-sound/kew/kew-2.4.4.ebuild @@ -0,0 +1,27 @@ +# Copyright 2024 + +EAPI=8 + + +DESCRIPTION="kew (/kjuː/) is a command-line music player for Linux." +HOMEPAGE="https://github.com/ravachol/kew" +SRC_URI="https://github.com/ravachol/{P}/archive/refs/tags/v2.4.4.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" + +DEPEND="media-video/ffmpeg +dev-libs/glib +sci-libs/fftw +media-gfx/chafa +media-libs/freeimage +media-libs/opus media-libs/opusfile +media-libs/libvorbis" +RDEPEND=${DEPEND} + + + +src_install() +{ + emake DESTDIR="${D}" install +} \ No newline at end of file diff --git a/media-sound/kew/metadata.xml b/media-sound/kew/metadata.xml new file mode 100644 index 0000000000..1796d9e0e6 --- /dev/null +++ b/media-sound/kew/metadata.xml @@ -0,0 +1,11 @@ + + + + + emergeviolet@protonmail.com + Violet + + + ravachol/kew + + From f572b82d5af1bf193ca04b7efa73813f4ef405e3 Mon Sep 17 00:00:00 2001 From: Violet Date: Tue, 4 Jun 2024 10:01:30 -0400 Subject: [PATCH 3/7] more tweaks to pkgbuild Signed-off-by: Violet --- media-sound/kew/kew-2.4.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/kew/kew-2.4.4.ebuild b/media-sound/kew/kew-2.4.4.ebuild index 5623748e83..b87aebcd1b 100644 --- a/media-sound/kew/kew-2.4.4.ebuild +++ b/media-sound/kew/kew-2.4.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="kew (/kjuː/) is a command-line music player for Linux." HOMEPAGE="https://github.com/ravachol/kew" -SRC_URI="https://github.com/ravachol/{P}/archive/refs/tags/v2.4.4.tar.gz" +SRC_URI="https://github.com/ravachol/${PN}/archive/refs/tags/v2.4.4.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" From 892e054f8c7ae80ac69c080eb54e72e0ecf8453e Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Tue, 4 Jun 2024 14:55:53 -0400 Subject: [PATCH 4/7] app-backup/b2-3.18.0: fix broken tests. On the last version bump, the number of skipped tests was decreased in an attempt to improve test coverage. This was poorly tested resulting in failing tests. Signed-off-by: Wolfgang E. Sanyer Closes: https://bugs.gentoo.org/932105 --- app-backup/b2/b2-3.18.0.ebuild | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/app-backup/b2/b2-3.18.0.ebuild b/app-backup/b2/b2-3.18.0.ebuild index de51fe0a3d..d9cef16efb 100644 --- a/app-backup/b2/b2-3.18.0.ebuild +++ b/app-backup/b2/b2-3.18.0.ebuild @@ -48,11 +48,25 @@ DEPEND=" distutils_enable_tests pytest -# - integration tests require an application key and id (which is reasonable) -# - sync tests require network access +EPYTEST_DESELECT=( + # fixture 'worker_id' not found + "test/integration/test_b2_command_line.py" + "test/integration/test_help.py::test_help" + "test/integration/test_autocomplete.py" + + # Timeout exceeded + # I think this is trying to access files outside of the sandbox + "test/unit/console_tool/test_install_autocomplete.py::test_install_autocomplete" + + # TypeError: super(type, obj): obj must be an instance or subtype of type + # This test itself does not fail, but running it causes subsequent test to + # fail, which otherwise pass. Not really sure why (I assume this test is + # somehow polluting the test fixture?) but disabling causes the other tests + # to pass + "test/unit/_cli/test_autocomplete_cache.py" +) python_test() { - epytest --deselect test/unit/console_tool test/unit - epytest test/unit/console_tool + epytest test } pkg_postinst() { From 41e35f47a0a8f826a81f22a6d6abe6744ea36974 Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Tue, 4 Jun 2024 15:23:03 -0400 Subject: [PATCH 5/7] dev-python/b2sdk: bump to v2.3.0 Signed-off-by: Wolfgang E. Sanyer --- dev-python/b2sdk/Manifest | 1 + dev-python/b2sdk/b2sdk-2.3.0.ebuild | 52 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 dev-python/b2sdk/b2sdk-2.3.0.ebuild diff --git a/dev-python/b2sdk/Manifest b/dev-python/b2sdk/Manifest index 84564c521f..6e707ab7fb 100644 --- a/dev-python/b2sdk/Manifest +++ b/dev-python/b2sdk/Manifest @@ -1,2 +1,3 @@ DIST b2sdk-1.21.0.tar.gz 335333 BLAKE2B 7aa3a9664844e1f5ef71b7eec2fc28f456bed0a8ae431a90f23865cb9d73526090f78926b943f67bb1745bb9760718666202a9bd67790d92d90c14a0f1510bab SHA512 3d431ce8a3be536d6e49d20a0e6eef2d435bfccf2dd36c0b501c03ebd013de68063302f3ae4d8c9cd6fcfa7b77e3ea2c00b06c3a5e044e30f545a4ab5248fa62 DIST b2sdk-2.0.0.tar.gz 378875 BLAKE2B 0d65eb0b9238fccb5f6ef2252280cb9891c1fbf9bfddc2ef38692f5063fc0384eefab26876126d9dc056f178788e72a970f604fb8f9952e1ef6cd62a2417ab9d SHA512 97700574cd948a8a177bb52edc89e67d8f1cf6efcc7227c8581af30cdc95dc7e54afd30357f5723f2abee05cdbbf17d6b26494c586c2851782bebb72224386c0 +DIST b2sdk-2.3.0.tar.gz 390949 BLAKE2B e14c9fc56b7ed66350b8d73456dd50b0f6fdb40d7a6fe73cf7950afcb25bb5257a63bb361d8cbca99116b4999a2b0195967b4e08aff5ca9aaf5c16e4b4b532eb SHA512 29ba07581d0e587b413396f128d7fe14f8ac25ea0553eef69e1c428823690974d9373db727321f9838886a07946c36defdd5bae24d31266751d6b1a2f05968c6 diff --git a/dev-python/b2sdk/b2sdk-2.3.0.ebuild b/dev-python/b2sdk/b2sdk-2.3.0.ebuild new file mode 100644 index 0000000000..e240ecd74d --- /dev/null +++ b/dev-python/b2sdk/b2sdk-2.3.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_PEP517="pdm-backend" +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +inherit distutils-r1 + +DESCRIPTION="The client library for BackBlaze's B2 product" +HOMEPAGE="https://github.com/Backblaze/b2-sdk-python" +SRC_URI="https://github.com/Backblaze/b2-sdk-python/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/b2-sdk-python-${PV}" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +export PDM_BUILD_SCM_VERSION=${PV} + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/logfury-1.0.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.9.1[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +# tqdm dependency is temporary, see +# https://github.com/Backblaze/b2-sdk-python/issues/489 +BDEPEND+=" test? ( + $(python_gen_cond_dep ' + >=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}] + >=dev-python/pytest-lazy-fixture-0.6.3[${PYTHON_USEDEP}] + >=dev-python/tqdm-4.66.2[${PYTHON_USEDEP}] + ') +)" + +# These tests seem to require some b2 authentication (they're integration tests +# so this is not unreasonable) +EPYTEST_DESELECT=( + # These integration tests require an actual connection to backblaze, which + # can't typically work in the sandbox + test/integration +) + +python_test() { + # https://github.com/Backblaze/b2-sdk-python/issues/488 + epytest test +} From 8714381ef5750a50c5cb58c024a53a7353557e4e Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Tue, 4 Jun 2024 15:46:08 -0400 Subject: [PATCH 6/7] app-backup/b2: bump to 4.0.1 Signed-off-by: Wolfgang E. Sanyer --- app-backup/b2/Manifest | 1 + app-backup/b2/b2-4.0.1.ebuild | 75 ++++++++++++++++++++ app-backup/b2/files/b2-4.0.1-nameclash.patch | 17 +++++ 3 files changed, 93 insertions(+) create mode 100644 app-backup/b2/b2-4.0.1.ebuild create mode 100644 app-backup/b2/files/b2-4.0.1-nameclash.patch diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 92370c8f8d..604ce7bb89 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,2 +1,3 @@ DIST b2-3.18.0.gh.tar.gz 189572 BLAKE2B 9516d98c7c493791f120c345480f16c8d615cbf425f692fa3fe6688c21ef7d26f14cdd7b44cfb22f2c13a5554166c046eb5fa1712a1e1994fa4e4181399eda84 SHA512 45c784e961b8b650d27e7fe642cacd194462b3c0864fdc1af52e41a70b435c36fbb803e80cfb2c88b8165ea95459a7e62b1995f26caf612110f8c77418cb6669 DIST b2-3.9.0.tar.gz 131326 BLAKE2B c357831b7c0b4ae6abc4fafb6e09690f8ffe833d2c58c05610ffdbf94ba276f5fa143dd1528f7e7424b6fa96857c8328be993e6ffc60b61c44037bd9ef0b0e96 SHA512 db2fab07e973d6d39db3931dd7f645ee3c9737f4de0ab29327490607d52aad4df2e9049782ef347ee44f80b76dbe91f495ce273285001d49195abe91d5b2cb5d +DIST b2-4.0.1.gh.tar.gz 201737 BLAKE2B 74fb1dd52c8592816c2f2680469c2dd08910f8c25d4a923dd53258f63dd4c38ef77855e6845c41572b8fe52d33ee390a2fac6555016663c450feeb6ff89ed09e SHA512 02a14c2c78fecd1dda536539b5977d6ff45892db0355575209417d7f8471a45ace0d4766dd454c0ba0a65a1ae44e0c698cca38814b0bf36ca5e7a69efec9149a diff --git a/app-backup/b2/b2-4.0.1.ebuild b/app-backup/b2/b2-4.0.1.ebuild new file mode 100644 index 0000000000..1f428d20f8 --- /dev/null +++ b/app-backup/b2/b2-4.0.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +DISTUTILS_USE_PEP517="pdm-backend" +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 pypi + +DESCRIPTION="Command-line tool for BackBlaze's B2 product" +HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool" +SRC_URI="https://github.com/Backblaze/B2_Command_Line_Tool/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +S="${WORKDIR}/B2_Command_Line_Tool-${PV}" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}/${P}-nameclash.patch" +) + +export PDM_BUILD_SCM_VERSION=${PV} + +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/argcomplete-2.1.2[${PYTHON_USEDEP}] + >=dev-python/arrow-1.3.0[${PYTHON_USEDEP}] + >=dev-python/b2sdk-2.3.0[${PYTHON_USEDEP}] + >=dev-python/docutils-0.19[${PYTHON_USEDEP}] + >=dev-python/phx-class-registry-4.0.6[${PYTHON_USEDEP}] + >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}] + >=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}] + >=dev-python/tqdm-4.65.0[${PYTHON_USEDEP}] + ') +" + +DEPEND=" + test? ( + $(python_gen_cond_dep ' + >=dev-python/backoff-2.2.1[${PYTHON_USEDEP}] + >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] + ') + ) +" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # fixture 'worker_id' not found + "test/integration/test_b2_command_line.py" + "test/integration/test_help.py::test_help" + "test/integration/test_autocomplete.py" + + # Timeout exceeded + # I think this is trying to access files outside of the sandbox + "test/unit/console_tool/test_install_autocomplete.py::test_install_autocomplete" + + # TypeError: super(type, obj): obj must be an instance or subtype of type + # This test itself does not fail, but running it causes subsequent test to + # fail, which otherwise pass. Not really sure why (I assume this test is + # somehow polluting the test fixture?) but disabling causes the other tests + # to pass + "test/unit/_cli/test_autocomplete_cache.py" +) +python_test() { + epytest test +} + +pkg_postinst() { + elog "The b2 executable has been renamed to backblaze2 in order to" + elog "avoid a name clash with b2 from boost-build" +} diff --git a/app-backup/b2/files/b2-4.0.1-nameclash.patch b/app-backup/b2/files/b2-4.0.1-nameclash.patch new file mode 100644 index 0000000000..463c4c3878 --- /dev/null +++ b/app-backup/b2/files/b2-4.0.1-nameclash.patch @@ -0,0 +1,17 @@ +diff --git a/pyproject.toml b/pyproject.toml +index ff817d2..de26c16 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -65,9 +65,9 @@ full = [ + Homepage = "https://github.com/Backblaze/B2_Command_Line_Tool" + + [project.scripts] +-b2 = "b2._internal.b2v4.__main__:main" +-b2v3 = "b2._internal.b2v3.__main__:main" +-b2v4 = "b2._internal.b2v4.__main__:main" ++backblaze2 = "b2._internal.b2v4.__main__:main" ++backblaze2v3 = "b2._internal.b2v3.__main__:main" ++backblaze2v4 = "b2._internal.b2v4.__main__:main" + + [build-system] + requires = ["pdm-backend"] From 444c02085811d174e5da1f6f29132941159eff4d Mon Sep 17 00:00:00 2001 From: "Wolfgang E. Sanyer" Date: Tue, 4 Jun 2024 15:50:04 -0400 Subject: [PATCH 7/7] app-backup/b2: remove old version and patches Signed-off-by: Wolfgang E. Sanyer --- app-backup/b2/Manifest | 1 - app-backup/b2/b2-3.9.0.ebuild | 98 ------------------- app-backup/b2/files/b2-2.5.0-nameclash.patch | 14 --- ...9.0-disable-pip-requirement-installs.patch | 23 ----- 4 files changed, 136 deletions(-) delete mode 100644 app-backup/b2/b2-3.9.0.ebuild delete mode 100644 app-backup/b2/files/b2-2.5.0-nameclash.patch delete mode 100644 app-backup/b2/files/b2-3.9.0-disable-pip-requirement-installs.patch diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 604ce7bb89..8c82430e89 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,3 +1,2 @@ DIST b2-3.18.0.gh.tar.gz 189572 BLAKE2B 9516d98c7c493791f120c345480f16c8d615cbf425f692fa3fe6688c21ef7d26f14cdd7b44cfb22f2c13a5554166c046eb5fa1712a1e1994fa4e4181399eda84 SHA512 45c784e961b8b650d27e7fe642cacd194462b3c0864fdc1af52e41a70b435c36fbb803e80cfb2c88b8165ea95459a7e62b1995f26caf612110f8c77418cb6669 -DIST b2-3.9.0.tar.gz 131326 BLAKE2B c357831b7c0b4ae6abc4fafb6e09690f8ffe833d2c58c05610ffdbf94ba276f5fa143dd1528f7e7424b6fa96857c8328be993e6ffc60b61c44037bd9ef0b0e96 SHA512 db2fab07e973d6d39db3931dd7f645ee3c9737f4de0ab29327490607d52aad4df2e9049782ef347ee44f80b76dbe91f495ce273285001d49195abe91d5b2cb5d DIST b2-4.0.1.gh.tar.gz 201737 BLAKE2B 74fb1dd52c8592816c2f2680469c2dd08910f8c25d4a923dd53258f63dd4c38ef77855e6845c41572b8fe52d33ee390a2fac6555016663c450feeb6ff89ed09e SHA512 02a14c2c78fecd1dda536539b5977d6ff45892db0355575209417d7f8471a45ace0d4766dd454c0ba0a65a1ae44e0c698cca38814b0bf36ca5e7a69efec9149a diff --git a/app-backup/b2/b2-3.9.0.ebuild b/app-backup/b2/b2-3.9.0.ebuild deleted file mode 100644 index 92990f4610..0000000000 --- a/app-backup/b2/b2-3.9.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 pypi - -DESCRIPTION="Command-line tool for BackBlaze's B2 product" -HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.0-nameclash.patch" - "${FILESDIR}/${PN}-3.9.0-disable-pip-requirement-installs.patch" -) - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/argcomplete-2.1.2[${PYTHON_USEDEP}] - >=dev-python/arrow-1.0.2[${PYTHON_USEDEP}] - >=dev-python/b2sdk-1.21.0[${PYTHON_USEDEP}] - >=dev-python/docutils-0.19[${PYTHON_USEDEP}] - >=dev-python/phx-class-registry-4.0.6[${PYTHON_USEDEP}] - >=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}] - >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}] - >=dev-python/tqdm-4.65.0[${PYTHON_USEDEP}] - ') - $(python_gen_cond_dep ' - >=dev-python/importlib_metadata-3.3.0[${PYTHON_USEDEP}] - ' pypy3 python3_8) -" - -DEPEND=" - test? ( - $(python_gen_cond_dep ' - >=dev-python/backoff-2.2.1[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] - ') - ) -" - -distutils_enable_tests pytest - -# - integration tests require an application key and id (which is reasonable) -# - sync tests require network access -python_test() { - epytest \ - --deselect test/integration/test_autocomplete.py::test_autocomplete_b2_bucket_n_file_name \ - --deselect test/integration/test_autocomplete.py::test_autocomplete_b2_commands \ - --deselect test/integration/test_autocomplete.py::test_autocomplete_b2_only_matching_commands \ - --deselect test/integration/test_b2_command_line.py::test_integration \ - --deselect test/integration/test_b2_command_line.py::test_download \ - --deselect test/integration/test_b2_command_line.py::test_basic \ - --deselect test/integration/test_b2_command_line.py::test_bucket \ - --deselect test/integration/test_b2_command_line.py::test_key_restrictions \ - --deselect test/integration/test_b2_command_line.py::test_account \ - --deselect test/integration/test_b2_command_line.py::test_sync_up \ - --deselect test/integration/test_b2_command_line.py::test_sync_up_sse_b2 \ - --deselect test/integration/test_b2_command_line.py::test_sync_up_sse_c \ - --deselect test/integration/test_b2_command_line.py::test_sync_up_no_prefix \ - --deselect test/integration/test_b2_command_line.py::test_sync_down \ - --deselect test/integration/test_b2_command_line.py::test_sync_down_no_prefix \ - --deselect test/integration/test_b2_command_line.py::test_sync_down_sse_c_no_prefix \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy_no_prefix_default_encryption \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy_no_prefix_no_encryption \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy_no_prefix_sse_b2 \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy_no_prefix_sse_c \ - --deselect test/integration/test_b2_command_line.py::test_sync_copy_sse_c_single_bucket \ - --deselect test/integration/test_b2_command_line.py::test_sync_long_path \ - --deselect test/integration/test_b2_command_line.py::test_default_sse_b2 \ - --deselect test/integration/test_b2_command_line.py::test_sse_b2 \ - --deselect test/integration/test_b2_command_line.py::test_sse_c \ - --deselect test/integration/test_b2_command_line.py::test_license[True] \ - --deselect test/integration/test_b2_command_line.py::test_license[False] \ - --deselect test/integration/test_b2_command_line.py::test_file_lock \ - --deselect test/integration/test_b2_command_line.py::test_profile_switch \ - --deselect test/integration/test_b2_command_line.py::test_replication_basic \ - --deselect test/integration/test_b2_command_line.py::test_replication_setup \ - --deselect test/integration/test_b2_command_line.py::test_replication_monitoring \ - --deselect test/integration/test_b2_command_line.py::test_enable_file_lock_first_retention_second \ - --deselect test/integration/test_b2_command_line.py::test_enable_file_lock_and_set_retention_at_once \ - --deselect test/integration/test_b2_command_line.py::test_cut \ - --deselect test/unit/test_console_tool.py::TestConsoleTool::test_sync_exclude_if_modified_after_exact \ - --deselect test/unit/test_console_tool.py::TestConsoleTool::test_sync_exclude_if_modified_after_in_range -} - -pkg_postinst() { - elog "The b2 executable has been renamed to backblaze2 in order to" - elog "avoid a name clash with b2 from boost-build" -} diff --git a/app-backup/b2/files/b2-2.5.0-nameclash.patch b/app-backup/b2/files/b2-2.5.0-nameclash.patch deleted file mode 100644 index 507392ae1b..0000000000 --- a/app-backup/b2/files/b2-2.5.0-nameclash.patch +++ /dev/null @@ -1,14 +0,0 @@ -# boost installs an executable named b2, which clashes with the default name for -# this package. This package changes the executable name to avoid this clash. -diff --git a/setup.py b/setup.py -index f9c1bbe..76ca28f 100644 ---- a/setup.py -+++ b/setup.py -@@ -135,6 +135,6 @@ setup( - # "scripts" keyword. Entry points provide cross-platform support and allow - # pip to create the appropriate form of executable for the target platform. - entry_points={ -- 'console_scripts': ['b2=b2.console_tool:main'], -+ 'console_scripts': ['backblaze2=b2.console_tool:main'], - }, - ) diff --git a/app-backup/b2/files/b2-3.9.0-disable-pip-requirement-installs.patch b/app-backup/b2/files/b2-3.9.0-disable-pip-requirement-installs.patch deleted file mode 100644 index e9ec96911e..0000000000 --- a/app-backup/b2/files/b2-3.9.0-disable-pip-requirement-installs.patch +++ /dev/null @@ -1,23 +0,0 @@ -# These configurations attempt to install missing dependencies using pip, which -# violates the network sandbox. Instead, we'll manage the dependencies in -# portage. ---- a/setup.py -+++ b/setup.py -@@ -104,7 +104,7 @@ - # requirements files see: - # https://packaging.python.org/en/latest/requirements.html - dependency_links=[], -- install_requires=read_requirements(), -+ # install_requires=read_requirements(), - - # List additional groups of dependencies here (e.g. development - # dependencies). You can install these using the following syntax, -@@ -114,7 +114,7 @@ - 'doc': read_requirements('doc'), - 'license': read_requirements('license'), - }, -- setup_requires=['setuptools_scm<6.0'], -+ # setup_requires=['setuptools_scm<6.0'], - use_scm_version=True, - - # If there are data files included in your packages that need to be