summaryrefslogtreecommitdiff
path: root/dev-python/three-merge
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-07-10 04:26:23 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-07-10 04:26:23 +0100
commit9e8f96c1b33dc01bc5dfbed0cfb2702bb299f1e0 (patch)
tree935774930075230b45a40e5c8da1e0199bf277a5 /dev-python/three-merge
parent796e724b5ace96ff70d918765662edf62f1d8c85 (diff)
gentoo auto-resync : 10:07:2023 - 04:26:23
Diffstat (limited to 'dev-python/three-merge')
-rw-r--r--dev-python/three-merge/Manifest2
-rw-r--r--dev-python/three-merge/three-merge-0.1.1.ebuild26
2 files changed, 0 insertions, 28 deletions
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 6173bd284e0d..ce86c7612aa0 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,5 +1,3 @@
-DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
DIST three-merge-0.1.1.gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
EBUILD three-merge-0.1.1-r1.ebuild 717 BLAKE2B 744d16d2a52c7185d8690ed0ada7ad4649b70d840bc24f40204cf2b1c6d9109967aece55915affadc63654595148a6ddccbbd7c2a1e6ff06a26123307caee0b7 SHA512 a124c6d4b296bebab25e226f4eb3d5e9e0b2513674410227285da369a20d62f0ee0b2e85ecd90a80c43fb7e4afa6a6b8f137d7ea67a1217eaa36f962b14c135e
-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.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
deleted file mode 100644
index 21f79fc691f7..000000000000
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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