[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-delete-merged-branches/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-delete-merged-branches/
Date: Fri, 23 Dec 2022 20:53:31 +0000 (UTC)	[thread overview]
Message-ID: <1671828779.132648ac0b128cbcdf1378a71e09e3cee0199c80.sping@gentoo> (raw)

commit:     132648ac0b128cbcdf1378a71e09e3cee0199c80
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 20:51:39 2022 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 20:52:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132648ac

dev-vcs/git-delete-merged-branches: 7.4.0 + drop old

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 dev-vcs/git-delete-merged-branches/Manifest        |  4 +--
 .../git-delete-merged-branches-7.2.0.ebuild        | 41 ---------------------
 .../git-delete-merged-branches-7.2.1-r1.ebuild     | 42 ----------------------
 .../git-delete-merged-branches-7.2.1.ebuild        | 41 ---------------------
 ...ild => git-delete-merged-branches-7.4.0.ebuild} |  1 +
 5 files changed, 2 insertions(+), 127 deletions(-)

diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index 2b73db800782..76a9bea5c4c9 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,4 +1,2 @@
-DIST git-delete-merged-branches-7.2.0.tar.gz 38948 BLAKE2B ceec3333221a75b7da8a0d0287c5fea9095136f3ccd4b3f59b205cfca6b2e394cf766aed632f9e94b34ec8f7bb3e1b4ef63c358581e0cf3df8ba33c19915aaf5 SHA512 cc7e250b98caa446af246067727768ae771235fa9d89cd5a319fa2143c826e13c9c2938cf399baefa217be95073fcf50d64a771f98fb12f10d4320b62bfe8b05
-DIST git-delete-merged-branches-7.2.1.tar.gz 39267 BLAKE2B 3514cb84dcd64e0f935eaf806dfbda6227f0c25dcafcd0c33de49fcfdeab330ca1636f63bef0bbd78c19475b0d039b38dbd1a86be614041313d83156d9f1f0fe SHA512 d7849ca309378bde5d09f4c663f65cd7b8a0e40425e134b3c5c4814220070d41da517c489d021036332bf3f85d4dd863b1a5b991549de0241bbaa2db69b9699b
-DIST git-delete-merged-branches-7.2.2.tar.gz 39286 BLAKE2B 9b527db763875e1dfd4c0eeec16e05e3c483747add86e5aed50c0ff5257f5b95f006ad0c5b97978155f1a045419e823f3eec8858333992653f2c6f302c6e9564 SHA512 521858fc393c577ba024b853b92e50dc6ae0e386035972cc6e000db7d7eb0fe9af327b9958a2394c3058a42bcacf50098f6a4dc7767347be9ba2a28b8993595f
 DIST git-delete-merged-branches-7.3.1.tar.gz 41031 BLAKE2B d84e2839223e58f359711f62fe276713e47079efca23860ab28fe43e6ba93ef4661bf56a76be56f2f2c7b5a487214af447c8746bf10adc4fe400aa7727bbb863 SHA512 8c23d8835208f28f64bcd390ee26d2e49c6a941c1299263bc5de91a9790fd2ebd80c573331095847946d2feb98aae8ce71815959b04d1368c7f2cead1e63240d
+DIST git-delete-merged-branches-7.4.0.tar.gz 40887 BLAKE2B e267a0d1154d8adc8cb3a8ab0cfbab687b61b5d17bea63ea6946bbfe41b4cbdbbe288f16e120f7823f3bb50c4e6d61d3ca643fa3fe961bce5c26cc2a64287573 SHA512 90459162bb6d7cf9746ca0497a89f998b6a7b0cf165425e74375c55f99fa7ada3b8db66b567b41985e0728785c922c1a7cbdd30b4aab4700acf6a34a3d5056f3

diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.0.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.0.ebuild
deleted file mode 100644
index 6ec57561f7ac..000000000000
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line tool to delete merged Git branches"
-HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="full-name-executable test"
-
-COMMON_DEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	full-name-executable? ( !dev-vcs/git-extras )
-	dev-vcs/git
-"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	if ! use full-name-executable; then
-	    rm "${D}"/usr/bin/git-delete-merged-branches || die
-	fi
-}

diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1-r1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1-r1.ebuild
deleted file mode 100644
index 4c3741ca6cb1..000000000000
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line tool to delete merged Git branches"
-HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="full-name-executable test"
-
-COMMON_DEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	full-name-executable? ( !dev-vcs/git-extras )
-	dev-vcs/git
-"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	if ! use full-name-executable; then
-	    rm "${D}"/usr/bin/git-delete-merged-branches || die
-	fi
-}

diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild
deleted file mode 100644
index 6ec57561f7ac..000000000000
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line tool to delete merged Git branches"
-HOMEPAGE="https://github.com/hartwork/git-delete-merged-branches"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="full-name-executable test"
-
-COMMON_DEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	full-name-executable? ( !dev-vcs/git-extras )
-	dev-vcs/git
-"
-
-RESTRICT="!test? ( test )"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	if ! use full-name-executable; then
-	    rm "${D}"/usr/bin/git-delete-merged-branches || die
-	fi
-}

diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.2.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
similarity index 93%
rename from dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.2.ebuild
rename to dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
index 4c3741ca6cb1..ef3284ec6ac5 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.2.2.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
@@ -38,5 +38,6 @@ src_install() {
 
 	if ! use full-name-executable; then
 	    rm "${D}"/usr/bin/git-delete-merged-branches || die
+	    rm "${D}"/usr/share/man/man1/git-delete-merged-branches.1* || die
 	fi
 }

next             reply	other threads:[~2022-12-23 20:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-23 20:53 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-12 22:22 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-delete-merged-branches/ Sebastian Pipping
2024-10-12 22:20 Sam James
2024-10-12 22:06 Sebastian Pipping
2024-05-28 20:49 Sam James
2024-05-22 17:16 Sebastian Pipping
2023-11-07  0:07 Sebastian Pipping
2023-09-24 15:58 Arthur Zamarin
2023-05-20  7:33 Michał Górny
2022-12-13 20:31 Sebastian Pipping
2022-11-27 17:59 Sebastian Pipping
2022-11-27  0:45 Sebastian Pipping
2022-11-26 14:21 Sebastian Pipping
2022-09-03 13:56 Sebastian Pipping

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2b73db80078 dfblob:76a9bea5c4c dfblob:6ec57561f7a
dfblob:4c3741ca6cb dfblob:6ec57561f7a dfblob:4c3741ca6cb
dfblob:ef3284ec6ac )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-delete-merged-branches/" )
	(help)

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=1671828779.132648ac0b128cbcdf1378a71e09e3cee0199c80.sping@gentoo \
    --to=sping@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