From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 dev-python/three-merge/Manifest                 |  3 +++
 dev-python/three-merge/metadata.xml             | 16 +++++++++++++++
 dev-python/three-merge/three-merge-0.1.1.ebuild | 26 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 dev-python/three-merge/Manifest
 create mode 100644 dev-python/three-merge/metadata.xml
 create mode 100644 dev-python/three-merge/three-merge-0.1.1.ebuild

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

diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
new file mode 100644
index 000000000000..e0e520e7908e
--- /dev/null
+++ b/dev-python/three-merge/Manifest
@@ -0,0 +1,3 @@
+DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
+EBUILD three-merge-0.1.1.ebuild 662 BLAKE2B d3d5d621f3857ac130103bdc3b2088d26045b454429eb4165386f265d5fed72613f2be64c6c13f0832fcea4c9fc3764ed62849488fedf475efb2d14f410a491d SHA512 80a4c044dd872c8d39e25042660c3e650b072c13fea1a49e60fe68f4a266f32bc97442063ad069b7c94508609a40f3c06ea286fb7b372115a1556845cbf7f9ad
+MISC metadata.xml 529 BLAKE2B f84df808d5dd8ba2116da158d589a55f571fdd4641c31b8ae077b6f7550c10c02666eb9e65e51ab929cf8e149decc368901ad2229506d172c8b9a672fab589ff SHA512 e424e78bc3d309ec12147a05a250b58b1e6468940b6b417e01b1b74705762f63dc3ded2f880eb4f1b5a066aaff70ef5dd12c4546a83e1fca60561b0e23293984
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
new file mode 100644
index 000000000000..a1562d89ee7a
--- /dev/null
+++ b/dev-python/three-merge/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">three-merge</remote-id>
+    <remote-id type="github">spyder-ide/three-merge</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
new file mode 100644
index 000000000000..a6dd1a854807
--- /dev/null
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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