From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/
Date: Sun, 17 Sep 2023 13:35:27 +0000 (UTC) [thread overview]
Message-ID: <1694957716.84e5752522cc7f4bb7e1e625d3e3004ba4e274f6.mgorny@gentoo> (raw)
commit: 84e5752522cc7f4bb7e1e625d3e3004ba4e274f6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 12:46:45 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 13:35:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e57525
dev-python/merge3: Bump to 0.0.14
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/merge3/Manifest | 1 +
dev-python/merge3/merge3-0.0.14.ebuild | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index e94783501e3c..179de351f99e 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1 +1,2 @@
DIST merge3-0.0.13.gh.tar.gz 15980 BLAKE2B c194573667f9e1f5ad60627a26f90f8c7ff28c160f5c0e9fe3e76e95cea8d0ce17d0d0241a2d20f3169d57ae35cada3dcabc25604331014180cea352e1f0e4cf SHA512 235f5f99c0156511ebe25a7a5568ac10ed26645a395cc464800b1417b1d7655c9de218afbe1c612409608e0d34fafa57ce44de362965d6bd381bf7e45742e9e0
+DIST merge3-0.0.14.gh.tar.gz 16109 BLAKE2B 482ad2aa32cbfc535c0c96d8c7d25fff4dad3e3ea00ccc48c7c89086e143e2d4c13b49eef79532123f282ac81b3797f6358fccf7115c1b2776c80df76ea6cc82 SHA512 62ed82925838329be7cf1e9456bb6bb02e85a41a0c54cff94f32624c29d9c15c47c3f3f7ec6b1e8f421f3648000964e1afff36a913ca49bf3fb95a52faa71b83
diff --git a/dev-python/merge3/merge3-0.0.14.ebuild b/dev-python/merge3/merge3-0.0.14.ebuild
new file mode 100644
index 000000000000..470baaecca23
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python implementation of 3-way merge"
+HOMEPAGE="
+ https://github.com/breezy-team/merge3
+ https://pypi.org/project/merge3/
+"
+SRC_URI="
+ https://github.com/breezy-team/merge3/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
next reply other threads:[~2023-09-17 13:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-17 13:35 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-14 16:54 [gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/ Arthur Zamarin
2025-10-14 16:54 Arthur Zamarin
2025-05-15 18:46 Arthur Zamarin
2024-06-15 12:38 Petr Vaněk
2024-06-15 12:26 Petr Vaněk
2024-05-06 15:29 Michał Górny
2023-12-30 18:30 Michał Górny
2023-09-09 6:10 Arthur Zamarin
2023-07-15 3:10 Sam James
2023-07-10 20:21 Arthur Zamarin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1694957716.84e5752522cc7f4bb7e1e625d3e3004ba4e274f6.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox