From nobody Fri Jan 17 12:37:39 2025 X-Original-To: dev-commits-ports-main@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 4YZK511t49z5kwXH; Fri, 17 Jan 2025 12:37:41 +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 4YZK501GNlz3fyV; Fri, 17 Jan 2025 12:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737117460; 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=uSeIwQPeGkaiGI4uBsaN6cVBD8zRgcSFXKtP+uqDjvY=; b=m/nx2mdqwi0lVWs6E4owBnvhziElxCkjS6co5p8gbDavOOy//3GEb3mSFHt4TDOEGrD1ZQ lgSHy/0g6ak77QYpuH96VVMXJWx8NCMP2I0z/nCOjhh5vFQAmxnAvBPgGJlCVhTisorQXQ mT5thcpzZGA4+2XMbERivJCjRtSPrY3/8Kccav9Y6yjBb4gVbeSppdoLOMvMRVWkqmlANH 35tLwfdgfv9Uz6LRJsHHn3u4TR+ZPZF1NgCJVKoO2bQMIKAPXHxAYsVDwaBoixyMQSN+DX DRYxz/6mP5tQSmLJkhY4d9IcZtr59H085D++2CSPYVOr6/M6/3QnrxFGribtzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737117460; 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=uSeIwQPeGkaiGI4uBsaN6cVBD8zRgcSFXKtP+uqDjvY=; b=cQVF4zU1KsNdPt9LpzbbQR/8xNuIXUMnnYDC/4378yDiDYCKP0DZHLZBpw6nbj82Rdb1cg u0tPQ+9W3ITs1jaFAXqzD5CiqncXdbPcxvfRJ8lohf+y3gzOD6xlvHX08iRbbUdFsdVfjr GDySz41TUE4rqG6RjkRJWctQGg8PSdPzfxdT2QzJf6sGm3NWdhUjBeqHmrKwkyb2lbBmV0 8VXPlAAZx2oiRRx5+yVatw7jRvlEKk4wYS2v1I2Z24nMQFc3h+64sSee3NHWVNjDhGPrOt yb1OpyDR2VDoWWZMdeVric61LmyVvrLT2F+wqDRDl9DwhMkBAHe5jDTUOThRRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737117460; a=rsa-sha256; cv=none; b=yeuiry/iMBqcmpKSoZQNb1O6fZKI34Mz3G4WFhL3US5r8ZNbVvTyJtLw7CrDcW++1Yl4Hb KZBTettbANP1J66vFrtxkKQPaZsXE/Lac0e348c1BY4TYJ/JHSVI9XDzrWTkZsQe6zJY7+ KPSCqPXJjTJCjgJAh4DIGg8ngv/Ujl1tzsmPNdbn82JVgORVApSqtB8NbPh8zIfNrIVg5e rW7CTNzyouJsJsMmNPsEf/tFNdFTKeyY7iRayA8LlgxQFw5G1N66CTjhOkkx4HnphbzTo/ uNuE8DV3rSpIB5m5z1y1CQVDB1/Smc6HhbdxKfU+657+NIQRMS8kTkwb/8jMYQ== 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 4YZK500jRlz394; Fri, 17 Jan 2025 12:37:40 +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 50HCbdTN073427; Fri, 17 Jan 2025 12:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCbdDu073423; Fri, 17 Jan 2025 12:37:39 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:37:39 GMT Message-Id: <202501171237.50HCbdDu073423@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 32245e7007b4 - main - audio/beets: chase kubo -> kubo-go rename List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 32245e7007b4d7c039e83faa6834aa2787d51c7a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=32245e7007b4d7c039e83faa6834aa2787d51c7a commit 32245e7007b4d7c039e83faa6834aa2787d51c7a Author: Robert Clausecker AuthorDate: 2025-01-13 12:07:41 +0000 Commit: Robert Clausecker CommitDate: 2025-01-17 12:36:54 +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 --- 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)