diff options
Diffstat (limited to 'dev-python/merge3')
| -rw-r--r-- | dev-python/merge3/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/merge3/merge3-0.0.14.ebuild | 25 | ||||
| -rw-r--r-- | dev-python/merge3/merge3-0.0.15.ebuild | 2 |
3 files changed, 2 insertions, 29 deletions
diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest index de9eaadd8158..8722cf7913f6 100644 --- a/dev-python/merge3/Manifest +++ b/dev-python/merge3/Manifest @@ -1,5 +1,3 @@ -DIST merge3-0.0.14.gh.tar.gz 16109 BLAKE2B 482ad2aa32cbfc535c0c96d8c7d25fff4dad3e3ea00ccc48c7c89086e143e2d4c13b49eef79532123f282ac81b3797f6358fccf7115c1b2776c80df76ea6cc82 SHA512 62ed82925838329be7cf1e9456bb6bb02e85a41a0c54cff94f32624c29d9c15c47c3f3f7ec6b1e8f421f3648000964e1afff36a913ca49bf3fb95a52faa71b83 DIST merge3-0.0.15.gh.tar.gz 16783 BLAKE2B 6c6a7ac8e8be8d4711c8dbf69fb38eb3b90b93281295d5ae172f371d3c8a1647a2f0e3c14725b760d9dcc0dfd77583170487956e9de87f21720d6db1be19e3eb SHA512 d87ead80219e14b210840333396e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4 -EBUILD merge3-0.0.14.ebuild 523 BLAKE2B 542cd5caa9ccfa266bdde3535ce198fe815588f548031fdfc0c26d5b21ec28967a56f68685d25941f224e102a87b1870ed560598bb0a27663612c59227eb9ab1 SHA512 22d8b40a29d2333fd80a04bc9079313736b014c14da52d5f9d50407f2353b21a062be4409c2022dd1ee9145b2f6c91fc95e857d50ba50ee01f504e649fd58fcd -EBUILD merge3-0.0.15.ebuild 528 BLAKE2B aaedb68328bbc2bd5e6821087a4191ad7f3b62d2a4daab2c495aed7325f16aba1d336fbe4f7b15e29cfcf79a27d28373460ca7dddd266105c304d1e0271f18fd SHA512 51e8952d66520e5fda566c861e2a72681a5a4c5064b8e5398885dd845fb58ed9e174e108f7750eb1b8dd59833c490e7411936c07dbb916cc055f0e50e77d7810 +EBUILD merge3-0.0.15.ebuild 528 BLAKE2B 9f21d8fe702ae3151581437928bf179bb237d284fffff1affd908b0a1da94d0c9596812bcaf46181c7fd56de065f455fe0b532d602d6434c36480e8e24372f0e SHA512 0dce332c64f6c89115aadf690d3ff146a326c1f673db2c94a6fefd8e202507084561b8c1ef0e461522fbbbb483a9461b8600726df48fc23d36458487c665aa72 MISC metadata.xml 392 BLAKE2B 151736f3c81068ca500e08ec4b3af9fa4b037208b434b00c0f4c6f5425f7a83494a420850124ad8d0e4dde6bb790ec0185c6228afead752a361762e5a67b8309 SHA512 1fe3084232da7079cba8abb30d760d3b474fd01fe8671ac6d001dea800118981dda41999df1f060d4b32a2b69fb9c4764bb6cae6712f557ce87fd3fd0a75eaf8 diff --git a/dev-python/merge3/merge3-0.0.14.ebuild b/dev-python/merge3/merge3-0.0.14.ebuild deleted file mode 100644 index 470baaecca23..000000000000 --- a/dev-python/merge3/merge3-0.0.14.ebuild +++ /dev/null @@ -1,25 +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 diff --git a/dev-python/merge3/merge3-0.0.15.ebuild b/dev-python/merge3/merge3-0.0.15.ebuild index e3d8a68d3396..2ed6bf5a197e 100644 --- a/dev-python/merge3/merge3-0.0.15.ebuild +++ b/dev-python/merge3/merge3-0.0.15.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 pypi |