From 9d4dbafa899e79cccde97c1405347f9509c0714b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 15 Oct 2025 19:03:28 +0200
Subject: [PATCH] dev-python/merge3: Bump to 0.0.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/merge3/Manifest             |  1 +
 dev-python/merge3/merge3-0.0.16.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 dev-python/merge3/merge3-0.0.16.ebuild

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index b4a2a2e8168bd..5f8df6e0421dc 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1 +1,2 @@
 DIST merge3-0.0.15.gh.tar.gz 16783 BLAKE2B 6c6a7ac8e8be8d4711c8dbf69fb38eb3b90b93281295d5ae172f371d3c8a1647a2f0e3c14725b760d9dcc0dfd77583170487956e9de87f21720d6db1be19e3eb SHA512 d87ead80219e14b210840333396e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4
+DIST merge3-0.0.16.gh.tar.gz 20832 BLAKE2B b1e79d15a7a9bf623ca605136d1e9e76a94f03893a3d1719d59d869c0d597b75f4757e3d83e8b03709c5ab26cd3a54a16a04f400c87ac0afc5c54a949177ea61 SHA512 bcbf42145a79845c2a53d788949def6f254ae4d951e203f73555da09ed73a669c37ba29cef3f1bf3dcb60a6530b04953852447b8b0dfadc22cf8f6ba60c22ce0
diff --git a/dev-python/merge3/merge3-0.0.16.ebuild b/dev-python/merge3/merge3-0.0.16.ebuild
new file mode 100644
index 0000000000000..0aff0c2c0ac4d
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..14} )
+
+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 ~ppc ~ppc64 ~x86"
+
+distutils_enable_tests unittest