From nobody Fri Jan 17 12:47:56 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YZKJr4cDXz5kx31; Fri, 17 Jan 2025 12:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZKJr2Pfbz3hlV; Fri, 17 Jan 2025 12:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737118076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MrqMbzst2ERlxbMYeTW8dvSZvpyE04NPYcjW9Chhn1w=; b=gbTBVtMMOagVTUkZGD+gM9S2nZ/Fo1vaVpu5ZUtWoG9EbIOb3BLgsrptXXct4upMjIu+Jj IQp2nT72MoHIIlc1biN1z3I4/BpXi4/eU5HctB2RpKQBEB85Hi0WOje6Nmdbl3YElns5sG kZ2bYdEgYX+kII0A7AmPnM/d2FYJ8+tUAh+4iQzWVUyyOklIf/SBAyBfv04razZL+C05JT zOvXBcIbeczeDjx01r6ORfWRH8GpPqXzn4y4ivYcnJU3jSNgvFI7zH9AfIXUMNl2KxXUPt Vz77nhy0uUCl0w8qSzDfzX9woJaKnn59JjRFlz9DFW9pvuwzeeiqhhmBaYJ6Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737118076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MrqMbzst2ERlxbMYeTW8dvSZvpyE04NPYcjW9Chhn1w=; b=X0yI19W5KsNiIuJgRkgogj7SgVCzLJz4zsw8AO4kEUCOWTlAG2djxya0toiqrmCrCG4fDi 5Eprr/VqFmT4HMhdXwOoZuDwAJH1GANcZV3ZInxE9qPv1oEcpExBaQg4xmLo2zlnEKCJah yanPFC+/NFVk8XWlR5ykj2MlubXw/lVxcINWzZjb2axt/bLfs7Z7PW3mehurDd3KszCUxi Pm/13rVLFUyNLC13e4Kl2a3EbW1wqhaVlC4QmMMXDtHQS1ldKDXHHqLKU50B4U5sXHBl4T LtUTsTfycTzIylUoQkalqSj1FjMj1Py9OvQA+4txXzvE2LAaEScPruyY0PYkIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737118076; a=rsa-sha256; cv=none; b=oT1ox7FTvpXCTATyG3MMwdAhswUkm1x04FS3e4URggNi3G4GcdRj8SyDgUMKN1lcPDcrA8 hlFEV5ZymhsJMr79VH1TD9UlIB1fqBVvgeVZzx9+iXBiTsxOj5weHkzcipmlX/4+r11fVK 67DfnGdEYveBWMQGotNm9IWyqWiSVoAbwkBdYIqxRcjrMVyACxcP4qiXQ1JPdoD7uaws3f Peml1Bn/dDs7S60JvAPHcMrCWIp4tHaPTJZbm7mVi+bA3FTUlL/8N5a1+CGq1MTVxcWgX9 ht4zVGO2Lc57ib83xafkOK3ugGKnUBSexEnC3tGmbPcRRkmIh0nLzLqYG2dRHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YZKJr1pXxz3Gb; Fri, 17 Jan 2025 12:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HCluKm093783; Fri, 17 Jan 2025 12:47:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCluHc093778; Fri, 17 Jan 2025 12:47:56 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:47:56 GMT Message-Id: <202501171247.50HCluHc093778@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: caacd6f039f4 - 2025Q1 - audio/beets: chase kubo -> kubo-go rename List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: caacd6f039f43a7b0514b2107a81c51a8b33b3b1 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=caacd6f039f43a7b0514b2107a81c51a8b33b3b1 commit caacd6f039f43a7b0514b2107a81c51a8b33b3b1 Author: Robert Clausecker AuthorDate: 2025-01-13 12:07:41 +0000 Commit: Robert Clausecker CommitDate: 2025-01-17 12:45:34 +0000 audio/beets: chase kubo -> kubo-go rename This time, actually fix the command invocations in the source code. Approved by: portmgr (build fix blanket) MFH: 2025Q1 (cherry picked from commit 32245e7007b4d7c039e83faa6834aa2787d51c7a) --- audio/beets/Makefile | 3 ++- audio/beets/files/patch-beetsplug_ipfs.py | 44 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/audio/beets/Makefile b/audio/beets/Makefile index 8d78563be058..81b61145fcbe 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -1,5 +1,6 @@ PORTNAME= beets DISTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= PYPI @@ -70,7 +71,7 @@ EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_ FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg IMAGEMAGICK_USES= magick:run -IPFS_RUN_DEPENDS= kubo:sysutils/kubo-go +IPFS_RUN_DEPENDS= kubo-go:sysutils/kubo-go KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR} LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} diff --git a/audio/beets/files/patch-beetsplug_ipfs.py b/audio/beets/files/patch-beetsplug_ipfs.py new file mode 100644 index 000000000000..a97325cf3417 --- /dev/null +++ b/audio/beets/files/patch-beetsplug_ipfs.py @@ -0,0 +1,44 @@ +--- beetsplug/ipfs.py.orig 2025-01-13 12:04:44 UTC ++++ beetsplug/ipfs.py +@@ -134,9 +134,9 @@ class IPFSPlugin(BeetsPlugin): + self._log.info("Adding {0} to ipfs", album_dir) + + if self.config["nocopy"]: +- cmd = "ipfs add --nocopy -q -r".split() ++ cmd = "kubo-go add --nocopy -q -r".split() + else: +- cmd = "ipfs add -q -r".split() ++ cmd = "kubo-go add -q -r".split() + cmd.append(album_dir) + try: + output = util.command_output(cmd).stdout.split() +@@ -178,7 +178,7 @@ class IPFSPlugin(BeetsPlugin): + + def ipfs_get_from_hash(self, lib, _hash): + try: +- cmd = "ipfs get".split() ++ cmd = "kubo-go get".split() + cmd.append(_hash) + util.command_output(cmd) + except (OSError, subprocess.CalledProcessError) as err: +@@ -202,9 +202,9 @@ class IPFSPlugin(BeetsPlugin): + self.ipfs_added_albums(lib, tmp.name) + try: + if self.config["nocopy"]: +- cmd = "ipfs add --nocopy -q ".split() ++ cmd = "kubo-go add --nocopy -q ".split() + else: +- cmd = "ipfs add -q ".split() ++ cmd = "kubo-go add -q ".split() + cmd.append(tmp.name) + output = util.command_output(cmd).stdout + except (OSError, subprocess.CalledProcessError) as err: +@@ -230,7 +230,7 @@ class IPFSPlugin(BeetsPlugin): + return False + path = os.path.join(remote_libs, lib_name.encode() + b".db") + if not os.path.exists(path): +- cmd = f"ipfs get {_hash} -o".split() ++ cmd = f"kubo-go get {_hash} -o".split() + cmd.append(path) + try: + util.command_output(cmd)