summaryrefslogtreecommitdiff
path: root/dev-python/merge3
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-12-30 23:46:05 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-12-30 23:46:05 +0000
commitbb262580ec0b56a32797f121e627928d103e6bb1 (patch)
treeb3b80cb753a087635c972352ce99fed1d01f286b /dev-python/merge3
parent35e3ee5faf74dc69409f957f81a6848d4d24c49f (diff)
gentoo auto-resync : 30:12:2023 - 23:46:05
Diffstat (limited to 'dev-python/merge3')
-rw-r--r--dev-python/merge3/Manifest2
-rw-r--r--dev-python/merge3/merge3-0.0.13.ebuild22
2 files changed, 0 insertions, 24 deletions
diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index 9441b21299cf..e6b39ca4fd8e 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1,5 +1,3 @@
-DIST merge3-0.0.13.gh.tar.gz 15980 BLAKE2B c194573667f9e1f5ad60627a26f90f8c7ff28c160f5c0e9fe3e76e95cea8d0ce17d0d0241a2d20f3169d57ae35cada3dcabc25604331014180cea352e1f0e4cf SHA512 235f5f99c0156511ebe25a7a5568ac10ed26645a395cc464800b1417b1d7655c9de218afbe1c612409608e0d34fafa57ce44de362965d6bd381bf7e45742e9e0
DIST merge3-0.0.14.gh.tar.gz 16109 BLAKE2B 482ad2aa32cbfc535c0c96d8c7d25fff4dad3e3ea00ccc48c7c89086e143e2d4c13b49eef79532123f282ac81b3797f6358fccf7115c1b2776c80df76ea6cc82 SHA512 62ed82925838329be7cf1e9456bb6bb02e85a41a0c54cff94f32624c29d9c15c47c3f3f7ec6b1e8f421f3648000964e1afff36a913ca49bf3fb95a52faa71b83
-EBUILD merge3-0.0.13.ebuild 518 BLAKE2B 4e06164448463fd2452e24bdcd65e94aa5236677871d876e441ebf3c391f64ef7dacbc4b5ee5de099e7590bf7c9326bce699bf8f02238012d388bfd0d653adbb SHA512 307f4997b3005fc0de24b68a072ffc812c8e07fc1527f3d04efdf0e02a49e9d451d3cf209e64e006759f674652d2892937abe40e66fd6612248d92f07cfaa665
EBUILD merge3-0.0.14.ebuild 523 BLAKE2B 542cd5caa9ccfa266bdde3535ce198fe815588f548031fdfc0c26d5b21ec28967a56f68685d25941f224e102a87b1870ed560598bb0a27663612c59227eb9ab1 SHA512 22d8b40a29d2333fd80a04bc9079313736b014c14da52d5f9d50407f2353b21a062be4409c2022dd1ee9145b2f6c91fc95e857d50ba50ee01f504e649fd58fcd
MISC metadata.xml 392 BLAKE2B 151736f3c81068ca500e08ec4b3af9fa4b037208b434b00c0f4c6f5425f7a83494a420850124ad8d0e4dde6bb790ec0185c6228afead752a361762e5a67b8309 SHA512 1fe3084232da7079cba8abb30d760d3b474fd01fe8671ac6d001dea800118981dda41999df1f060d4b32a2b69fb9c4764bb6cae6712f557ce87fd3fd0a75eaf8
diff --git a/dev-python/merge3/merge3-0.0.13.ebuild b/dev-python/merge3/merge3-0.0.13.ebuild
deleted file mode 100644
index 43b8cbc8211a..000000000000
--- a/dev-python/merge3/merge3-0.0.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-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 ~x86"
-
-distutils_enable_tests unittest