{"bugs":[],"categories":[{"categoryid":450,"name":"dev-lang","summary":"The dev-lang category contains various programming language implementations and related tools."},{"categoryid":336,"name":"dev-python","summary":"The dev-python category contains packages whose primary purpose is to provide Python modules, extensions and bindings, as well as tools and utilities useful for development in the Python programming language."}],"changelog":[{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"5a8faf10d3a88a8922fa0784a73973136e1ee282","committime":"2025-05-23T13:24:36","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"arthurzam@gentoo.org","authorname":"Arthur Zamarin","body":"Signed-off-by: Arthur Zamarin ","commitid":"c9e63651ee9702dad084a915c22d8e4ed856ad3e","committime":"2025-05-23T12:02:24","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: enable py3.14"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"b84cef24feed12b54ca0c9682ea8620cc622295a","committime":"2025-02-28T13:33:30","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"mgorny@gentoo.org","authorname":"Michał Górny","body":"Signed-off-by: Michał Górny ","commitid":"4833fb739fc50ab67481ab53ad488270570a4d2a","committime":"2025-02-28T12:20:51","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Enable pypy3.11"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"71bf1148c478cd5dd006c10c349a86f614154cdf","committime":"2024-05-18T10:33:41","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"mgorny@gentoo.org","authorname":"Michał Górny","body":"Signed-off-by: Michał Górny ","commitid":"6ca417fa28f3b74135fd030ef57ae047217e6e17","committime":"2024-05-18T09:45:05","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Enable py3.13"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"3af45f318feb832e68d85e6c029885b24e5943a6","committime":"2023-11-24T16:01:59","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"arthurzam@gentoo.org","authorname":"Arthur Zamarin","body":"Signed-off-by: Arthur Zamarin ","commitid":"92de8e351d8d1dd6075a1254a087b182a71efc29","committime":"2023-11-24T15:46:57","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Stabilize 0.1.1-r1 arm64, #918385"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"e74a355d263717b0e70bb1ac58f2934f9a97fa18","committime":"2023-11-23T17:01:56","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"arthurzam@gentoo.org","authorname":"Arthur Zamarin","body":"Signed-off-by: Arthur Zamarin ","commitid":"f0052df492c846c63afb1d35eb10f9333982f7eb","committime":"2023-11-23T16:45:21","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Keyword 0.1.1-r1 arm64, #918052"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"d834d915515f4efc5ba4487c095abbd3df7272a7","committime":"2023-11-17T15:46:58","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"andrewammerlaan@gentoo.org","authorname":"Andrew Ammerlaan","body":"Signed-off-by: Andrew Ammerlaan ","commitid":"1f4d7a07ad223cfa4029746416a71a319bbbb2ef","committime":"2023-11-17T15:31:02","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: enable pypy3"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"75de9ff4bafd31cfebb84517f7c37e7ceea4f2d9","committime":"2023-07-10T01:31:41","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"mgorny@gentoo.org","authorname":"Michał Górny","body":"Signed-off-by: Michał Górny ","commitid":"2c50fb15928f9cd99a25014aa7841957d6a78034","committime":"2023-07-10T01:24:34","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Remove old"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"85d428c9ebda5710a368ecacee0f69ae88e79970","committime":"2023-07-09T17:01:43","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"arthurzam@gentoo.org","authorname":"Arthur Zamarin","body":"Signed-off-by: Arthur Zamarin ","commitid":"e79fcd6d9b5e8e61fd33af3968df01f5e7e09f21","committime":"2023-07-09T16:51:54","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Stabilize 0.1.1-r1 ALLARCHES, #910147"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"42773f7776b89ee6db42d967f0ccd16c7ac83399","committime":"2023-05-31T10:01:57","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"mgorny@gentoo.org","authorname":"Michał Górny","body":"Signed-off-by: Michał Górny ","commitid":"a9ddae173dd4f6ce551cdd6fd3c759c816bf802c","committime":"2023-05-31T09:55:00","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Enable py3.12"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"d65e2beb486c50a34b3033d4c377c404f11fb594","committime":"2023-05-27T19:31:52","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"arthurzam@gentoo.org","authorname":"Arthur Zamarin","body":"Signed-off-by: Arthur Zamarin ","commitid":"f935eda0a65444f724664927b4077019af08ca80","committime":"2023-05-27T19:10:03","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: EAPI=8, PEP517"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"8d0ebee607de5c63d747980fbeb0806c193a29c9","committime":"2023-01-14T13:02:17","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"soap@gentoo.org","authorname":"David Seifert","body":"Signed-off-by: David Seifert ","commitid":"ed468028e725c9580a7b2ee02d6b7b9375f7a0b2","committime":"2023-01-14T12:51:19","packageid":72203,"repoid":1,"summary":"*\/*: remove py3.8 from PYTHON_COMPAT"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"0ba20778457630ded03e41195e12b60d5acba1a3","committime":"2022-05-17T12:33:11","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"andrewammerlaan@gentoo.org","authorname":"Andrew Ammerlaan","body":"Signed-off-by: Andrew Ammerlaan ","commitid":"7ef58a566b303d4b649e447f803578671c7e29bb","committime":"2022-05-17T12:03:39","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: enable py3.11 and disable py3.7"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"4a07cd1511e476e9d22dcb092212e8a4d7fd5071","committime":"2021-06-05T15:20:08","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"andrewammerlaan@gentoo.org","authorname":"Andrew Ammerlaan","body":"Package-Manager: Portage-3.0.19, Repoman-3.0.3\nSigned-off-by: Andrew Ammerlaan ","commitid":"4f7c97aa562d7ad604373160ebddab7e74a015f5","committime":"2021-06-05T14:39:23","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: enable py3.10"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"9247164345615ee67f9f91bb7ebb963d6487a3f9","committime":"2020-12-20T17:05:06","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"whissi@gentoo.org","authorname":"Thomas Deutschmann","body":"Package-Manager: Portage-3.0.12, Repoman-3.0.2\nSigned-off-by: Thomas Deutschmann ","commitid":"eb23808232626f936c63c57c9d6e893b5fcccf57","committime":"2020-12-20T16:08:11","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: x86 stable (bug #760531)"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"013d731213513ddc8a7140ea16b1da6e7f686244","committime":"2020-12-19T20:05:06","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"sam@gentoo.org","authorname":"Sam James","body":"Signed-off-by: Sam James ","commitid":"a88b40b93fddbee9bc602a55c31d06e1842a1a53","committime":"2020-12-19T19:35:04","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: Stabilize 0.1.1 amd64, #760531"},{"authoremail":"repomirrorci@gentoo.org","authorname":"Repository mirror & CI","commitid":"4aedf5f80188e8bb9c616b635711f50ba0436bb6","committime":"2020-11-17T14:43:18","packageid":72203,"repoid":1,"summary":"Merge updates from master"},{"authoremail":"andrewammerlaan@riseup.net","authorname":"Andrew Ammerlaan","body":"Package-Manager: Portage-3.0.9, Repoman-3.0.2\nSigned-off-by: Andrew Ammerlaan \nSigned-off-by: Joonas Niilola ","commitid":"070e6aea698ba53c1d463390ffc3ed70129d88ea","committime":"2020-11-09T12:58:35","packageid":72203,"repoid":1,"summary":"dev-python\/three-merge: lib to perform 3-way merge between strings"}],"dependencies":[],"depending":[{"block":false,"categoryid":336,"description":"The Scientific Python Development Environment","ebuildids":[889904],"firstseen":"2010-05-04T00:54:45.661860","maintainer":"grozin@gentoo.org","maintainername":"Andrey Grozin","name":"spyder","packageid":50836,"summary":"Spyder is a powerful scientific environment written in Python, for Python,and designed by and for scientists, engineers and data analysts. It features a unique combination of the advanced editing, analysis, debugging and profiling functionality of a comprehensive development tool with the data exploration, interactive execution, deep inspection and beautiful visualization capabilities of an analysis package. Furthermore, Spyder offers built-in integration with many popular scientific libraries, including NumPy, SciPy, Pandas, IPython, QtConsole, Matplotlib, SymPy, and more, and can be extended further with full plugin support."}],"ebuilds":[{"archs":["amd64","arm64","x86"],"ebuildid":788264,"firstseen":"2023-05-27T20:46:14.942571","license":"MIT","moddate":"2026-03-30T13:49:41","packageid":72203,"repoid":1,"slot":"0","uses":["python_targets_pypy3_11","python_targets_python3_11","python_targets_python3_12","python_targets_python3_13","python_targets_python3_14","test"],"version":"0.1.1-r1"}],"masks":[],"package":{"categoryid":336,"description":"Simple Python library to perform a 3-way merge between strings","firstseen":"2020-11-17T14:46:04.271566","name":"three-merge","packageid":72203},"rdependencies":[{"block":false,"categoryid":450,"description":"An interpreted, interactive, object-oriented programming language","ebuildids":[788264,788264,788264,788264],"firstseen":"2010-05-04T00:54:45.661860","maintainer":"python@gentoo.org","maintainername":"Python","name":"python","packageid":43095},{"block":false,"categoryid":336,"description":"Diff, match and patch algorithms for plain text","ebuildids":[788264],"firstseen":"2011-12-27T14:35:53.280221","maintainer":"aidecoe@gentoo.org","maintainername":"Amadeusz Żołnowski","name":"diff-match-patch","packageid":58611,"summary":"The Diff Match and Patch libraries offer robust algorithms to perform the operations required for synchronizing plain text. Diff: Compare two blocks of plain text and efficiently return a list of differences. Match: Given a search string, find its best fuzzy match in a block of plain text. Weighted for both accuracy and location. Patch: Apply a list of patches onto plain text. Use best-effort to apply patch even when the underlying text doesn't match. Diff Match and Patch libraries are currently available in Java, JavaScript, C++, C#, Objective C, Lua and Python, although this package contains only Python implementation. Regardless of language, each library features the same API and the same functionality. All versions also have comprehensive test harnesses."},{"block":false,"categoryid":450,"description":"A fast, compliant alternative implementation of the Python (3.11) language","ebuildids":[788264],"firstseen":"2024-10-21T16:27:14.789750","name":"pypy","packageid":77785}],"repos":[{"branch":"master","lastcommit":"52197549fd3431fa256b8edbafdcd3702dd0e134","name":"gentoo","path":"\/usr\/portage","repoid":1,"upstream":"origin"}],"tracked":false,"urls":["https:\/\/github.com\/spyder-ide\/three-merge\/","https:\/\/pypi.org\/project\/three-merge\/"],"uses":[{"description":"Enable dependencies and\/or preparations necessary to run tests (usually controlled by FEATURES=test but can be toggled independently)","isdefault":false,"use":"test"},{"description":"Build with PyPy3.11","group":"python_targets","isdefault":false,"use":"pypy3_11"},{"description":"Build with Python 3.11","group":"python_targets","isdefault":false,"use":"python3_11"},{"description":"Build with Python 3.12","group":"python_targets","isdefault":false,"use":"python3_12"},{"description":"Build with Python 3.13","group":"python_targets","isdefault":false,"use":"python3_13"},{"description":"Build with Python 3.14","group":"python_targets","isdefault":false,"use":"python3_14"}]}