[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

[Michał Górny]

commit:     6efcbb068cb3c149cd276a3868e706d2594a6459
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 15:03:28 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  6 15:29:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efcbb06

dev-python/merge3: Bump to 0.0.15

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/merge3/Manifest             |  1 +
 dev-python/merge3/merge3-0.0.15.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index b9ae3a58fa5a..f49c0a0d9b61 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1 +1,2 @@
 DIST merge3-0.0.14.gh.tar.gz 16109 BLAKE2B 
482ad2aa32cbfc535c0c96d8c7d25fff4dad3e3ea00ccc48c7c89086e143e2d4c13b49eef79532123f282ac81b3797f6358fccf7115c1b2776c80df76ea6cc82
 SHA512 
62ed82925838329be7cf1e9456bb6bb02e85a41a0c54cff94f32624c29d9c15c47c3f3f7ec6b1e8f421f3648000964e1afff36a913ca49bf3fb95a52faa71b83
+DIST merge3-0.0.15.gh.tar.gz 16783 BLAKE2B 
6c6a7ac8e8be8d4711c8dbf69fb38eb3b90b93281295d5ae172f371d3c8a1647a2f0e3c14725b760d9dcc0dfd77583170487956e9de87f21720d6db1be19e3eb
 SHA512 
d87ead80219e14b210840333396e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4

diff --git a/dev-python/merge3/merge3-0.0.15.ebuild 
b/dev-python/merge3/merge3-0.0.15.ebuild
new file mode 100644
index 000000000000..e3d8a68d3396
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023-2024 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