summaryrefslogtreecommitdiff
path: root/dev-python/merge3
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-30 16:35:43 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-30 16:35:43 -0500
commit719f34f1b995c87fcee57237cdbc4f7b4ee21b51 (patch)
tree9d29fb8faa9fd4f9e485181f5bae5d28d51c69cd /dev-python/merge3
parent12f44434dede883e1d33b5470fb17a1b873107cd (diff)
downloadbaldeagleos-repo-719f34f1b995c87fcee57237cdbc4f7b4ee21b51.tar.gz
baldeagleos-repo-719f34f1b995c87fcee57237cdbc4f7b4ee21b51.tar.xz
baldeagleos-repo-719f34f1b995c87fcee57237cdbc4f7b4ee21b51.zip
Adding metadata
Diffstat (limited to 'dev-python/merge3')
-rw-r--r--dev-python/merge3/Manifest1
-rw-r--r--dev-python/merge3/merge3-0.0.15.ebuild25
-rw-r--r--dev-python/merge3/merge3-0.0.16.ebuild2
3 files changed, 1 insertions, 27 deletions
diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index 5f8df6e0421d..48b243f8d587 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1,2 +1 @@
-DIST merge3-0.0.15.gh.tar.gz 16783 BLAKE2B 6c6a7ac8e8be8d4711c8dbf69fb38eb3b90b93281295d5ae172f371d3c8a1647a2f0e3c14725b760d9dcc0dfd77583170487956e9de87f21720d6db1be19e3eb SHA512 d87ead80219e14b210840333396e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4
DIST merge3-0.0.16.gh.tar.gz 20832 BLAKE2B b1e79d15a7a9bf623ca605136d1e9e76a94f03893a3d1719d59d869c0d597b75f4757e3d83e8b03709c5ab26cd3a54a16a04f400c87ac0afc5c54a949177ea61 SHA512 bcbf42145a79845c2a53d788949def6f254ae4d951e203f73555da09ed73a669c37ba29cef3f1bf3dcb60a6530b04953852447b8b0dfadc22cf8f6ba60c22ce0
diff --git a/dev-python/merge3/merge3-0.0.15.ebuild b/dev-python/merge3/merge3-0.0.15.ebuild
deleted file mode 100644
index fe791749ca0a..000000000000
--- a/dev-python/merge3/merge3-0.0.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-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 ~ppc ~ppc64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/merge3/merge3-0.0.16.ebuild b/dev-python/merge3/merge3-0.0.16.ebuild
index 0012484731e3..0adf8a5a3ca9 100644
--- a/dev-python/merge3/merge3-0.0.16.ebuild
+++ b/dev-python/merge3/merge3-0.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2025 Gentoo Authors
+# Copyright 2023-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8