[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2024-06-15 Thread Petr Vaněk 
commit: 5f3eccb3bd0dbf54b57d0c5c35c6675621e756aa
Author: Petr Vaněk  gentoo  org>
AuthorDate: Sat Jun 15 12:37:24 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Sat Jun 15 12:37:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3eccb3

dev-python/merge3: drop 0.0.14

Signed-off-by: Petr Vaněk  gentoo.org>

 dev-python/merge3/Manifest |  1 -
 dev-python/merge3/merge3-0.0.14.ebuild | 25 -
 2 files changed, 26 deletions(-)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index f49c0a0d9b61..b4a2a2e8168b 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1,2 +1 @@
-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 
d87ead80219e14b21084096e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4

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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2024-06-15 Thread Petr Vaněk 
commit: db7075a4a49f46fb264b3f8cd3f08669edda6bfa
Author: Petr Vaněk  gentoo  org>
AuthorDate: Sat Jun 15 12:25:01 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Sat Jun 15 12:25:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7075a4

dev-python/merge3: enable py3.13

Signed-off-by: Petr Vaněk  gentoo.org>

 dev-python/merge3/merge3-0.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2024-05-06 Thread Michał Górny 
commit: 6efcbb068cb3c149cd276a3868e706d2594a6459
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May  6 15:03:28 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  6 15:29:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efcbb06

dev-python/merge3: Bump to 0.0.15

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/merge3/Manifest |  1 +
 dev-python/merge3/merge3-0.0.15.ebuild | 25 +
 2 files changed, 26 insertions(+)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index b9ae3a58fa5a..f49c0a0d9b61 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1 +1,2 @@
 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 
d87ead80219e14b21084096e274d46ef282c12a3de61ae06efb186f0bfd9c65f3ccbd7566ec62766201ed33a962bdc3ea3c30efbd241fd0018b69b94e3e4

diff --git a/dev-python/merge3/merge3-0.0.15.ebuild 
b/dev-python/merge3/merge3-0.0.15.ebuild
new file mode 100644
index ..e3d8a68d3396
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023-2024 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

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2023-12-30 Thread Michał Górny 
commit: 0b3249e65686a3aa76859720c1a4aee4bb90c2a6
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec 30 18:29:11 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec 30 18:29:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3249e6

dev-python/merge3: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/merge3/Manifest |  1 -
 dev-python/merge3/merge3-0.0.13.ebuild | 22 --
 2 files changed, 23 deletions(-)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index 179de351f99e..b9ae3a58fa5a 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1,2 +1 @@
-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

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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2023-09-17 Thread Michał Górny 
commit: 84e5752522cc7f4bb7e1e625d3e3004ba4e274f6
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 17 12:46:45 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 17 13:35:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e57525

dev-python/merge3: Bump to 0.0.14

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/merge3/Manifest |  1 +
 dev-python/merge3/merge3-0.0.14.ebuild | 25 +
 2 files changed, 26 insertions(+)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index e94783501e3c..179de351f99e 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1 +1,2 @@
 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

diff --git a/dev-python/merge3/merge3-0.0.14.ebuild 
b/dev-python/merge3/merge3-0.0.14.ebuild
new file mode 100644
index ..470baaecca23
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.14.ebuild
@@ -0,0 +1,25 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2023-09-09 Thread Arthur Zamarin 
commit: 804d86e5256945badd2a8331c17ee29f439ec1e0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep  9 06:10:01 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep  9 06:10:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d86e5

dev-python/merge3: Keyword 0.0.13 x86, #909844

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/merge3/merge3-0.0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/merge3/merge3-0.0.13.ebuild 
b/dev-python/merge3/merge3-0.0.13.ebuild
index 5ea88529976e..43b8cbc8211a 100644
--- a/dev-python/merge3/merge3-0.0.13.ebuild
+++ b/dev-python/merge3/merge3-0.0.13.ebuild
@@ -17,6 +17,6 @@ 
SRC_URI="https://github.com/breezy-team/merge3/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests unittest

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2023-07-14 Thread Sam James 
commit: dcc9d57e0e91191c6bdb4c573c08d1bbc403aefc
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 15 03:07:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 03:09:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc9d57e

dev-python/merge3: Keyword 0.0.13 arm64, #909844

Signed-off-by: Sam James  gentoo.org>

 dev-python/merge3/merge3-0.0.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/merge3/merge3-0.0.13.ebuild 
b/dev-python/merge3/merge3-0.0.13.ebuild
index cbadd39169d8..5ea88529976e 100644
--- a/dev-python/merge3/merge3-0.0.13.ebuild
+++ b/dev-python/merge3/merge3-0.0.13.ebuild
@@ -17,6 +17,6 @@ 
SRC_URI="https://github.com/breezy-team/merge3/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 distutils_enable_tests unittest

[gentoo-commits] repo/gentoo:master commit in: dev-python/merge3/

2023-07-10 Thread Arthur Zamarin 
commit: dd7b67735050fbbf004a6815196d1b8871a4d268
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul  5 16:45:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Jul 10 20:19:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd7b6773

dev-python/merge3: new package, add 0.0.13

Dependency for dev-vcs/breezy

Bug: https://bugs.gentoo.org/896944
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/merge3/Manifest |  1 +
 dev-python/merge3/merge3-0.0.13.ebuild | 22 ++
 dev-python/merge3/metadata.xml | 13 +
 3 files changed, 36 insertions(+)

diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
new file mode 100644
index ..e94783501e3c
--- /dev/null
+++ b/dev-python/merge3/Manifest
@@ -0,0 +1 @@
+DIST merge3-0.0.13.gh.tar.gz 15980 BLAKE2B 
c194573667f9e1f5ad60627a26f90f8c7ff28c160f5c0e9fe3e76e95cea8d0ce17d0d0241a2d20f3169d57ae35cada3dcabc25604331014180cea352e1f0e4cf
 SHA512 
235f5f99c0156511ebe25a7a5568ac10ed26645a395cc464800b1417b1d7655c9de218afbe1c612409608e0d34fafa57ce44de362965d6bd381bf7e45742e9e0

diff --git a/dev-python/merge3/merge3-0.0.13.ebuild 
b/dev-python/merge3/merge3-0.0.13.ebuild
new file mode 100644
index ..cbadd39169d8
--- /dev/null
+++ b/dev-python/merge3/merge3-0.0.13.ebuild
@@ -0,0 +1,22 @@
+# 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"
+
+distutils_enable_tests unittest

diff --git a/dev-python/merge3/metadata.xml b/dev-python/merge3/metadata.xml
new file mode 100644
index ..4a879f5ee336
--- /dev/null
+++ b/dev-python/merge3/metadata.xml
@@ -0,0 +1,13 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   pyt...@gentoo.org
+   Python
+   
+   
+   
+   merge3
+   breezy-team/merge3
+   
+