commit: 51f180d4adf8208cd49e0ed6c6aaf9559c14b677
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Sun May 4 22:32:09 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun May 4 22:37:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f180d4
dev-python/html2text: fix file conflicts due to unapplied sed
```
* SED: the following did not cause any changes
* sed -e 's/html2text = html2text.cli:main/py\0/' -i setup.cfg || die;
* no-op: -e s/html2text = html2text.cli:main/py\0/
```
And on merge:
```
* Detected file collision(s):
*
* /usr/bin/html2text
*
* Searching all installed packages for file collisions...
*
* Press Ctrl-C to Stop
*
* app-text/html2text-2.2.3:0::gentoo
* /usr/bin/html2text
*
* Package 'dev-python/html2text-2025.4.15' NOT merged due to file
* collisions. If necessary, refer to your elog messages for the whole
* content of the above message.
```
Regression in commit 989f1d35a84d9755eced0c36e4bdd99ef992e6b9 which
bumped to a version that ported the upstream build system to use
pyproject.toml. Same information, different file.
Fixes: 989f1d35a84d9755eced0c36e4bdd99ef992e6b9
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
.../{html2text-2025.4.15.ebuild => html2text-2025.4.15-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/html2text/html2text-2025.4.15.ebuild
b/dev-python/html2text/html2text-2025.4.15-r1.ebuild
similarity index 90%
rename from dev-python/html2text/html2text-2025.4.15.ebuild
rename to dev-python/html2text/html2text-2025.4.15-r1.ebuild
index 9ff465278ffa..de8f32e83486 100644
--- a/dev-python/html2text/html2text-2025.4.15.ebuild
+++ b/dev-python/html2text/html2text-2025.4.15-r1.ebuild
@@ -28,6 +28,6 @@ distutils_enable_tests pytest
src_prepare() {
# naming conflict with app-text/html2text, bug 421647
- sed -e 's/html2text = html2text.cli:main/py\0/' -i setup.cfg || die
+ sed -e 's/html2text = "html2text.cli:main"/py\0/' -i pyproject.toml ||
die
distutils-r1_src_prepare
}
