From 58363a659e5161822c630bb4e16459a3a838696c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 27 May 2023 21:13:07 +0100
Subject: gentoo auto-resync : 27:05:2023 - 21:13:06

---
 dev-python/three-merge/Manifest                    |  1 +
 dev-python/three-merge/three-merge-0.1.1-r1.ebuild | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 dev-python/three-merge/three-merge-0.1.1-r1.ebuild

(limited to 'dev-python/three-merge')

diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 0e4f1c092990..aaf6ec573a4b 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,4 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
+EBUILD three-merge-0.1.1-r1.ebuild 695 BLAKE2B 68f256ee4e02da3cc32a70f363b95755fba073c24717fa309dfe422142d2957430fd5572dde32d291724827623e3296f10458184bb060a1e169074bfdc3ad892 SHA512 a89792e09a7cbedb4a4cb94523313c50a9c4f8998ada8cee3f6982a3fceb224c4ac98a2e145cb6b3f4d3ffb689c75d42489f57a26e2bbb4f9d03039541eec26d
 EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 68fd8f149bf57cb795d81d89a710d64841ddd059becdc45945629265806e45fa4e29994ff2a2173ec3ffad755ae914ad81919e352585b6d62f9e8410a2524564 SHA512 85fbbe82aabd5eb4d9af6ee96107b9f320b7f9821f6dd591425ccc3ba3207b01ffd2f6bfe92769fdf8682731bc395571774860b94e544cf2c0246a3c0b4599ff
 MISC metadata.xml 432 BLAKE2B 85741fa3b4c10a6a3ebea91bfc5f91d82377e48e77553b72aa1c15bd42865f8c77e8f267b713ea3b3a0240c10ceb54dfe59f8e112735feac2f33fc9d7d141757 SHA512 af883c75dc04ad12092166db8b97c0028ee662abe6ca1bafffa478843616cc9033725ae3b6f696e82c8dfd323a1889ff9ccb3dab0637d2fa8e1cfddf1341a531
diff --git a/dev-python/three-merge/three-merge-0.1.1-r1.ebuild b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..35a2d565d516
--- /dev/null
+++ b/dev-python/three-merge/three-merge-0.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
+HOMEPAGE="https://github.com/spyder-ide/three-merge
+	https://pypi.org/project/three-merge/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
-- 
cgit v1.2.3