public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-lfs/
Date: Fri, 28 Jan 2022 07:24:19 +0000 (UTC)	[thread overview]
Message-ID: <1643354640.d1ff69c7b3de3dc6a86ea45082e97f42b74c0565.sam@gentoo> (raw)

commit:     d1ff69c7b3de3dc6a86ea45082e97f42b74c0565
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 28 07:20:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:24:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ff69c7

dev-vcs/git-lfs: allow app-text/ronn-ng instead of app-text/ronn

ronn is going away and is replaced by ronn-ng.

(Revbump because otherwise the package manager has no reason to be
aware that it can be liberated of app-text/ronn and choose app-text/ronn-ng
otherwise, when app-text/ronn gets masked.)

Bug: https://bugs.gentoo.org/770907
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git-lfs/{git-lfs-2.11.0.ebuild => git-lfs-2.11.0-r1.ebuild} | 4 ++--
 dev-vcs/git-lfs/{git-lfs-2.13.3.ebuild => git-lfs-2.13.3-r1.ebuild} | 4 ++--
 dev-vcs/git-lfs/git-lfs-9999.ebuild                                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild
similarity index 93%
rename from dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
rename to dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild
index 6fdbdcf910e1..5db47f6cb90f 100644
--- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"

diff --git a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild
similarity index 94%
rename from dev-vcs/git-lfs/git-lfs-2.13.3.ebuild
rename to dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild
index 5c5be39ec301..2cf565a6aba2 100644
--- a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"

diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index 641f9c79a60b..9074b5b98409 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
 SLOT="0"
 IUSE="doc test"
 
-BDEPEND="doc? ( app-text/ronn )"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
 RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"


             reply	other threads:[~2022-01-28  7:24 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-28  7:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-11 11:01 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-lfs/ Sam James
2024-04-09  6:59 Yixun Lan
2024-04-09  6:59 Yixun Lan
2023-09-25  6:33 Arthur Zamarin
2023-09-25  6:33 Arthur Zamarin
2023-08-08  5:27 Sam James
2023-08-08  5:27 Sam James
2023-08-08  5:27 Sam James
2023-07-26  2:53 Sam James
2023-07-26  2:53 Sam James
2023-06-12 14:06 Sam James
2023-04-25 22:16 Sam James
2023-04-10 22:17 Sam James
2023-03-04 13:22 Arthur Zamarin
2023-02-21  9:29 Sam James
2023-02-21  9:29 Sam James
2023-02-21  9:29 Sam James
2022-10-15  6:58 Jakov Smolić
2022-07-25  6:10 Joonas Niilola
2022-06-12  7:33 Joonas Niilola
2022-05-18 15:14 Joonas Niilola
2022-05-18 15:14 Joonas Niilola
2022-04-09 17:56 Agostino Sarubbo
2022-03-04  9:49 Joonas Niilola
2022-03-04  9:49 Joonas Niilola
2021-12-15  5:37 Sam James
2021-04-10  7:45 Joonas Niilola
2021-04-10  7:45 Joonas Niilola
2021-02-01 16:32 Sam James
2021-01-28  8:16 Joonas Niilola
2021-01-28  8:16 Joonas Niilola
2021-01-28  8:16 Joonas Niilola
2020-11-18 15:24 Joonas Niilola
2020-11-18 15:24 Joonas Niilola
2020-08-12 22:10 Thomas Deutschmann
2020-08-12 22:10 Thomas Deutschmann
2020-07-19 16:03 Sam James
2020-07-05 17:17 William Hubbs
2020-06-15 14:59 Agostino Sarubbo
2020-05-24 20:01 William Hubbs
2020-05-24 19:57 William Hubbs
2020-05-17 11:29 Joonas Niilola
2020-05-17 11:29 Joonas Niilola
2020-05-17 11:29 Joonas Niilola
2020-05-17 11:29 Joonas Niilola
2020-05-07 13:29 Agostino Sarubbo
2020-03-25 11:17 Joonas Niilola
2020-03-25 11:17 Joonas Niilola
2020-03-25 11:17 Joonas Niilola
2019-06-24 15:14 Michael Haubenwallner
2019-06-18  6:55 Ettore Di Giacinto
2019-06-18  6:55 Ettore Di Giacinto
2019-05-31  6:49 Agostino Sarubbo
2019-02-08 22:15 Ettore Di Giacinto
2019-02-08 22:15 Ettore Di Giacinto
2018-09-23 11:26 Ettore Di Giacinto
2018-09-23 11:26 Ettore Di Giacinto
2018-06-27 14:41 Ettore Di Giacinto
2018-06-27 14:41 Ettore Di Giacinto
2018-02-03 10:03 Ettore Di Giacinto
2017-10-01  8:27 Ettore Di Giacinto
2017-10-01  8:27 Ettore Di Giacinto
2017-09-24  9:22 Ettore Di Giacinto
2017-09-24  9:22 Ettore Di Giacinto
2017-07-20 17:11 Ettore Di Giacinto
2017-07-02 14:16 Ettore Di Giacinto
2017-07-02 14:16 Ettore Di Giacinto
2017-06-04 15:18 Ettore Di Giacinto
2017-05-21 11:14 Ettore Di Giacinto
2017-05-01 10:18 Ettore Di Giacinto
2017-05-01 10:18 Ettore Di Giacinto
2017-05-01 10:18 Ettore Di Giacinto
2017-03-31 14:10 Ettore Di Giacinto
2017-03-31 14:10 Ettore Di Giacinto
2017-03-08 10:17 Ettore Di Giacinto
2017-03-03  9:47 Ettore Di Giacinto
2017-02-23 14:25 Ettore Di Giacinto
2017-02-23 14:25 Ettore Di Giacinto

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=1643354640.d1ff69c7b3de3dc6a86ea45082e97f42b74c0565.sam@gentoo \
    --to=sam@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