+ py-three-merge in wip

[K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	K.I.A.Derouiche <kamelderouiche%yahoo.com@localhost>
Pushed By:	jihbed
Date:		Fri Nov 4 15:39:24 2022 +0000
Changeset:	2b1fb61c4c09eac720d799d44727b01a18d063df

Modified Files:
	Makefile
Added Files:
	py-three-merge/DESCR
	py-three-merge/Makefile
	py-three-merge/PLIST
	py-three-merge/distinfo

Log Message:
+ py-three-merge in wip

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2b1fb61c4c09eac720d799d44727b01a18d063df

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                |  1 +
 py-three-merge/DESCR    |  4 ++++
 py-three-merge/Makefile | 18 ++++++++++++++++++
 py-three-merge/PLIST    | 12 ++++++++++++
 py-three-merge/distinfo |  5 +++++
 5 files changed, 40 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 1e2b85fbf1..843355a47d 100644
--- a/Makefile
+++ b/Makefile
@@ -4844,6 +4844,7 @@ SUBDIR+=	py-tranquil
 SUBDIR+=	py-transaction
 SUBDIR+=	py-translationstring
 SUBDIR+=	py-tree-sitter
+SUBDIR+=	py-three-merge
 SUBDIR+=	py-tribe
 SUBDIR+=	py-trie3
 SUBDIR+=	py-trimesh
diff --git a/py-three-merge/DESCR b/py-three-merge/DESCR
new file mode 100644
index 0000000000..d634467875
--- /dev/null
+++ b/py-three-merge/DESCR
@@ -0,0 +1,4 @@
+Simple Python library to perform a 3-way merge between strings,
+based on diff-match-patch. This library performs merges at a
+character level, as opposed to most VCS systems, which opt for
+a line-based approach.
diff --git a/py-three-merge/Makefile b/py-three-merge/Makefile
new file mode 100644
index 0000000000..04d1ef4e99
--- /dev/null
+++ b/py-three-merge/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+DISTNAME=	three-merge-0.1.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/three-merge/}
+
+MAINTAINER=	kamelderouiche%yahoo.com@localhost
+HOMEPAGE=	https://github.com/spyder-ide/three-merge
+COMMENT=	Simple library for merging two strings with respect to a base one
+LICENSE=	mit
+
+DEPENDS+=	${PYPKGPREFIX}-diff-match-patch>=0:../../textproc/py-diff-match-patch
+
+USE_LANGUAGES=	# none
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/py-three-merge/PLIST b/py-three-merge/PLIST
new file mode 100644
index 0000000000..985bb96f53
--- /dev/null
+++ b/py-three-merge/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/three_merge/__init__.py
+${PYSITELIB}/three_merge/__init__.pyc
+${PYSITELIB}/three_merge/__init__.pyo
+${PYSITELIB}/three_merge/merge.py
+${PYSITELIB}/three_merge/merge.pyc
+${PYSITELIB}/three_merge/merge.pyo
diff --git a/py-three-merge/distinfo b/py-three-merge/distinfo
new file mode 100644
index 0000000000..7b11808cab
--- /dev/null
+++ b/py-three-merge/distinfo
@@ -0,0 +1,5 @@
+$NetBSD$
+
+BLAKE2s (three-merge-0.1.1.tar.gz) = 19aa387eda5245e56f0a75dbc42bb497d04c2b798221e320ee6cc3f95abd5816
+SHA512 (three-merge-0.1.1.tar.gz) = 30960ddb3283b2096ed4e0b31d543339c4440e17c6c120560553d47e0cca4b6ea4f91adbd5746dee7eca2b5af4bf16249707dbac4ceff3b0a4622562a87cb775
+Size (three-merge-0.1.1.tar.gz) = 5898 bytes