public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/
Date: Mon, 10 Jul 2023 01:25:27 +0000 (UTC)	[thread overview]
Message-ID: <1688952274.2c50fb15928f9cd99a25014aa7841957d6a78034.mgorny@gentoo> (raw)

commit:     2c50fb15928f9cd99a25014aa7841957d6a78034
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 01:24:34 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 01:24:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c50fb15

dev-python/three-merge: Remove old

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

 dev-python/three-merge/Manifest                 |  1 -
 dev-python/three-merge/three-merge-0.1.1.ebuild | 26 -------------------------
 2 files changed, 27 deletions(-)

diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 8e6d20b4332f..d615ccde7c58 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,2 +1 @@
-DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
 DIST three-merge-0.1.1.gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc

diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
deleted file mode 100644
index 21f79fc691f7..000000000000
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
-HOMEPAGE="https://github.com/spyder-ide/three-merge
-	https://pypi.org/project/three-merge/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
-
-BDEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest


             reply	other threads:[~2023-07-10  1:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-10  1:25 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-28 13:18 [gentoo-commits] repo/gentoo:master commit in: dev-python/three-merge/ Michał Górny
2024-05-18 10:15 Michał Górny
2023-11-24 15:47 Arthur Zamarin
2023-11-23 16:45 Arthur Zamarin
2023-11-17 15:31 Andrew Ammerlaan
2023-07-09 16:52 Arthur Zamarin
2023-05-31  9:59 Michał Górny
2023-05-27 19:21 Arthur Zamarin
2022-05-17 12:20 Andrew Ammerlaan
2021-06-05 15:10 Andrew Ammerlaan
2021-05-22 20:55 Andrew Ammerlaan
2020-12-20 16:30 Thomas Deutschmann
2020-12-19 19:36 Sam James
2020-11-17 14:21 Joonas Niilola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1688952274.2c50fb15928f9cd99a25014aa7841957d6a78034.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox