pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-beets: use environment override instead of patch
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Oct 14 17:15:26 2025 +0200
Changeset: db70509885ee22d84c8bc7ef7d2f53489bbdacd1
Modified Files:
py-beets/Makefile
py-beets/distinfo
Removed Files:
py-beets/patches/patch-pyproject.toml
Log Message:
py-beets: use environment override instead of patch
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=db70509885ee22d84c8bc7ef7d2f53489bbdacd1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-beets/Makefile | 5 +++--
py-beets/distinfo | 1 -
py-beets/patches/patch-pyproject.toml | 16 ----------------
3 files changed, 3 insertions(+), 19 deletions(-)
diffs:
diff --git a/py-beets/Makefile b/py-beets/Makefile
index 1f229e22fe..291238a2cd 100644
--- a/py-beets/Makefile
+++ b/py-beets/Makefile
@@ -10,7 +10,6 @@ HOMEPAGE= https://beets.io/
COMMENT= Music geek's media organizer
LICENSE= mit
-# https://github.com/beetbox/beets/issues/5596
TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-core>=2.2.1:../../devel/py-poetry-core
TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-dynamic-versioning>=0:../../devel/py-poetry-dynamic-versioning
DEPENDS+= ${PYPKGPREFIX}-Unidecode>=1.3.6:../../textproc/py-Unidecode
@@ -43,6 +42,8 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
PYTHON_VERSIONS_INCOMPATIBLE= 310
+MAKE_ENV+= POETRY_DYNAMIC_VERSIONING_BYPASS=${PKGVERSION_NOREV}
+
# as of 2.4.0
# 1067 passed, 101 skipped, 1 warning
.if make(test)
@@ -54,8 +55,8 @@ ALLOW_NETWORK_ACCESS= yes
DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions
.endif
+# https://github.com/beetbox/beets/issues/5596
post-install:
- cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet-${PYVERSSUFFIX} || ${TRUE}
${INSTALL_DATA} ${WRKSRC}/man/beet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/beet-${PYVERSSUFFIX}.1
${INSTALL_DATA} ${WRKSRC}/man/beetsconfig.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/beetsconfig-${PYVERSSUFFIX}.5
cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet-${PYVERSSUFFIX} || ${TRUE}
diff --git a/py-beets/distinfo b/py-beets/distinfo
index 42f9f3624a..f1ddccdd5e 100644
--- a/py-beets/distinfo
+++ b/py-beets/distinfo
@@ -3,4 +3,3 @@ $NetBSD: distinfo,v 1.24 2025/09/21 15:17:23 wiz Exp $
BLAKE2s (beets-2.5.0.tar.gz) = b3cb98ac227c2dfbd8641c74015d393fcc80fc1830f7211632679540417e6722
SHA512 (beets-2.5.0.tar.gz) = 01cf8ec446b4848668fe4b23ba68e9eafb2123680401fd11cec65023f786aca45cd91819113cc6ef2b73b49e000d63ce36ace3942d67c4499580a2b9fb840360
Size (beets-2.5.0.tar.gz) = 2141493 bytes
-SHA1 (patch-pyproject.toml) = 2012f6d7a38e839751aced8e328fc12f4257ebd0
diff --git a/py-beets/patches/patch-pyproject.toml b/py-beets/patches/patch-pyproject.toml
deleted file mode 100644
index bb71b37e52..0000000000
--- a/py-beets/patches/patch-pyproject.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Disable automatic version detection -- needs .git directory.
-https://github.com/beetbox/beets/issues/6089
-
---- pyproject.toml.orig 2025-10-13 12:22:04.122698682 +0000
-+++ pyproject.toml
-@@ -158,7 +158,7 @@ beet = "beets.ui:main"
-
-
- [tool.poetry-dynamic-versioning]
--enable = true
-+enable = false
- vcs = "git"
- format = "{base}.dev{distance}+{commit}"
-
Home |
Main Index |
Thread Index |
Old Index